Merge pull request #24 from jumpserver/dev

Dev

README.md

@@ -3,12 +3,8 @@
 JumpServer 客户端，支持本地本地客户端拉起。
 ## 概览
 
-### Win
 ![windows](static/windows.png)
 
-### Mac
-![macos](static/macos.png)
-
 ## 安装
 
 ### Mac
@@ -17,7 +13,15 @@ JumpServer 客户端，支持本地本地客户端拉起。
 
 ### Win
 
-下载Win安装包，双击JumpServer.exe 文件（需要等待10几秒钟）。
+下载Win安装包，双击JumpServer安装包文件（需要等待10几秒钟）。
+
+### Linux
+
+下载Linux安装包，双击Deb安装包文件，打开安装包管理器进行安装。或者使用命令进行安装
+```
+sudo dpkg -i <package_file>
+```
+
 
 ## 卸载
 
@@ -29,6 +33,12 @@ JumpServer 客户端，支持本地本地客户端拉起。
 
 移除JumpServer.app。
 
+### Linux
+
+点击打开软件管理器进行卸载。或者使用命令进行卸载
+```
+sudo dpkg --purge <package_file>
+```
 
 ## 打包
 

go-client/config.json

@@ -209,7 +209,7 @@
         "match_first": [],
         "is_internal": true,
         "is_default": false,
-        "is_set": true
+        "is_set": false
       },
       {
         "name": "securecrt",
@@ -309,7 +309,7 @@
         "match_first": [],
         "is_internal": false,
         "is_default": false,
-        "is_set": true
+        "is_set": false
       }
     ]
   },
@@ -346,8 +346,24 @@
         "arg_format": "",
         "match_first": [],
         "is_internal": true,
-        "is_default": true,
-        "is_set": true
+        "is_default": false,
+        "is_set": false
+      },
+      {
+        "name": "xfreerdp",
+        "display_name": "xFreeRDP",
+        "protocol": [
+          "rdp"
+        ],
+        "comment": "FreeRDP 是远程桌面协议 (RDP) 的免费实现，在 Apache 许可证下发布。\n安装命令\nsudo apt-get install freerdp\nsudo yum install freerdp",
+        "download_url": "https://github.com/FreeRDP/FreeRDP-内置",
+        "type": "windows",
+        "path": "xfreerdp",
+        "arg_format": "",
+        "match_first": [],
+        "is_internal": true,
+        "is_default": false,
+        "is_set": false
       }
     ],
     "filetransfer": [],
@@ -377,6 +393,25 @@
         "is_internal": true,
         "is_default": false,
         "is_set": true
+      },
+      {
+        "name": "dbeaver",
+        "display_name": "DBeaver Community",
+        "protocol": [
+          "oracle",
+          "mysql",
+          "postgresql",
+          "mariadb"
+        ],
+        "comment": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。\n\n!!!手动下载安装，点击保存启用!!!",
+        "download_url": "https://dbeaver.io/download/",
+        "type": "databases",
+        "path": "",
+        "arg_format": "-con name={name}|driver={protocol}|user={username}|password={value}|database={dbname}|host={host}|port={port}|save=false|connect=true",
+        "match_first": [],
+        "is_internal": false,
+        "is_default": false,
+        "is_set": false
       }
     ]
   }

go-client/pkg/awaken/awaken_darwin.go

@@ -18,7 +18,7 @@ func getCommandFromArgs(connectInfo map[string]string, argFormat string) string
 	return argFormat
 }
 
-func awakenRDPCommand(filePath string) *exec.Cmd {
+func awakenRDPCommand(filePath string, cfg *config.AppConfig) *exec.Cmd {
 	global.LOG.Debug(filePath)
 	cmd := exec.Command("open", filePath)
 	return cmd

go-client/pkg/awaken/awaken_linux.go

@@ -18,9 +18,20 @@ func getCommandFromArgs(connectInfo map[string]string, argFormat string) string
 	return argFormat
 }
 
-func awakenRDPCommand(filePath string) *exec.Cmd {
+func awakenRDPCommand(filePath string, cfg *config.AppConfig) *exec.Cmd {
 	global.LOG.Debug(filePath)
-	cmd := exec.Command("remmina", filePath)
+	var appItem *config.AppItem
+	appLst := cfg.Linux.RemoteDesktop
+	for _, app := range appLst {
+		if app.IsActive() && app.IsSupportProtocol("rdp") {
+			appItem = &app
+			break
+		}
+	}
+	if appItem == nil {
+		return nil
+	}
+	cmd := exec.Command(appItem.Name, filePath)
 	return cmd
 }
 

go-client/pkg/awaken/awaken_unix.go

@@ -9,7 +9,7 @@ import (
 )
 
 func handleRDP(r *Rouse, filePath string, cfg *config.AppConfig) *exec.Cmd {
-	cmd := awakenRDPCommand(filePath)
+	cmd := awakenRDPCommand(filePath, cfg)
 	return cmd
 }
 

interface/build/win/installer.nsh

@@ -7,7 +7,7 @@
     WriteRegStr HKCR "jms" "URL Protocol" ""
     WriteRegStr HKCR "jms\shell" "" ""
     WriteRegStr HKCR "jms\shell\open" "" ""
-    WriteRegStr HKCR "jms\shell\open\command" "" '$INSTDIR\resources\bin\windows\JumpServerClient.exe "%1"'
+    WriteRegStr HKCR "jms\shell\open\command" "" '"$INSTDIR\resources\bin\windows\JumpServerClient.exe" "%1"'
 !macroend
 
 !macro customUnInstall

interface/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jumpserver-client",
   "author": "Fit2Cloud Technology Co., Ltd.; <[email protected]>",
-  "version": "v2.0.1",
+  "version": "v2.0.2",
   "homepage": "https://jumpserver.org",
   "private": true,
   "scripts": {

interface/vue.config.js

@@ -80,8 +80,8 @@ module.exports = {
           }]
         },
         nsis: {
-          oneClick: true,
-          allowToChangeInstallationDirectory: false,
+          oneClick: false,
+          allowToChangeInstallationDirectory: true,
           deleteAppDataOnUninstall: true,
           include: "build/win/installer.nsh"
         },