system-clients 3.3.3 → 3.3.4-v3

package/src/plugins/GetLoginInfoService.js

@@ -2,21 +2,36 @@ import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 import cryptJS from './EncryptUtil'
 
-let loginGen = async function (username, password, cue) {
-  let data = {username, password,resourceName:'客服系统'}
-  const getLogin = await Vue.resetpost('/api/af-auth/login', data,
-    {resolveMsg: null, rejectMsg: null,headerConfig:{'Content-type': "application/json"}
-  })
-  if (getLogin.data) {
+let loginGen = async function (name, password, cue) {
+  let data = {name: name, password: password}
+  data = '$' + cryptJS.RSAEncrypt(JSON.stringify(data))
+  const getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null})
+  if (getLogin.data.states === '登录成功') {
     //获取jwt
-    if (getLogin.data.resources.data && getLogin.data.resources.data.id){
-      Vue.$login.jwt = getLogin.data.resources.data.id
-      Vue.$login.f =  getLogin.data.resources.data
-    }else {
-      Vue.$login.jwt = getLogin.data.resources.id
-      Vue.$login.f =  getLogin.data.resources
+    Vue.$login.jwt = getLogin.data.jwt
+    Vue.$login.jwtNew = getLogin.data.jwtNew
+    if (getLogin.data.s) {
+      Vue.$login['v3-session-key'] = cryptJS.RSADecrypt(getLogin.data.s)
+    }
+    // 调用远程登录服务，获取所有有权访问的功能
+    data = {username: name, password: password}
+    data = cryptJS.RSAEncrypt(JSON.stringify(data))
+    const resource = await Vue.resetpost(`/rs/user/userLogin/客服系统`, data, {
+      resolveMsg: null,
+      rejectMsg: null
+    })
+    // 兼容旧版ldao
+    if ((JSON.stringify(resource.data).startsWith("{") || JSON.stringify(resource.data).startsWith("[")) && resource.data.code && resource.data.msg && resource.data.code !== 200) {
+      throw {status: 555, data: resource.data.msg}
+    }
+    console.log('登陆获取Util', JSON.stringify(resource.data))
+
+    // 兼容旧版ldao，旧版不返回code
+    if ((JSON.stringify(resource.data).startsWith("{") || JSON.stringify(resource.data).startsWith("[")) && resource.data.code && resource.data.msg) {
+      Vue.$login.f = resource.data.data
+    } else {
+      Vue.$login.f = resource.data
     }
-    Vue.$login.jwtNew = getLogin.data.access_token
     // 把登录用户添加到cookie里
     Vue.cookie.set('loginId', Vue.$login.f.id)
     try {
@@ -24,7 +39,8 @@ let loginGen = async function (username, password, cue) {
       let hasRight = await Vue.resetpost(`/rs/search`, {
         source: "tool.getFullTree(this.getRights().where(row.getType() == $function$))",
         userid: Vue.$login.f.id
-      }, { resolveMsg: null, rejectMsg: null })
+      }, {resolveMsg: null, rejectMsg: null})
+      console.log('有权限功能返回数据', JSON.stringify(hasRight.data))
       //准备替换功能树
       var fun = []
       hasRight.data[0].children[0].children.forEach((item) => {
@@ -34,6 +50,8 @@ let loginGen = async function (username, password, cue) {
           })
         }
       })
+      // console.log('替换前', JSON.stringify(Vue.$login.f.functions))
+      // console.log('替换后', JSON.stringify(fun))
       Vue.$login.f.functions = fun
     } catch (error) {
     }
@@ -84,6 +102,21 @@ let loginGen = async function (username, password, cue) {
         Vue.$login.f.f_installman = []
         console.log('安装人模块', error)
       }
