system-clients 3.3.3-v3-test1 → 3.3.3-v3-t2

package/package.json

@@ -1,105 +1,105 @@
-{
-  "name": "system-clients",
-  "version": "3.3.3-v3-test1",
-  "description": "系统基础框架",
-  "main": "src/index.js",
-  "directories": {
-    "doc": "doc",
-    "example": "examples",
-    "test": "test"
-  },
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "unit": "karma start test/unit/karma.conf.js",
-    "makeall": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production webpack --progress --hide-modules --config build/webpack.example.conf.js",
-    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
-  },
-  "dependencies": {
-    "base64-js": "^1.3.0",
-    "js-base64": "^2.4.9",
-    "less": "^2.7.1",
-    "less-loader": "^2.2.3",
-    "nyc": "^15.1.0",
-    "src": "^1.1.2",
-    "vue": "^1.0.17"
-  },
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "jsencrypt": "^3.0.0-rc.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "manage-client": "^1.4.20",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "rimraf": "^2.5.0",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.107-test",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aotu/System"
-  },
-  "keywords": [
-    "system_clients"
-  ],
-  "author": "杨文宇",
-  "license": "ISC"
-}
+{
+  "name": "system-clients",
+  "version": "3.3.3-v3-t2",
+  "description": "系统基础框架",
+  "main": "src/index.js",
+  "directories": {
+    "doc": "doc",
+    "example": "examples",
+    "test": "test"
+  },
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "unit": "karma start test/unit/karma.conf.js",
+    "makeall": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production webpack --progress --hide-modules --config build/webpack.example.conf.js",
+    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
+  },
+  "dependencies": {
+    "base64-js": "^1.3.0",
+    "js-base64": "^2.4.9",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "nyc": "^15.1.0",
+    "src": "^1.1.2",
+    "vue": "^1.0.17"
+  },
+  "devDependencies": {
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "^3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "manage-client": "^1.4.20",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "rimraf": "^2.5.0",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.107-test",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aotu/System"
+  },
+  "keywords": [
+    "system_clients"
+  ],
+  "author": "杨文宇",
+  "license": "ISC"
+}

package/src/components/server/Login.vue

@@ -146,7 +146,7 @@ import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import {isPasswordModificationExpired} from '../Util'
-
+import { isStrongPassword } from '../../util/password-validation'
 let daibanJson = require('../../util/Daiban.json')
 
 
@@ -193,7 +193,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })

package/src/components/server/ModifyPw.vue

@@ -1,125 +1,196 @@
 <template>
   <div>
     <validator name="v">
-      <modal :show.sync="show" v-ref:modal  backdrop="false">
+      <modal :show.sync="show" v-ref:modal backdrop="false">
         <header slot="modal-header" class="modal-header">
           <button type="button" class="close" @click="rest"><span>&times;</span></button>
           <h4 class="modal-title">修改密码</h4>
         </header>
         <article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
+          <div class="password-alert">
+            {{ passwordRuleHint }}
+          </div>
           <div class="has-feedback form-group"
                :class="{'has-warning':$v.password.required,'has-error': $v.password.required,
           'has-success':!$v.password.required}">
-            <label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
+            <label for="password" class="col-sm-3 control-label">原始密码</label>
+            <div class="col-sm-8 password-field-wrap">
               <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
               <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
-              <span v-if="$v.password.required">不能为空</span>
+              <span class="field-error" v-if="$v.password.required">不能为空</span>
             </div>
           </div>
           <div class="has-feedback form-group"
-               :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, 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.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与大小字母外加特殊字符的组合，并且不能出现类似'123','abc'等连贯数字或者字母</span>
-              <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
+               :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.chinesePassword) && !$v.newpassword.required,
+          'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16 && !$v.newpassword.chinesePassword}">
+            <label for="newpassword" class="col-sm-3 control-label">新的密码</label>
+            <div class="col-sm-8 password-field-wrap">
+              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, chinesePassword: true}'>
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16 && !$v.newpassword.chinesePassword"></span>
+              <span class="field-error" v-if="$v.newpassword.required">不能为空</span>
+              <span class="field-error" v-if="$v.newpassword.chinesePassword && !$v.newpassword.required">密码不能包含中文</span>
+              <div v-if="passwordStrength.visible" class="password-strength">
+                <span class="strength-label">密码强度</span>
+                <span class="strength-tag" :class="passwordStrength.type">{{ passwordStrength.label }}</span>
+                <span class="strength-desc">{{ passwordStrength.desc }}</span>
+              </div>
             </div>
           </div>
           <div class="has-feedback form-group"
                :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
           'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
