Revert "EAL4:hardcode password修改"

This reverts commit d0b966013b

nezha-fronted/src/components/common/header.vue

@@ -122,7 +122,7 @@
           <div style="height: 1px; width: 100%; background-color: #cccccc;"></div>
         </el-menu-item>
         <el-menu-item index="101-3">
-          <div @click="showPwdDialog">{{$t('overall.changeMima')}}</div>
+          <div @click="showPwdDialog">{{$t('overall.changePwd')}}</div>
         </el-menu-item>
         <el-menu-item index="101-4">
           <div @click="logout">{{$t('overall.signOut')}}</div>

nezha-fronted/src/components/common/language/cn.js

@@ -53,7 +53,7 @@ const cn = {
     active: "活跃",
     type: "类别",
     detail: "详细信息",
-    changeMima: "修改密码",
+    changePwd: "修改密码",
     createCabinet: "创建机柜",
     createModel: "创建型号",
     createModule: "创建模块",
@@ -108,7 +108,7 @@ const cn = {
   pageSize: "条/页",
   login: {
     username: "登录名",
-    mima: "密码",
+    password: "密码",
     login: "登录"
   },
   dashboard: {
@@ -469,7 +469,7 @@ const cn = {
       remark: "描述",
       cli: "CLI账号",
       loginType: "登录类型",
-      mima: "密码",
+      password: "密码",
       ssh: "SSH-Key",
       account: "用户名",
       port: "端口",
@@ -520,16 +520,16 @@ const cn = {
     remark: "描述",
     cli: "CLI账号",
     loginType: "登录类型",
-    mima: "密码",
+    password: "密码",
     ssh: "SSH key",
     protocol: "协议",
     sshProtocol: "SSH",
     telnetProtocol: "Telnet",
     userTip: "用户名提示",
-    mimaTip: "密码提示",
+    passwordTip: "密码提示",
-    reloginMimaTip: "RELOGIN提示",
+    reloginPasswordTip: "RELOGIN提示",
-    userMimaIntroduce: "请指定用户名和密码提示以便TELNET登录过程可自动运行",
+    userPwdIntroduce: "请指定用户名和密码提示以便TELNET登录过程可自动运行",
-    reLoginMimaIntroduce: "请指定密码提示以便RELOGIN登录过程可自动运行",
+    reLoginPwdIntroduce: "请指定密码提示以便RELOGIN登录过程可自动运行",
     account: "用户名",
     port: "端口",
     upload: "上传",
@@ -570,16 +570,16 @@ const cn = {
       createAccount: "新增用户",
       editAccount: "编辑用户",
       notCurrentlySupport: "暂不支持",
-      mima: "密码",
+      password: "密码",
-      oldMima: "旧密码",
+      oldPwd: "旧密码",
-      inputOldMima: "请输入旧密码",
+      inputOldPwd: "请输入旧密码",
-      newMima: "新密码",
+      newPwd: "新密码",
-      inputNewMima: "请输入新密码",
+      inputNewPwd: "请输入新密码",
-      confirmMima: "确认密码",
+      confirmPwd: "确认密码",
-      inputConfirmMima: "请再次输入密码",
+      inputConfirmPwd: "请再次输入密码",
-      invalidMima: "无效的密码，最少6个字符",
+      invalidPwd: "无效的密码，最少6个字符",
-      confirmMimaErr: "两次密码输入不一致",
+      confirmPwdErr: "两次密码输入不一致",
-      reinputMima: "请再次输入密码",
+      reinputPwd: "请再次输入密码",
       notification: "通知"
     },
     roles:{
@@ -749,13 +749,13 @@ const cn = {
         smtpHost: "SMTP主机",
         smtpPort: "SMTP端口",
         smtpAccount: "SMTP账号",
-        smtpMima: "SMTP密码",
+        smtpPwd: "SMTP密码",
         sendAccount: "发送账号",
         testAccount: "测试账号",
         useSSL: "SSL",
         useTLS: "TLS",
         testConnection: "测试连接",
-        mimaTip: "提示：一些邮件提供商需要输入的是Token",
+        pwdTip: "提示：一些邮件提供商需要输入的是Token",
         sendAccountTip: "提示：发送邮件账号，默认使用SMTP账号作为发送账号",
         testAccountTip: "提示：仅用来作为测试邮件收件人",
         sslTip: "如果SMTP端口是465，通常需要启用SSL",
@@ -769,7 +769,7 @@ const cn = {
         ldap: "LDAP",
         address: "LDAP地址",
         dn: "Bind DN",
-        mima: "密码",
+        pwd: "密码",
         ou: "用户OU",
         filter: "用户过滤器",
         map: "LDAP属性映射",
@@ -801,11 +801,11 @@ const cn = {
       reset: {
         reset: "重置",
         type: "类型",
-        mima: "密码",
+        pwd: "密码",
         metric: "指标",
         alert: "告警",
         sysConfig: "系统设置",
-        mimaTip: "请输入密码",
+        pwdTip: "请输入密码",
         promptTitle: "确认密码",
         yes: "是",
         no: "否"
@@ -907,7 +907,7 @@ const cn = {
       authProtocol: "认证协议",
       privProtocol: "隐私协议",
       contextName: "内容名称",
-      privMima: "隐私密码"
+      privPassword: "隐私密码"
     },
     endpoint: {
       createEndpoint: "新增Endpoint",

nezha-fronted/src/components/common/language/en.js

@@ -47,7 +47,7 @@ const en = {
     back: 'Back', //返回
     unavailable: 'Unavailable',
     available: 'Available',
-    changeMima:'Change password',//修改密码
+    changePwd:'Change password',//修改密码
     createChart:'Create chart',
     createProject:'Create project',
     createEndpoint:'Create endpoint',
@@ -113,7 +113,7 @@ const en = {
   },
   login: {
     username: 'Username',
-    mima: 'Password',
+    password: 'Password',
     login: 'Login'
   },
   dashboard:{
@@ -425,16 +425,16 @@ const en = {
     remark:'Description',//'描述'
     cli:'CLI account',//'CLI账号'
     loginType:'Login type',//'登录类型'
-    mima:'Password',//'密码'
+    password:'Password',//'密码'
     ssh:'SSH key',//'SSH-Key'
     protocol:"Protocol",
     sshProtocol:"SSH",
     telnetProtocol:"Telnet",
     userTip:"User tip",//用户名提示
-    mimaTip:"Password tip",//密码提示
+    passwordTip:"Password tip",//密码提示
-    reloginMimaTip:"Relogin tip",//密码提示
+    reloginPasswordTip:"Relogin tip",//密码提示
-    userMimaIntroduce:'Please specify a user name and password so that the telenet login process can automatically log in',
+    userPwdIntroduce:'Please specify a user name and password so that the telenet login process can automatically log in',
-    reLoginMimaIntroduce:'Please specify the password prompt so that the login process can run automatically',
+    reLoginPwdIntroduce:'Please specify the password prompt so that the login process can run automatically',
     account:'User name',//'用户名'
     port:'Port',//'端口'
     upload:'Upload',//'上传'
@@ -520,7 +520,7 @@ const en = {
       remark:'Description',//'描述'
       cli:'CLI account',//'CLI账号'
       loginType:'Login type',//'登录类型'
-      mima:'Password',//'密码'
+      password:'Password',//'密码'
       ssh:'SSH-Key',//'SSH-Key'
       account:'Username',//'用户名'
       port:'Port',//'端口'
@@ -573,16 +573,16 @@ const en = {
       createAccount: 'New account',//"新增用户"
       editAccount: 'Edit account',//"编辑用户"
       notCurrentlySupport: 'Not available',//'暂不支持'
-      mima: 'Password',//'密码'
+      password: 'Password',//'密码'
-      oldMima:'Old password',
+      oldPwd:'Old password',
-      inputOldMima:'Please input old password',
+      inputOldPwd:'Please input old password',
-      newMima:'New password',
+      newPwd:'New password',
-      inputNewMima:'Please input new password',
+      inputNewPwd:'Please input new password',
-      confirmMima:'Confirm password',
+      confirmPwd:'Confirm password',
-      inputConfirmMima:'Please input confirm password',
+      inputConfirmPwd:'Please input confirm password',
-      invalidMima:'invalide password,the length at least 6',
+      invalidPwd:'invalide password,the length at least 6',
-      confirmMimaErr:'The two passwords are inconsistent',
+      confirmPwdErr:'The two passwords are inconsistent',
-      reinputMima:'Enter password again',
+      reinputPwd:'Enter password again',
       notification: 'Notification'
     },
     roles:{
@@ -753,13 +753,13 @@ const en = {
         smtpHost:'SMTP host',
         smtpPort:'SMTP port',
         smtpAccount:'SMTP account',
-        smtpMima:'SMTP password',
+        smtpPwd:'SMTP password',
         sendAccount:'Send account',
         testAccount:'Test account',
         useSSL:'SSL',
         useTLS:'TLS',
         testConnection:'Test connection',
-        mimaTip:'Tip:Some email providers need to enter token',
+        pwdTip:'Tip:Some email providers need to enter token',
         sendAccountTip:'Tip:The SMTP account is used as the sending account by default',
         testAccountTip:'Tip:Used only as test mail recipient',
         sslTip:'If the SMTP port is 465, you usually need to enable SSL',
@@ -773,7 +773,7 @@ const en = {
         ldap:'LDAP',
         address:'LDAP address',
         dn:'Bind DN',
-        mima:'Password',
+        pwd:'Password',
         ou:'User OU',
         filter:'User filter',
         map:'LDAP field mapping',
@@ -805,11 +805,11 @@ const en = {
       reset:{
         reset:'Reset',
         type:'Type',
-        mima:'Password',
+        pwd:'Password',
         metric:'metric',
         alert:'alert',
         sysConfig:'System config',
-        mimaTip:'Please input your password',
+        pwdTip:'Please input your password',
         promptTitle:'Confirm',
         yes:'Yes',
         no:'No',
@@ -909,7 +909,7 @@ const en = {
       authProtocol: 'Auth protocol',
       privProtocol: 'Priv protocol',
       contextName: 'Context name',
-      privMima: 'Priv password',
+      privPassword: 'Priv password',
       tip: {
         defaultEndpointSet: 'Default endpoint settings',//"默认的Endpoint设置"
         relation: 'Module associated Endpoint will configure the following ports/paths/parameters by default'//"组件关联的Endpoint将默认配置以下端口/路径/参数"

nezha-fronted/src/components/common/login.vue

@@ -11,7 +11,7 @@
       <div class="login-label"></div>
       <div class="login-input">
         <i class="nz-icon nz-icon-password"></i>
-        <input v-model="loginData.password" type="password" name="password" autocomplete="on" :placeholder="$t('login.mima')"></input>
+        <input v-model="loginData.password" type="password" name="password" autocomplete="on" :placeholder="$t('login.password')"></input>
       </div>
       <div class="login-foot">
         <button @click="login" class="login-btn" id="login" v-loading="loading">{{$t("login.login")}}</button>

nezha-fronted/src/components/common/rightBox/accountBox.vue

@@ -24,7 +24,7 @@
                     v-model="editUser.username" maxlength="64" show-word-limit size="small" :disabled="editUser.username==='admin' && editUser.userId==1"></el-input>
         </el-form-item>
         <!--password-->
-        <el-form-item :label="$t('config.account.mima')" prop="password" v-if="!editUser.userId">
+        <el-form-item :label="$t('config.account.password')" prop="password" v-if="!editUser.userId">
           <el-input autocomplete="new-password" type="password" placeholder="" v-model="editUser.password"
                     maxlength="16" show-word-limit size="small" @blur="passwordBlur"></el-input>
         </el-form-item>

nezha-fronted/src/components/common/rightBox/moduleBox.vue

@@ -165,7 +165,7 @@
 
             <el-row v-if="editModule.security_level == 'authNoPriv' || editModule.security_level == 'authPriv'">
               <el-col :span="6">
-                <div class="sub-label sub-label-required">{{$t('login.mima')}}</div>
+                <div class="sub-label sub-label-required">{{$t('login.password')}}</div>
               </el-col>
               <el-col :span="18">
                 <el-form-item prop="password">
@@ -204,7 +204,7 @@
 
             <el-row v-if="editModule.security_level == 'authPriv'">
               <el-col :span="6">
-                <div class="sub-label sub-label-required">{{$t('project.module.privMima')}}</div>
+                <div class="sub-label sub-label-required">{{$t('project.module.privPassword')}}</div>
               </el-col>
               <el-col :span="18">
                 <el-form-item prop="priv_password">

nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue

@@ -67,7 +67,7 @@
 
               <el-row class="mib-browser-ad-search-item" v-if="assetSetting.auth.securityLevel == 'authNoPriv' || assetSetting.auth.securityLevel == 'authPriv'">
                 <el-col :span="6">
-                  <div class="mib-browser-ad-search-label">{{$t('login.mima')}}</div>
+                  <div class="mib-browser-ad-search-label">{{$t('login.password')}}</div>
                 </el-col>
                 <el-col :span="17">
                   <el-input class="input-x-mini-24" v-model.trim="assetSetting.auth.password"></el-input>
@@ -100,7 +100,7 @@
 
               <el-row class="mib-browser-ad-search-item" v-if="assetSetting.auth.securityLevel == 'authPriv'">
                 <el-col :span="6">
-                  <div class="mib-browser-ad-search-label">{{$t('project.module.privMima')}}</div>
+                  <div class="mib-browser-ad-search-label">{{$t('project.module.privPassword')}}</div>
                 </el-col>
                 <el-col :span="17">
                   <el-input class="input-x-mini-24" v-model.trim="assetSetting.auth.privPassword"></el-input>

nezha-fronted/src/components/page/asset/accountConfig.vue

@@ -6,17 +6,17 @@
       </el-form-item>
       <el-form-item :label="$t('asset.loginType')" prop="params.method">
         <el-radio-group v-model="account.params.method" size="small">
-          <el-radio-button label="password">{{$t('asset.mima')}}</el-radio-button>
+          <el-radio-button label="password">{{$t('asset.password')}}</el-radio-button>
           <el-radio-button label="key">{{$t('asset.ssh')}}</el-radio-button>
         </el-radio-group>
       </el-form-item>
-      <el-form-item :label="$t('asset.mima')" v-if="account.params.method == 'password'">
+      <el-form-item :label="$t('asset.password')" v-if="account.params.method == 'password'">
         <el-input autocomplete="new-password" size="small" type="password" v-model="account.params.password"/>
       </el-form-item>
       <el-form-item :label="$t('asset.ssh')" v-if="account.params.method == 'key'" prop="file">
         <el-input rows="4" type="textarea" placeholder="" v-model="account.params.key" size="small"></el-input>
       </el-form-item>
-      <el-form-item :label="$t('asset.mima')" v-if="account.params.method == 'key'">
+      <el-form-item :label="$t('asset.password')" v-if="account.params.method == 'key'">
         <el-input autocomplete="new-password" size="small" type="password" v-model="account.params.keyPassword"/>
       </el-form-item>
       <el-form-item :label="$t('asset.port')" prop="port" style="display: inline-block">
@@ -30,7 +30,7 @@
       <el-form-item :label="$t('asset.userTip')" prop="userTip">
         <el-input autocomplete="new-password" size="small" v-model="account.params.userTip"/>
       </el-form-item>
-      <el-form-item :label="$t('asset.mima')">
+      <el-form-item :label="$t('asset.password')">
         <el-input autocomplete="new-password" size="small" type="password" v-model="account.params.password"/>
       </el-form-item>
       <el-form-item :label="this.$t('asset.passwordTip')">
@@ -71,7 +71,7 @@
             <el-radio-button label="authPriv"></el-radio-button>
           </el-radio-group>
         </el-form-item>
-        <el-form-item :label="$t('login.mima')" prop="params.password" v-if="account.params.securityLevel == 'authNoPriv' || account.params.securityLevel == 'authPriv'">
+        <el-form-item :label="$t('login.password')" prop="params.password" v-if="account.params.securityLevel == 'authNoPriv' || account.params.securityLevel == 'authPriv'">
           <el-input autocomplete="new-password" size="small" type="password" v-model="account.params.password"/>
         </el-form-item>
         <el-form-item :label="$t('project.module.authProtocol')" prop="params.authProtocol" v-if="account.params.securityLevel == 'authNoPriv' || account.params.securityLevel == 'authPriv'">
@@ -86,7 +86,7 @@
             <el-radio-button label="AES"></el-radio-button>
           </el-radio-group>
         </el-form-item>
-        <el-form-item :label="$t('project.module.privMima')" prop="params.privPassword" v-if="account.params.securityLevel == 'authPriv'">
+        <el-form-item :label="$t('project.module.privPassword')" prop="params.privPassword" v-if="account.params.securityLevel == 'authPriv'">
           <el-input autocomplete="new-password" size="small" type="password" v-model="account.params.privPassword"/>
         </el-form-item>
       </template>

nezha-fronted/src/components/page/asset/asset.vue

@@ -687,7 +687,7 @@
           detail.account = account.user;
           let loginType = "";
           if (account.authType == 1) {
-            loginType = this.$t('asset.mima');
+            loginType = this.$t('asset.password');
           } else if (account.authType == 2) {
             loginType = this.$t('asset.ssh');
           }

nezha-fronted/src/components/page/config/changePwd.vue

@@ -1,18 +1,18 @@
 <template>
   <div>
-    <el-dialog class="nz-dialog" :title="$t('overall.changeMima')" :visible.sync="visible"  @open="dialogOpened"  :modal-append-to-body='false' @closed="dialogClosed" width="600px" :show-close="false" >
+    <el-dialog class="nz-dialog" :title="$t('overall.changePwd')" :visible.sync="visible"  @open="dialogOpened"  :modal-append-to-body='false' @closed="dialogClosed" width="600px" :show-close="false" >
       <el-form :model="user" label-position="right" label-width="150px" :rules="rules" ref="changePwdForm" size="mini">
         <el-form-item :label="$t('config.account.account')" prop="username" v-show="curUser != sysUser">
           <el-input type="text" autocomplete="false" v-model="user.username" disabled></el-input>
         </el-form-item>
-        <el-form-item :label="$t('config.account.oldMima')" prop="pwd">
+        <el-form-item :label="$t('config.account.oldPwd')" prop="pwd">
-          <el-input type="password" autocomplete="false" :show-password="true" v-model="user.pwd" maxlength="20" :placeholder="$t('config.account.inputOldMima')"></el-input>
+          <el-input type="password" autocomplete="false" :show-password="true" v-model="user.pwd" maxlength="20" :placeholder="$t('config.account.inputOldPwd')"></el-input>
         </el-form-item>
-        <el-form-item :label="$t('config.account.newMima')" prop="newPwd">
+        <el-form-item :label="$t('config.account.newPwd')" prop="newPwd">
-          <el-input type="password" autocomplete="false" :show-password="true" v-model="user.newPwd" maxlength="20" :placeholder="$t('config.account.inputNewMima')"></el-input>
+          <el-input type="password" autocomplete="false" :show-password="true" v-model="user.newPwd" maxlength="20" :placeholder="$t('config.account.inputNewPwd')"></el-input>
         </el-form-item>
-        <el-form-item :label="$t('config.account.confirmMima')" prop="confirmPwd">
+        <el-form-item :label="$t('config.account.confirmPwd')" prop="confirmPwd">
-          <el-input type="password" autocomplete="false"  :show-password="true" v-model="user.confirmPwd" maxlength="20" :placeholder="$t('config.account.inputConfirmMima')"></el-input>
+          <el-input type="password" autocomplete="false"  :show-password="true" v-model="user.confirmPwd" maxlength="20" :placeholder="$t('config.account.inputConfirmPwd')"></el-input>
         </el-form-item>
       </el-form>
       <!--底部按钮-->
@@ -46,7 +46,7 @@
           if(value && value != '' ){
             callback();
           }else{
-            callback(new Error(temp.$t('config.account.invalidMima')))
+            callback(new Error(temp.$t('config.account.invalidPwd')))
           }
         };
         var validateConfirmPass=(rule,value,callback) => {
@@ -67,7 +67,7 @@
           rules:{
             pwd:[{required:true,message: this.$t('validate.required'), trigger: 'blur'}],
             newPwd:[{required:true,message: this.$t('validate.required'), trigger: 'blur'},{validator:validatePass,trigger: 'blur'}],
-            confirmPwd:[{required:true,message: this.$t('config.account.reinputMima'), trigger: 'blur'},{validator:validateConfirmPass,trigger: 'blur'}]
+            confirmPwd:[{required:true,message: this.$t('config.account.reinputPwd'), trigger: 'blur'},{validator:validateConfirmPass,trigger: 'blur'}]
           },
           visible:false,
         }

nezha-fronted/src/components/page/config/mibBrowser.vue

@@ -81,7 +81,7 @@
 
                 <el-row class="mib-browser-ad-search-item" v-if="searchParamPop.auth.securityLevel == 'authNoPriv' || searchParamPop.auth.securityLevel == 'authPriv'">
                   <el-col :span="6">
-                    <div class="mib-browser-ad-search-label">{{$t('login.mima')}}</div>
+                    <div class="mib-browser-ad-search-label">{{$t('login.password')}}</div>
                   </el-col>
                   <el-col :span="17">
                     <el-input type="password" class="input-x-mini-24" v-model.trim="searchParamPop.auth.password"></el-input>
@@ -114,7 +114,7 @@
 
                 <el-row class="mib-browser-ad-search-item" v-if="searchParamPop.auth.securityLevel == 'authPriv'">
                   <el-col :span="6">
-                    <div class="mib-browser-ad-search-label">{{$t('project.module.privMima')}}</div>
+                    <div class="mib-browser-ad-search-label">{{$t('project.module.privPassword')}}</div>
                   </el-col>
                   <el-col :span="17">
                     <el-input type="password" class="input-x-mini-24" v-model.trim="searchParamPop.auth.privPassword"></el-input>

nezha-fronted/src/components/page/config/system.vue

@@ -63,7 +63,7 @@
             <el-form-item :label="$t('config.system.email.smtpAccount')" prop="email_smtp_account">
               <el-input  v-model="email.email_smtp_account" :disabled="email.email_enable == 'off'"> autocomplete="off"</el-input>
             </el-form-item>
-            <el-form-item :label="$t('config.system.email.smtpMima')" prop="email_smtp_password">
+            <el-form-item :label="$t('config.system.email.smtpPwd')" prop="email_smtp_password">
               <el-input v-model="email.email_smtp_password" type="password" :show-password="false" :disabled="email.email_enable == 'off'"  autocomplete="off"></el-input>
               <div><span>{{$t('config.system.email.pwdTip')}}</span></div>
             </el-form-item>
@@ -119,7 +119,7 @@
             <el-form-item :label="$t('config.system.ldap.dn')" prop="ldap_dn">
               <el-input v-model="ldap.ldap_dn"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('config.system.ldap.mima')" prop="ldap_password">
+            <el-form-item :label="$t('config.system.ldap.pwd')" prop="ldap_password">
               <el-input v-model="ldap.ldap_password" type="password"></el-input>
             </el-form-item>
             <el-form-item :label="$t('config.system.ldap.ou')" prop="ldap_ou">

nezha-fronted/src/components/page/project/project.vue

@@ -694,7 +694,7 @@
           detail.account=account.user;
           let loginType="";
           if(account.authType==1){
-            loginType=this.$t('asset.mima');
+            loginType=this.$t('asset.password');
           }else if(account.authType==2){
             loginType=this.$t('asset.ssh');
           }