system-clients 3.1.72-ls → 3.1.73-ls

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.1.72-ls",
+  "version": "3.1.73-ls",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/server/Login.vue

@@ -87,6 +87,9 @@
         <button class="button_clear" @click="depPromptCancel">取消</button>
       </footer>
     </modal>
+
+    <!-- 修改密码组件 -->
+    <modify-pw :show.sync="modifyPwShow" v-if="modifyPwShow" :ename="model.ename"></modify-pw>
   </div>
 
 </template>
@@ -142,7 +145,10 @@
           throw new Error('Mac地址验证失败, 请联系管理员！！')
         }
       }
-      if (self.config.depPrompt) {
+      if (self.config.weakPassword && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(self.model.password))) {
+        self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
+          self.modifyPwShow = true
+        }) else if (self.config.depPrompt) {
         self.depPromptShow = true
       } else {
         self.$goto('home-page', {functions: self.$login.f})
@@ -204,6 +210,7 @@
           isMac: false,
           depPrompt: false,
         },
+        modifyPwShow:false,
         login: false,
         depPromptShow: false,
         model: {},

package/src/components/server/ModifyPw.vue

@@ -18,14 +18,15 @@
             </div>
           </div>
           <div class="has-feedback form-group"
-               :class="{'has-warning':$v.newpassword.required,'has-error':$v.newpassword.strongpassword && !($v.newpassword.required),
-          'has-success': !$v.newpassword.required && !$v.newpassword.strongpassword }">
+               :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
+          'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength  && !$v.newpassword.chinesePassword}">
             <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
             <div class="col-sm-4">
-              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, strongpassword: true}'>
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !($v.newpassword.strongpassword && !($v.newpassword.required))"></span>
+              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
               <span v-if="$v.newpassword.required">不能为空</span>
-              <span v-if="$v.newpassword.strongpassword && !($v.newpassword.required)">密码必须包含英文大小写、阿拉伯数字、字符</span>
+              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与大小字母外加特殊字符的组合，并且不能出现类似'123','abc'等连贯数字或者字母</span>
+              <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
             </div>
           </div>
           <div class="has-feedback form-group"
@@ -52,55 +53,73 @@
 
 </template>
 <script>
-  import co from 'co'
-  import validator from '../../plugins/validation';
+import co from 'co'
+import validator from '../../plugins/validation'
 
-  let saveGen = function * (self) {
-    self.deliver.ename = self.functions.ename
-    // let res = yield self.$post('rs/user/entity', {data: self.deliver})
-    // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
-    // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
-    //  Util.f.password = self.deliver.newpassword
-    let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
-    self.$login.f.password = self.deliver.newpassword
-    if (res.data) {
+let saveGen = function * (self) {
+  self.deliver.ename = self.ename || self.functions.ename
+  // let res = yield self.$post('rs/user/entity', {data: self.deliver})
+  // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
+  // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
+  //  Util.f.password = self.deliver.newpassword
+  let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver }, {resolveMsg: null,rejectMsg: null})
+  self.$login.f.password = self.deliver.newpassword
+  if (res.data) {
+    console.log("修改密码返回：" , res.data)
+    // 兼容旧版ldao，旧版不返回code
+    if (res.data.code === 200) {
       self.deliver.password = ''
       self.deliver.newpassword = ''
       self.deliver.affirmpassword = ''
       self.show = false
+      self.$showAlert("修改密码成功", 'success', 2000)
+    } else {
+      // 兼容旧版ldao，旧版不返回code
+      self.deliver.password = ''
+      self.deliver.newpassword = ''
+      self.deliver.affirmpassword = ''
+      self.show = false
+      self.$showAlert("修改密码成功", 'success', 2000)
+    }
+  } else {
+    if (res.data.code) {
+      self.$showAlert("修改密码失败，原因：" + res.data.msg, 'warning', 2000)
+    } else {
+      self.$showMessage(res.data)
     }
   }
-  export default {
-    title: '系统管理-密码修改',
-    data () {
-      return {
-        deliver: {
-          password: '',
-          newpassword: '',
-          affirmpassword: ''
-        },
-        functions: this.$login.f
-      }
-    },
-    props: ['show'],
-    methods: {
-      confirm () {
-        let gen = saveGen(this)
-        co(gen)
+}
+export default {
+  title: '系统管理-密码修改',
+  data () {
+    return {
+      deliver: {
+        password: '',
+        newpassword: '',
+        affirmpassword: ''
       },
-      rest () {
-        this.show = false
-        this.deliver = {password: '', newpassword: '', affirmpassword: ''}
-      }
+      functions: this.$login.f
+    }
+  },
+  props: ['show','ename'],
+  methods: {
+    confirm () {
+      let gen = saveGen(this)
+      co(gen)
+    },
+    rest () {
+      this.show = false
+      this.deliver = {password: '', newpassword: '', affirmpassword: ''}
     }
   }
+}
 </script>
 <style>
-  /*修改密码body界面样式*/
-  .modifystyle {
-    background: #FCFEEE;
-  }
-  .modifystyle span{
-    color: red;
-  }
+/*修改密码body界面样式*/
+.modifystyle {
+  background: #FCFEEE;
+}
+.modifystyle span{
+  color: red;
+}
 </style>

package/src/plugins/validation.js

@@ -1,7 +1,15 @@
 import Vue from 'vue'
 import Validator from 'vue-validator'
 Vue.use(Validator)
-//密码强度验证器(必须为为大小写字母、阿拉伯数字、字符)
 Vue.validator('strongpassword', function (val) {
-  return /^(?:(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
-});
+  return /^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
+})
+Vue.validator('chinesePassword', function (val) {
+  var testBealoon=/.*?[\u4E00-\u9FFF]+.*$/.test(val)
+  return !(/.*?[\u4E00-\u9FFF]+.*$/.test(val))
+})
+// 潜能要求8~16位数字字母组合；
+Vue.validator('numbersAndLetter8to16', function (val) {
+  return /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(val)
+})
+