system-clients 3.2.87 → 3.2.89

package/src/filiale/weinan/system.js

@@ -1,7 +1,7 @@
-// 分公司特殊组件页面注册
-
-exports.specialComp =  {
-  'home-page': (resolve) => {
-    require(['./Main'], resolve)
-  }
-}
+// 分公司特殊组件页面注册
+
+exports.specialComp =  {
+  'home-page': (resolve) => {
+    require(['./Main'], resolve)
+  }
+}

package/src/filiale/wenxi/Login.vue

@@ -171,6 +171,7 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
+      // todo v4
       let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
@@ -435,6 +436,7 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
+          // todo v4
           let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
           if(logininfo.data){
             if(logininfo.data.ename && logininfo.data.password){

package/src/filiale/wenxi/Main.vue

@@ -165,6 +165,7 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
+  // todo v4
   let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
@@ -462,6 +463,7 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
+          // todo v4
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }

package/src/filiale/wuhai/Main.vue

@@ -165,6 +165,7 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
+  // todo v4
   let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
@@ -467,6 +468,7 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
+          // todo v4
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }
@@ -475,6 +477,7 @@ export default {
     // 微信统计投诉和咨询的条数
     async WechatOfComplaintAndConsult () {
       console.log('开始执行')
+      // todo v4
       let WeChatData = await this.$resetpost('rs/sql/singleTable_OrderBy',{
         data:{
           items: 'f_isreply',

package/src/filiale/yuchuan/Login.vue

@@ -170,6 +170,7 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
+      // todo v4
       let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
@@ -419,6 +420,7 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
+          // todo v4
           let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
           if(logininfo.data){
             if(logininfo.data.ename && logininfo.data.password){

package/src/filiale/yuchuan/Main.vue

@@ -155,6 +155,7 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
+  // todo v4
   let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
@@ -541,6 +542,7 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
+          // todo v4
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }

package/src/filiale/zhoukou/Main.vue

@@ -151,6 +151,7 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
+  // todo v4
   let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
@@ -422,6 +423,7 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
+          // todo v4
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }

package/src/plugins/GetLoginInfoService.js

@@ -2,33 +2,17 @@ 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))
-  const getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null})
-  if (getLogin.data.states === '登录成功') {
+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
-    Vue.$login.jwt = getLogin.data.jwt
-    Vue.$login.jwtNew = getLogin.data.jwtNew
+    Vue.$login.jwt = getLogin.data.resources.data.id
+    Vue.$login.jwtNew = getLogin.data.access_token
     // 调用远程登录服务，获取所有有权访问的功能
-    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.f =  getLogin.data.resources.data
     // 把登录用户添加到cookie里
     Vue.cookie.set('loginId', Vue.$login.f.id)
     try {
@@ -37,7 +21,6 @@ let loginGen = async function (name, 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) => {
@@ -47,8 +30,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) {
     }
@@ -99,21 +80,6 @@ let loginGen = async function (name, 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', {
@@ -131,37 +97,6 @@ let loginGen = async function (name, 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', {
@@ -205,7 +140,10 @@ let loginGen = async function (name, password, cue) {
     }
 
   } else {
-    let error = {status: 401, data: getLogin.data.states}
+    let error = {status: 401, data: "登录失败，请稍后重试"}
+    if (getLogin.data.code !== 500) {
+      error = {status: getLogin.data.code, data: getLogin.data.msg}
+    }
     // 抛出错误
     throw error
   }

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

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Thu Aug 03 14:29:00 CST 2023
-gradle.version=7.4