vue2-client 1.6.63-single → 1.7.1

package/src/router/guards.js

@@ -1,153 +1,153 @@
-import { hasAuthority } from '@vue2-client/utils/authority-utils'
-import { loginIgnore } from '@vue2-client/router/index'
-import { checkAuthorization } from '@vue2-client/utils/request'
-import NProgress from 'nprogress'
-import { logout } from '@vue2-client/services/user'
-import {
-  startLogin,
-  checkSingleAuthorization,
-} from '@vue2-client/utils/login'
-import AES from '@vue2-client/utils/EncryptUtil'
-
-NProgress.configure({ showSpinner: false })
-
-/**
- * 进度条开始
- * @param to
- * @param form
- * @param next
- */
-const progressStart = (to, from, next) => {
-  // start progress bar
-  if (!NProgress.isStarted()) {
-    NProgress.start()
-  }
-  next()
-}
-
-/**
- * 登录守卫
- * @param to
- * @param form
- * @param next
- * @param options
- */
-const loginGuard = (to, from, next, options) => {
-  const urlParams = new URLSearchParams(window.location.search)
-  const token = urlParams.get('token')
-  if (token) {
-    const { AESDecrypt } = AES
-    const info = AESDecrypt(token, '3KMKqvgwR8ULbR8Z')
-    const { store, message, router } = options
-    if (
-      (!loginIgnore.includes(to) || to.name === '404') &&
-      !checkSingleAuthorization()
-    ) {
-      startLogin({
-        ...info,
-        pathname: window.location.pathname,
-        store,
-        router,
-      })
-    } else {
-      const roles = store.getters['account/roles']
-      const user = localStorage.getItem(process.env.VUE_APP_USER_KEY)
-      const setUser = store._mutations['account/setUser'][0]
-      setUser(user)
-      if (roles.length === 0 && !loginIgnore.includes(to)) {
-        message.warning('登录已失效，请重新登录')
-        logout().finally((res) => {
-          next({ path: '/login' })
-        })
-      } else {
-        next()
-      }
-    }
-  } else {
-    const { store, message } = options
-    if (
-      (!loginIgnore.includes(to) || to.name === '404') &&
-      !checkAuthorization()
-    ) {
-      message.warning('登录已失效，请重新登录')
-      next({ path: '/login' })
-    } else {
-      const roles = store.getters['account/roles']
-      if (roles.length === 0 && !loginIgnore.includes(to)) {
-        message.warning('登录已失效，请重新登录')
-        logout().finally((res) => {
-          next({ path: '/login' })
-        })
-      } else {
-        next()
-      }
-    }
-  }
-}
-
-/**
- * 权限守卫
- * @param to
- * @param form
- * @param next
- * @param options
- */
-const authorityGuard = (to, from, next, options) => {
-  const { store, message } = options
-  const permissions = store.getters['account/permissions']
-  const roles = store.getters['account/roles']
-  if (!hasAuthority(to, permissions, roles)) {
-    message.warning(`对不起，您无权访问页面: ${to.fullPath}，请联系管理员`)
-    next({ path: '/403' })
-    // NProgress.done()
-  } else {
-    next()
-  }
-}
-
-/**
- * 混合导航模式下一级菜单跳转重定向
- * @param to
- * @param from
- * @param next
- * @param options
- * @returns {*}
- */
-const redirectGuard = (to, from, next, options) => {
-  const { store } = options
-  const getFirstChild = (routes) => {
-    const route = routes[0]
-    if (!route.children || route.children.length === 0) {
-      return route
-    }
-    return getFirstChild(route.children)
-  }
-  if (store.state.setting.layout === 'mix') {
-    const firstMenu = store.getters['setting/firstMenu']
-    if (firstMenu.find((item) => item.fullPath === to.fullPath)) {
-      store.commit('setting/setActivatedFirst', to.fullPath)
-      const subMenu = store.getters['setting/subMenu']
-      if (subMenu.length > 0) {
-        const redirect = getFirstChild(subMenu)
-        return next({ path: redirect.fullPath })
-      }
-    }
-  }
-  next()
-}
-
-/**
- * 进度条结束
- * @param to
- * @param form
- * @param options
- */
-const progressDone = () => {
-  // finish progress bar
-  NProgress.done()
-}
-
-export default {
-  beforeEach: [progressStart, loginGuard, authorityGuard, redirectGuard],
-  afterEach: [progressDone],
-}
+import { hasAuthority } from '@vue2-client/utils/authority-utils'
+import { loginIgnore } from '@vue2-client/router/index'
+import { checkAuthorization } from '@vue2-client/utils/request'
+import NProgress from 'nprogress'
+import { logout } from '@vue2-client/services/user'
+import {
+  startLogin,
+  checkSingleAuthorization,
+} from '@vue2-client/utils/login'
+import AES from '@vue2-client/utils/EncryptUtil'
+
+NProgress.configure({ showSpinner: false })
+
+/**
+ * 进度条开始
+ * @param to
+ * @param form
+ * @param next
+ */
+const progressStart = (to, from, next) => {
+  // start progress bar
+  if (!NProgress.isStarted()) {
+    NProgress.start()
+  }
+  next()
+}
+
+/**
+ * 登录守卫
+ * @param to
+ * @param form
+ * @param next
+ * @param options
+ */
+const loginGuard = (to, from, next, options) => {
+  const urlParams = new URLSearchParams(window.location.search)
+  const token = urlParams.get('token')
+  if (token) {
+    const { AESDecrypt } = AES
+    const info = AESDecrypt(token, '3KMKqvgwR8ULbR8Z')
+    const { store, message, router } = options
+    if (
+      (!loginIgnore.includes(to) || to.name === '404') &&
+      !checkSingleAuthorization()
+    ) {
+      startLogin({
+        ...info,
+        pathname: window.location.pathname,
+        store,
+        router,
+      })
+    } else {
+      const roles = store.getters['account/roles']
+      const user = localStorage.getItem(process.env.VUE_APP_USER_KEY)
+      const setUser = store._mutations['account/setUser'][0]
+      setUser(user)
+      if (roles.length === 0 && !loginIgnore.includes(to)) {
+        message.warning('登录已失效，请重新登录')
+        logout().finally((res) => {
+          next({ path: '/login' })
+        })
+      } else {
+        next()
+      }
+    }
+  } else {
+    const { store, message } = options
+    if (
+      (!loginIgnore.includes(to) || to.name === '404') &&
+      !checkAuthorization()
+    ) {
+      message.warning('登录已失效，请重新登录')
+      next({ path: '/login' })
+    } else {
+      const roles = store.getters['account/roles']
+      if (roles.length === 0 && !loginIgnore.includes(to)) {
+        message.warning('登录已失效，请重新登录')
+        logout().finally((res) => {
+          next({ path: '/login' })
+        })
+      } else {
+        next()
+      }
+    }
+  }
+}
+
+/**
+ * 权限守卫
+ * @param to
+ * @param form
+ * @param next
+ * @param options
+ */
+const authorityGuard = (to, from, next, options) => {
+  const { store, message } = options
+  const permissions = store.getters['account/permissions']
+  const roles = store.getters['account/roles']
+  if (!hasAuthority(to, permissions, roles)) {
+    message.warning(`对不起，您无权访问页面: ${to.fullPath}，请联系管理员`)
+    next({ path: '/403' })
+    // NProgress.done()
+  } else {
+    next()
+  }
+}
+
+/**
+ * 混合导航模式下一级菜单跳转重定向
+ * @param to
+ * @param from
+ * @param next
+ * @param options
+ * @returns {*}
+ */
+const redirectGuard = (to, from, next, options) => {
+  const { store } = options
+  const getFirstChild = (routes) => {
+    const route = routes[0]
+    if (!route.children || route.children.length === 0) {
+      return route
+    }
+    return getFirstChild(route.children)
+  }
+  if (store.state.setting.layout === 'mix') {
+    const firstMenu = store.getters['setting/firstMenu']
+    if (firstMenu.find((item) => item.fullPath === to.fullPath)) {
+      store.commit('setting/setActivatedFirst', to.fullPath)
+      const subMenu = store.getters['setting/subMenu']
+      if (subMenu.length > 0) {
+        const redirect = getFirstChild(subMenu)
+        return next({ path: redirect.fullPath })
+      }
+    }
+  }
+  next()
+}
+
+/**
+ * 进度条结束
+ * @param to
+ * @param form
+ * @param options
+ */
+const progressDone = () => {
+  // finish progress bar
+  NProgress.done()
+}
+
+export default {
+  beforeEach: [progressStart, loginGuard, authorityGuard, redirectGuard],
+  afterEach: [progressDone],
+}

