system-clients 3.2.95-temp-1 → 3.2.96-temp

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.95-temp-1",
+  "version": "3.2.96-temp",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/plugins/GetLoginInfoService.js

@@ -2,21 +2,33 @@ 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
+    // 调用远程登录服务，获取所有有权访问的功能
+    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 {
@@ -25,6 +37,7 @@ let loginGen = async function (username, password, cue) {
         source: "tool.getFullTree(this.getRights().where(row.getType() == $function$))",
         userid: Vue.$login.f.id
       }, { resolveMsg: null, rejectMsg: null })
+      console.log('有权限功能返回数据', JSON.stringify(hasRight.data))
       //准备替换功能树
       var fun = []
       hasRight.data[0].children[0].children.forEach((item) => {
@@ -34,6 +47,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 +99,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 +131,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', {
@@ -118,6 +179,11 @@ let loginGen = async function (username, password, cue) {
       for (let proc of Vue.$login.afterLogin) {
         await proc(Vue.$login.f)
       }
+      // 启动未操作下线计时器（30分钟）
+      if(Vue.$login.autoLoginout){
+        Vue.$login.startInactivityTimer(Vue.$login.autoLoginTimeOut)
+      }
+
       // 定时发送心跳
       if (cue) {
         setInterval(() => {
@@ -144,10 +210,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
   }
@@ -160,6 +223,9 @@ let GetLoginInfoService = {
   Verification: true,
   //构建时间开关
   versionTime: true,
+  //长时间未操作退出开关
+  autoLoginout: false,
+  autoLoginTimeOut:30*60*1000,
   //
   SinglePageToken : {},
   //登录信息展示开关
@@ -472,6 +538,39 @@ let GetLoginInfoService = {
     let ds = date.split('-')
     let nextMonth = ds[1] - 0 + 1
     return ds[0] + '-' + (nextMonth < 10 ? '0' + nextMonth : nextMonth) + '-20 00:00:00'
+  },
+  /**
+   * 启动未操作强制下线计时器
+   * @param timeout 超时时间（毫秒），默认30分钟
+   */
+  startInactivityTimer(timeout) {
+    // 清除已有的定时器
+    if (this._inactivityTimer) {
+      clearTimeout(this._inactivityTimer);
+    }
+    // 事件处理函数
+    const resetTimer = () => {
+      clearTimeout(this._inactivityTimer);
+      this._inactivityTimer = setTimeout(() => {
+        // 强制下线逻辑
+        // Vue.cookie.delete('loginId');
+        Vue.$login.f = {};
+        Vue.showMessage("长时间未操作，您已被强制下线", ['confirm']).then(() => {
+          location.reload();
+        });
+      }, timeout);
+    };
+    // 需要监听的事件
+    const events = ['mousemove', 'keydown', 'mousedown', 'scroll', 'touchstart'];
+    // 只绑定一次
+    if (!this._inactivityListenerAdded) {
+      events.forEach(event => {
+        window.addEventListener(event, resetTimer, true);
+      });
+      this._inactivityListenerAdded = true;
+    }
+    // 初始化计时器
+    resetTimer();
   }
 }
 

package/src/system.js

@@ -28,7 +28,7 @@ import TestResSelect from './components/server/TestResSelect'
 import RoleSelector from "./components/server/RoleSelector";
 
 // BAinformation备案信息展示(空不展示, 传入什么展示什么,可以传标签)
-export default function (val,filiale, {showLogin = false, show_daiBan = false, show_yiDi= false, BAinformation = null,showVersionTime=true} = {}) {
+export default function (val,filiale, {showLogin = false, show_daiBan = false, show_yiDi= false, BAinformation = null,showVersionTime=true,autoLoginout = false, autoLoginTimeOut=30*60*1000} = {}) {
   console.log(val,filiale,showLogin)
   //验证码开关赋值
   if(val!=null){
@@ -44,6 +44,10 @@ export default function (val,filiale, {showLogin = false, show_daiBan = false, s
   GetLoginInfoService.showDaiBan=show_daiBan
   //展示异地登录
   GetLoginInfoService.showYiDi=show_yiDi
+  //自动登出
+  GetLoginInfoService.autoLoginout = autoLoginout
+  //自动登出时长（默认30分钟）
+  GetLoginInfoService.autoLoginTimeOut = autoLoginTimeOut
   // 备案信息复制
   GetLoginInfoService.BAinformation = BAinformation
   Vue.use(GetLoginInfoService)
@@ -65,7 +69,7 @@ export default function (val,filiale, {showLogin = false, show_daiBan = false, s
   //资源选择
   Vue.component('res-select', ResSelect)
   Vue.component('res-select-group', ResSelectGroup)
- //资源选择测试
+  //资源选择测试
   Vue.component('test-res-select', TestResSelect)
 
   // 参数管理(新)