vue2-client 1.22.39 → 1.22.42

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/openapi/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/openapi/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

package/src/store/modules/setting.js

@@ -1,119 +1,119 @@
-import config from '@vue2-client/config'
-import { ADMIN } from '@vue2-client/config/default'
-import { formatFullPath } from '@vue2-client/utils/i18n'
-import { filterMenu } from '@vue2-client/utils/authority-utils'
-import { getLocalSetting } from '@vue2-client/utils/themeUtil'
-import deepClone from 'lodash.clonedeep'
-
-const localSetting = getLocalSetting(true)
-const customTitlesStr = sessionStorage.getItem(process.env.VUE_APP_TBAS_TITLES_KEY)
-const customTitles = (customTitlesStr && JSON.parse(customTitlesStr)) || []
-
-export default {
-  namespaced: true,
-  state: {
-    isMobile: false,
-    animates: ADMIN.animates,
-    palettes: ADMIN.palettes,
-    pageMinHeight: 0,
-    menuData: [],
-    activatedFirst: undefined,
-    customTitles,
-    ...config,
-    ...localSetting
-  },
-  getters: {
-    menuData (state, getters, rootState) {
-      if (state.filterMenu) {
-        const { permissions, roles } = rootState.account
-        return filterMenu(deepClone(state.menuData), permissions, roles)
-      }
-      return state.menuData
-    },
-    firstMenu (state, getters) {
-      const { menuData } = getters
-      if (menuData.length > 0 && !menuData[0].fullPath) {
-        formatFullPath(menuData)
-      }
-      return menuData.map(item => {
-        const menuItem = { ...item }
-        delete menuItem.children
-        return menuItem
-      })
-    },
-    subMenu (state) {
-      const { menuData, activatedFirst } = state
-      if (menuData.length > 0 && !menuData[0].fullPath) {
-        formatFullPath(menuData)
-      }
-      const current = menuData.find(menu => menu.fullPath === activatedFirst)
-      return current && current.children || []
-    }
-  },
-  mutations: {
-    setDevice (state, isMobile) {
-      state.isMobile = isMobile
-    },
-    setTheme (state, theme) {
-      state.theme = theme
-    },
-    setLayout (state, layout) {
-      state.layout = layout
-    },
-    setMultiPage (state, multiPage) {
-      state.multiPage = multiPage
-    },
-    setAnimate (state, animate) {
-      state.animate = animate
-    },
-    setWeekMode (state, weekMode) {
-      state.weekMode = weekMode
-    },
-    setFixedHeader (state, fixedHeader) {
-      state.fixedHeader = fixedHeader
-    },
-    setFixedSideBar (state, fixedSideBar) {
-      state.fixedSideBar = fixedSideBar
-    },
-    setLang (state, lang) {
-      state.lang = lang
-    },
-    setHideSetting (state, hideSetting) {
-      state.hideSetting = hideSetting
-    },
-    correctPageMinHeight (state, minHeight) {
-      state.pageMinHeight += minHeight
-    },
-    setMenuData (state, menuData) {
-      state.menuData = menuData
-    },
-    setAsyncRoutes (state, asyncRoutes) {
-      state.asyncRoutes = asyncRoutes
-    },
-    setPageWidth (state, pageWidth) {
-      state.pageWidth = pageWidth
-    },
-    setActivatedFirst (state, activatedFirst) {
-      state.activatedFirst = activatedFirst
-    },
-    setFixedTabs (state, fixedTabs) {
-      state.fixedTabs = fixedTabs
-    },
-    setCustomTitle (state, { path, title }) {
-      if (title) {
-        const obj = state.customTitles.find(item => item.path === path)
-        if (obj) {
-          obj.title = title
-        } else {
-          state.customTitles.push({ path, title })
-        }
-        sessionStorage.setItem(process.env.VUE_APP_TBAS_TITLES_KEY, JSON.stringify(state.customTitles))
-      }
-    },
-    setSetting (state, setting) {
-      for (const key in setting) {
-        state[key] = setting[key]
-      }
-    }
-  }
-}
+import config from '@vue2-client/config'
+import { ADMIN } from '@vue2-client/config/default'
+import { formatFullPath } from '@vue2-client/utils/i18n'
+import { filterMenu } from '@vue2-client/utils/authority-utils'
+import { getLocalSetting } from '@vue2-client/utils/themeUtil'
+import deepClone from 'lodash.clonedeep'
+
+const localSetting = getLocalSetting(true)
+const customTitlesStr = sessionStorage.getItem(process.env.VUE_APP_TBAS_TITLES_KEY)
+const customTitles = (customTitlesStr && JSON.parse(customTitlesStr)) || []
+
+export default {
+  namespaced: true,
+  state: {
+    isMobile: false,
+    animates: ADMIN.animates,
+    palettes: ADMIN.palettes,
+    pageMinHeight: 0,
+    menuData: [],
+    activatedFirst: undefined,
+    customTitles,
+    ...config,
+    ...localSetting
+  },
+  getters: {
+    menuData (state, getters, rootState) {
+      if (state.filterMenu) {
+        const { permissions, roles } = rootState.account
+        return filterMenu(deepClone(state.menuData), permissions, roles)
+      }
+      return state.menuData
+    },
+    firstMenu (state, getters) {
+      const { menuData } = getters
+      if (menuData.length > 0 && !menuData[0].fullPath) {
+        formatFullPath(menuData)
+      }
+      return menuData.map(item => {
+        const menuItem = { ...item }
+        delete menuItem.children
+        return menuItem
+      })
+    },
+    subMenu (state) {
+      const { menuData, activatedFirst } = state
+      if (menuData.length > 0 && !menuData[0].fullPath) {
+        formatFullPath(menuData)
+      }
+      const current = menuData.find(menu => menu.fullPath === activatedFirst)
+      return current && current.children || []
+    }
+  },
+  mutations: {
+    setDevice (state, isMobile) {
+      state.isMobile = isMobile
+    },
+    setTheme (state, theme) {
+      state.theme = theme
+    },
+    setLayout (state, layout) {
+      state.layout = layout
+    },
+    setMultiPage (state, multiPage) {
+      state.multiPage = multiPage
+    },
+    setAnimate (state, animate) {
+      state.animate = animate
+    },
+    setWeekMode (state, weekMode) {
+      state.weekMode = weekMode
+    },
+    setFixedHeader (state, fixedHeader) {
+      state.fixedHeader = fixedHeader
+    },
+    setFixedSideBar (state, fixedSideBar) {
+      state.fixedSideBar = fixedSideBar
+    },
+    setLang (state, lang) {
+      state.lang = lang
+    },
+    setHideSetting (state, hideSetting) {
+      state.hideSetting = hideSetting
+    },
+    correctPageMinHeight (state, minHeight) {
+      state.pageMinHeight += minHeight
+    },
+    setMenuData (state, menuData) {
+      state.menuData = menuData
+    },
+    setAsyncRoutes (state, asyncRoutes) {
+      state.asyncRoutes = asyncRoutes
+    },
+    setPageWidth (state, pageWidth) {
+      state.pageWidth = pageWidth
+    },
+    setActivatedFirst (state, activatedFirst) {
+      state.activatedFirst = activatedFirst
+    },
+    setFixedTabs (state, fixedTabs) {
+      state.fixedTabs = fixedTabs
+    },
+    setCustomTitle (state, { path, title }) {
+      if (title) {
+        const obj = state.customTitles.find(item => item.path === path)
+        if (obj) {
+          obj.title = title
+        } else {
+          state.customTitles.push({ path, title })
+        }
+        sessionStorage.setItem(process.env.VUE_APP_TBAS_TITLES_KEY, JSON.stringify(state.customTitles))
+      }
+    },
+    setSetting (state, setting) {
+      for (const key in setting) {
+        state[key] = setting[key]
+      }
+    }
+  }
+}