-            <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
+            <label for="affirmpassword" class="col-sm-3 control-label">确认密码</label>
+            <div class="col-sm-8 password-field-wrap">
               <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
               <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
-              <span v-if="$v.affirmpassword.required">不能为空</span>
-              <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
+              <span class="field-error" v-if="$v.affirmpassword.required">不能为空</span>
+              <span class="field-error" v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致</span>
             </div>
           </div>
         </article>
 
         <footer slot="modal-footer" class="modal-footer">
-          <button  type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
-          <button  type="button" class="btn btn-default" @click='rest'>取消</button>
+          <button type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
+          <button type="button" class="btn btn-default" @click='rest'>取消</button>
         </footer>
       </modal>
     </validator>
   </div>
-
-
 </template>
 <script>
-  import co from 'co'
-  import validator from '../../plugins/validation';
+import co from 'co'
+import validator from '../../plugins/validation'
+import { getPasswordStrength, PASSWORD_RULE_HINT } from '../../util/password-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 }, {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)
-      }
+let saveGen = function * (self) {
+  self.deliver.ename = self.functions.ename
+  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) {
+    if (res.data.code === 200) {
+      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)
-      }
+      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,
+      passwordRuleHint: PASSWORD_RULE_HINT
+    }
+  },
+  computed: {
+    passwordStrength () {
+      return getPasswordStrength(this.deliver.newpassword)
+    }
+  },
+  props: ['show'],
+  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;
-  }
+.modifystyle {
+  background: #fff;
+  padding: 10px 20px 20px;
+}
+
+.modifystyle .control-label {
+  color: #333;
+  font-weight: normal;
+  padding-top: 7px;
+}
+
+.password-field-wrap {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.password-field-wrap .form-control {
+  width: 100%;
+}
+
+.password-alert {
+  margin: 0 0 16px;
+  padding: 10px 12px;
+  border-radius: 4px;
+  background: #f5f7fa;
+  border: 1px solid #e4e7ed;
+  color: #606266;
+  font-size: 13px;
+  line-height: 1.6;
+}
+
+.field-error {
+  display: block;
+  margin-top: 6px;
+  color: #e74c3c;
+  font-size: 12px;
+  line-height: 1.4;
+}
+
+.password-strength {
+  margin-top: 8px;
+  font-size: 12px;
+  line-height: 1.6;
+  color: #606266;
+}
+
+.password-strength .strength-label {
+  margin-right: 6px;
+  color: #909399;
+}
+
+.password-strength .strength-tag {
+  display: inline-block;
+  margin-right: 8px;
+  padding: 1px 8px;
+  border-radius: 3px;
+  font-size: 12px;
+  line-height: 1.5;
+}
+
+.password-strength .strength-tag.success {
+  color: #2e7d32;
+  background: #e8f5e9;
+}
+
+.password-strength .strength-tag.error {
+  color: #c62828;
+  background: #ffebee;
+}
+
+.password-strength .strength-desc {
+  color: #606266;
+}
 </style>

package/src/filiale/baole/Login.vue

@@ -146,7 +146,7 @@ import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import {isPasswordModificationExpired} from '../../components/Util'
-
+import { isStrongPassword } from '../../util/password-validation'
 let daibanJson = require('../../util/Daiban.json')
 
 
@@ -206,7 +206,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })

package/src/filiale/chengtou/Login.vue

@@ -144,7 +144,7 @@ import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import {isPasswordModificationExpired} from '../../components/Util'
-
+import { isStrongPassword } from '../../util/password-validation'
 let daibanJson = require('../../util/Daiban.json')
 
 
@@ -204,7 +204,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })

package/src/filiale/dongguan/Login.vue

@@ -150,7 +150,7 @@ import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import {isPasswordModificationExpired} from '../../components/Util'
-
+import { isStrongPassword } from '../../util/password-validation'
 let daibanJson = require('../../util/Daiban.json')
 
 
@@ -210,7 +210,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })

package/src/filiale/furuike/Login.vue

@@ -137,7 +137,7 @@ import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import {isPasswordModificationExpired} from '../../components/Util'
-
+import { isStrongPassword } from '../../util/password-validation'
 let daibanJson = require('../../util/Daiban.json')
 
 
@@ -197,7 +197,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })

package/src/filiale/konggang/Login.vue

@@ -135,7 +135,7 @@
   import Vue from 'vue'
   import {HttpResetClass} from 'vue-client'
   import {isPasswordModificationExpired} from '../../components/Util'
