diff --git a/agent/configs/system.go b/agent/configs/system.go index be6f6897b..56ee39955 100644 --- a/agent/configs/system.go +++ b/agent/configs/system.go @@ -3,7 +3,7 @@ package configs type System struct { Mode string `mapstructure:"mode"` - Port string `mapstructure:"version"` + Port string `mapstructure:"port"` Version string `mapstructure:"version"` BaseDir string `mapstructure:"base_dir"` EncryptKey string `mapstructure:"encrypt_key"` diff --git a/agent/go.mod b/agent/go.mod index 8ff355476..93c0b3c9f 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -31,6 +31,7 @@ require ( github.com/minio/minio-go/v7 v7.0.74 github.com/nicksnyder/go-i18n/v2 v2.4.0 github.com/opencontainers/image-spec v1.1.0 + github.com/oschwald/maxminddb-golang v1.13.1 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.9.1 github.com/pkg/sftp v1.13.6 @@ -171,7 +172,6 @@ require ( github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect - github.com/oschwald/maxminddb-golang v1.13.1 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pierrec/lz4/v4 v4.1.15 // indirect diff --git a/frontend/src/api/interface/setting.ts b/frontend/src/api/interface/setting.ts index 1c9a0394b..80fff1ee8 100644 --- a/frontend/src/api/interface/setting.ts +++ b/frontend/src/api/interface/setting.ts @@ -227,5 +227,6 @@ export namespace Setting { id: number; addr: string; status: string; + version: string; } } diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index af5a04113..151938b02 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1743,6 +1743,10 @@ const message = { upgradeNow: 'Upgrade now', source: 'Download source', hasNewVersion: 'New version Available', + versionHigher: + 'Detected that node {0} version is higher than the main node, switching is not supported at this time. Please upgrade the main node system version and try again!', + versionLower: + 'Detected that node {0} version is lower than the main node, switching is not supported at this time. Please upgrade the system version of this node and try again!', about: 'About', project: 'Project Address', diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index f1e0b344f..79e4a3103 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -1548,6 +1548,8 @@ const message = { upgradeNow: '立即更新', source: '下載源', hasNewVersion: '有新版本', + versionHigher: '檢測到節點 {0} 版本高於主節點,暫不支持切換,請先升級主節點系統版本後重試!', + versionLower: '檢測到節點 {0} 版本低於主節點,暫不支持切換,請先升級該節點系統版本後重試!', safe: '安全', bindInfo: '監聽地址', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 0f6a6a907..33e56f007 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1546,6 +1546,8 @@ const message = { upgradeNow: '立即更新', source: '下载源', hasNewVersion: '有新版本', + versionHigher: '检测到节点 {0} 版本高于主节点,暂不支持切换,请先升级主节点系统版本后重试!', + versionLower: '检测到节点 {0} 版本低于主节点,暂不支持切换,请先升级该节点系统版本后重试!', safe: '安全', bindInfo: '监听地址', diff --git a/frontend/src/layout/components/Sidebar/index.vue b/frontend/src/layout/components/Sidebar/index.vue index 51b5df673..5559bd2b1 100644 --- a/frontend/src/layout/components/Sidebar/index.vue +++ b/frontend/src/layout/components/Sidebar/index.vue @@ -8,10 +8,8 @@ >