Merge pull request #45 from jumpserver/dev

Halo1236 · web-flow · commit f28d08708d87 · 2024-10-15T11:19:50.000+08:00
merge dev
diff --git a/go-client/config.json b/go-client/config.json
@@ -76,7 +76,7 @@
         "download_url": "https://mobaxterm.mobatek.net/download-home-edition.html",
         "type": "linux",
         "path": "",
-        "arg_format": "-newtab * sshpass -p{value} ssh -o StrictHostKeyChecking=no {username}@{host} -p{port}",
+        "arg_format": "-newtab*sshpass -p{value} ssh -o StrictHostKeyChecking=no {username}@{host} -p{port}",
         "match_first": [],
         "is_internal": false,
         "is_default": false,
@@ -125,16 +125,16 @@
         "is_set": false
       },
       {
-        "name": "filezilla",
-        "display_name": "Filezilla",
+        "name": "securefx",
+        "display_name": "SecureFX",
         "protocol": [
           "sftp"
         ],
         "comment": {
-          "zh": "FileZilla Client是一款免费、开源的 FTP 客户端。它支持FTP、SFTP。",
-          "en": "FileZilla Client is a free, open source FTP client. It supports FTP, SFTP."
+          "zh": "SecureFX 是一款安全的文件传输应用， 拥有一个简单易学的可视化界面。",
+          "en": "SecureFX is a secure file transfer application with an easy-to-learn visual interface."
         },
-        "download_url": "https://filezilla-project.org/download.php?type=client",
+        "download_url": "https://www.vandyke.com/cgi-bin/releases.php?product=securefx",
         "type": "linux",
         "path": "",
         "arg_format": "{protocol}://{username}:{value}@{host}:{port}",
@@ -262,6 +262,25 @@
         "is_internal": false,
         "is_default": false,
         "is_set": false
+      },
+      {
+        "name": "toad",
+        "display_name": "Toad for Oracle",
+        "protocol": [
+          "oracle"
+        ],
+        "comment": {
+          "zh": "Toad for Oracle是业界领先的数据库开发和管理工具。",
+          "en": "Toad for Oracle is an industry-leading database development and management tool."
+        },
+        "download_url": "https://www.quest.com/products/toad-for-oracle/",
+        "type": "databases",
+        "path": "",
+        "arg_format": "-c {username}/{value}@{host}:{port}/{dbname}",
+        "match_first": [],
+        "is_internal": false,
+        "is_default": false,
+        "is_set": false
       }
     ]
   },