-
+  import { isStrongPassword } from '../../util/password-validation'
 
 
   let saveGen = function *(self) {
@@ -193,7 +193,7 @@
       }
       console.log(self.$login.depPrompt)
       // 弱口令验证（默认开启，跳转过来的不进行验证）
-      if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+      if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
         self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
           self.modifyPwShow = true
         })

package/src/filiale/qianneng/Login.vue

@@ -147,7 +147,7 @@ import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import {isPasswordModificationExpired} from '../../components/Util'
 import cryptJS from "../../plugins/EncryptUtil";
-
+import { isStrongPassword } from '../../util/password-validation'
 let daibanJson = require('../../util/Daiban.json')
 
 
@@ -206,7 +206,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(.)(\1)+)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })

package/src/filiale/rizhao/Login.vue

@@ -125,8 +125,7 @@ import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import {isPasswordModificationExpired} from '../../components/Util'
-
-
+import { isStrongPassword } from '../../util/password-validation'
 
 let saveGen = function *(self) {
   try {
@@ -184,7 +183,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })

package/src/filiale/shiquan/Login.vue

@@ -146,7 +146,7 @@
   import Vue from 'vue'
   import {HttpResetClass} from 'vue-client'
   import {isPasswordModificationExpired} from '../../components/Util'
-
+  import { isStrongPassword } from '../../util/password-validation'
   let daibanJson = require('../../util/Daiban.json')
 
 
@@ -205,7 +205,7 @@
       }
       console.log(self.$login.depPrompt)
       // 弱口令验证（默认开启，跳转过来的不进行验证）
-      if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+      if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
         self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
           self.modifyPwShow = true
         })

package/src/filiale/tianyi/Login.vue

@@ -149,7 +149,7 @@ import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import {isPasswordModificationExpired} from '../../components/Util'
-
+import { isStrongPassword } from '../../util/password-validation'
 let daibanJson = require('../../util/Daiban.json')
 
 
@@ -209,7 +209,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })

package/src/filiale/tongchuan/Login.vue

@@ -142,7 +142,7 @@ import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import {isPasswordModificationExpired} from '../../components/Util'
-
+import { isStrongPassword } from '../../util/password-validation'
 let daibanJson = require('../../util/Daiban.json')
 
 
@@ -202,7 +202,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })

package/src/filiale/wenxi/Login.vue

@@ -142,7 +142,7 @@ import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import {isPasswordModificationExpired} from '../../components/Util'
-
+import { isStrongPassword } from '../../util/password-validation'
 let daibanJson = require('../../util/Daiban.json')
 
 
@@ -202,7 +202,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })

package/src/filiale/yuchuan/Login.vue

@@ -141,7 +141,7 @@ import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import {isPasswordModificationExpired} from '../../components/Util'
-
+import { isStrongPassword } from '../../util/password-validation'
 let daibanJson = require('../../util/Daiban.json')
 
 
@@ -201,7 +201,7 @@ let saveGen = function *(self) {
     }
     console.log(self.$login.depPrompt)
     // 弱口令验证（默认开启，跳转过来的不进行验证）
-    if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })

package/src/plugins/validation.js

@@ -1,15 +1,19 @@
 import Vue from 'vue'
 import Validator from 'vue-validator'
+import { isStrongPassword } from '../util/password-validation'
+
 Vue.use(Validator)
-//密码强度验证器(必须为为大小写字母、阿拉伯数字、字符)
+
+// 密码强度验证器(必须为大小写字母、阿拉伯数字、特殊字符)
 Vue.validator('strongpassword', function (val) {
-  return /^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
-});
+  return isStrongPassword(val)
+})
+
 Vue.validator('chinesePassword', function (val) {
-  var testBealoon=/.*?[\u4E00-\u9FFF]+.*$/.test(val)
   return !(/.*?[\u4E00-\u9FFF]+.*$/.test(val))
-});
-// 潜能要求8~16位数字字母组合；
+})
+
+// 强密码校验：12-16位，含大小写、数字、特殊字符，并排除常见弱口令与连续模式
 Vue.validator('numbersAndLetter8to16', function (val) {
-  return /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(val)
-});
+  return isStrongPassword(val)
+})

package/src/util/password-validation.js

