From eb36a0f8cb41eeebf9ec2d7e5dea9704d6c6ca23 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Sat, 16 Nov 2024 21:00:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=AE=B8=E5=8F=AF?=
 =?UTF-8?q?=E8=AF=81=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=20(#7094)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/i18n/lang/en.yaml                    | 1 +
 backend/i18n/lang/zh-Hant.yaml               | 1 +
 backend/i18n/lang/zh.yaml                    | 1 +
 frontend/src/lang/modules/en.ts              | 2 +-
 frontend/src/lang/modules/tw.ts              | 2 +-
 frontend/src/lang/modules/zh.ts              | 2 +-
 frontend/src/views/setting/license/index.vue | 7 ++++---
 7 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/backend/i18n/lang/en.yaml b/backend/i18n/lang/en.yaml
index 445010302..5765d271f 100644
--- a/backend/i18n/lang/en.yaml
+++ b/backend/i18n/lang/en.yaml
@@ -201,6 +201,7 @@ ErrLicenseSync: "Failed to sync license information, no license information dete
 ErrXpackNotFound: "This section is a professional edition feature, please import the license first in Panel Settings-License interface"
 ErrXpackNotActive: "This section is a professional edition feature, please synchronize the license status first in Panel Settings-License interface"
 ErrXpackOutOfDate: "The current license has expired, please re-import the license in Panel Settings-License interface"
+ErrXpackTimeout: "Request timed out, the network connection may be unstable, please try again later!"
 
 
 #license
diff --git a/backend/i18n/lang/zh-Hant.yaml b/backend/i18n/lang/zh-Hant.yaml
index f29fd67b2..3bf8c4912 100644
--- a/backend/i18n/lang/zh-Hant.yaml
+++ b/backend/i18n/lang/zh-Hant.yaml
@@ -202,6 +202,7 @@ ErrLicenseSync: "許可證信息同步失敗，資料庫中未檢測到許可證
 ErrXpackNotFound: "該部分為專業版功能，請先在 面板設置-許可證 界面導入許可證"
 ErrXpackNotActive: "該部分為專業版功能，請先在 面板設置-許可證 界面同步許可證狀態"
 ErrXpackOutOfDate: "當前許可證已過期，請重新在 面板設置-許可證 界面導入許可證"
+ErrXpackTimeout: "請求超時，網絡連接可能不穩定，請稍後再試！"
 
 #license
 ErrAlert: "告警資訊格式錯誤，請檢查後重試！"
diff --git a/backend/i18n/lang/zh.yaml b/backend/i18n/lang/zh.yaml
index 08d4ac3cd..a1174da53 100644
--- a/backend/i18n/lang/zh.yaml
+++ b/backend/i18n/lang/zh.yaml
@@ -204,6 +204,7 @@ ErrLicenseSync: "许可证信息同步失败，数据库中未检测到许可证
 ErrXpackNotFound: "该部分为专业版功能，请先在 面板设置-许可证 界面导入许可证"
 ErrXpackNotActive: "该部分为专业版功能，请先在 面板设置-许可证 界面同步许可证状态"
 ErrXpackOutOfDate: "当前许可证已过期，请重新在 面板设置-许可证 界面导入许可证"
+ErrXpackTimeout: "请求超时，网络连接可能不稳定，请稍后再试！"
 
 #license
 ErrAlert: "告警信息格式错误，请检查后重试！"
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index 6b727127c..1e57f6d4f 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -1690,7 +1690,7 @@ const message = {
         Enable: 'Enabled',
         Disable: 'Disabled',
         lostHelper:
-            'The License needs to be periodically synchronized for availability. Please ensure normal external network access.',
+            'The license has reached the maximum number of retry attempts. Please manually click the sync button to ensure the professional version features are functioning properly.',
         quickUpdate: 'Quick Update',
         import: 'Import',
         power: 'Authorize',
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
index 04b0b97c1..194abfa64 100644
--- a/frontend/src/lang/modules/tw.ts
+++ b/frontend/src/lang/modules/tw.ts
@@ -1567,7 +1567,7 @@ const message = {
         Lost: '已失聯',
         Enable: '已啟用',
         Disable: '未啟用',
-        lostHelper: '許可證需要定時同步是否可用，請保證正常外網訪問。',
+        lostHelper: '許可證已達到最大重試次數，請手動點擊同步按鈕，以確保專業版功能正常使用。',
         quickUpdate: '快速更新',
         import: '導入',
         power: '授 權',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 201dc9fa4..a7ece7f87 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -1568,7 +1568,7 @@ const message = {
         Lost: '已失联',
         Enable: '已激活',
         Disable: '未激活',
-        lostHelper: '许可证需要定时同步是否可用，请保证正常外网访问。',
+        lostHelper: '许可证已达到最大重试次数，请手动点击同步按钮，以确保专业版功能正常使用。',
         quickUpdate: '快速更新',
         import: '导入',
         power: '授 权',
diff --git a/frontend/src/views/setting/license/index.vue b/frontend/src/views/setting/license/index.vue
index 2a0628092..191f2e66a 100644
--- a/frontend/src/views/setting/license/index.vue
+++ b/frontend/src/views/setting/license/index.vue
@@ -45,7 +45,8 @@
                                     <div v-if="license.status">
                                         <el-tooltip
                                             v-if="license.status.indexOf('Lost') !== -1"
-                                            :content="$t('license.lostHelper')"
+                                            :content="license.message"
+                                            placement="top"
                                         >
                                             <el-tag type="info">
                                                 {{ $t('license.' + license.status) }}
@@ -56,7 +57,7 @@
                                     <span v-else>-</span>
                                 </el-descriptions-item>
                                 <el-descriptions-item class="descriptions" :label="$t('commons.table.message')">
-                                    {{ license.message }}
+                                    {{ showSync() ? $t('license.lostHelper') : '' }}
                                 </el-descriptions-item>
                             </el-descriptions>
                         </div>
@@ -200,7 +201,7 @@ const search = async () => {
     await getLicense()
         .then((res) => {
             loading.value = false;
-            license.status = res.data.status;
+            license.status = res.data.status === 'OnRetry' ? 'Enable' : res.data.status;
             globalStore.isProductPro =
                 res.data.status === 'Enable' || res.data.status === 'OnRetry' || res.data.status === 'Lost';
             if (res.data.status === '') {