package/src/router/index.js

@@ -1,27 +1,27 @@
-import { formatRoutes } from '@vue2-client/utils/routerUtil'
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403'], // 根据路由名称匹配
-  paths: ['/login', '/submitTicket'], // 根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   * @returns {boolean}
-   */
-  includes (route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  }
-}
-
-/**
- * 初始化路由实例
- * @param isAsync 是否异步路由模式
- * @returns {RouterOptions}
- */
-function initRouter (isAsync) {
-  const options = require('./async/config.async').default
-  formatRoutes(options.routes)
-  return options
-}
-export { loginIgnore, initRouter }
+import { formatRoutes } from '@vue2-client/utils/routerUtil'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403'], // 根据路由名称匹配
+  paths: ['/login', '/submitTicket'], // 根据路由fullPath匹配
+  /**
+   * 判断路由是否包含在该配置中
+   * @param route vue-router 的 route 对象
+   * @returns {boolean}
+   */
+  includes (route) {
+    return this.names.includes(route.name) || this.paths.includes(route.path)
+  }
+}
+
+/**
+ * 初始化路由实例
+ * @param isAsync 是否异步路由模式
+ * @returns {RouterOptions}
+ */
+function initRouter (isAsync) {
+  const options = require('./async/config.async').default
+  formatRoutes(options.routes)
+  return options
+}
+export { loginIgnore, initRouter }