+      // 获取换表员
+      // try {
+      //   let getChangeMeterman = await Vue.resetpost('/rs/search', {
+      //     source: 'this.getParentByType($organization$).getChildByName($换表员$).getUsers()',
+      //     userid: Vue.$login.f.id
+      //   }, {resolveMsg: null, rejectMsg: null})
+      //   let changemeterman = []
+      //   for (let i = 0; i < getChangeMeterman.data.length; i++) {
+      //     changemeterman.push(getChangeMeterman.data[i])
+      //   }
+      //   Vue.$login.f.f_changemeterman = changemeterman
+      // }catch (error) {
+      //   Vue.$login.f.f_changemeterman = []
+      //   console.log('换表员模块',error)
+      // }
       // 获取资源服务权限
       try {
         let getLic = await Vue.resetpost('/rs/search', {
@@ -101,6 +134,37 @@ let loginGen = async function (username, password, cue) {
         Vue.$login.f.f_gasman = []
         console.log('资源服务权限', error)
       }
+      // // 票据使用人
+      // try {
+      //   let getPaperUseman = await Vue.resetpost('/rs/search', {
+      //     source: 'this.getParentByType($organization$).getChildByName($票据使用人$).getUsers()',
+      //     userid: Vue.$login.f.id
+      //   }, {resolveMsg: null, rejectMsg: null})
+      //   let perperuseman = []
+      //   for (let i = 0; i < getPaperUseman.data.length; i++) {
+      //     perperuseman.push(getPaperUseman.data[i])
+      //   }
+      //   Vue.$login.f.f_paperUseman = perperuseman
+      // }catch (error) {
+      //   Vue.$login.f.f_paperUseman = []
+      //   console.log('票据使用人模块',error)
+      //
+      // }
+      // // 票据分配人
+      // try {
+      //   let getPaperAllotman = await Vue.resetpost('/rs/search', {
+      //     source: 'this.getParentByType($organization$).getChildByName($票据分配人$).getUsers()',
+      //     userid: Vue.$login.f.id
+      //   }, {resolveMsg: null, rejectMsg: null})
+      //   let paperallotman = []
+      //   for (let i = 0; i < getPaperAllotman.data.length; i++) {
+      //     paperallotman.push(getPaperAllotman.data[i])
+      //   }
+      //   Vue.$login.f.f_paperAllotman = paperallotman
+      // }catch (error) {
+      //   Vue.$login.f.f_paperAllotman = []
+      //   console.log('票据分配人模块',error)
+      // }
       // TODO 处理界面细节
       try {
         let viewDetails = await Vue.resetpost('rs/search', {
@@ -144,10 +208,7 @@ let loginGen = async function (username, password, cue) {
     }
 
   } else {
-    let error = {status: 401, data: "登录失败，请稍后重试"}
-    if (getLogin.data.code !== 500) {
-      error = {status: getLogin.data.code, data: getLogin.data.msg}
-    }
+    let error = {status: 401, data: getLogin.data.states}
     // 抛出错误
     throw error
   }
@@ -161,7 +222,7 @@ let GetLoginInfoService = {
   //构建时间开关
   versionTime: true,
   //
-  SinglePageToken : {},
+  SinglePageToken: {},
   //登录信息展示开关
   depPrompt: true,
   install(Vue, options) {
@@ -181,7 +242,11 @@ let GetLoginInfoService = {
     if (cue === undefined || cue === null || cue === '') {
       cue = true
     }
-    Vue.$login.SinglePageToken = cryptJS.AESEncrypt(JSON.stringify({name,password}), "3KMKqvgwR8ULbR8Z")
+    Vue.$login.SinglePageToken = cryptJS.AESEncrypt(JSON.stringify({
+      name,
+      password,
+      now: Date.now()
+    }), "3KMKqvgwR8ULbR8Z")
     return loginGen(name, password, cue)
   },
 

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/stores/AppData.js

@@ -9,7 +9,8 @@ let GetAppDataService = {
 
   // 开启卡监听
   load () {
-    return Vue.resetpost('api/af-system/logic/getInitData', {data: {f_filialeids: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+    return Vue.resetpost('rs/logic/getInitData', {data: {f_filialeids: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        console.warn("getInitData",JSON.stringify(res),res.data)
         res.data.singleValues.forEach((item) => {
           this.singleValues[item.name] = item.value
         })

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
+  }
+}

package/build.gradle

@@ -1,6 +0,0 @@
-version = '3.0.49'
-
-task release(type:Exec) {
-	workingDir '.'
-	commandLine 'cmd', '/c', 'release.bat ' + version
-}