From ebaf87a663f36901c975434b760d35f8480f1af6 Mon Sep 17 00:00:00 2001 From: halo Date: Wed, 20 Dec 2023 11:13:21 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81sqlserver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go-client/config.json | 18 ++++++++++++------ go-client/pkg/awaken/awaken_darwin.go | 2 ++ go-client/pkg/awaken/awaken_linux.go | 2 ++ interface/src/renderer/components/Dialog.vue | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/go-client/config.json b/go-client/config.json index 6a43d8b..1265e34 100644 --- a/go-client/config.json +++ b/go-client/config.json @@ -147,7 +147,8 @@ "oracle", "mysql", "postgresql", - "mariadb" + "mariadb", + "sqlserver" ], "comment": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。", "download_url": "https://dbeaver.io/download/", @@ -276,7 +277,8 @@ "mysql", "postgresql", "mariadb", - "redis" + "redis", + "sqlserver" ], "comment": "Terminal是MacOS操作系统上的虚拟终端应用软件，位于“实用工具”文件夹内。", "download_url": "内置", @@ -288,7 +290,8 @@ "mysql", "postgresql", "mariadb", - "redis" + "redis", + "sqlserver" ], "is_internal": true, "is_default": false, @@ -301,7 +304,8 @@ "oracle", "mysql", "postgresql", - "mariadb" + "mariadb", + "sqlserver" ], "comment": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。\n\n!!!手动下载安装，点击保存启用!!!", "download_url": "https://dbeaver.io/download/", @@ -379,7 +383,8 @@ "mysql", "postgresql", "mariadb", - "redis" + "redis", + "sqlserver" ], "comment": "Terminal是Linux操作系统上的虚拟终端应用软件。", "download_url": "内置", @@ -404,7 +409,8 @@ "oracle", "mysql", "postgresql", - "mariadb" + "mariadb", + "sqlserver" ], "comment": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。\n\n!!!手动下载安装，点击保存启用!!!", "download_url": "https://dbeaver.io/download/", diff --git a/go-client/pkg/awaken/awaken_darwin.go b/go-client/pkg/awaken/awaken_darwin.go index 9344cda..276f18f 100755 --- a/go-client/pkg/awaken/awaken_darwin.go +++ b/go-client/pkg/awaken/awaken_darwin.go @@ -114,6 +114,8 @@ func awakenDBCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd { argFormat = "psql 'user={username} password={value} host={host} dbname={dbname} port={port}'" case "mysql", "mariadb": argFormat = "mysql -u {username} -p{value} -h {host} -P {port} {dbname}" + case "sqlserver": + argFormat = "sqlcmd -S {host},{port} -U {username} -P {value} -d {dbname}" } commands := getCommandFromArgs(connectMap, argFormat) cmd := exec.Command( diff --git a/go-client/pkg/awaken/awaken_linux.go b/go-client/pkg/awaken/awaken_linux.go index 38a695b..ea2c002 100755 --- a/go-client/pkg/awaken/awaken_linux.go +++ b/go-client/pkg/awaken/awaken_linux.go @@ -129,6 +129,8 @@ func awakenDBCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd { argFormat = "psql 'user={username} password={value} host={host} dbname={dbname} port={port}'" case "mysql", "mariadb": argFormat = "mysql -u {username} -p{value} -h {host} -P {port} {dbname}" + case "sqlserver": + argFormat = "sqlcmd -S {host},{port} -U {username} -P {value} -d {dbname}" } commands := getCommandFromArgs(connectMap, argFormat) diff --git a/interface/src/renderer/components/Dialog.vue b/interface/src/renderer/components/Dialog.vue index 9315bff..e6f2424 100644 --- a/interface/src/renderer/components/Dialog.vue +++ b/interface/src/renderer/components/Dialog.vue @@ -32,7 +32,7 @@ export default { }, top: { type: String, - default: '12vh' + default: '10vh' }, width: { type: String, From 1784c3b6e15edca71bad971d577a101c5e5d8a6d Mon Sep 17 00:00:00 2001 From: halo Date: Wed, 20 Dec 2023 23:19:29 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dsqlserver=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go-client/pkg/awaken/awaken_darwin.go | 3 +++ go-client/pkg/awaken/awaken_linux.go | 3 +++ go-client/pkg/awaken/awaken_windows.go | 3 +++ 3 files changed, 9 insertions(+) diff --git a/go-client/pkg/awaken/awaken_darwin.go b/go-client/pkg/awaken/awaken_darwin.go index 276f18f..e9900c2 100755 --- a/go-client/pkg/awaken/awaken_darwin.go +++ b/go-client/pkg/awaken/awaken_darwin.go @@ -124,6 +124,9 @@ func awakenDBCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd { ) return cmd } else { + if r.Protocol == "sqlserver" { + connectMap["protocol"] = "mssql_jdbc_ms_new" + } appPath = appItem.Path commands := getCommandFromArgs(connectMap, appItem.ArgFormat) return exec.Command(appPath, strings.Split(commands, " ")...) diff --git a/go-client/pkg/awaken/awaken_linux.go b/go-client/pkg/awaken/awaken_linux.go index ea2c002..475673f 100755 --- a/go-client/pkg/awaken/awaken_linux.go +++ b/go-client/pkg/awaken/awaken_linux.go @@ -86,6 +86,9 @@ func awakenSSHCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd { global.LOG.Info(msg) } } else { + if r.Protocol == "sqlserver" { + connectMap["protocol"] = "mssql_jdbc_ms_new" + } var appPath string appPath = appItem.Path commands := getCommandFromArgs(connectMap, appItem.ArgFormat) diff --git a/go-client/pkg/awaken/awaken_windows.go b/go-client/pkg/awaken/awaken_windows.go index 85a5b9e..2649e60 100755 --- a/go-client/pkg/awaken/awaken_windows.go +++ b/go-client/pkg/awaken/awaken_windows.go @@ -103,6 +103,9 @@ func handleDB(r *Rouse, cfg *config.AppConfig) *exec.Cmd { "dbname": r.DBName, } + if r.Protocol == "sqlserver" { + connectMap["protocol"] = "mssql_jdbc_ms_new" + } if r.Protocol == "redis" { var conList []map[string]string ss := make(map[string]string) From 210c9e7520a0ef3e92390debd00654443affd418 Mon Sep 17 00:00:00 2001 From: halo Date: Tue, 26 Dec 2023 22:04:41 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20rdp=E6=8B=89=E4=B8=8D=E8=B5=B7?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go-client/pkg/awaken/awaken_windows.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go-client/pkg/awaken/awaken_windows.go b/go-client/pkg/awaken/awaken_windows.go index 2649e60..b1582e9 100755 --- a/go-client/pkg/awaken/awaken_windows.go +++ b/go-client/pkg/awaken/awaken_windows.go @@ -29,7 +29,7 @@ func getCommandFromArgs(connectInfo map[string]string, argFormat string) string } func handleRDP(r *Rouse, filePath string, cfg *config.AppConfig) *exec.Cmd { - cmd := exec.Command("mstsc.exe", filePath) + cmd := exec.Command("C:\\WINDOWS\\system32\\mstsc.exe", filePath) return cmd } From 4e92dc599a81785b06a78de8a499da25c4e4059f Mon Sep 17 00:00:00 2001 From: halo Date: Mon, 15 Jan 2024 23:01:18 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E7=BF=BB=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interface/src/renderer/pages/FileTransfer.vue | 2 +- interface/src/renderer/pages/RemoteDesktop.vue | 2 +- interface/src/renderer/pages/Terminal.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/renderer/pages/FileTransfer.vue b/interface/src/renderer/pages/FileTransfer.vue index 5aff1f3..cf395eb 100644 --- a/interface/src/renderer/pages/FileTransfer.vue +++ b/interface/src/renderer/pages/FileTransfer.vue @@ -18,7 +18,7 @@ diff --git a/interface/src/renderer/pages/RemoteDesktop.vue b/interface/src/renderer/pages/RemoteDesktop.vue index e236ae5..54fdaa1 100644 --- a/interface/src/renderer/pages/RemoteDesktop.vue +++ b/interface/src/renderer/pages/RemoteDesktop.vue @@ -18,7 +18,7 @@ diff --git a/interface/src/renderer/pages/Terminal.vue b/interface/src/renderer/pages/Terminal.vue index 780a963..c3ec958 100644 --- a/interface/src/renderer/pages/Terminal.vue +++ b/interface/src/renderer/pages/Terminal.vue @@ -18,7 +18,7 @@ From c07f6f7b432404669e6859a3da035e078c8863bd Mon Sep 17 00:00:00 2001 From: halo Date: Thu, 25 Jan 2024 21:04:38 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81ssms?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go-client/config.json | 147 ++++++++++++++---- go-client/pkg/config/config.go | 1 - interface/package.json | 2 +- interface/src/background.js | 2 +- interface/src/i18n/langs/en.json | 3 +- interface/src/i18n/langs/zh.json | 3 +- interface/src/renderer/assets/ssms17.png | Bin 0 -> 4054 bytes .../src/renderer/components/ListTable.vue | 14 +- interface/src/renderer/pages/About.vue | 2 +- interface/src/renderer/pages/Databases.vue | 5 +- interface/src/renderer/pages/FileTransfer.vue | 5 +- .../src/renderer/pages/RemoteDesktop.vue | 5 +- interface/src/renderer/pages/Terminal.vue | 5 +- 13 files changed, 147 insertions(+), 47 deletions(-) create mode 100644 interface/src/renderer/assets/ssms17.png diff --git a/go-client/config.json b/go-client/config.json index 1265e34..6004a16 100644 --- a/go-client/config.json +++ b/go-client/config.json @@ -9,8 +9,11 @@ "ssh", "telnet" ], - "comment": "PuTTY是一个Telnet、SSH、rlogin、纯TCP以及串行接口连接软件。", - "download_url": "内置", + "comment": { + "zh": "PuTTY是一个Telnet、SSH、rlogin、纯TCP以及串行接口连接软件。", + "en": "PuTTY is a Telnet, SSH, rlogin, pure TCP and serial interface connection software." + }, + "download_url": "", "type": "linux", "path": "putty.exe", "arg_format": "-{protocol} {username}@{host} -P {port} -pw {value}", @@ -26,7 +29,10 @@ "ssh", "telnet" ], - "comment": "XShell是一个强大的安全终端模拟软件，它支持SSH、TELNET协议。", + "comment": { + "zh": "XShell是一个强大的安全终端模拟软件，它支持SSH、TELNET协议。", + "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", "path": "", @@ -43,7 +49,10 @@ "ssh", "telnet" ], - "comment": "SecureCRT是VanDyke Software所开发销售的一个SSH、Telnet客户端和虚拟终端软件。", + "comment": { + "zh": "SecureCRT是VanDyke Software所开发销售的一个SSH、Telnet客户端和虚拟终端软件。", + "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", "path": "", @@ -60,7 +69,10 @@ "ssh", "telnet" ], - "comment": "MobaXterm是一款功能丰富的远程计算机管理工具，其包括了SSH客户端、FTP客户端、远程桌面等。", + "comment": { + "zh": "MobaXterm是一款功能丰富的远程计算机管理工具，其包括了SSH客户端、FTP客户端、远程桌面等。", + "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", "path": "", @@ -78,8 +90,11 @@ "protocol": [ "rdp" ], - "comment": "Microsoft Remote Desktop是一款强大的微软远程连接工具，可以从几乎任何地方连接到远程PC和您的工作资源。", - "download_url": "内置", + "comment": { + "zh": "Microsoft Remote Desktop是一款强大的微软远程连接工具，可以从几乎任何地方连接到远程PC和您的工作资源。", + "en": "Microsoft Remote Desktop is a powerful Microsoft remote connection tool that can connect to remote PCs and your work resources from almost anywhere." + }, + "download_url": "", "type": "windows", "path": "mstsc.exe", "arg_format": "{file}", @@ -96,7 +111,10 @@ "protocol": [ "sftp" ], - "comment": "WinSCP是一个Windows环境下使用SSH的开源图形化SFTP客户端，同时支持SCP协议。", + "comment": { + "zh": "WinSCP是一个Windows环境下使用SSH的开源图形化SFTP客户端，同时支持SCP协议。", + "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", "path": "", @@ -112,7 +130,10 @@ "protocol": [ "sftp" ], - "comment": "FileZilla Client是一款免费、开源的 FTP 客户端。它支持FTP、SFTP。", + "comment": { + "zh": "FileZilla Client是一款免费、开源的 FTP 客户端。它支持FTP、SFTP。", + "en": "FileZilla Client is a free, open source FTP client. It supports FTP, SFTP." + }, "download_url": "https://filezilla-project.org/download.php?type=client", "type": "linux", "path": "", @@ -130,7 +151,10 @@ "protocol": [ "oracle" ], - "comment": "PL/SQL Developer是一个集成开发环境，由Allround Automations公司开发，专门面向Oracle数据库存储的程序单元的开发。", + "comment": { + "zh": "PL/SQL Developer是一个集成开发环境，由Allround Automations公司开发，专门面向Oracle数据库存储的程序单元的开发。", + "en": "PL/SQL Developer is an integrated development environment developed by Allround Automations, specifically for the development of program units stored in Oracle databases." + }, "download_url": "https://www.allroundautomations.com/registered-plsqldev/", "type": "databases", "path": "", @@ -150,7 +174,10 @@ "mariadb", "sqlserver" ], - "comment": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。", + "comment": { + "zh": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。", + "en": "DBeaver Community is a general database management tool and SQL client that supports MySQL, PostgreSQL, Oracle and other JDBC-compatible databases." + }, "download_url": "https://dbeaver.io/download/", "type": "databases", "path": "", @@ -166,7 +193,10 @@ "protocol": [ "redis" ], - "comment": "Redis Desktop Manager 是一款能够跨平台使用的开源 Redis 可视化工具，主要针对 Redis 开发设计。", + "comment": { + "zh": "Redis Desktop Manager 是一款能够跨平台使用的开源 Redis 可视化工具，主要针对 Redis 开发设计。", + "en": "Redis Desktop Manager is an open source Redis visualization tool that can be used across platforms and is mainly designed for Redis development." + }, "download_url": "https://github.com/FuckDoctors/rdm-builder/releases/download/2022.5.1/resp-2022.5.1.exe", "type": "databases", "path": "", @@ -175,6 +205,25 @@ "is_internal": false, "is_default": false, "is_set": false + }, + { + "name": "ssms17", + "display_name": "SQL Server Management Studio 17", + "protocol": [ + "sqlserver" + ], + "comment": { + "zh": "SQL Server Management Studio (SSMS) 是一种集成环境，用于管理从 SQL Server 到 Azure SQL 数据库的任何 SQL 基础结构。", + "en": "SQL Server Management Studio (SSMS) is an integrated environment for managing any SQL infrastructure, from SQL Server to Azure SQL Database." + }, + "download_url": "https://download.microsoft.com/download/D/D/4/DD495084-ADA7-4827-ADD3-FC566EC05B90/SSMS-Setup-CHS.exe", + "type": "databases", + "path": "-S {host},{port} -U {username} -P {value} -d {dbname}", + "arg_format": "", + "match_first": [], + "is_internal": false, + "is_default": false, + "is_set": false } ] }, @@ -187,8 +236,11 @@ "ssh", "telnet" ], - "comment": "Terminal是MacOS操作系统上的虚拟终端应用软件，位于“实用工具”文件夹内。", - "download_url": "内置", + "comment": { + "zh": "Terminal是MacOS操作系统上的虚拟终端应用软件，位于“实用工具”文件夹内。", + "en": "Terminal is a virtual terminal application software on the MacOS operating system, located in the \"Utilities\" folder." + }, + "download_url": "", "type": "linux", "path": "Terminal", "arg_format": "{protocol} {username}@{host} -p {port} -P {value}", @@ -204,7 +256,10 @@ "ssh", "telnet" ], - "comment": "iTerm2是MacOS操作系统上的虚拟终端应用软件。\n\n!!!手动下载安装，点击保存启用!!!", + "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", @@ -221,7 +276,10 @@ "ssh", "telnet" ], - "comment": "SecureCRT是VanDyke Software所开发销售的一个SSH、Telnet客户端和虚拟终端软件。\n\n!!!手动下载安装，点击保存启用!!!", + "comment": { + "zh": "SecureCRT是VanDyke Software所开发销售的一个SSH、Telnet客户端和虚拟终端软件。\n\n!!!手动下载安装，点击保存启用!!!", + "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", "path": "/Applications/SecureCRT.app/Contents/MacOS/SecureCRT", @@ -239,8 +297,11 @@ "protocol": [ "rdp" ], - "comment": "Microsoft Remote Desktop是一款强大的微软远程连接工具，可以从几乎任何地方连接到远程PC和您的工作资源。\n\n!!!手动下载安装，点击保存启用!!!", - "download_url": "内置", + "comment": { + "zh": "Microsoft Remote Desktop是一款强大的微软远程连接工具，可以从几乎任何地方连接到远程PC和您的工作资源。\n\n!!!手动下载安装，点击保存启用!!!", + "en": "Microsoft Remote Desktop is a powerful Microsoft remote connection tool that can connect to remote PCs and your work resources from almost anywhere.\n\n!!!Manually download and install, click Save to activate!!!" + }, + "download_url": "", "type": "windows", "path": "/Applications/Microsoft Remote Desktop.app", "arg_format": "{file}", @@ -257,7 +318,10 @@ "protocol": [ "sftp" ], - "comment": "FileZilla Client是一款免费、开源的 FTP 客户端。它支持FTP、SFTP。\n\n!!!手动下载安装，点击保存启用!!!", + "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!!!" + }, "download_url": "https://filezilla-project.org/download.php?type=client", "type": "linux", "path": "/Applications/FileZilla.app/Contents/MacOS/filezilla", @@ -280,8 +344,11 @@ "redis", "sqlserver" ], - "comment": "Terminal是MacOS操作系统上的虚拟终端应用软件，位于“实用工具”文件夹内。", - "download_url": "内置", + "comment": { + "zh": "Terminal是MacOS操作系统上的虚拟终端应用软件，位于“实用工具”文件夹内。", + "en": "Terminal is a virtual terminal application software on the MacOS operating system, located in the \"Utilities\" folder." + }, + "download_url": "", "type": "linux", "path": "Terminal", "arg_format": "", @@ -307,7 +374,10 @@ "mariadb", "sqlserver" ], - "comment": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。\n\n!!!手动下载安装，点击保存启用!!!", + "comment": { + "zh": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。\n\n!!!手动下载安装，点击保存启用!!!", + "en": "DBeaver Community is a general database management tool and SQL client that supports MySQL, PostgreSQL, Oracle and other JDBC-compatible databases.\n\n!!!Manually download and install, click Save to activate!!!" + }, "download_url": "https://dbeaver.io/download/", "type": "databases", "path": "/Applications/DBeaver.app/Contents/MacOS/dbeaver", @@ -328,8 +398,11 @@ "ssh", "telnet" ], - "comment": "Terminal是Linux操作系统上的虚拟终端应用软件。", - "download_url": "内置", + "comment": { + "zh": "Terminal是Linux操作系统上的虚拟终端应用软件。", + "en": "Terminal is a virtual terminal application software on the Linux operating system." + }, + "download_url": "", "type": "linux", "path": "Terminal", "arg_format": "{protocol} {username}@{host} -p {port} -P {value}", @@ -346,8 +419,11 @@ "protocol": [ "rdp" ], - "comment": "Remmina 是一个使用 GTK+ 开发的远程桌面客户端，提供了 RDP、VNC、XDMCP、SSH 等远程连接协议的支持。", - "download_url": "https://remmina.org/how-to-install-remmina/-内置", + "comment": { + "zh": "Remmina 是一个使用 GTK+ 开发的远程桌面客户端，提供了 RDP、VNC、XDMCP、SSH 等远程连接协议的支持。", + "en": "Remmina is a remote desktop client developed using GTK+, providing support for remote connection protocols such as RDP, VNC, XDMCP, and SSH." + }, + "download_url": "https://remmina.org/how-to-install-remmina/", "type": "windows", "path": "remmina", "arg_format": "{file}", @@ -362,8 +438,11 @@ "protocol": [ "rdp" ], - "comment": "FreeRDP 是远程桌面协议 (RDP) 的免费实现，在 Apache 许可证下发布。\n安装命令\nsudo apt-get install freerdp\nsudo yum install freerdp", - "download_url": "https://github.com/FreeRDP/FreeRDP-内置", + "comment": { + "zh": "FreeRDP 是远程桌面协议 (RDP) 的免费实现，在 Apache 许可证下发布。\n安装命令\nsudo apt-get install freerdp\nsudo yum install freerdp", + "en": "FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), released under the Apache License.\nInstallation command\nsudo apt-get install freerdp\nsudo yum install freerdp" + }, + "download_url": "https://github.com/FreeRDP/FreeRDP", "type": "windows", "path": "xfreerdp", "arg_format": "{file} /cert-ignore", @@ -386,8 +465,11 @@ "redis", "sqlserver" ], - "comment": "Terminal是Linux操作系统上的虚拟终端应用软件。", - "download_url": "内置", + "comment": { + "zh": "Terminal是Linux操作系统上的虚拟终端应用软件。", + "en": "Terminal is a virtual terminal application software on the Linux operating system." + }, + "download_url": "", "type": "linux", "path": "Terminal", "arg_format": "", @@ -412,7 +494,10 @@ "mariadb", "sqlserver" ], - "comment": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。\n\n!!!手动下载安装，点击保存启用!!!", + "comment": { + "zh": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。\n\n!!!手动下载安装，点击保存启用!!!", + "en": "DBeaver Community is a general database management tool and SQL client that supports MySQL, PostgreSQL, Oracle and other JDBC-compatible databases.\n\n!!!Manually download and install, click Save to activate!!!" + }, "download_url": "https://dbeaver.io/download/", "type": "databases", "path": "", diff --git a/go-client/pkg/config/config.go b/go-client/pkg/config/config.go index 16b5b95..314ace4 100644 --- a/go-client/pkg/config/config.go +++ b/go-client/pkg/config/config.go @@ -25,7 +25,6 @@ type AppItem struct { Name string `json:"name"` DisplayName string `json:"display_name"` Protocol []string `json:"protocol"` - Comment string `json:"comment"` Type string `json:"type"` MatchFirst []string `json:"match_first"` Path string `json:"path"` diff --git a/interface/package.json b/interface/package.json index 36162b3..d200613 100644 --- a/interface/package.json +++ b/interface/package.json @@ -1,7 +1,7 @@ { "name": "jumpserver-client", "author": "Fit2Cloud Technology Co., Ltd.; ", - "version": "v2.1.0", + "version": "v2.1.1", "homepage": "https://jumpserver.org", "private": true, "scripts": { diff --git a/interface/src/background.js b/interface/src/background.js index d36ce77..956b607 100644 --- a/interface/src/background.js +++ b/interface/src/background.js @@ -45,7 +45,7 @@ async function createWindow() { if (process.env.WEBPACK_DEV_SERVER_URL) { // Load the url of the dev server if in development mode await mainWindow.loadURL(process.env.WEBPACK_DEV_SERVER_URL); - // if (!process.env.IS_TEST) mainWindow.webContents.openDevTools() + if (!process.env.IS_TEST) mainWindow.webContents.openDevTools() } else { createProtocol("app"); // Load the index.html when not in development diff --git a/interface/src/i18n/langs/en.json b/interface/src/i18n/langs/en.json index 9ea1b00..6006750 100644 --- a/interface/src/i18n/langs/en.json +++ b/interface/src/i18n/langs/en.json @@ -12,7 +12,8 @@ "DefaultApp": "Default Application", "Configured": "Configured", "NotConfigured": "Not Configured", - "OracleOCI": "The client needs to use OCI version 21.0 and above to connect to the Oracle." + "OracleOCI": "The client needs to use OCI version 21.0 and above to connect to the Oracle.", + "SystemComesWith": "System comes with" }, "Dialog": { "Save&Default": "Save And Default", diff --git a/interface/src/i18n/langs/zh.json b/interface/src/i18n/langs/zh.json index 783f578..d45b408 100644 --- a/interface/src/i18n/langs/zh.json +++ b/interface/src/i18n/langs/zh.json @@ -12,7 +12,8 @@ "DefaultApp": "默认应用", "Configured": "已配置", "NotConfigured": "未配置", - "OracleOCI": "本地客户端连 Oracle 数据库需要使用 21.0 及以上版本 OCI" + "OracleOCI": "本地客户端连 Oracle 数据库需要使用 21.0 及以上版本 OCI", + "SystemComesWith": "系统自带" }, "Dialog": { "Save&Default": "保存且默认", diff --git a/interface/src/renderer/assets/ssms17.png b/interface/src/renderer/assets/ssms17.png new file mode 100644 index 0000000000000000000000000000000000000000..dfde660ab6b3ee3f60e38e0bde8fed8f11d8a308 GIT binary patch literal 4054 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
{{ d.display_name }}
-
{{ d.comment }}
+
{{ d.comment[$i18n.locale] }}
{{ $t(is_set_string(d.is_set)) }} @@ -24,6 +24,9 @@