package/src/utils/EncryptUtil.js

@@ -68,14 +68,19 @@ export default {
       return null
     }
   },
-
+  normalizeEncryptData (data) {
+    if (typeof data === 'string') {
+      return data
+    }
+    return JSON.stringify(data)
+  },
   AESEncryptCBC(data, CRYPTO_KEY) {
     // 生成随机IV（每次加密不同）
     const iv = CryptoJS.lib.WordArray.random(16)
 
     // 使用 AES CBC 模式进行加密
     const encrypted = CryptoJS.AES.encrypt(
-      JSON.stringify(data),
+      this.normalizeEncryptData(data),
       CryptoJS.enc.Hex.parse(CRYPTO_KEY),
       {
         iv: iv, // IV

package/src/utils/errorCode.js

@@ -1,6 +1,6 @@
-export default {
-  401: '认证失败，无法访问系统资源',
-  403: '当前操作没有权限',
-  404: '访问资源不存在',
-  default: '系统未知错误，请反馈给管理员'
-}
+export default {
+  401: '认证失败，无法访问系统资源',
+  403: '当前操作没有权限',
+  404: '访问资源不存在',
+  default: '系统未知错误，请反馈给管理员'
+}

package/src/utils/login.js

@@ -99,8 +99,9 @@ function afterLogin(res, options) {
     const jwt = res.jwtNew
     // 如果返回字段有s说明是走的V3XuanJian网关
     if(res.s || res.session) {
-      setV4SessionKey({session: res.s || res.session})
+      setSessionKey({session: res.s || res.session})
     }
+    setAccessToken(data, jwt)
     // 获取路由配置
     getRoutesConfig(data, setting.routeName)
       .then((result) => {
@@ -116,7 +117,6 @@ function afterLogin(res, options) {
             }
             result.functions.unshift(resourceManageMain)
             afterGeneral(result, options)
-            setAccessToken(data, jwt)
             if (result.deps === '用户工单登记') {
               router.push(setting.ticketPage).catch(() => {
               })
@@ -181,6 +181,11 @@ export function setV4SessionKey(res) {
   if (sessionKey) localStorage.setItem(V4_SESSION_KEY, sessionKey)
 }
 
+export function setSessionKey(res) {
+  const sessionKey = EncryptUtil.RSADecryptRaw(res.session, 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKo++i9J9dzAFtbxwowKDCo2mxi7MXxE8A8VvssaydWjjgmEz/HHMPLOhi1182a1si4pWL0/MizKnquD7T2Bu4jpQbAFnkNYEMEyq/kw904Xl0JCQHYFuvnI99RE8Q3KlTP6kEUGDjV34EL6vBGJcQvArLtj1xoP8y0nIfJ2Pw5TAgMBAAECgYAGGB8IllMwxceLhjf6n1l0IWRH7FuHIUieoZ6k0p6rASHSgWiYNRMxfecbtX8zDAoG0QAWNi7rn40ygpR5gS1fWDAKhmnhKgQIT6wW0VmD4hraaeyP78iy8BLhlvblri2nCPIhDH5+l96v7D47ZZi3ZSOzcj89s1eS/k7/N4peEQJBAPEtGGJY+lBoCxQMhGyzuzDmgcS1Un1ZE2pt+XNCVl2b+T8fxWJH3tRRR8wOY5uvtPiK1HM/IjT0T5qwQeH8Yk0CQQC0tcv3d/bDb7bOe9QzUFDQkUSpTdPWAgMX2OVPxjdq3Sls9oA5+fGNYEy0OgyqTjde0b4iRzlD1O0OhLqPSUMfAkEAh5FIvqezdRU2/PsYSR4yoAdCdLdT+h/jGRVefhqQ/6eYUJJkWp15tTFHQX3pIe9/s6IeT/XyHYAjaxmevxAmlQJBAKSdhvQjf9KAjZKDEsa7vyJ/coCXuQUWSCMNHbcR5aGfXgE4e45UtUoIE1eKGcd6AM6LWhx3rR6xdFDpb9je8BkCQB0SpevGfOQkMk5i8xkEt9eeYP0fi8nv6eOUcK96EXbzs4jV2SAoQJ9oJegPtPROHbhIvVUmNQTbuP10Yjg59+8=')
+  if (sessionKey) localStorage.setItem(V4_SESSION_KEY, sessionKey)
+}
+
 export function setV4AccessToken(res) {
   const payload = unwrapV4LoginPayload(res)
   if (!payload?.access_token) return

package/src/utils/request.js

@@ -233,7 +233,7 @@ function loadInterceptors() {
     if (token) {
       if (config.url !== V4_LOGIN) {
         // V4 环境则添加 V4请求头
-        config.headers[V4_ACCESS_TOKEN] = token
+        config.headers[V4_ACCESS_TOKEN] = `Bearer ${token}`
         config.headers[ACCESS_TOKEN] = token
       }
     }
@@ -249,7 +249,7 @@ function loadInterceptors() {
       !config.url.includes('/logic/openapi/') &&
       !config.url.includes('devApi') &&
       !config.url.includes('auth/login') &&
-      config.url.includes('api/af-')
+      (config.url.includes('api/af-') || config.url.includes('rs/user/userLogin'))
     ) {
       if (config.data && !(config.data instanceof FormData)) {
         if (v4SessionKey) {

package/vue.config.js

@@ -12,7 +12,7 @@ const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
 const liuli = 'http://192.168.50.67:31567'
-const v3Server = 'http://192.168.50.67:31567'
+const v3Server = 'http://127.0.0.1:8077'
 const geoserver = 'http://192.168.50.67:31567'
 // const gateway = 'http://192.168.50.67:31467'
 // const testUpload = 'http://123.60.214.109:8406'
@@ -36,6 +36,12 @@ module.exports = {
     port: 8020,
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
+      '/rs/logic/getLogin': {
+        pathRewrite: {
+          '^/rs/logic/getLogin': '/getLogin'
+        },
+        target: v3Server,
+      },
       // '/apply-image': {
       //   target: revenue,
       // },

package//350/277/201/347/247/273/346/227/245/345/277/227.md

@@ -1,15 +1,15 @@
-# vue2迁移vue3
-
-1. 完成vue-cli，webpack，babel，eslint的升级
-   - core-js 3.30.1 -> 3.33.0
-   - add regenerator-runtime
-   - @babel/core 7.21.4 -> 7.22.20
-   - babel-eslint 10.1.0 -> @babel/eslint-parser 7.22.15
-   - @vue/cli 4.5.19 -> 5.0.8
-   - babel-jest 25.5.1 -> 26.6.3
-   - eslint 6.8.0 -> 7.32.0
-   - jest 24.0.0 -> 26.6.3
-   - webpack 4.46.0 -> 5.88.2
-2. 完成vue2的2.7升级
-   - vue 2.6.14 -> 2.7.14
-   - eslint 7.32.0 -> 8.51.0
+# vue2迁移vue3
+
+1. 完成vue-cli，webpack，babel，eslint的升级
+   - core-js 3.30.1 -> 3.33.0
+   - add regenerator-runtime
+   - @babel/core 7.21.4 -> 7.22.20
+   - babel-eslint 10.1.0 -> @babel/eslint-parser 7.22.15
+   - @vue/cli 4.5.19 -> 5.0.8
+   - babel-jest 25.5.1 -> 26.6.3
+   - eslint 6.8.0 -> 7.32.0
+   - jest 24.0.0 -> 26.6.3
+   - webpack 4.46.0 -> 5.88.2
+2. 完成vue2的2.7升级
+   - vue 2.6.14 -> 2.7.14
+   - eslint 7.32.0 -> 8.51.0

package/.idea/af-vue2-client.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/deployment.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PublishConfigData" remoteFilesAllowedToDisappearOnAutoupload="false">
-    <serverData>
-      <paths name="50.4">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-    </serverData>
-  </component>
-</project>

package/.idea/encodings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>

package/.idea/gradle.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="parallelModelFetch" value="true" />
-  </component>
-</project>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="corretto-21" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>