system-clients 3.2.7 → 3.2.8-aodeToV4

package/src/plugins/GetLoginInfoService.js

@@ -1,36 +1,29 @@
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
-import cryptJS from './EncryptUtil'
-let loginGen = async function (name, password, cue) {
-  let data = {name: name, password: password}
-  data = '$'+cryptJS.RSAEncrypt(JSON.stringify(data))
-  let getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null})
-  if (getLogin.data.states === '登录成功') {
-    // 调用远程登录服务，获取所有有权访问的功能
-    data = {username: name, password: password}
-    data = cryptJS.RSAEncrypt(JSON.stringify(data))
-    let resource = await Vue.resetpost(`/rs/user/userLogin/客服系统`, data, {
-      resolveMsg: null,
-      rejectMsg: null
-    })
-    console.log('登陆获取Util', JSON.stringify(resource.data))
-    Vue.$login.f = resource.data
-    //获取jwt
-    Vue.$login.jwt = getLogin.data.jwt
-    // 把登录用户添加到cookie里
-    Vue.cookie.set('loginId', Vue.$login.f.id)
 
-    try {
-      //获取有权限的功能树
-      let hasRight = await Vue.resetpost(`/rs/search`, {
+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) {
+      //获取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.jwtNew = getLogin.data.access_token
+      // 把登录用户添加到cookie里
+      Vue.cookie.set('loginId', Vue.$login.f.id)
+      try {
+        //获取有权限的功能树
+        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
-        })
-      console.log('有权限功能返回数据', JSON.stringify(hasRight.data))
+        }, { resolveMsg: null, rejectMsg: null })
       //准备替换功能树
       var fun=[]
       hasRight.data[0].children[0].children.forEach((item) => {
@@ -40,8 +33,6 @@ let loginGen = async function (name, password, cue) {
           })
         }
       })
-      // console.log('替换前', JSON.stringify(Vue.$login.f.functions))
-      // console.log('替换后', JSON.stringify(fun))
       Vue.$login.f.functions=fun
     }catch (error) {
     }
@@ -76,22 +67,22 @@ let loginGen = async function (name, password, cue) {
         Vue.$login.f.f_gasman = []
         console.log('抄表员模块',error)
       }
-      // 获取安装人
-      try {
-        let getInstallman = await Vue.resetpost('/rs/search', {
-          source: 'this.getParentByType($organization$).getChildByName($安装员$).getUsers()',
-          userid: Vue.$login.f.id
-        }, {resolveMsg: null, rejectMsg: null})
-        console.log('获取安装员', getInstallman)
-        let installman = []
-        for (let i = 0; i < getInstallman.data.length; i++) {
-          installman.push(getInstallman.data[i])
-        }
-        Vue.$login.f.f_installman = installman
-      }catch (error) {
-        Vue.$login.f.f_installman =[]
-        console.log('安装人模块',error)
-      }
+      // // 获取安装人
+      // try {
+      //   let getInstallman = await Vue.resetpost('/rs/search', {
+      //     source: 'this.getParentByType($organization$).getChildByName($安装员$).getUsers()',
+      //     userid: Vue.$login.f.id
+      //   }, {resolveMsg: null, rejectMsg: null})
+      //   console.log('获取安装员', getInstallman)
+      //   let installman = []
+      //   for (let i = 0; i < getInstallman.data.length; i++) {
+      //     installman.push(getInstallman.data[i])
+      //   }
+      //   Vue.$login.f.f_installman = installman
+      // }catch (error) {
+      //   Vue.$login.f.f_installman =[]
+      //   console.log('安装人模块',error)
+      // }
       // 获取换表员
       // try {
       //   let getChangeMeterman = await Vue.resetpost('/rs/search', {
@@ -171,25 +162,19 @@ let loginGen = async function (name, password, cue) {
         await proc(Vue.$login.f)
       }
       // 定时发送心跳
-      if (cue){
-        setInterval(()=> {
-          let http = new HttpResetClass()
-          //暂时不出现不出现异地登录校验
-          http.load('POST', `rs/user/access/${Vue.$login.f.id}`, {}, {resolveMsg: null, rejectMsg: null}).then((req) => {
-            if(req.data.forcestate && req.data.forcestate == 1){
-              Vue.showMessage("您被强制下线!", ['confirm']).then((res) => {
-                location.reload()
-              })
-            }else if(req.data.status==710){
-              Vue.showMessage(req.data.msg+",您将被强制退出系统", ['confirm']).then((res) => {
-                if (res === 'confirm') {
-                  location.reload()
-                }
-              })
-            }
-          })
-        }, 2 * 60 * 1000)
-      }
+      setInterval(()=> {
+        let http = new HttpResetClass()
+		//暂时不出现不出现异地登录校验
+        http.load('POST', `rs/user/access/${Vue.$login.f.id}`, {}, {resolveMsg: null, rejectMsg: null}).then((req) => {
+          if(req.data.status==710){
+            // Vue.showMessage(req.data.msg+",您将被强制退出系统", ['confirm']).then((res) => {
+            //   if (res === 'confirm') {
+            //     location.reload()
+            //   }
+            // })
+          }
+        })
+      }, 2 * 60 * 1000)
     }
 
   } else {
@@ -204,8 +189,6 @@ let GetLoginInfoService = {
   afterLogin: [],
   //验证码开关
   Verification: true,
-  //登录信息展示开关
-  depPrompt: true,
   install (Vue, options) {
     // 给vue增添对话框显示方法
     Vue.$login = Vue.prototype.$login = GetLoginInfoService
@@ -219,13 +202,9 @@ let GetLoginInfoService = {
    * 登录
    * @param name
    * @param password
-   * @param cue true/false 是/否显示异地登录
    */
-  login (name, password, cue) {
-    if (cue === undefined || cue === null || cue === ''){
-      cue = true
-    }
-    return loginGen(name, password, cue)
+  login (name, password) {
+    return loginGen(name, password)
   },
 
   convertToIn (val) {
@@ -517,5 +496,4 @@ let GetLoginInfoService = {
     return ds[0] + '-' + (nextMonth < 10 ? '0' + nextMonth : nextMonth) + '-20 00:00:00'
   }
 }
-
 export default GetLoginInfoService

package/src/plugins/validation.js

@@ -5,11 +5,3 @@ Vue.use(Validator)
 Vue.validator('strongpassword', function (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 /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(val)
-});

package/src/project/State.js

@@ -4,7 +4,7 @@ export default class {
   constructor () {
     this.selected = null
     // 左侧项目树
-    this.projects = new TreeList('/rs/sql/project.sql')
+    this.projects = new TreeList('/api/af-system/sql/project.sql')
   }
 
   select (selected) {

package/src/stores/AppData.js

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