@@ -0,0 +1,185 @@
+const REG_STRONG_PWD =
+  /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*(),.?":{}|<>~`+=_\\-])[A-Za-z\d!@#$%^&*(),.?":{}|<>~`+=_\\-]{12,16}$/
+
+const COMMON_PASSWORDS = [
+  'password',
+  'password123',
+  '123456',
+  '12345678',
+  'qwerty',
+  'abc123',
+  'Password1',
+  'password1',
+  '123456789',
+  'welcome',
+  'admin',
+  'letmein',
+  'monkey',
+  'dragon',
+  'master',
+  'superman',
+  'qwerty123',
+  'admin123',
+  'root',
+  'pass',
+  'test',
+  'guest',
+  'user',
+  '000000',
+  '111111',
+  '666666',
+  '888888',
+  '999999',
+  'iloveyou',
+  'welcome123',
+  'password!',
+  'Passw0rd!',
+  'Passw0rd',
+  'Password!',
+  'passw0rd',
+  'P@ssw0rd',
+  'P@ssword',
+  'Password@123'
+]
+
+export const PASSWORD_RULE_HINT = '密码长度须为 12-16 位，包含大小写字母、数字与特殊符号。'
+
+export const PASSWORD_DEFAULT_ERROR = '新密码必须包含大小写字母、数字和特殊字符，且长度为12-16位'
+
+function hasConsecutiveNumbers (password) {
+  for (let i = 0; i <= password.length - 3; i++) {
+    const substr = password.substring(i, i + 3)
+    if (/^\d{3,}$/.test(substr)) {
+      const digits = substr.split('').map(Number)
+      let isConsecutive = true
+      for (let j = 1; j < digits.length; j++) {
+        if (digits[j] !== digits[j - 1] + 1) {
+          isConsecutive = false
+          break
+        }
+      }
+      if (isConsecutive) return true
+    }
+  }
+  return false
+}
+
+function hasConsecutiveLetters (password) {
+  const lowerPassword = password.toLowerCase()
+  for (let i = 0; i <= lowerPassword.length - 3; i++) {
+    const substr = lowerPassword.substring(i, i + 3)
+    if (/^[a-z]{3,}$/.test(substr)) {
+      let isConsecutive = true
+      for (let j = 1; j < substr.length; j++) {
+        if (substr.charCodeAt(j) !== substr.charCodeAt(j - 1) + 1) {
+          isConsecutive = false
+          break
+        }
+      }
+      if (isConsecutive) return true
+    }
+  }
+  return false
+}
+
+function hasRepeatedChars (password) {
+  return /(.)\1{2,}/.test(password)
+}
+
+function hasKeyboardPattern (password) {
+  const keyboardRows = ['qwertyuiop', 'asdfghjkl', 'zxcvbnm', '1234567890']
+  const lowerPassword = password.toLowerCase()
+
+  for (const row of keyboardRows) {
+    for (let i = 0; i <= row.length - 3; i++) {
+      const pattern = row.substring(i, i + 3)
+      if (lowerPassword.includes(pattern)) {
+        return true
+      }
+    }
+  }
+  return false
+}
+
+export function validateStrongPassword (password) {
+  const result = {
+    isValid: true,
+    errors: []
+  }
+
+  if (!password) {
+    result.isValid = false
+    result.errors.push('不能为空')
+    return result
+  }
+
+  if (!REG_STRONG_PWD.test(password)) {
+    result.isValid = false
+    result.errors.push('密码长度须为12-16位，且包含大写字母、小写字母、数字和特殊字符')
+    return result
+  }
+
+  if (COMMON_PASSWORDS.includes(password) || COMMON_PASSWORDS.includes(password.toLowerCase())) {
+    result.isValid = false
+    result.errors.push('不能使用常见密码')
+    return result
+  }
+
+  if (hasConsecutiveNumbers(password)) {
+    result.isValid = false
+    result.errors.push('不能包含连续数字')
+    return result
+  }
+
+  if (hasConsecutiveLetters(password)) {
+    result.isValid = false
+    result.errors.push('不能包含连续字母')
+    return result
+  }
+
+  if (hasRepeatedChars(password)) {
+    result.isValid = false
+    result.errors.push('不能包含3个或以上相同字符')
+    return result
+  }
+
+  if (hasKeyboardPattern(password)) {
+    result.isValid = false
+    result.errors.push('不能包含键盘连续按键模式')
+    return result
+  }
+
+  return result
+}
+
+export function isStrongPassword (password) {
+  return validateStrongPassword(password).isValid
+}
+
+export function getPasswordStrength (password) {
+  if (!password) {
+    return {
+      label: '未输入',
+      type: 'default',
+      desc: '请输入密码以查看强度',
+      visible: false
+    }
+  }
+
+  const { isValid, errors } = validateStrongPassword(password)
+  if (isValid) {
+    return {
+      label: '强',
+      type: 'success',
+      desc: '密码满足复杂度要求',
+      visible: true
+    }
+  }
+
+  return {
+    label: '弱',
+    type: 'error',
+    desc: errors[0] || '密码不满足安全要求',
+    visible: true
+  }
+}