From 02577ef74629af54e0258f6174b6c7ba3374e297 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <31820853+zhengkunwang223@users.noreply.github.com>
Date: Fri, 14 Apr 2023 17:18:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20OpenResty=20=E5=8D=87=E7=BA=A7=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=BD=AC=E5=88=B0=E5=88=9B=E5=BB=BA=E7=BD=91=E7=AB=99?=
 =?UTF-8?q?=E5=A4=84=20(#647)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/website/runtime/index.vue  | 47 +-----------
 .../views/website/website/create/index.vue    | 76 ++++++++++++++-----
 2 files changed, 60 insertions(+), 63 deletions(-)

diff --git a/frontend/src/views/website/runtime/index.vue b/frontend/src/views/website/runtime/index.vue
index 6fb6a28e8..5f201b30e 100644
--- a/frontend/src/views/website/runtime/index.vue
+++ b/frontend/src/views/website/runtime/index.vue
@@ -8,7 +8,7 @@
                 },
             ]"
         />
-        <LayoutContent :title="$t('runtime.runtime')" v-loading="loading" :class="{ mask: !versionExist }">
+        <LayoutContent :title="$t('runtime.runtime')" v-loading="loading">
             <template #toolbar>
                 <el-button type="primary" @click="openCreate">
                     {{ $t('runtime.create') }}
@@ -65,15 +65,6 @@
                 </ComplexTable>
             </template>
         </LayoutContent>
-        <el-card width="30%" v-if="!versionExist" class="mask-prompt">
-            <span>
-                {{ $t('runtime.openrestryWarn') }}
-                <span class="open-warn" @click="goRouter()">
-                    <el-icon><Position /></el-icon>
-                    {{ $t('runtime.toupgrade') }}
-                </span>
-            </span>
-        </el-card>
         <CreateRuntime ref="createRef" @close="search" />
     </div>
 </template>
@@ -90,8 +81,6 @@ import CreateRuntime from '@/views/website/runtime/create/index.vue';
 import Status from '@/components/status/index.vue';
 import i18n from '@/lang';
 import { useDeleteData } from '@/hooks/use-delete-data';
-import { CheckAppInstalled } from '@/api/modules/app';
-import router from '@/routers';
 
 const paginationConfig = reactive({
     currentPage: 1,
@@ -122,7 +111,6 @@ const buttons = [
 const loading = ref(false);
 const items = ref<Runtime.RuntimeDTO[]>([]);
 const createRef = ref();
-const versionExist = ref(false);
 
 const search = async () => {
     req.page = paginationConfig.currentPage;
@@ -151,44 +139,11 @@ const openDelete = async (row: Runtime.Runtime) => {
     search();
 };
 
-const onCheck = async () => {
-    try {
-        const res = await CheckAppInstalled('openresty');
-        if (res.data && res.data.version) {
-            if (compareVersions(res.data.version, '1.21.4')) {
-                versionExist.value = true;
-            }
-        }
-    } catch (error) {}
-};
-
-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;
-}
-
-const goRouter = async () => {
-    router.push({ name: 'AppUpgrade' });
-};
-
 onMounted(() => {
     search();
     timer = setInterval(() => {
         search();
     }, 10000 * 3);
-    onCheck();
 });
 
 onUnmounted(() => {
diff --git a/frontend/src/views/website/website/create/index.vue b/frontend/src/views/website/website/create/index.vue
index 340c12d4c..3c476b9dd 100644
--- a/frontend/src/views/website/website/create/index.vue
+++ b/frontend/src/views/website/website/create/index.vue
@@ -41,7 +41,7 @@
                 </template>
             </DrawerHeader>
         </template>
-        <el-row v-loading="loading">
+        <el-row v-loading="loading" :class="{ mask: !versionExist }">
             <el-col :span="22" :offset="1">
                 <el-alert
                     v-if="website.type == 'deployment'"
@@ -227,13 +227,25 @@
             </span>
         </template>
         <Check ref="preCheckRef"></Check>
+        <el-card width="30%" v-if="!versionExist" class="mask-prompt">
+            <span>
+                {{ $t('runtime.openrestryWarn') }}
+            </span>
+        </el-card>
     </el-drawer>
 </template>
 
 <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 } from '@/api/modules/app';
+import {
+    GetApp,
+    GetAppDetail,
+    SearchApp,
+    GetAppInstalled,
+    GetAppDetailByID,
+    CheckAppInstalled,
+} from '@/api/modules/app';
 import { CreateWebsite, PreCheck } from '@/api/modules/website';
 import { Rules } from '@/global/form-rules';
 import i18n from '@/lang';
@@ -270,7 +282,7 @@ const website = ref({
     proxyType: 'tcp',
     port: 9000,
 });
-let rules = ref<any>({
+const rules = ref<any>({
     primaryDomain: [Rules.domain],
     alias: [Rules.linuxName],
     type: [Rules.requiredInput],
@@ -288,31 +300,31 @@ let rules = ref<any>({
     port: [Rules.port],
 });
 
-let open = ref(false);
-let loading = ref(false);
-let groups = ref<Group.GroupInfo[]>([]);
+const open = ref(false);
+const loading = ref(false);
+const groups = ref<Group.GroupInfo[]>([]);
 
-let appInstalles = ref<App.AppInstalled[]>([]);
-let appReq = reactive({
+const appInstalles = ref<App.AppInstalled[]>([]);
+const appReq = reactive({
     type: 'website',
     page: 1,
     pageSize: 20,
 });
-let apps = ref<App.App[]>([]);
-let appVersions = ref<string[]>([]);
-let appDetail = ref<App.AppDetail>();
-let appParams = ref<App.AppParams>();
-let paramKey = ref(1);
-let preCheckRef = ref();
-let staticPath = ref('');
-let runtimeResource = ref('appstore');
+const apps = ref<App.App[]>([]);
+const appVersions = ref<string[]>([]);
+const appDetail = ref<App.AppDetail>();
+const appParams = ref<App.AppParams>();
+const paramKey = ref(1);
+const preCheckRef = ref();
+const staticPath = ref('');
+const runtimeResource = ref('appstore');
 const runtimeReq = ref<Runtime.RuntimeReq>({
     page: 1,
     pageSize: 100,
     status: 'normal',
 });
 const runtimes = ref<Runtime.RuntimeDTO[]>([]);
-
+const versionExist = ref(true);
 const em = defineEmits(['close']);
 
 const handleClose = () => {
@@ -326,11 +338,24 @@ const changeType = (type: string) => {
             website.value.appInstallId = appInstalles.value[0].id;
         }
     } else if (type == 'runtime') {
+        checkNginxVersion();
         getRuntimes();
     } else {
         website.value.appInstallId = undefined;
     }
     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 = () => {
@@ -474,6 +499,23 @@ const changeAlias = (value: string) => {
     website.value.alias = value;
 };
 
+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,
 });