system-clients 3.3.1 → 3.3.2-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/stores/AppData.js

@@ -9,7 +9,7 @@ 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) => {
         res.data.singleValues.forEach((item) => {
           this.singleValues[item.name] = item.value
         })

package/build.gradle

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