system-phone 3.1.93 → 3.1.94

package/src/filiale/yulinyuchuan/LoginApp.vue

@@ -63,6 +63,7 @@
 import Vue from 'vue'
 import * as Util from '../../Util'
 import JSEncrypt from 'jsencrypt'
+import { validateStrongPasswordPhone } from '../../plugins/validateStrongPasswordPhone.js'
 //获取json配置文件
 let asyncReady = async function (self, url) {
   try {
@@ -361,10 +362,14 @@ export default {
         console.log('获取参数结束')
         this.loaderShow = false
         // 弱口令验证
-        if (this.weakPassword && !(/^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(this.password))) {
-          await this.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm'])
-          this.modifyPassword = true
-          return
+        // 弱口令验证
+        if (this.weakPassword) {
+          const pwdResult = validateStrongPasswordPhone(this.password)
+          if (!pwdResult.isValid) {
+            await this.$showMessage('登录系统: 此账户的密码过于简单，' + (pwdResult.errors[0] || '请修改密码后重新登陆！！！'), ['confirm'])
+            this.modifyPassword = true
+            return
+          }
         }
         this.$androidUtil.setPreference('current_create_current_address', JSON.stringify({
           f_address: '',

package/src/filiale/yulinyuchuanTY/LoginApp.vue

@@ -63,6 +63,7 @@
 import Vue from 'vue'
 import * as Util from '../../Util'
 import JSEncrypt from 'jsencrypt'
+import { validateStrongPasswordPhone } from '../../plugins/validateStrongPasswordPhone.js'
 //获取json配置文件
 let asyncReady = async function (self, url) {
   try {
@@ -331,10 +332,14 @@ export default {
         console.log('获取参数结束')
         this.loaderShow = false
         // 弱口令验证
-        if (this.weakPassword && !(/^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(this.password))) {
-          await this.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm'])
-          this.modifyPassword = true
-          return
+        // 弱口令验证
+        if (this.weakPassword) {
+          const pwdResult = validateStrongPasswordPhone(this.password)
+          if (!pwdResult.isValid) {
+            await this.$showMessage('登录系统: 此账户的密码过于简单，' + (pwdResult.errors[0] || '请修改密码后重新登陆！！！'), ['confirm'])
+            this.modifyPassword = true
+            return
+          }
         }
         this.$androidUtil.setPreference('current_create_current_address', JSON.stringify({
           f_address: '',

package/src/plugins/GetStringData.js

@@ -1,18 +1,18 @@
-
-let GetStringdatas = {
-
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.$getString = Vue.prototype.$getString = GetStringdatas
-  },
-  getSubStr (String) {
-    if(String.endsWith('phone')){
-      let oldStr = String
-      let index = oldStr.lastIndexOf("/")
-      return oldStr.substring(0, index)
-    }
-    return String
-  }
-}
-
-export default GetStringdatas
+
+let GetStringdatas = {
+
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.$getString = Vue.prototype.$getString = GetStringdatas
+  },
+  getSubStr (String) {
+    if(String.endsWith('phone')){
+      let oldStr = String
+      let index = oldStr.lastIndexOf("/")
+      return oldStr.substring(0, index)
+    }
+    return String
+  }
+}
+
+export default GetStringdatas

package/src/plugins/LoadParams.js

@@ -1,24 +1,24 @@
-import Vue from 'vue'
-import AppData from '../stores/AppData'
-
-let LoadParams = {
-    // 开启卡监听
-  load () {
-    return Vue.resetpost(`${Vue.androidUtil.getProxyUrl()}/rs/path/getParams`, {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-      res.data.forEach((item) => {
-        let value = []
-        item.f_paramvalues.forEach((item, index) => {
-          value[index] = {}
-          value[index].label = item.name
-          value[index].value = item.name
-        })
-        AppData.params[item.name] = value
-      })
-    }).catch((res) => {
-      this.msg = res.data
-      this.show = true
-    })
-  }
-}
-
-export default LoadParams
+import Vue from 'vue'
+import AppData from '../stores/AppData'
+
+let LoadParams = {
+    // 开启卡监听
+  load () {
+    return Vue.resetpost(`${Vue.androidUtil.getProxyUrl()}/rs/path/getParams`, {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      res.data.forEach((item) => {
+        let value = []
+        item.f_paramvalues.forEach((item, index) => {
+          value[index] = {}
+          value[index].label = item.name
+          value[index].value = item.name
+        })
+        AppData.params[item.name] = value
+      })
+    }).catch((res) => {
+      this.msg = res.data
+      this.show = true
+    })
+  }
+}
+
+export default LoadParams

package/src/plugins/validateStrongPasswordPhone.js

@@ -1,172 +1,185 @@
 const REG_STRONG_PWD =
-  /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?])(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]{8,16}$/;
+  /^(?=.*[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",
-];
-
-// 检查连续数字（3个或以上）
-const hasConsecutiveNumbers = (password) => {
+  '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);
+    const substr = password.substring(i, i + 3)
     if (/^\d{3,}$/.test(substr)) {
-      // 检查是否为连续数字
-      const digits = substr.split("").map(Number);
-      let isConsecutive = true;
+      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;
+          isConsecutive = false
+          break
         }
       }
-      if (isConsecutive) return true;
+      if (isConsecutive) return true
     }
   }
-  return false;
-};
+  return false
+}
 
-// 检查连续字母（3个或以上）
-const hasConsecutiveLetters = (password) => {
-  const lowerPassword = password.toLowerCase();
+function hasConsecutiveLetters (password) {
+  const lowerPassword = password.toLowerCase()
   for (let i = 0; i <= lowerPassword.length - 3; i++) {
-    const substr = lowerPassword.substring(i, i + 3);
+    const substr = lowerPassword.substring(i, i + 3)
     if (/^[a-z]{3,}$/.test(substr)) {
-      // 检查是否为连续字母
-      let isConsecutive = true;
+      let isConsecutive = true
       for (let j = 1; j < substr.length; j++) {
         if (substr.charCodeAt(j) !== substr.charCodeAt(j - 1) + 1) {
-          isConsecutive = false;
-          break;
+          isConsecutive = false
+          break
         }
       }
-      if (isConsecutive) return true;
+      if (isConsecutive) return true
     }
   }
-  return false;
-};
-
-// 检查重复字符（3个或以上相同字符）
-const hasRepeatedChars = (password) => {
-  return /(.)\1{2,}/.test(password);
-};
-
-// 检查键盘连续按键（如 qwerty, asdf 等）
-const hasKeyboardPattern = (password) => {
-  const keyboardRows = ["qwertyuiop", "asdfghjkl", "zxcvbnm", "1234567890"];
-  const lowerPassword = password.toLowerCase();
+  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);
+      const pattern = row.substring(i, i + 3)
       if (lowerPassword.includes(pattern)) {
-        return true;
+        return true
       }
     }
   }
-  return false;
-};
-
-/**
- * 密码校验结果对象
- * @typedef {Object} PasswordValidationResult
- * @property {boolean} isValid
- * @property {string[]} errors
- */
-
-/**
- * 增强的密码校验函数
- * @param {string} password
- * @returns {PasswordValidationResult}
- */
+  return false
+}
+
 export const validateStrongPasswordPhone = (password) => {
   const result = {
     isValid: true,
-    errors: [],
-  };
+    errors: []
+  }
+
+  if (!password) {
+    result.isValid = false
+    result.errors.push('不能为空')
+    return result
+  }
 
-  // 1. 基本格式校验
   if (!REG_STRONG_PWD.test(password)) {
-    result.isValid = false;
-    result.errors.push(
-      "密码长度必须为8-16位，且需同时包含大写字母、小写字母、数字和特殊字符"
-    );
-    return result;
+    result.isValid = false
+    result.errors.push('密码长度须为12-16位，且包含大写字母、小写字母、数字和特殊字符')
+    return result
   }
 
-  // 2. 检查是否为常见密码
-  if (
-    COMMON_PASSWORDS.includes(password) ||
-    COMMON_PASSWORDS.includes(password.toLowerCase())
-  ) {
-    result.isValid = false;
-    result.errors.push("不能使用常见密码");
-    return result;
+  if (COMMON_PASSWORDS.includes(password) || COMMON_PASSWORDS.includes(password.toLowerCase())) {
+    result.isValid = false
+    result.errors.push('不能使用常见密码')
+    return result
   }
 
-  // 3. 检查连续数字
   if (hasConsecutiveNumbers(password)) {
-    result.isValid = false;
-    result.errors.push("不能包含连续数字");
-    return result;
+    result.isValid = false
+    result.errors.push('不能包含连续数字')
+    return result
   }
 
-  // 4. 检查连续字母
   if (hasConsecutiveLetters(password)) {
-    result.isValid = false;
-    result.errors.push("不能包含连续字母");
-    return result;
+    result.isValid = false
+    result.errors.push('不能包含连续字母')
+    return result
   }
 
-  // 5. 检查重复字符
   if (hasRepeatedChars(password)) {
-    result.isValid = false;
-    result.errors.push("不能包含3个或以上相同字符");
-    return result;
+    result.isValid = false
+    result.errors.push('不能包含3个或以上相同字符')
+    return result
   }
 
-  // 6. 检查键盘模式
   if (hasKeyboardPattern(password)) {
-    result.isValid = false;
-    result.errors.push("不能包含键盘连续按键模式");
-    return result;
+    result.isValid = false
+    result.errors.push('不能包含键盘连续按键模式')
+    return result
   }
 
-  return result;
-};
+  return result
+}
+
+export function isStrongPassword (password) {
+  return validateStrongPasswordPhone(password).isValid
+}
+
+export function getPasswordStrength (password) {
+  if (!password) {
+    return {
+      label: '未输入',
+      type: 'default',
+      desc: '请输入密码以查看强度',
+      visible: false
+    }
+  }
+
+  const { isValid, errors } = validateStrongPasswordPhone(password)
+  if (isValid) {
+    return {
+      label: '强',
+      type: 'success',
+      desc: '密码满足复杂度要求',
+      visible: true
+    }
+  }
+
+  return {
+    label: '弱',
+    type: 'error',
+    desc: errors[0] || '密码不满足安全要求',
+    visible: true
+  }
+}

package/src/services/ConfigService.js

@@ -1,24 +1,24 @@
-import Vue from 'vue'
-import AppData from '../stores/AppData'
-
-let LoadParams = {
-    // 开启卡监听
-  load () {
-    return Vue.resetpost(`${Vue.androidUtil.getProxyUrl()}/rs/path/getParams`, {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-      res.data.forEach((item) => {
-        let value = []
-        item.f_paramvalues.forEach((item, index) => {
-          value[index] = {}
-          value[index].label = item.name
-          value[index].value = item.name
-        })
-        AppData.params[item.name] = value
-      })
-    }).catch((res) => {
-      this.msg = res.data
-      this.show = true
-    })
-  }
-}
-
-export default LoadParams
+import Vue from 'vue'
+import AppData from '../stores/AppData'
+
+let LoadParams = {
+    // 开启卡监听
+  load () {
+    return Vue.resetpost(`${Vue.androidUtil.getProxyUrl()}/rs/path/getParams`, {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      res.data.forEach((item) => {
+        let value = []
+        item.f_paramvalues.forEach((item, index) => {
+          value[index] = {}
+          value[index].label = item.name
+          value[index].value = item.name
+        })
+        AppData.params[item.name] = value
+      })
+    }).catch((res) => {
+      this.msg = res.data
+      this.show = true
+    })
+  }
+}
+
+export default LoadParams

package/static/app.json

@@ -1,5 +1,5 @@
-{
-	"hybrid_version":"2018-01-01 00:00:01",
-	"appVer":"1"
-
+{
+	"hybrid_version":"2018-01-01 00:00:01",
+	"appVer":"1"
+
 }

package/static/globals.txt

@@ -1,74 +1,74 @@
-{
-    "lastNewFormDate": "1980-01-01 00:00:00",
-    "f_repairman_id": "x",
-    "f_user_id": "aaa",
-    "cc_base_url": "http://aotesoft.f3322.net:8300",
-    "REMOTE_WWW_PREFIX": "",
-    "LOCAL_PATH_PREFIX": "/data/data/com.aofeng.hybridwork/files/",
-    "REMOTE_BZ_PREFIX": "thiswillremove",
-    "ProjectNativeMethod": "com.aofeng.hybridwork.android.ProjectNativeMethod",
-    "SCREEN_ORIENTATION":"0",
-    "startService": "true",
-    "full_screen":"true",
-    "pos":"false",
-    "device":"com.aofeng.hybrid.pos.device.ZTDevice",
-    "reader":"com.aofeng.hybrid.pos.reader.ZTChangAnReader",
-    "printer":"com.aofeng.hybrid.pos.printer.ZTPrinter",
-    "cloud_url":"http://113.140.20.122:4004/",
-    "version": "0",
-    "txtServiceStopped": "false",
-    "msgCount": "0",
-    "f_subcompany": "changan",
-    "entities": [
-	      "t_serviceworkorder",
-        "t_oppointment",
-        "t_service",
-        "t_complaint",
-        "t_consult",
-      	"t_service_acitivity",
-        "t_servicework",
-       	"t_notwork",
-       	"t_delayapply",
-       	"t_delayreply",
-        "t_reminder",
-        "t_site_back",
-       	"t_servicesend",
-        "t_recall",
-        "t_servicedelete",
-      	"t_servicerepair",
-       	"t_details",
-       	"t_doorrepair",
-       	"t_accidenttreatment",
-      	"t_gaiconduit",
-       	"t_liconduit",
-       	 "t_firstgascheck",
-       	"t_failure",
-       	"t_failurecase",
-       	"t_material",
-       	"t_baseuserinfo",
-       	"t_repairimg",
-       	"t_retail",
-         "t_notice",
-         "t_check_paper_alarm",
-         "t_check_paper",
-         "t_check_plan_item",
-         "t_check_plan",
-         "t_check_paper_cooker",
-         "t_check_paper_counter",
-         "t_check_paper_defect",
-         "t_check_paper_furnace",
-         "t_check_paper_heater",
-         "t_check_paper_innerplumb",
-         "t_check_paper_meter",
-         "t_phone_state",
-         "t_check_paper_plumb",
-         "t_check_paper_valve",
-         "t_blob",
-         "t_plan_item_meter",
-         "t_plan_item_device",
-         "t_device_info",
-         "t_defect_info",
-         "t_devices_items",
-         "t_paper_devices"
-    ]
-}
+{
+    "lastNewFormDate": "1980-01-01 00:00:00",
+    "f_repairman_id": "x",
+    "f_user_id": "aaa",
+    "cc_base_url": "http://aotesoft.f3322.net:8300",
+    "REMOTE_WWW_PREFIX": "",
+    "LOCAL_PATH_PREFIX": "/data/data/com.aofeng.hybridwork/files/",
+    "REMOTE_BZ_PREFIX": "thiswillremove",
+    "ProjectNativeMethod": "com.aofeng.hybridwork.android.ProjectNativeMethod",
+    "SCREEN_ORIENTATION":"0",
+    "startService": "true",
+    "full_screen":"true",
+    "pos":"false",
+    "device":"com.aofeng.hybrid.pos.device.ZTDevice",
+    "reader":"com.aofeng.hybrid.pos.reader.ZTChangAnReader",
+    "printer":"com.aofeng.hybrid.pos.printer.ZTPrinter",
+    "cloud_url":"http://113.140.20.122:4004/",
+    "version": "0",
+    "txtServiceStopped": "false",
+    "msgCount": "0",
+    "f_subcompany": "changan",
+    "entities": [
+	      "t_serviceworkorder",
+        "t_oppointment",
+        "t_service",
+        "t_complaint",
+        "t_consult",
+      	"t_service_acitivity",
+        "t_servicework",
+       	"t_notwork",
+       	"t_delayapply",
+       	"t_delayreply",
+        "t_reminder",
+        "t_site_back",
+       	"t_servicesend",
+        "t_recall",
+        "t_servicedelete",
+      	"t_servicerepair",
+       	"t_details",
+       	"t_doorrepair",
+       	"t_accidenttreatment",
+      	"t_gaiconduit",
+       	"t_liconduit",
+       	 "t_firstgascheck",
+       	"t_failure",
+       	"t_failurecase",
+       	"t_material",
+       	"t_baseuserinfo",
+       	"t_repairimg",
+       	"t_retail",
+         "t_notice",
+         "t_check_paper_alarm",
+         "t_check_paper",
+         "t_check_plan_item",
+         "t_check_plan",
+         "t_check_paper_cooker",
+         "t_check_paper_counter",
+         "t_check_paper_defect",
+         "t_check_paper_furnace",
+         "t_check_paper_heater",
+         "t_check_paper_innerplumb",
+         "t_check_paper_meter",
+         "t_phone_state",
+         "t_check_paper_plumb",
+         "t_check_paper_valve",
+         "t_blob",
+         "t_plan_item_meter",
+         "t_plan_item_device",
+         "t_device_info",
+         "t_defect_info",
+         "t_devices_items",
+         "t_paper_devices"
+    ]
+}