From b09c423bcc05616fa267121f7a387dd6e959dc35 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Sat, 7 Oct 2023 21:50:16 -0500
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=A3=E5=86=B3=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=BD=91=E7=AB=99=E5=88=87=E6=8D=A2=E7=B1=BB=E5=9E=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=20(#2451?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/interface/app.ts             |  2 +-
 .../views/website/website/create/index.vue    | 60 +++++--------------
 2 files changed, 16 insertions(+), 46 deletions(-)

diff --git a/frontend/src/api/interface/app.ts b/frontend/src/api/interface/app.ts
index 58f60ee6a..6890babe1 100644
--- a/frontend/src/api/interface/app.ts
+++ b/frontend/src/api/interface/app.ts
@@ -106,7 +106,7 @@ export namespace App {
 
     export interface AppInstalled extends CommonModel {
         name: string;
-        appId: string;
+        appId: number;
         appDetailId: string;
         env: string;
         status: string;
diff --git a/frontend/src/views/website/website/create/index.vue b/frontend/src/views/website/website/create/index.vue
index 2bace8dfc..7a129939d 100644
--- a/frontend/src/views/website/website/create/index.vue
+++ b/frontend/src/views/website/website/create/index.vue
@@ -332,14 +332,7 @@
 <script lang="ts" setup name="CreateWebSite">
 import DrawerHeader from '@/components/drawer-header/index.vue';
 import { App } from '@/api/interface/app';
-import {
-    GetApp,
-    GetAppDetail,
-    SearchApp,
-    GetAppInstalled,
-    GetAppDetailByID,
-    CheckAppInstalled,
-} from '@/api/modules/app';
+import { GetApp, GetAppDetail, SearchApp, GetAppInstalled, GetAppDetailByID } from '@/api/modules/app';
 import { CreateWebsite, PreCheck } from '@/api/modules/website';
 import { Rules, checkNumberRange } from '@/global/form-rules';
 import i18n from '@/lang';
@@ -442,31 +435,24 @@ const handleClose = () => {
 };
 
 const changeType = (type: string) => {
-    if (type == 'deployemnt') {
-        if (appInstalles.value && appInstalles.value.length > 0) {
-            website.value.appInstallId = appInstalles.value[0].id;
-        }
-    } else if (type == 'runtime') {
-        checkNginxVersion();
-        getRuntimes();
-    } else {
-        website.value.appInstallId = undefined;
+    switch (type) {
+        case 'deployment':
+            website.value.appType = 'installed';
+            if (appInstalles.value && appInstalles.value.length > 0) {
+                website.value.appInstallId = appInstalles.value[0].id;
+            }
+            break;
+        case 'runtime':
+            getRuntimes();
+            break;
+        default:
+            website.value.appInstallId = undefined;
+            break;
     }
     website.value.type = type;
     versionExist.value = true;
 };
 
-const checkNginxVersion = async () => {
-    try {
-        const res = await CheckAppInstalled('openresty', '');
-        if (res.data && res.data.version) {
-            if (!compareVersions(res.data.version, '1.21.4')) {
-                versionExist.value = false;
-            }
-        }
-    } catch (error) {}
-};
-
 const searchAppInstalled = () => {
     GetAppInstalled({ type: 'website', unused: true }).then((res) => {
         appInstalles.value = res.data;
@@ -531,6 +517,7 @@ const changeRuntimeType = () => {
     } else {
         runtimeReq.value.status = 'running';
     }
+    website.value.runtimeID = undefined;
     getRuntimes();
 };
 
@@ -622,23 +609,6 @@ const changeAlias = (value: string) => {
     website.value.alias = domain;
 };
 
-function compareVersions(version1: string, version2: string): boolean {
-    const v1 = version1.split('.');
-    const v2 = version2.split('.');
-    const len = Math.max(v1.length, v2.length);
-
-    for (let i = 0; i < len; i++) {
-        const num1 = parseInt(v1[i] || '0');
-        const num2 = parseInt(v2[i] || '0');
-
-        if (num1 !== num2) {
-            return num1 > num2 ? true : false;
-        }
-    }
-
-    return false;
-}
-
 defineExpose({
     acceptParams,
 });