From a241fb32d282c2cb00184c9dfe8293ece1033d03 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Wed, 13 Sep 2023 16:58:15 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=20openresty=20?=
 =?UTF-8?q?=E9=9D=9E=2080=20443=20=E7=AB=AF=E5=8F=A3=E6=8F=90=E7=A4=BA=20(?=
 =?UTF-8?q?#2276)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/app-status/index.vue | 6 ++++--
 frontend/src/lang/modules/en.ts              | 3 ++-
 frontend/src/lang/modules/tw.ts              | 2 +-
 frontend/src/lang/modules/zh.ts              | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/app-status/index.vue b/frontend/src/components/app-status/index.vue
index 725d63515..dfc7909ab 100644
--- a/frontend/src/components/app-status/index.vue
+++ b/frontend/src/components/app-status/index.vue
@@ -42,9 +42,9 @@
                         </el-button>
                     </span>
 
-                    <span class="warn" v-if="key === 'openresty' && httpPort != 80">
+                    <span class="warn" v-if="key === 'openresty' && (httpPort != 80 || httpsPort != 443)">
                         <el-alert class="helper" type="error" :closable="false">
-                            {{ $t('website.openrestryHelper', [httpPort]) }}
+                            {{ $t('website.openrestryHelper', [httpPort, httpsPort]) }}
                         </el-alert>
                     </span>
                 </div>
@@ -123,6 +123,7 @@ let operateReq = reactive({
 });
 let refresh = ref(1);
 const httpPort = ref(0);
+const httpsPort = ref(0);
 
 const em = defineEmits(['setting', 'isExist', 'before', 'update:loading', 'update:maskShow']);
 const setting = () => {
@@ -140,6 +141,7 @@ const onCheck = async () => {
             em('isExist', res.data);
             operateReq.installId = res.data.appInstallId;
             httpPort.value = res.data.httpPort;
+            httpsPort.value = res.data.httpsPort;
             refresh.value++;
         })
         .catch(() => {
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index 4dcc85d7f..f81f26802 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -1505,7 +1505,8 @@ const message = {
         changeVersion: 'Switch version',
         retainConfig: 'Whether to keep php-fpm.conf and php.ini files',
         runDirHelper2: 'Please ensure that the secondary running directory is under the index directory',
-        openrestryHelper: 'The default port of OpenResty is {0}, which affects website domain name access',
+        openrestryHelper:
+            'OpenResty default HTTP port: {0} HTTPS port: {1}, which may affect website domain name access and HTTPS forced redirect',
     },
     php: {
         short_open_tag: 'Short tag support',
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
index 290fdfd58..048fa7ee6 100644
--- a/frontend/src/lang/modules/tw.ts
+++ b/frontend/src/lang/modules/tw.ts
@@ -1432,7 +1432,7 @@ const message = {
         changeVersion: '切換版本',
         retainConfig: '是否保留 php-fpm.conf 和 php.ini 文件',
         runDirHelper2: '請確保二級運行目錄位於 index 目錄下',
-        openrestryHelper: 'OpenResty默認端口為 {0}，影響網站域名訪問',
+        openrestryHelper: 'OpenResty 默認 HTTP 端口：{0} HTTPS 端口：{1}，可能影響網站域名訪問和 HTTPS 強制跳轉',
     },
     php: {
         short_open_tag: '短標簽支持',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index c01a8b66d..5a7fe6ab4 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -1432,7 +1432,7 @@ const message = {
         changeVersion: '切换版本',
         retainConfig: '是否保留 php-fpm.conf 和 php.ini 文件',
         runDirHelper2: '请确保二级运行目录位于 index 目录下',
-        openrestryHelper: 'OpenResty默认端口为 {0}，影响网站域名访问',
+        openrestryHelper: 'OpenResty 默认 HTTP 端口：{0} HTTPS 端口 ：{1}，可能影响网站域名访问和 HTTPS 强制跳转',
     },
     php: {
         short_open_tag: '短标签支持',