Skip to content

Commit b134a68

Browse files
Halo1236Halo1236
authored
Merge pull request #39 from jumpserver/dev
feat: 支持xftp
2 parents 0e1e2d5 + 9444bb8 commit b134a68

File tree

9 files changed

+95
-30
lines changed

9 files changed

+95
-30
lines changed

‎go-client/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ build-client:
1414
GOARCH=amd64 GOOS=darwin $(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/darwin/client $(SSHCSRCFILE)
1515

1616
GOARCH=amd64 GOOS=windows $(CLIENTBUILD) -ldflags "$(LDFLAGS) -H windowsgui" -o $(BUILDDIR)/windows/JumpServerClient.exe $(CLIENTSRCFILE)
17+
GOARCH=386 GOOS=windows $(CLIENTBUILD) -ldflags "$(LDFLAGS) -H windowsgui" -o $(BUILDDIR)/windows/JumpServerClient32.exe $(CLIENTSRCFILE)
1718

1819
GOARCH=amd64 GOOS=linux $(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/linux-amd64/JumpServerClient $(CLIENTSRCFILE)
1920
GOARCH=amd64 GOOS=linux $(CLIENTBUILD) -ldflags "$(LDFLAGS)" -o $(BUILDDIR)/linux-amd64/client $(SSHCSRCFILE)

‎go-client/config.json

+57
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,25 @@
142142
"is_internal": false,
143143
"is_default": false,
144144
"is_set": false
145+
},
146+
{
147+
"name": "xftp",
148+
"display_name": "Xftp",
149+
"protocol": [
150+
"sftp"
151+
],
152+
"comment": {
153+
"zh": "Xftp是一个功能强大的SFTP、FTP 文件传输软件。",
154+
"en": "Xftp is a powerful SFTP and FTP file transfer software."
155+
},
156+
"download_url": "https://www.xshell.com/zh/xftp-download/",
157+
"type": "linux",
158+
"path": "",
159+
"arg_format": "-newwin {protocol}://{username}:{value}@{host}:{port}",
160+
"match_first": [],
161+
"is_internal": false,
162+
"is_default": false,
163+
"is_set": false
145164
}
146165
],
147166
"databases": [
@@ -224,6 +243,25 @@
224243
"is_internal": false,
225244
"is_default": false,
226245
"is_set": false
246+
},
247+
{
248+
"name": "another_redis",
249+
"display_name": "Another Redis Desktop Manager",
250+
"protocol": [
251+
"redis"
252+
],
253+
"comment": {
254+
"zh": "更快、更好、更稳定的Redis桌面(GUI)管理客户端。",
255+
"en": "A faster, better and more stable redis desktop manager."
256+
},
257+
"download_url": "https://github.com/qishibo/AnotherRedisDesktopManager",
258+
"type": "databases",
259+
"path": "",
260+
"arg_format": "--host {host} --port {port} --auth {username}@{value}",
261+
"match_first": [],
262+
"is_internal": false,
263+
"is_default": false,
264+
"is_set": false
227265
}
228266
]
229267
},
@@ -386,6 +424,25 @@
386424
"is_internal": false,
387425
"is_default": false,
388426
"is_set": false
427+
},
428+
{
429+
"name": "another_redis",
430+
"display_name": "Another Redis Desktop Manager",
431+
"protocol": [
432+
"redis"
433+
],
434+
"comment": {
435+
"zh": "更快、更好、更稳定的Redis桌面(GUI)管理客户端。",
436+
"en": "A faster, better and more stable redis desktop manager."
437+
},
438+
"download_url": "https://github.com/qishibo/AnotherRedisDesktopManager",
439+
"type": "databases",
440+
"path": "/Applications/Another Redis Desktop Manager.app/Contents/MacOS/Another Redis Desktop Manager",
441+
"arg_format": "--host {host} --port {port} --auth {username}@{value}",
442+
"match_first": [],
443+
"is_internal": false,
444+
"is_default": false,
445+
"is_set": false
389446
}
390447
]
391448
},

‎go-client/pkg/awaken/awaken_windows.go