@@ -351,18 +370,38 @@
     ],
     "filetransfer": [
       {
-        "name": "filezilla",
-        "display_name": "Filezilla",
+        "name": "iterm",
+        "display_name": "iTerm2",
+        "protocol": [
+          "ssh",
+          "telnet"
+        ],
+        "comment": {
+          "zh": "iTerm2是MacOS操作系统上的虚拟终端应用软件。\n\n!!!手动下载安装，点击保存启用!!!",
+          "en": "iTerm2 is a virtual terminal application software on the MacOS operating system.\n\n\n!!!Manually download and install, click Save to activate!!!"
+        },
+        "download_url": "https://iterm2.com/downloads.html",
+        "type": "linux",
+        "path": "iTerm2",
+        "arg_format": "{protocol} {username}@{host} -p {port} -P {value}",
+        "match_first": [],
+        "is_internal": true,
+        "is_default": false,
+        "is_set": false
+      },
+      {
+        "name": "securefx",
+        "display_name": "SecureFX",
         "protocol": [
           "sftp"
         ],
         "comment": {
-          "zh": "FileZilla Client是一款免费、开源的 FTP 客户端。它支持FTP、SFTP。\n\n!!!手动下载安装，点击保存启用!!!",
-          "en": "FileZilla Client is a free, open source FTP client. It supports FTP, SFTP.\n\n!!!Manually download and install, click Save to activate!!!"
+          "zh": "SecureFX 是一款安全的文件传输应用， 拥有一个简单易学的可视化界面。\n\n!!!手动下载安装，点击保存启用!!!",
+          "en": "SecureFX is a secure file transfer application with an easy-to-learn visual interface.\n\n!!!Manually download and install, click Save to activate!!!"
         },
-        "download_url": "https://filezilla-project.org/download.php?type=client",
+        "download_url": "https://www.vandyke.com/cgi-bin/releases.php?product=securefx",
         "type": "linux",
-        "path": "/Applications/FileZilla.app/Contents/MacOS/filezilla",
+        "path": "/Applications/SecureFX.app/Contents/MacOS/SecureFX",
         "arg_format": "{protocol}://{username}:{value}@{host}:{port}",
         "match_first": [],
         "is_internal": false,
@@ -502,7 +541,7 @@
         "download_url": "https://github.com/FreeRDP/FreeRDP",
         "type": "windows",
         "path": "xfreerdp",
-        "arg_format": "{file} /cert-ignore",
+        "arg_format": "{file} /cert-ignore /d: /p:",
         "match_first": [],
         "is_internal": true,
         "is_default": false,
diff --git a/go-client/pkg/awaken/awaken_linux.go b/go-client/pkg/awaken/awaken_linux.go
@@ -74,7 +74,7 @@ func awakenSSHCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd {
 		currentDesktop := strings.ToLower(strings.Trim(string(out), "\n"))
 
 		switch currentDesktop {
-		case "gnome", "ubuntu:gnome":
+		case "gnome", "ubuntu:gnome", "ukui":
 			cmd = exec.Command(
 				"gnome-terminal", "--", "bash", "-c",
 				fmt.Sprintf("%s %s; exec bash -i", clientPath, commands),
@@ -141,7 +141,7 @@ func awakenDBCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd {
 		currentDesktop := strings.ToLower(strings.Trim(string(out), "\n"))
 
 		switch currentDesktop {
-		case "gnome", "ubuntu:gnome":
+		case "gnome", "ubuntu:gnome", "ukui":
 			cmd = exec.Command(
 				"gnome-terminal", "--", "bash", "-c",
 				fmt.Sprintf("%s; exec bash -i", commands),
diff --git a/go-client/pkg/awaken/awaken_windows.go b/go-client/pkg/awaken/awaken_windows.go
@@ -72,7 +72,7 @@ func handleSSH(r *Rouse, cfg *config.AppConfig) *exec.Cmd {
 	commands := getCommandFromArgs(connectMap, appItem.ArgFormat)
 	if strings.Contains(commands, "*") {
 		commands := strings.Split(commands, "*")
-		return exec.Command(appPath, commands...)
+		return exec.Command(appPath, commands[0], commands[1])
 	} else {
 		commands := strings.Split(commands, " ")
 		return exec.Command(appPath, commands...)
diff --git a/interface/package.json b/interface/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jumpserver-client",
   "author": "Fit2Cloud Technology Co., Ltd.; <support@fit2cloud.com>",
-  "version": "v2.1.3",
+  "version": "v2.1.4",
   "homepage": "https://jumpserver.org",
   "private": true,
   "scripts": {
diff --git a/interface/src/i18n/langs/index.js b/interface/src/i18n/langs/index.js
@@ -1,5 +1,5 @@
-import zhLocale from "element-plus/lib/locale/lang/zh-cn";
-import enLocale from "element-plus/lib/locale/lang/en";
+import zhLocale from "element-plus/es/locale/lang/zh-cn";
+import enLocale from "element-plus/es/locale/lang/en";
 import zh from './zh.json'
 import en from './en.json'
 
diff --git a/interface/src/renderer/assets/securefx.png b/interface/src/renderer/assets/securefx.png
diff --git a/interface/src/renderer/assets/toad.png b/interface/src/renderer/assets/toad.png
diff --git a/interface/src/renderer/pages/About.vue b/interface/src/renderer/pages/About.vue
@@ -2,7 +2,7 @@
   <div>
     <img id="logo" src="@/assets/JumpServer.png" alt=""/>
     <p>{{ $t('Common.JumpServerClient') }}</p>
-    <p>{{ $t('AboutUs.Version') }}：v2.1.3</p>
+    <p>{{ $t('AboutUs.Version') }}：v2.1.4</p>
     <p>{{ $t('AboutUs.Copyright') }}：FIT2CLOUD 飞致云 © 2014-2024 {{ $t('AboutUs.AllRightsReserved')}}</p>
     <a target="_blank" href="https://www.fit2cloud.com/jumpserver/index.html">{{ $t('AboutUs.OfficialWebsite') }}</a>
     <a target="_blank" href="https://docs.jumpserver.org/zh/v3/">{{ $t('AboutUs.OnlineDocumentation') }}</a>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jumpserver-client",`
`3`	`3`	`"author": "Fit2Cloud Technology Co., Ltd.; <[email protected]>",`
`4`		`- "version": "v2.1.3",`
	`4`	`+ "version": "v2.1.4",`
`5`	`5`	`"homepage": "https://jumpserver.org",`
`6`	`6`	`"private": true,`
`7`	`7`	`"scripts": {`