package/src/services/api/DictionaryDetailsViewApi.js

@@ -1,6 +1,6 @@
 const DictionaryDetailsViewApi = {
   // 查询：获取字典详情
-  getDictionaryDetails: '/api/af-system/logic/getDictionaryDetails'
+  getDictionaryDetails: '/api/system/logic/getDictionaryDetails'
 }
 
 export { DictionaryDetailsViewApi }

package/src/services/api/LogDetailsViewApi.js

@@ -1,10 +1,10 @@
 const LogDetailsViewApi = {
   // 查询：获取日志详情
-  getLogDetails: '/api/af-system/logic/foreignaidGetLogDetails',
+  getLogDetails: '/api/system/logic/foreignaidGetLogDetails',
   // 查询：获取日志维护记录
-  getLogRecordList: '/api/af-system/logic/foreignaidGetRecordList',
+  getLogRecordList: '/api/system/logic/foreignaidGetRecordList',
   // 操作：更新日志状态
-  updateLogStatusData: '/api/af-system/logic/foreignaidUpdateLogStatus'
+  updateLogStatusData: '/api/system/logic/foreignaidUpdateLogStatus'
 }
 
 export { LogDetailsViewApi }

package/src/services/api/QueryParamsDetailsViewApi.js

@@ -1,6 +1,6 @@
 const QueryParamsDetailsViewApi = {
   // 查询：获取查询配置详情
-  getQueryParamsDetails: '/api/af-system/logic/getQueryParamsDetails'
+  getQueryParamsDetails: '/api/system/logic/getQueryParamsDetails'
 }
 
 export { QueryParamsDetailsViewApi }

