Merge branch 'dev'

jumpserver · Dec 19, 2024 · 2f1cbc7 · 2f1cbc7
2 parents 008d53e + 1538a8e
commit 2f1cbc7
Show file tree

Hide file tree

Showing 165 changed files with 10,544 additions and 5,152 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,13 @@ go-client/build
 interface/node_modules
 interface/yarn.lock
 interface/dist_electron
-interface/dist
+interface/dist
+
+interface/new-Client/*
+
+new-Client/node_modules
+new-Client/out
+new-Client/dist
+
+ui/node_modules
+ui/dist/
diff --git a/go-client/Makefile b/go-client/Makefile
@@ -22,8 +22,10 @@ build-client:
 	GOARCH=arm64 GOOS=linux $(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/linux-arm64/JumpServerClient $(CLIENTSRCFILE)
 	GOARCH=arm64 GOOS=linux $(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/linux-arm64/client $(SSHCSRCFILE)
 
+	mkdir -p $(BASEPATH)/../ui/bin/
+
 	cp -R $(BASEPATH)/Scripts $(BUILDDIR)/darwin
-	cp -R $(BUILDDIR)/* $(BASEPATH)/../interface/bin/
-	cp $(BASEPATH)/config.json $(BASEPATH)/../interface/bin/
-	cp $(BASEPATH)/putty.exe $(BASEPATH)/../interface/bin/windows/
-	cp $(BASEPATH)/pkg/autoit/*.dll $(BASEPATH)/../interface/bin/windows/
+	cp -R $(BUILDDIR)/* $(BASEPATH)/../ui/bin/
+	cp $(BASEPATH)/config.json $(BASEPATH)/../ui/bin/
+	cp $(BASEPATH)/putty.exe $(BASEPATH)/../ui/bin/windows/
+	cp $(BASEPATH)/pkg/autoit/*.dll $(BASEPATH)/../ui/bin/windows/
diff --git a/go-client/build.ps1 b/go-client/build.ps1
@@ -0,0 +1,13 @@
+set CGO_ENABLED=0
+set GOOS=windows
+
+set GOARCH=amd64
+go build -trimpath -ldflags "-w -s -H windowsgui" -o build/windows/JumpServerClient.exe ./cmd/awaken/
+set GOARCH=386
+go build -trimpath -ldflags "-w -s -H windowsgui" -o build/windows/JumpServerClient32.exe ./cmd/awaken/
+
+
+Copy-Item -Path "build/*" -Destination "../ui/bin/" -Recurse -Force
+Copy-Item -Path config.json -Destination "../ui/bin/" -Force
+Copy-Item -Path putty.exe -Destination "../ui/bin/windows/" -Force
+Copy-Item -Path "pkg/autoit/*.dll" -Destination "../ui/bin/windows/" -Force
diff --git a/go-client/config.json b/go-client/config.json
@@ -1,5 +1,11 @@
 {
   "filename": "Jumpserve Clients Config",
+  "version": 1,
+  "defaultSetting": {
+    "layout": "list",
+    "language": "en",
+    "theme": "light"
+  },
   "windows": {
     "terminal": [
       {
@@ -14,10 +20,13 @@
           "en": "PuTTY is a Telnet, SSH, rlogin, pure TCP and serial interface connection software."
         },
         "download_url": "",
-        "type": "linux",
+        "type": "terminal",
         "path": "putty.exe",
         "arg_format": "-{protocol} {username}@{host} -P {port} -pw {value}",
-        "match_first": [],
+        "match_first": [
+          "ssh",
+          "telnet"
+        ],
         "is_internal": true,
         "is_default": true,
         "is_set": true
@@ -34,7 +43,7 @@
           "en": "XShell is a powerful secure terminal simulation software that supports SSH and TELNET protocols."
         },
         "download_url": "https://www.xshell.com/zh/xshell-download/",
-        "type": "linux",
+        "type": "terminal",
         "path": "",
         "arg_format": "-newtab {name} -url {protocol}://{username}:{value}@{host}:{port}",
         "match_first": [],
@@ -54,7 +63,7 @@
           "en": "SecureCRT is an SSH, Telnet client and virtual terminal software developed and sold by VanDyke Software."
         },
         "download_url": "https://www.vandyke.com/cgi-bin/releases.php?product=securecrt",
-        "type": "linux",
+        "type": "terminal",
         "path": "",
         "arg_format": "/N {name} /T /SSH2 /ACCEPTHOSTKEYS /p {port} /password {value} /L {username} {host}",
         "match_first": [],
@@ -74,7 +83,7 @@
           "en": "MobaXterm is a feature-rich remote computer management tool, including SSH client, FTP client, remote desktop, etc."
         },
         "download_url": "https://mobaxterm.mobatek.net/download-home-edition.html",
-        "type": "linux",
+        "type": "terminal",
         "path": "",
         "arg_format": "-newtab*sshpass -p{value} ssh -o StrictHostKeyChecking=no {username}@{host} -p{port}",
         "match_first": [],
@@ -98,7 +107,9 @@
         "type": "windows",
         "path": "mstsc.exe",
         "arg_format": "{file}",
-        "match_first": [],
+        "match_first": [
+          "rdp"
+        ],
         "is_internal": true,
         "is_default": true,
         "is_set": true
@@ -116,7 +127,7 @@
           "en": "WinSCP is an open source graphical SFTP client that uses SSH in a Windows environment and supports the SCP protocol."
         },
         "download_url": "https://winscp.net/eng/index.php",
-        "type": "linux",
+        "type": "filetransfer",
         "path": "",
         "arg_format": "{protocol}://{username}:{value}@{host}:{port}",
         "match_first": [],
@@ -135,7 +146,7 @@
           "en": "SecureFX is a secure file transfer application with an easy-to-learn visual interface."
         },
         "download_url": "https://www.vandyke.com/cgi-bin/releases.php?product=securefx",
-        "type": "linux",
+        "type": "filetransfer",
         "path": "",
         "arg_format": "{protocol}://{username}:{value}@{host}:{port}",
         "match_first": [],
@@ -154,7 +165,7 @@
           "en": "Xftp is a powerful SFTP and FTP file transfer software."
         },
         "download_url": "https://www.xshell.com/zh/xftp-download/",
-        "type": "linux",
+        "type": "filetransfer",
         "path": "",
         "arg_format": "-newwin {protocol}://{username}:{value}@{host}:{port}",
         "match_first": [],
@@ -164,6 +175,81 @@
       }
     ],
     "databases": [
+      {
+        "name": "navicat17",
+        "display_name": "Navicat premium Lite 17",
+        "protocol": [
+          "oracle",
+          "mysql",
+          "postgresql",
+          "mariadb",
+          "sqlserver"
+        ],
+        "comment": {
+          "zh": "数据库管理软件",
+          "en": "Database management software."
+        },
+        "download_url": "https://www.navicat.com.cn/products",
+        "type": "databases",
+        "path": "",
+        "arg_format": "",
+        "autoit": [
+          {
+            "cmd": "Wait",
+            "type": "15",
+            "element": "[CLASS:TNavicatMainForm]"
+          },
+          {
+            "cmd": "SendKey",
+            "type": "",
+            "element": "^u"
+          },
+          {
+            "cmd": "ControlSend",
+            "type": "{url}",
+            "element": "[CLASS:TTextHintMemo; INSTANCE:1]"
+          },
+          {
+            "cmd": "ControlClick",
+            "type": "135,8",
+            "element": "[CLASS:TButton; INSTANCE:5]"
+          },
+          {
+            "cmd": "ControlClick",
+            "type": "35,15",
+            "element": "[CLASS:TButton; INSTANCE:2]"
+          },
+          {
+            "cmd": "ControlClick",
+            "type": "50,7",
+            "element": "[CLASS:TRadioButton; INSTANCE:1]"
+          },
+          {
+            "cmd": "ControlClick",
+            "type": "1OO,10",
+            "element": "[CLASS:TButton; INSTANCE:1]"
+          },
+          {
+            "cmd": "ControlClick",
+            "type": "50,12",
+            "element": "[CLASS:TButtonedEdit; INSTANCE:1]"
+          },
+          {
+            "cmd": "ControlSetText",
+            "type": "{value}",
+            "element": "[CLASS:TButtonedEdit; INSTANCE:1]"
+          },
+          {
+            "cmd": "ControlClick",
+            "type": "36,13",
+            "element": "[CLASS:TButton; INSTANCE:2]"
+          }
+        ],
+        "match_first": [],
+        "is_internal": false,
+        "is_default": false,
+        "is_set": false
+      },
       {
         "name": "plsql",
         "display_name": "PL/SQL Developer",
@@ -242,7 +328,7 @@
         "autoit": [
           {
             "cmd": "Wait",
-            "type": "sleep",
+            "type": "15",
             "element": "[REGEXPTITLE:连接到服务器|Connect]"
           },
           {
@@ -256,7 +342,7 @@
             "element": "[NAME:comboBoxAuthentication]"
           },
           {
-            "cmd": "ControlSend",
+            "cmd": "ControlSetText",
             "type": "{username}",
             "element": "[CLASS:Edit; INSTANCE:2]"
           },
@@ -267,7 +353,7 @@
           },
           {
             "cmd": "ControlClick",
-            "type": "connect",
+            "type": "40,10",
             "element": "[NAME:connect]"
           }
         ],
@@ -330,10 +416,13 @@
           "en": "Terminal is a virtual terminal application software on the MacOS operating system, located in the \"Utilities\" folder."
         },
         "download_url": "",
-        "type": "linux",
+        "type": "terminal",
         "path": "Terminal",
         "arg_format": "{protocol} {username}@{host} -p {port} -P {value}",
-        "match_first": [],
+        "match_first": [
+          "ssh",
+          "telnet"
+        ],
         "is_internal": true,
         "is_default": true,
         "is_set": true
@@ -350,7 +439,7 @@
           "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",
+        "type": "terminal",
         "path": "iTerm2",
         "arg_format": "{protocol} {username}@{host} -p {port} -P {value}",
         "match_first": [],
@@ -370,7 +459,7 @@
           "en": "SecureCRT is an SSH, Telnet client and virtual terminal software developed and sold by VanDyke Software.\n\n!!!Manually download and install, click Save to activate!!!"
         },
         "download_url": "https://www.vandyke.com/cgi-bin/releases.php?product=securecrt",
-        "type": "linux",
+        "type": "terminal",
         "path": "/Applications/SecureCRT.app/Contents/MacOS/SecureCRT",
         "arg_format": "/N {name} /T /SSH2 /ACCEPTHOSTKEYS /p {port} /password {value} /L {username} {host}",
         "match_first": [],
@@ -394,7 +483,9 @@
         "type": "windows",
         "path": "/Applications/Microsoft Remote Desktop.app",
         "arg_format": "{file}",
-        "match_first": [],
+        "match_first": [
+          "rdp"
+        ],
         "is_internal": true,
         "is_default": true,
         "is_set": true
@@ -405,18 +496,19 @@
         "name": "iterm",
         "display_name": "iTerm2",
         "protocol": [
-          "ssh",
-          "telnet"
+          "sftp"
         ],
         "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",
+        "type": "filetransfer",
         "path": "iTerm2",
         "arg_format": "{protocol} {username}@{host} -p {port} -P {value}",
-        "match_first": [],
+        "match_first": [
+          "sftp"
+        ],
         "is_internal": true,
         "is_default": false,
         "is_set": false
@@ -432,7 +524,7 @@
           "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://www.vandyke.com/cgi-bin/releases.php?product=securefx",
-        "type": "linux",
+        "type": "filetransfer",
         "path": "/Applications/SecureFX.app/Contents/MacOS/SecureFX",
         "arg_format": "{protocol}://{username}:{value}@{host}:{port}",
         "match_first": [],
@@ -458,7 +550,7 @@
           "en": "Terminal is a virtual terminal application software on the MacOS operating system, located in the \"Utilities\" folder."
         },
         "download_url": "",
-        "type": "linux",
+        "type": "databases",
         "path": "Terminal",
         "arg_format": "",
         "match_first": [
@@ -531,10 +623,13 @@
           "en": "Terminal is a virtual terminal application software on the Linux operating system."
         },
         "download_url": "",
-        "type": "linux",
+        "type": "terminal",
         "path": "Terminal",
         "arg_format": "{protocol} {username}@{host} -p {port} -P {value}",
-        "match_first": [],
+        "match_first": [
+          "ssh",
+          "telnet"
+        ],
         "is_internal": true,
         "is_default": true,
         "is_set": true
@@ -598,7 +693,7 @@
           "en": "Terminal is a virtual terminal application software on the Linux operating system."
         },
         "download_url": "",
-        "type": "linux",
+        "type": "databases",
         "path": "Terminal",
         "arg_format": "",
         "match_first": [