Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion go-client/pkg/awaken/awaken_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,16 @@ func awakenDBCommand(r *Rouse, cfg *config.AppConfig) (*exec.Cmd, error) {
if r.Protocol == "oracle" {
connectMap["dbname"] = r.getUserName()
}
if appItem.Name == "dbx" {
switch r.Protocol {
case "postgresql":
connectMap["protocol"] = "postgres"
case "sqlserver":
connectMap["protocol"] = "mssql"
default:
connectMap["protocol"] = r.Protocol
}
}
if appItem.IsInternal {
var argFormat string
switch r.Protocol {
Expand Down Expand Up @@ -190,7 +200,7 @@ func awakenDBCommand(r *Rouse, cfg *config.AppConfig) (*exec.Cmd, error) {
return nil, fmt.Errorf("No database application configured or found (selected path: %s, reason: %v)", appItem.Path, err)
}
}
if r.Protocol == "sqlserver" {
if r.Protocol == "sqlserver" && appItem.Name != "dbx" {
connectMap["protocol"] = "mssql_jdbc_ms_new"
}
commands := getCommandFromArgs(connectMap, appItem.ArgFormat)
Expand Down
10 changes: 10 additions & 0 deletions go-client/pkg/awaken/awaken_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,16 @@ func awakenDBCommand(r *Rouse, cfg *config.AppConfig) (*exec.Cmd, error) {
if r.Protocol == "oracle" {
connectMap["dbname"] = r.getUserName()
}
if appItem.Name == "dbx" {
switch r.Protocol {
case "postgresql":
connectMap["protocol"] = "postgres"
case "sqlserver":
connectMap["protocol"] = "mssql"
default:
connectMap["protocol"] = r.Protocol
}
}
if appItem.IsInternal {
var argFormat string
switch r.Protocol {
Expand Down
10 changes: 10 additions & 0 deletions go-client/pkg/awaken/awaken_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,16 @@ func handleDB(r *Rouse, cfg *config.AppConfig) (*exec.Cmd, error) {
connectMap["library"] = "SQLOLEDB"
}
}
if appItem.Name == "dbx" {
switch r.Protocol {
case "postgresql":
connectMap["protocol"] = "postgres"
case "sqlserver":
connectMap["protocol"] = "mssql"
default:
connectMap["protocol"] = r.Protocol
}
}
if r.Protocol == "redis" && appItem.Name == "resp" {
var conList []map[string]string
ss := make(map[string]string)
Expand Down
5 changes: 5 additions & 0 deletions plugins/linux/index.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{
"version": 1,
"plugins": [
{
"id": "linux.dbx",
"name": "dbx",
"category": "databases"
},
{
"id": "linux.dbeaver",
"name": "dbeaver",
Expand Down
17 changes: 17 additions & 0 deletions plugins/linux/linux.dbx/connect.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"platform": "linux",
"match_first": [],
"is_default": false,
"is_set": false,
"is_internal": false,
"executable": {
"type": "user_path",
"default": "",
"required": true
},
"launch": {
"type": "args",
"template": "dbx://connection/new?name={name}&type={protocol}&user={username}&password={value}&database={dbname}&host={host}&port={port}&one_time=true"
},
"display_name": "DBX"
}
Binary file added plugins/linux/linux.dbx/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions plugins/linux/linux.dbx/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"id": "linux.dbx",
"name": "dbx",
"display_name": "DBX",
"version": "1.0.0",
"min_client_version": "4.0.0",
"author": "JumpServer",
"homepage": "https://github.com/jumpserver/clients",
"download_url": "https://dbxio.com/cn",
"category": "databases",
"protocols": [
"mariadb",
"mysql",
"oracle",
"postgresql",
"sqlserver",
"redis"
],
"builtin": true,
"comment": {
"zh": "DBX 是一个开源、轻量的数据库与数据基础设施工作台。它把连接管理、对象浏览、SQL 编辑、数据修改、结构工具、专项控制台和自动化入口放在同一个工作区中,支持 70+ 种数据库及数据系统。\n\n!!!手动下载安装,点击保存启用!!!",
"en": "DBX is an open-source, lightweight workspace for databases and data infrastructure. It brings connection management, object browsing, SQL editing, data changes, schema tools, specialized consoles, and automation into one interface across more than 70 databases and data systems.\n\n!!!Manually download and install, click Save to activate!!!"
}
}
5 changes: 5 additions & 0 deletions plugins/macos/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
"name": "dbeaver",
"category": "databases"
},
{
"id": "macos.dbx",
"name": "dbx",
"category": "databases"
},
{
"id": "macos.iterm",
"name": "iterm",
Expand Down
17 changes: 17 additions & 0 deletions plugins/macos/macos.dbx/connect.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"platform": "macos",
"match_first": [],
"is_default": false,
"is_set": false,
"is_internal": false,
"executable": {
"type": "user_path",
"default": "/Applications/DBX.app/Contents/MacOS/dbx",
"required": false
},
"launch": {
"type": "args",
"template": "dbx://connection/new?name={name}&type={protocol}&user={username}&password={value}&database={dbname}&host={host}&port={port}&one_time=true"
},
"display_name": "DBX"
}
Binary file added plugins/macos/macos.dbx/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions plugins/macos/macos.dbx/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"id": "macos.dbx",
"name": "dbx",
"display_name": "DBX",
"version": "1.0.0",
"min_client_version": "4.0.0",
"author": "JumpServer",
"homepage": "https://github.com/jumpserver/clients",
"download_url": "https://dbxio.com/cn",
"category": "databases",
"protocols": [
"mariadb",
"mysql",
"oracle",
"postgresql",
"sqlserver",
"redis"
],
"builtin": true,
"comment": {
"zh": "DBX 是一个开源、轻量的数据库与数据基础设施工作台。它把连接管理、对象浏览、SQL 编辑、数据修改、结构工具、专项控制台和自动化入口放在同一个工作区中,支持 70+ 种数据库及数据系统。\n\n!!!手动下载安装,点击保存启用!!!",
"en": "DBX is an open-source, lightweight workspace for databases and data infrastructure. It brings connection management, object browsing, SQL editing, data changes, schema tools, specialized consoles, and automation into one interface across more than 70 databases and data systems.\n\n!!!Manually download and install, click Save to activate!!!"
}
}
5 changes: 5 additions & 0 deletions plugins/windows/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
"name": "dbeaver",
"category": "databases"
},
{
"id": "windows.dbx",
"name": "dbx",
"category": "databases"
},
{
"id": "windows.mobaxterm",
"name": "mobaxterm",
Expand Down
17 changes: 17 additions & 0 deletions plugins/windows/windows.dbx/connect.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"platform": "windows",
"match_first": [],
"is_default": false,
"is_set": false,
"is_internal": false,
"executable": {
"type": "user_path",
"default": "",
"required": true
},
"launch": {
"type": "args",
"template": "dbx://connection/new?name={name}&type={protocol}&user={username}&password={value}&database={dbname}&host={host}&port={port}&one_time=true"
},
"display_name": "DBX"
}
Binary file added plugins/windows/windows.dbx/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions plugins/windows/windows.dbx/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"id": "windows.dbx",
"name": "dbx",
"display_name": "DBX",
"version": "1.0.0",
"min_client_version": "4.0.0",
"author": "JumpServer",
"homepage": "https://github.com/jumpserver/clients",
"download_url": "https://dbxio.com/cn",
"category": "databases",
"protocols": [
"mariadb",
"mysql",
"oracle",
"postgresql",
"sqlserver",
"redis"
],
"builtin": true,
"comment": {
"zh": "DBX 是一个开源、轻量的数据库与数据基础设施工作台。它把连接管理、对象浏览、SQL 编辑、数据修改、结构工具、专项控制台和自动化入口放在同一个工作区中,支持 70+ 种数据库及数据系统。\n\n!!!手动下载安装,点击保存启用!!!",
"en": "DBX is an open-source, lightweight workspace for databases and data infrastructure. It brings connection management, object browsing, SQL editing, data changes, schema tools, specialized consoles, and automation into one interface across more than 70 databases and data systems.\n\n!!!Manually download and install, click Save to activate!!!"
}
}
Binary file added ui/assets/images/dbx.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ui/components/SettingItems/settingItems.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const { setAppConfig } = useSettingManager();
const imagesMap: Record<string, string | undefined> = {
iterm: getImageByName("item2"),
dbeaver: getImageByName("dbeaver"),
dbx: getImageByName("dbx"),
heidisql: getImageByName("heidisql"),
mstsc: getImageByName("mstsc"),
terminal: getImageByName("terminal"),
Expand Down
Loading