package/src/services/api/TicketDetailsViewApi.js

@@ -1,34 +1,34 @@
 const TicketDetailsViewApi = {
   // 查询：获取工单流转详情
-  getTicketWorkFlowDetails: '/api/af-system/logic/getTicketWorkFlowDetails',
+  getTicketWorkFlowDetails: '/api/system/logic/getTicketWorkFlowDetails',
   // 查询：获取工单详情
-  getTicketDetails: '/api/af-system/logic/getTicketDetails',
+  getTicketDetails: '/api/system/logic/getTicketDetails',
   // 手动关闭工单
-  manualCloseTicket: '/api/af-system/logic/manualCloseTicket',
+  manualCloseTicket: '/api/system/logic/manualCloseTicket',
   // 转交工单给其他人
-  transferTicketToOthers: '/api/af-system/logic/transferTicketToOthers',
+  transferTicketToOthers: '/api/system/logic/transferTicketToOthers',
   // 确认工单，开始处理
-  confirmTicket: '/api/af-system/logic/confirmTicket',
+  confirmTicket: '/api/system/logic/confirmTicket',
   // 查询：获取订单详情用于订单追踪
-  getTicketDetailsForUploader: '/api/af-system/logic/getTicketDetailsForUploader',
+  getTicketDetailsForUploader: '/api/system/logic/getTicketDetailsForUploader',
   // 更新：将工单优先级增加
-  rushTicket: '/api/af-system/logic/rushTicket',
+  rushTicket: '/api/system/logic/rushTicket',
   // 客户手动关闭工单
-  manualCloseTicketByCustomer: '/api/af-system/logic/manualCloseTicketByCustomer',
+  manualCloseTicketByCustomer: '/api/system/logic/manualCloseTicketByCustomer',
   // 在工单提交页面删除照片
-  revocationImage: '/api/af-system/logic/revocationImage',
+  revocationImage: '/api/system/logic/revocationImage',
   // 在工单提交页面删除照片
-  getTicketImages: '/api/af-system/logic/getTicketImages',
+  getTicketImages: '/api/system/logic/getTicketImages',
   // 用户填写附加信息时取消了操作，将已上传的照片清空
-  removeAllImages: '/api/af-system/logic/removeAllImages',
+  removeAllImages: '/api/system/logic/removeAllImages',
   // 提交用户填写附加信息
-  AddonDescriptionToTicket: '/api/af-system/logic/AddonDescriptionToTicket',
+  AddonDescriptionToTicket: '/api/system/logic/AddonDescriptionToTicket',
   // 获取用户填写附加信息
-  getAddonDescription: '/api/af-system/logic/getAddonDescription',
+  getAddonDescription: '/api/system/logic/getAddonDescription',
   // 发起售后工单流程
-  createTicket: '/api/af-system/logic/createTicket',
+  createTicket: '/api/system/logic/createTicket',
   // 查询：获取所有员工名，供前端展示备选项
-  getAllEmployeeName: '/api/af-system/logic/getAllEmployeeName'
+  getAllEmployeeName: '/api/system/logic/getAllEmployeeName'
 }
 
 export { TicketDetailsViewApi }

package/src/services/api/cas.js

