From 84b5f1beb66a8f141474e4781922ea961ef50dbe Mon Sep 17 00:00:00 2001
From: chaos-zhu <ggchaos1022@gmail.com>
Date: Tue, 24 Dec 2024 22:38:59 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8C=89=E9=92=AE&=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=87=8D=E8=BF=9E=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/app/controller/notify.js                    |  2 +-
 web/src/views/setting/components/notify-config.vue | 13 +------------
 web/src/views/terminal/components/terminal-tab.vue |  6 ++----
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/server/app/controller/notify.js b/server/app/controller/notify.js
index 9479fc6..c03014a 100644
--- a/server/app/controller/notify.js
+++ b/server/app/controller/notify.js
@@ -25,7 +25,7 @@ async function updateNotifyConfig({ res, request }) {
       case 'tg':
         let { sendTg } = await decryptAndExecuteAsync(path.join(__dirname, '../utils/plus.js')) || {}
         console.log('sendTg: ', sendTg)
-        if (!sendTg) return res.fail({ msg: 'Plus功能解析失败' })
+        if (!sendTg) return res.fail({ msg: 'Plus专属功能点，请激活Plus' })
         await sendTg(noticeConfig[type], 'EasyNode通知测试', '这是一条测试通知')
         break
     }
diff --git a/web/src/views/setting/components/notify-config.vue b/web/src/views/setting/components/notify-config.vue
index 12bc180..3de9367 100644
--- a/web/src/views/setting/components/notify-config.vue
+++ b/web/src/views/setting/components/notify-config.vue
@@ -93,30 +93,19 @@
     </template>
     <el-form-item label="" class="form_item">
       <el-button
-        v-if="noticeConfig.type !== 'tg'"
         type="primary"
         :loading="loading"
         @click="handleSave"
       >
         测试并保存
       </el-button>
-      <PlusSupportTip>
-        <el-button
-          type="primary"
-          :disabled="!isPlusActive"
-          :loading="loading"
-          @click="handleSave"
-        >
-          测试并保存
-        </el-button>
-      </PlusSupportTip>
     </el-form-item>
   </el-form>
 </template>
 
 <script setup>
 import { ref, reactive, onMounted, getCurrentInstance, computed } from 'vue'
-import PlusSupportTip from '@/components/common/PlusSupportTip.vue'
+// import PlusSupportTip from '@/components/common/PlusSupportTip.vue'
 
 const { proxy: { $api, $notification, $store } } = getCurrentInstance()
 
diff --git a/web/src/views/terminal/components/terminal-tab.vue b/web/src/views/terminal/components/terminal-tab.vue
index d1cb833..406dda2 100644
--- a/web/src/views/terminal/components/terminal-tab.vue
+++ b/web/src/views/terminal/components/terminal-tab.vue
@@ -211,7 +211,7 @@ const connectIO = () => {
     curStatus.value = CONNECT_FAIL
     term.value.write('\r\n\x1b[91mError: 连接失败,请检查EasyNode服务端是否正常, 回车重新发起连接\x1b[0m \r\n')
     $notification({
-      title: '连接失败',
+      title: '服务端连接失败',
       message: '请检查EasyNode服务端是否正常',
       type: 'error'
     })
@@ -222,7 +222,6 @@ const reconnectTerminal = (isCommonTips = false, tips) => {
   socket.value.removeAllListeners()
   socket.value.close()
   socket.value = null
-  curStatus.value = CONNECT_FAIL
   socketConnected.value = false
   if (isCommonTips) {
     if (isPlusActive.value && autoReconnect.value) {
@@ -354,12 +353,11 @@ function extractLastCdPath(text) {
 
 const onData = () => {
   term.value.onData((key) => {
-    if (!socket.value || !socketConnected.value) return
-
     if ('\r' === key && curStatus.value === CONNECT_FAIL) {
       reconnectTerminal(false, '重新连接中...')
       return
     }
+    if (!socket.value || !socketConnected.value) return
 
     if (isLongPressCtrl.value || isLongPressAlt.value) {
       const keyCode = key.toUpperCase().charCodeAt(0)