From 15ed63f589953af4418b0b40dcc29f4f6712eb9e Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Wed, 8 Jul 2020 14:39:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix(xpack):=20=E6=9B=B4=E6=96=B0Xpack?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/xpack b/src/views/xpack index 10b240694..dcb3e4d6d 160000 --- a/src/views/xpack +++ b/src/views/xpack @@ -1 +1 @@ -Subproject commit 10b24069424f198271cf359907267c1b728cdc3c +Subproject commit dcb3e4d6d27987c9e14dbaecb46eeb791057523d From d94b3c9fc96d5192fbb2b75d099088e2fa129fb0 Mon Sep 17 00:00:00 2001 From: Bai Date: Wed, 8 Jul 2020 14:57:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix(system=5Fuser):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E5=88=9B=E5=BB=BA/?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2=E8=AE=A4=E8=AF=81=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/SystemUser/SystemUserCreateUpdate.vue | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue index 7eb4f82fd..b2bc5761b 100644 --- a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue +++ b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue @@ -47,12 +47,7 @@ export default { if (form.login_mode !== 'auto') { return true } - if (!form.auto_push) { - return false - } - if (form.auto_generate_key) { - return true - } + return form.auto_generate_key === true } }, username_same_with_user: { @@ -73,9 +68,6 @@ export default { if (form.login_mode !== 'auto') { return true } - if (!form.auto_push) { - return true - } } }, protocol: { @@ -127,9 +119,6 @@ export default { if (form.login_mode !== 'auto') { return true } - if (!form.auto_push) { - return false - } return form.auto_generate_key === true } }, From efb5de92893ac4cae429a7f8e53dfd18241d3b20 Mon Sep 17 00:00:00 2001 From: Bai Date: Wed, 8 Jul 2020 15:01:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix(i18n):=20=E4=BF=AE=E6=94=B9=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?helpMessage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/cn.json | 1 + src/i18n/langs/en.json | 1 + src/views/assets/SystemUser/SystemUserCreateUpdate.vue | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json index 3244aa87f..33d1a2f37 100644 --- a/src/i18n/langs/cn.json +++ b/src/i18n/langs/cn.json @@ -113,6 +113,7 @@ "SFTPHelpMessage": "SFTP的起始路径，tmp目录, 用户home目录或者自定义", "SerialNumber": "序列号", "SudoHelpMessage": "使用逗号分隔多个命令，如: /bin/whoami,/sbin/ifconfig", + "PasswordHelpMessage": "密码或密钥密码", "SystemUser": "系统用户", "SystemUserDetail": "系统用户详情", "SystemUserListHelpMessage": "系统用户是 JumpServer 跳转登录资产时使用的用户，可以理解为登录资产用户，如 web，sa，dba（`ssh web@some-host`），而不是使用某个用户的用户名跳转登录服务器（`ssh xiaoming@some-host`）； 简单来说是用户使用自己的用户名登录 JumpServer，JumpServer 使用系统用户登录资产。 系统用户创建时，如果选择了自动推送，JumpServer 会使用 Ansible 自动推送系统用户到资产中，如果资产（交换机）不支持 Ansible，请手动填写账号密码。\n", diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 2c4e95852..ea0b83dbc 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -113,6 +113,7 @@ "SFTPHelpMessage": "SFTP root dir, tmp, home or custom", "SerialNumber": "Serial number", "SudoHelpMessage": "Use comma split multi command, ex: /bin/whoami,/bin/ifconfig", + "PasswordHelpMessage": "Password or private key password", "SystemUser": "System user", "SystemUserDetail": "System user detail", "SystemUserListHelpMessage": "System user is JumpServer jump login assets used by the users, can be understood as the user login assets, such as web, sa, the dba (` ssh web@some-host `), rather than using a user the username login server jump (` ssh xiaoming@some-host `); In simple terms, users log into JumpServer using their own username, and JumpServer uses system users to log into assets. When system users are created, if you choose auto push JumpServer to use Ansible push system users into the asset, if the asset (Switch) does not support ansible, please manually fill in the account password.\n", diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue index b2bc5761b..2e2104ec0 100644 --- a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue +++ b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue @@ -114,7 +114,7 @@ export default { hidden: (item) => item.protocol !== 'ssh' }, password: { - helpText: '密码或密钥密码', + helpText: this.$t('assets.PasswordHelpMessage'), hidden: form => { if (form.login_mode !== 'auto') { return true From 652919f827fcfca1d03bb64d339f581219e132ee Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Wed, 8 Jul 2020 16:44:13 +0800 Subject: [PATCH 4/5] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E4=B8=BA2.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Footer/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/components/Footer/index.vue b/src/layout/components/Footer/index.vue index 63dd197a5..890aaf7e1 100644 --- a/src/layout/components/Footer/index.vue +++ b/src/layout/components/Footer/index.vue @@ -1,7 +1,7 @@