@@ -1,79 +1,79 @@
-import { post } from '@vue2-client/services/api/restTools'
-import notification from 'ant-design-vue/lib/notification'
-import { logout } from '@vue2-client/services/user'
-import Cookie from 'js-cookie'
-
-const casApi = {
-  // 根据用户信息校验服务访问权限并生成ST
-  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
-  // 根据TGC生成ST
-  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
-  // 验证ST
-  serviceValidate: '/api/af-sso/logic/serviceValidate',
-  // 其他验证
-  otherValidate: '/api/af-sso/logic'
-}
-
-function setTGTCookie (cookie) {
-  return Cookie.set('TGT-Cookie', cookie)
-}
-function removeTGTCookie () {
-  return Cookie.remove('TGT-Cookie')
-}
-export function getTGTCookie () {
-  return Cookie.get('TGT-Cookie')
-}
-
-export function CASLoginByAuth (serviceKey) {
-  return new Promise((resolve, reject) => {
-    post(casApi.createSTByUserInfo, {
-      serviceKey: serviceKey
-    }).then(res => {
-      setTGTCookie(res.tgc)
-      resolve(res)
-    }).catch(msg => {
-      reject(msg)
-    })
-  })
-}
-
-export function CASLogin (serviceKey, inner) {
-  // 从第三方跳转登录
-  const tgc = getTGTCookie()
-  if (tgc && !inner) {
-    return new Promise((resolve, reject) => {
-      post(casApi.createSTByTGC, {
-        serviceKey: serviceKey,
-        tgc: tgc
-      }).then(res => {
-        resolve(res)
-      }).catch(msg => {
-        if (msg === '当前操作没有权限') {
-          removeTGTCookie()
-          notification.error({
-            message: '授权已过期，请重新登录',
-            description: '2秒后自动跳转回登陆页面'
-          })
-          logout().then(() => {
-            setTimeout(() => {
-              window.location.href = '/login?serviceKey=' + serviceKey
-            }, 1500)
-          })
-        } else {
-          reject(msg)
-        }
-      })
-    })
-  } else {
-    return CASLoginByAuth(serviceKey)
-  }
-}
-
-export function doOtherValidate (logicName, st, serviceKey) {
-  return post(casApi.otherValidate + '/' + logicName, {
-    st: st,
-    serviceKey: serviceKey
-  }, null)
-}
-
-export default casApi
+import { post } from '@vue2-client/services/api/restTools'
+import notification from 'ant-design-vue/lib/notification'
+import { logout } from '@vue2-client/services/user'
+import Cookie from 'js-cookie'
+
+const casApi = {
+  // 根据用户信息校验服务访问权限并生成ST
+  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
+  // 根据TGC生成ST
+  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
+  // 验证ST
+  serviceValidate: '/api/af-sso/logic/serviceValidate',
+  // 其他验证
+  otherValidate: '/api/af-sso/logic'
+}
+
+function setTGTCookie (cookie) {
+  return Cookie.set('TGT-Cookie', cookie)
+}
+function removeTGTCookie () {
+  return Cookie.remove('TGT-Cookie')
+}
+export function getTGTCookie () {
+  return Cookie.get('TGT-Cookie')
+}
+
+export function CASLoginByAuth (serviceKey) {
+  return new Promise((resolve, reject) => {
+    post(casApi.createSTByUserInfo, {
+      serviceKey: serviceKey
+    }).then(res => {
+      setTGTCookie(res.tgc)
+      resolve(res)
+    }).catch(msg => {
+      reject(msg)
+    })
+  })
+}
+
+export function CASLogin (serviceKey, inner) {
+  // 从第三方跳转登录
+  const tgc = getTGTCookie()
+  if (tgc && !inner) {
+    return new Promise((resolve, reject) => {
+      post(casApi.createSTByTGC, {
+        serviceKey: serviceKey,
+        tgc: tgc
+      }).then(res => {
+        resolve(res)
+      }).catch(msg => {
+        if (msg === '当前操作没有权限') {
+          removeTGTCookie()
+          notification.error({
+            message: '授权已过期，请重新登录',
+            description: '2秒后自动跳转回登陆页面'
+          })
+          logout().then(() => {
+            setTimeout(() => {
+              window.location.href = '/login?serviceKey=' + serviceKey
+            }, 1500)
+          })
+        } else {
+          reject(msg)
+        }
+      })
+    })
+  } else {
+    return CASLoginByAuth(serviceKey)
+  }
+}
+
+export function doOtherValidate (logicName, st, serviceKey) {
+  return post(casApi.otherValidate + '/' + logicName, {
+    st: st,
+    serviceKey: serviceKey
+  }, null)
+}
+
+export default casApi