fix: Modify the node synchronization description information (#8473)

core/app/service/setting.go

@@ -9,7 +9,6 @@ import (
 	"encoding/json"
 	"encoding/pem"
 	"fmt"
-	"github.com/1Panel-dev/1Panel/core/utils/xpack"
 	"net"
 	"net/http"
 	"os"
@@ -18,9 +17,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/1Panel-dev/1Panel/core/app/model"
-
 	"github.com/1Panel-dev/1Panel/core/app/dto"
+	"github.com/1Panel-dev/1Panel/core/app/model"
 	"github.com/1Panel-dev/1Panel/core/app/repo"
 	"github.com/1Panel-dev/1Panel/core/buserr"
 	"github.com/1Panel-dev/1Panel/core/constant"
@@ -30,6 +28,7 @@ import (
 	"github.com/1Panel-dev/1Panel/core/utils/encrypt"
 	"github.com/1Panel-dev/1Panel/core/utils/firewall"
 	"github.com/1Panel-dev/1Panel/core/utils/req_helper/proxy_local"
+	"github.com/1Panel-dev/1Panel/core/utils/xpack"
 	"github.com/gin-gonic/gin"
 )
 
@@ -200,7 +199,11 @@ func (u *SettingService) UpdateProxy(req dto.ProxyUpdate) error {
 	if err := settingRepo.Update("ProxyPasswdKeep", req.ProxyPasswdKeep); err != nil {
 		return err
 	}
-	_ = xpack.Sync(constant.SyncSystemProxy)
+	go func() {
+		if err := xpack.Sync(constant.SyncSystemProxy); err != nil {
+			global.LOG.Errorf("sync proxy to node failed, err: %v", err)
+		}
+	}()
 	return nil
 }
 

core/i18n/lang/en.yaml

@@ -94,11 +94,12 @@ SubTask: "Subtask"
 ScriptLibrary: "Script Library"
 
 Node: "Node"
-SyncNode: "Sync node data {{ .name }}"
+SyncNode: "Sync node data"
-SyncPackageBackups: "Package backup account data"
+SyncPackageData: "Package sync data [{{ .detail }}]"
-SyncPackageProxy: "Package system proxy data"
-SyncPackagePanelJson: "Package node basic data"
 SyncPackageEncrypt: "Data package encryption"
+SyncRequest: "Request node sync API"
+SyncFailedRetry: "Node data sync failed (attempt {{ .index }}), {{ .err }}"
+SyncFailed: "Sync failed, please manually sync in the node list!"
 
 #upgrade node
 NodeUpgrade: "Upgrade node {{ .name }}"

core/i18n/lang/ja.yaml

@@ -95,11 +95,12 @@ SubTask: "サブタスク"
 ScriptLibrary: "スクリプトライブラリ"
 
 Node: "ノード"
-SyncNode: "ノードデータ同期 {{ .name }}"
+SyncNode: "ノードデータ同期"
-SyncPackageBackups: "バックアップアカウントデータのパッケージ化"
+SyncPackageData: "同期データのパッケージ化 [{{ .detail }}]"
-SyncPackageProxy: "システムプロキシデータのパッケージ化"
-SyncPackagePanelJson: "ノード基本データのパッケージ化"
 SyncPackageEncrypt: "データパッケージの暗号化"
+SyncRequest: "ノード同期APIをリクエスト"
+SyncFailedRetry: "ノードデータ同期失敗 ({{ .index }}回目), {{ .err }}"
+SyncFailed: "同期に失敗しました、ノードリストで手動同期してください！"
 
 #upgrade node
 NodeUpgrade: "{{ .name }} ノードのアップグレード"

core/i18n/lang/ko.yaml

@@ -94,11 +94,12 @@ SubTask: "서브 작업"
 ScriptLibrary: "스크립트 라이브러리"
 
 Node: "노드"
-SyncNode: "노드 데이터 동기화 {{ .name }}"
+SyncNode: "노드 데이터 동기화"
-SyncPackageBackups: "백업 계정 데이터 패키징"
+SyncPackageData: "동기화 데이터 패키징 [{{ .detail }}]"
-SyncPackageProxy: "시스템 프록시 데이터 패키징"
-SyncPackagePanelJson: "노드 기본 데이터 패키징"
 SyncPackageEncrypt: "데이터 패키지 암호화"
+SyncRequest: "노드 동기화 API 요청"
+SyncFailedRetry: "노드 데이터 동기화 실패 ({{ .index }}번째 시도), {{ .err }}"
+SyncFailed: "동기화 실패, 노드 목록에서 수동 동기화를 실행하세요!"
 
 #upgrade node
 NodeUpgrade: "{{ .name }} 노드 업그레이드"

core/i18n/lang/ms.yml

@@ -94,11 +94,12 @@ SubTask: "Tugas Sub"
 ScriptLibrary: "Pustaka Skrip"
 
 Node: "Nod"
-SyncNode: "Segerakkan data nod {{ .name }}"
+SyncNode: "Segerakkan data nod"
-SyncPackageBackups: "Pakej data akaun sandaran"
+SyncPackageData: "Pakej data segerak [{{ .detail }}]"
-SyncPackageProxy: "Pakej data proksi sistem"
-SyncPackagePanelJson: "Pakej data asas nod"
 SyncPackageEncrypt: "Enkripsi pakej data"
+SyncRequest: "Permintaan API segerak nod"
+SyncFailedRetry: "Gagal segerak data nod (percubaan ke-{{ .index }}), {{ .err }}"
+SyncFailed: "Segerakan gagal, sila segerakkan secara manual dalam senarai nod!"
 
 #upgrade node
 NodeUpgrade: "Naik taraf node {{ .name }}"

core/i18n/lang/pt-BR.yaml

@@ -94,11 +94,12 @@ SubTask: "Subtarefa"
 ScriptLibrary: "Biblioteca de Scripts"
 
 Node: "Nó"
-SyncNode: "Sincronizar dados do nó {{ .name }}"
+SyncNode: "Sincronizar dados do nó"
-SyncPackageBackups: "Empacotar dados da conta de backup"
+SyncPackageData: "Empacotar dados de sincronização [{{ .detail }}]"
-SyncPackageProxy: "Empacotar dados de proxy do sistema"
-SyncPackagePanelJson: "Empacotar dados básicos do nó"
 SyncPackageEncrypt: "Criptografia de pacote de dados"
+SyncRequest: "Solicitar API de sincronização de nó"
+SyncFailedRetry: "Falha na sincronização de dados do nó (tentativa {{ .index }}), {{ .err }}"
+SyncFailed: "Falha na sincronização, por favor sincronize manualmente na lista de nós!"
 
 #upgrade node
 NodeUpgrade: "Atualizar nó {{ .name }}"

core/i18n/lang/ru.yaml

@@ -94,11 +94,12 @@ SubTask: "Подзадача"
 ScriptLibrary: "Библиотека скриптов"
 
 Node: "Узел"
-SyncNode: "Синхронизация данных узла {{ .name }}"
+SyncNode: "Синхронизация данных узла"
-SyncPackageBackups: "Упаковка данных резервных копий аккаунтов"
+SyncPackageData: "Упаковка данных синхронизации [{{ .detail }}]"
-SyncPackageProxy: "Упаковка данных системного прокси"
-SyncPackagePanelJson: "Упаковка базовых данных узла"
 SyncPackageEncrypt: "Шифрование пакета данных"
+SyncRequest: "Запрос API синхронизации узла"
+SyncFailedRetry: "Ошибка синхронизации данных узла (попытка {{ .index }}), {{ .err }}"
+SyncFailed: "Ошибка синхронизации, выполните ручную синхронизацию в списке узлов!"
 
 #upgrade node
 NodeUpgrade: "Обновление узла {{ .name }}"

core/i18n/lang/zh-Hant.yaml

@@ -94,11 +94,12 @@ SubTask: "子任務"
 ScriptLibrary: "腳本庫"
 
 Node: "節點"
-SyncNode: "同步節點數據 {{ .name }}"
+SyncNode: "同步節點數據"
-SyncPackageBackups: "打包備份帳號數據"
+SyncPackageData: "打包同步數據 [{{ .detail }}]"
-SyncPackageProxy: "打包系統代理數據"
-SyncPackagePanelJson: "打包節點基礎數據"
 SyncPackageEncrypt: "數據包加密"
+SyncRequest: "請求節點同步接口"
+SyncFailedRetry: "第 {{ .index }} 次同步節點數據失敗，{{ .err }}"
+SyncFailed: "同步失敗，請在節點列表中手動同步！"
 
 #upgrade node
 NodeUpgrade: "升級節點 {{ .name }}"

core/i18n/lang/zh.yaml

@@ -95,11 +95,12 @@ ScriptLibrary: "脚本库"
 
 #sync node
 Node: "节点"
-SyncNode: "同步节点数据 {{ .name }}"
+SyncNode: "同步节点数据"
-SyncPackageBackups: "打包备份账号数据"
+SyncPackageData: "打包同步数据 [{{ .detail }}]"
-SyncPackageProxy: "打包系统代理数据"
-SyncPackagePanelJson: "打包节点基础数据"
 SyncPackageEncrypt: "数据包加密"
+SyncRequest: "请求节点同步接口"
+SyncFailedRetry: "第 {{ .index }} 次同步节点数据失败，{{ .err }}"
+SyncFailed: "同步失败，请在节点列表中手动同步！"
 
 #upgrade node
 NodeUpgrade: "升级节点 {{ .name }}"

frontend/src/lang/modules/zh-Hant.ts

@@ -1041,7 +1041,7 @@ const message = {
     terminal: {
         local: '本機',
         localHelper: 'local 名稱僅用於系統本機標識',
-        connLocalErr: '无法自动认证，请填写本地服务器的登录信息！',
+        connLocalErr: '無法自動認證，請填寫本地服務器的登錄信息！',
         testConn: '連接測試',
         saveAndConn: '保存並連接',
         connTestOk: '連接信息可用',

frontend/src/lang/modules/zh.ts

@@ -1039,6 +1039,7 @@ const message = {
     terminal: {
         local: '本机',
         localHelper: 'local 名称仅用于系统本机标识',
+        connLocalErr: '无法自动认证，请填写本地服务器的登录信息！',
         testConn: '连接测试',
         saveAndConn: '保存并连接',
         connTestOk: '连接信息可用',

frontend/src/views/terminal/terminal/index.vue

@@ -212,7 +212,9 @@ const acceptParams = async () => {
     timer = setInterval(() => {
         syncTerminal();
     }, 1000 * 5);
-    onNewLocal();
+    if (terminalTabs.value.length === 0) {
+        onNewLocal();
+    }
     if (!mobile.value) {
         screenfull.on('change', () => {
             globalStore.isFullScreen = screenfull.isFullscreen;