Merge pull request #168 from jumpserver/v2.0

feat: 更新Master代码

.github/release-config.yml

@@ -1,4 +1,4 @@
-name-template: 'Release v$RESOLVED_VERSION'
+name-template: 'v$RESOLVED_VERSION'
 tag-template: 'v$RESOLVED_VERSION'
 categories:
   - title: '🌱 新功能 Features'

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",

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",

src/layout/components/Footer/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="footer" :style="style">
     <div class="pull-right">
-      Version <strong>2.0.1</strong> <span v-if="!publicSettings.XPACK_LICENSE_IS_VALID"> GPLv2. </span>
+      Version <strong>2.0.2</strong> <span v-if="!publicSettings.XPACK_LICENSE_IS_VALID"> GPLv2. </span>
     </div>
     <div v-if="!publicSettings.XPACK_LICENSE_IS_VALID" style="padding-left:20px;">
       <strong>Copyright</strong> FIT2CLOUD 飞致云 © 2014-2020

src/views/assets/SystemUser/SystemUserCreateUpdate.vue

@@ -47,12 +47,7 @@ export default {
             if (form.login_mode !== 'auto') {
               return true
             }
-            if (!form.auto_push) {
+            return form.auto_generate_key === true
-              return false
-            }
-            if (form.auto_generate_key) {
-              return 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: {
@@ -122,14 +114,11 @@ export default {
           hidden: (item) => item.protocol !== 'ssh'
         },
         password: {
-          helpText: '密码或密钥密码',
+          helpText: this.$t('assets.PasswordHelpMessage'),
           hidden: form => {
             if (form.login_mode !== 'auto') {
               return true
             }
-            if (!form.auto_push) {
-              return false
-            }
             return form.auto_generate_key === true
           }
         },