+25-23
Original file line numberDiff line numberDiff line change
@@ -107,31 +107,33 @@ func handleDB(r *Rouse, cfg *config.AppConfig) *exec.Cmd {
107107
connectMap["protocol"] = "mssql_jdbc_ms_new"
108108
}
109109
if r.Protocol == "redis" {
110-
var conList []map[string]string
111-
ss := make(map[string]string)
112-
ss["host"] = r.Host
113-
ss["port"] = strconv.Itoa(r.Port)
114-
ss["name"] = r.getName()
115-
ss["auth"] = r.Token.ID + "@" + r.Value
116-
ss["ssh_agent_path"] = ""
117-
ss["ssh_password"] = ""
118-
ss["ssh_private_key_path"] = ""
119-
ss["timeout_connect"] = "60000"
120-
ss["timeout_execute"] = "60000"
121-
conList = append(conList, ss)
110+
if appItem.Name == "resp" {
111+
var conList []map[string]string
112+
ss := make(map[string]string)
113+
ss["host"] = r.Host
114+
ss["port"] = strconv.Itoa(r.Port)
115+
ss["name"] = r.getName()
116+
ss["auth"] = r.Token.ID + "@" + r.Value
117+
ss["ssh_agent_path"] = ""
118+
ss["ssh_password"] = ""
119+
ss["ssh_private_key_path"] = ""
120+
ss["timeout_connect"] = "60000"
121+
ss["timeout_execute"] = "60000"
122+
conList = append(conList, ss)
122123

123-
bjson, _ := json.Marshal(conList)
124-
currentPath := filepath.Dir(os.Args[0])
125-
rdmPath := filepath.Join(currentPath, ".rdm")
126-
EnsureDirExist(rdmPath)
127-
filePath := filepath.Join(rdmPath, "connections.json")
128-
global.LOG.Error(filePath)
129-
err := ioutil.WriteFile(filePath, bjson, os.ModePerm)
130-
if err != nil {
131-
global.LOG.Error(err.Error())
132-
return nil
124+
bjson, _ := json.Marshal(conList)
125+
currentPath := filepath.Dir(os.Args[0])
126+
rdmPath := filepath.Join(currentPath, ".rdm")
127+
EnsureDirExist(rdmPath)
128+
filePath := filepath.Join(rdmPath, "connections.json")
129+
global.LOG.Error(filePath)
130+
err := ioutil.WriteFile(filePath, bjson, os.ModePerm)
131+
if err != nil {
132+
global.LOG.Error(err.Error())
133+
return nil
134+
}
135+
connectMap["config_file"] = currentPath
133136
}
134-
connectMap["config_file"] = currentPath
135137
}
136138
commands := getCommandFromArgs(connectMap, appItem.ArgFormat)
137139
if strings.Contains(commands, "*") {

‎interface/build/win/installer.nsh

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
WriteRegStr HKCR "jms" "URL Protocol" ""
88
WriteRegStr HKCR "jms\shell" "" ""
99
WriteRegStr HKCR "jms\shell\open" "" ""
10-
WriteRegStr HKCR "jms\shell\open\command" "" '"$INSTDIR\resources\bin\windows\JumpServerClient.exe" "%1"'
11-
10+
${If} ${RunningX64}
11+
WriteRegStr HKCR "jms\shell\open\command" "" '"$INSTDIR\resources\bin\windows\JumpServerClient.exe" "%1"'
12+
${else}
13+
WriteRegStr HKCR "jms\shell\open\command" "" '"$INSTDIR\resources\bin\windows\JumpServerClient32.exe" "%1"'
14+
${EndIf}
1215
AccessControl::GrantOnFile \
1316
"$INSTDIR\resources\bin" "(BU)" "GenericWrite + GenericRead"
1417
Pop $R0

‎interface/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jumpserver-client",
33
"author": "Fit2Cloud Technology Co., Ltd.; <[email protected]>",
4-
"version": "v2.1.1",
4+
"version": "v2.1.3",
55
"homepage": "https://jumpserver.org",
66
"private": true,
77
"scripts": {

‎interface/src/renderer/assets/another_redis.png

11 KB
Loading

‎interface/src/renderer/assets/xftp.png

6.91 KB
Loading

‎interface/src/renderer/pages/About.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<div>
33
<img id="logo" src="@/assets/JumpServer.png" alt=""/>
44
<p>{{ $t('Common.JumpServerClient') }}</p>
5-
<p>{{ $t('AboutUs.Version') }}：v2.1.1</p>
6-
<p>{{ $t('AboutUs.Copyright') }}：FIT2CLOUD 飞致云 © 2014-2023 {{ $t('AboutUs.AllRightsReserved')}}</p>
5+
<p>{{ $t('AboutUs.Version') }}：v2.1.3</p>
6+
<p>{{ $t('AboutUs.Copyright') }}：FIT2CLOUD 飞致云 © 2014-2024 {{ $t('AboutUs.AllRightsReserved')}}</p>
77
<a target="_blank" href="https://www.fit2cloud.com/jumpserver/index.html">{{ $t('AboutUs.OfficialWebsite') }}</a>
88
<a target="_blank" href="https://docs.jumpserver.org/zh/v3/">{{ $t('AboutUs.OnlineDocumentation') }}</a>
99
<a target="_blank" href="https://kb.fit2cloud.com/categories/jumpserver">{{ $t('AboutUs.KnowledgeBase') }}</a>

‎interface/vue.config.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,14 @@ module.exports = {
7070
target: [{
7171
target: 'nsis',
7272
arch: [
73-
'x64'
73+
'x64',
74+
'ia32'
7475
]
7576
},{
7677
target: 'msiWrapped',
7778
arch: [
78-
'x64'
79+
'x64',
80+
'ia32'
7981
]
8082
}]
8183
},

0 commit comments

Comments
 (0)