vue2-client 1.20.92 → 1.20.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.20.92",
+  "version": "1.20.93",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
@@ -113,4 +113,4 @@
     "not dead",
     "not ie 11"
   ]
-}
+}

package/src/constants/crypto.js

@@ -0,0 +1,5 @@
+/**
+ * 与会话加密对应的 RSA 私钥，与 af-system-vue-web .env 中 VITE_RSA_PRIVATE_KEY 保持一致
+ */
+export const RSA_PRIVATE_KEY =
+  'MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIRrmftLDHCQqREEJ132Onu+W3vmFbdF7QD751SrcDDGDTfzuz1zBuElvkHhuDBb7KZkXrCIe+MhvX2IvxcLObl3faX+evYlnfj2HRbF0hIpQLuIq22tL06ZcV5w7wqLxUZRpFElIFm8gZTkUvfKXVuHw89e4daDVhU5hK3GHNGTAgMBAAECgYABiINrFaE1E8pkBYx1JJA5yuhL73aUktfd2TeCU00vFg6kyrWCI85Sa2RKu/6CJNZWeOFgdubEUv7a22tRrNIZb3yUMaqtTwSso78mspIOJqjWXTkTH9WPElfTcdpdIse/lgZtPz6egxkuhadSvwrM9Y6NgusiW/5+x95Ct08iOQJBAN5aK+7uISURvGQj2EaRtgGEd8+d4oHl+BYvvTeG3qSgUikHQW3j0sp4gXPw2kxw6sjVgLFOc4FB6LGqwzOTzokCQQCYdYG8ty3Uo/ebUlNzeJFxHXjy/KvBSytAUzAXkRu3nZrkEaPQsi3dgOkZgk+F1fMDzfQ4EbDIU6xvqOoZXHg7AkATCW9XfoXR8anKfRMoP5Nwn9HOMbtR2cmaxK2TknV/bMZ8AsYETYwfj5+tuIJIJybC2RyykX/sIiN1CqS5xr7ZAkArj19rMRdaKyMi8MnBM1Cy9g3Jt2HHj5ejAGG8SgyWUOShh1y70z0BjcSMMkxQXAncK2s83ekZw7aADM4eQupjAkARRgTwwMOnn3IoKmQusKhZk0uxilZ4Zc2LH6Z4GiWnvteM0W8Zw4Z1lJUcjgQq3dGqL2RdmzeQZ+HgPIOXrZVK'

package/src/pages/login/Login.vue

@@ -55,6 +55,7 @@
 <script>
 import CommonLayout from '@vue2-client/layouts/CommonLayout'
 import { getRoutesConfig, login, V4Login } from '@vue2-client/services/user'
+import { setV4AccessToken } from '@vue2-client/utils/login'
 import { setAuthorization } from '@vue2-client/utils/request'
 import { loadRoutes, funcToRouterOA, funcToRouter } from '@vue2-client/utils/routerUtil'
 import { mapMutations, mapState } from 'vuex'
@@ -131,7 +132,7 @@ export default {
       }
     },
     afterLoginV4 (res) {
-      this.setV4AccessToken(res)
+      setV4AccessToken(res)
       let data = res.resources
       if (data.data) {
         data = data.data
@@ -224,14 +225,6 @@ export default {
         const dateAfter = new Date(timestamp)
         setAuthorization({ token: data, expireAt: dateAfter })
       }
-    },
-    setV4AccessToken (res) {
-      localStorage.setItem(ACCESS_TOKEN, res.access_token)
-      let timestamp = new Date().getTime()// 当前的时间戳
-      timestamp = timestamp + res.expire * 60 * 1000
-      // 格式化时间获取年月日, 登陆过期时间
-      const dateAfter = new Date(timestamp)
-      setAuthorization({ token: res.access_token, expireAt: dateAfter })
     }
   }
 }

package/src/pages/login/LoginV3.vue

@@ -55,6 +55,7 @@
 <script>
 import CommonLayout from '@vue2-client/layouts/CommonLayout'
 import { getRoutesConfig, login, V4Login } from '@vue2-client/services/user'
+import { setV4AccessToken } from '@vue2-client/utils/login'
 import { setAuthorization } from '@vue2-client/utils/request'
 import { loadRoutes, funcToRouterOA, funcToRouter } from '@vue2-client/utils/routerUtil'
 import { mapMutations, mapState } from 'vuex'
@@ -130,7 +131,7 @@ export default {
       }
     },
     afterLoginV4 (res) {
-      this.setV4AccessToken(res)
+      setV4AccessToken(res)
       let data = res.resources
       if (data.data) {
         data = data.data
@@ -223,14 +224,6 @@ export default {
         const dateAfter = new Date(timestamp)
         setAuthorization({ token: data, expireAt: dateAfter })
       }
-    },
-    setV4AccessToken (res) {
-      localStorage.setItem(ACCESS_TOKEN, res.access_token)
-      let timestamp = new Date().getTime()// 当前的时间戳
-      timestamp = timestamp + res.expire * 60 * 1000
-      // 格式化时间获取年月日, 登陆过期时间
-      const dateAfter = new Date(timestamp)
-      setAuthorization({ token: res.access_token, expireAt: dateAfter })
     }
   }
 }

package/src/utils/EncryptUtil.js

@@ -7,7 +7,7 @@ export default {
    * @param word
    * @returns {*}
    */
-  AESEncrypt (word, encryKey) {
+  AESEncrypt(word, encryKey) {
     const key = CryptoJS.enc.Utf8.parse(encryKey)
     const srcs = CryptoJS.enc.Utf8.parse(word)
     const encrypted = CryptoJS.AES.encrypt(srcs, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
@@ -18,7 +18,7 @@ export default {
    * @param word
    * @returns {*}
    */
-  AESDecrypt (word, encryKey) {
+  AESDecrypt(word, encryKey) {
     const key = CryptoJS.enc.Utf8.parse(encryKey)
     const decrypt = CryptoJS.AES.decrypt(word, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
     const ret = CryptoJS.enc.Utf8.stringify(decrypt).toString()
@@ -33,7 +33,7 @@ export default {
    * @param word
    * @returns {*}
    */
-  RSAEncrypt (word) {
+  RSAEncrypt(word) {
     const encrypt = new RsaEncryptJS()
     encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
     const resdata = encrypt.encrypt(word)
@@ -44,14 +44,32 @@ export default {
    * @param word
    * @returns {*}
    */
-  RSADecrypt (word) {
+  RSADecrypt(word) {
     const encrypt = new RsaEncryptJS()
     encrypt.setPrivateKey('MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKo++i9J9dzAFtbxwowKDCo2mxi7MXxE8A8VvssaydWjjgmEz/HHMPLOhi1182a1si4pWL0/MizKnquD7T2Bu4jpQbAFnkNYEMEyq/kw904Xl0JCQHYFuvnI99RE8Q3KlTP6kEUGDjV34EL6vBGJcQvArLtj1xoP8y0nIfJ2Pw5TAgMBAAECgYAGGB8IllMwxceLhjf6n1l0IWRH7FuHIUieoZ6k0p6rASHSgWiYNRMxfecbtX8zDAoG0QAWNi7rn40ygpR5gS1fWDAKhmnhKgQIT6wW0VmD4hraaeyP78iy8BLhlvblri2nCPIhDH5+l96v7D47ZZi3ZSOzcj89s1eS/k7/N4peEQJBAPEtGGJY+lBoCxQMhGyzuzDmgcS1Un1ZE2pt+XNCVl2b+T8fxWJH3tRRR8wOY5uvtPiK1HM/IjT0T5qwQeH8Yk0CQQC0tcv3d/bDb7bOe9QzUFDQkUSpTdPWAgMX2OVPxjdq3Sls9oA5+fGNYEy0OgyqTjde0b4iRzlD1O0OhLqPSUMfAkEAh5FIvqezdRU2/PsYSR4yoAdCdLdT+h/jGRVefhqQ/6eYUJJkWp15tTFHQX3pIe9/s6IeT/XyHYAjaxmevxAmlQJBAKSdhvQjf9KAjZKDEsa7vyJ/coCXuQUWSCMNHbcR5aGfXgE4e45UtUoIE1eKGcd6AM6LWhx3rR6xdFDpb9je8BkCQB0SpevGfOQkMk5i8xkEt9eeYP0fi8nv6eOUcK96EXbzs4jV2SAoQJ9oJegPtPROHbhIvVUmNQTbuP10Yjg59+8=')
     const resdata = encrypt.decrypt(word)
     return JSON.parse(resdata.toString())
   },
+  /**
+   * RSA 私钥解密，返回明文字符串（不做 JSON 解析）
+   *
+   * @param {string} encryptedData Base64 密文
+   * @param {string} privateKey PKCS#8 格式的私钥
+   * @returns {string|null} 解密失败时返回 null
+   */
+  RSADecryptRaw(encryptedData, privateKey) {
+    try {
+      const encrypt = new RsaEncryptJS()
+      encrypt.setPrivateKey(privateKey)
+      const decrypted = encrypt.decrypt(encryptedData)
+      if (!decrypted) return null
+      return decrypted
+    } catch {
+      return null
+    }
+  },
 
-  AESEncryptCBC (data, CRYPTO_KEY) {
+  AESEncryptCBC(data, CRYPTO_KEY) {
     // 生成随机IV（每次加密不同）
     const iv = CryptoJS.lib.WordArray.random(16)
 
@@ -79,7 +97,7 @@ export default {
    * @param hexKey 十六进制格式的加密密钥
    * @returns 解密后的原始字符串
    */
-  AESDecryptCBC (combinedText, hexKey) {
+  AESDecryptCBC(combinedText, hexKey) {
     try {
       // 分离 IV 和 密文
       const parts = combinedText.split(':')
@@ -114,7 +132,7 @@ export default {
    * @param hexKey 十六进制格式的密钥
    * @returns 解密后的字符串，失败时返回null
    */
-  safeAESDecryptCBC (combinedText, hexKey) {
+  safeAESDecryptCBC(combinedText, hexKey) {
     try {
       return this.AESDecryptCBC(combinedText, hexKey)
     } catch {
@@ -129,7 +147,7 @@ export default {
    * @param sessionKey 会话密钥
    * @returns 解密后的数据，失败时返回原数据
    */
-  decryptResponse (responseData, sessionKey) {
+  decryptResponse(responseData, sessionKey) {
     try {
       let dataStr = ''
 

package/src/utils/login.js

@@ -9,9 +9,12 @@ import { message } from 'ant-design-vue'
 import {
   ACCESS_TOKEN,
   V4_ACCESS_TOKEN,
+  V4_SESSION_KEY,
 } from '@vue2-client/store/mutation-types'
 import { setAuthorization } from '@vue2-client/utils/request'
 import { loginGen } from '@vue2-client/base-client/plugins/GetLoginInfoService'
+import { RSA_PRIVATE_KEY } from '@vue2-client/constants/crypto'
+import EncryptUtil from '@vue2-client/utils/EncryptUtil'
 // 认证类型
 const AUTH_TYPE = {
   BEARER: 'Bearer',
@@ -21,7 +24,7 @@ const AUTH_TYPE = {
   AUTH2: 'auth2',
 }
 
-export function checkSingleAuthorization (authType = AUTH_TYPE.BEARER, token) {
+export function checkSingleAuthorization(authType = AUTH_TYPE.BEARER, token) {
   switch (authType) {
     case AUTH_TYPE.BEARER:
       if (localStorage.getItem(V4_ACCESS_TOKEN)) {
@@ -39,7 +42,7 @@ export function checkSingleAuthorization (authType = AUTH_TYPE.BEARER, token) {
   return false
 }
 
-function setSingleAuthorization (auth, authType = AUTH_TYPE.BEARER) {
+function setSingleAuthorization(auth, authType = AUTH_TYPE.BEARER) {
   switch (authType) {
     case AUTH_TYPE.BEARER:
       localStorage.setItem(V4_ACCESS_TOKEN, 'Bearer ' + auth.token)
@@ -52,7 +55,7 @@ function setSingleAuthorization (auth, authType = AUTH_TYPE.BEARER) {
   }
 }
 
-function setAccessToken (data) {
+function setAccessToken(data) {
   if (data) {
     localStorage.setItem(ACCESS_TOKEN, data)
     let timestamp = new Date().getTime() // 当前的时间戳
@@ -63,7 +66,7 @@ function setAccessToken (data) {
   }
 }
 
-function afterGeneral (result, options) {
+function afterGeneral(result, options) {
   return new Promise((resolve) => {
     const { password, store } = options
     const user = Object.assign(
@@ -93,7 +96,7 @@ function afterGeneral (result, options) {
   })
 }
 
-function afterLogin (res, options) {
+function afterLogin(res, options) {
   const { name, password, store, router, pathname } = options
   const setting = store.state.setting
   const loginRes = res.states
@@ -138,7 +141,7 @@ function afterLogin (res, options) {
   }
 }
 
-function afterLoginV4 (res, option) {
+function afterLoginV4(res, option) {
   const { router, pathname } = option
   setV4AccessToken(res)
   let data = res.resources
@@ -154,16 +157,49 @@ function afterLoginV4 (res, option) {
   })
 }
 
-export function setV4AccessToken (res) {
-  localStorage.setItem(ACCESS_TOKEN, res.access_token)
-  let timestamp = new Date().getTime()// 当前的时间戳
-  timestamp = timestamp + res.expire * 60 * 1000
-  // 格式化时间获取年月日, 登陆过期时间
+function unwrapV4LoginPayload(res) {
+  if (!res || typeof res !== 'object') return null
+  if (res.access_token !== undefined && res.access_token !== null) return res
+  if (
+    res.data &&
+    typeof res.data === 'object' &&
+    res.data.access_token !== undefined &&
+    res.data.access_token !== null
+  ) {
+    return res.data
+  }
+  return null
+}
+
+function getWebConfigFromStorage() {
+  try {
+    const str = localStorage.getItem(process.env.VUE_APP_WEB_CONFIG_KEY)
+    return str ? JSON.parse(str) : {}
+  } catch {
+    return {}
+  }
+}
+
+/** 解析登录接口返回的 session 并写入 v4-session-key（受 webConfig.requestEncrypt 控制） */
+export function setV4SessionKey(res) {
+  const webConfig = getWebConfigFromStorage()
+  if (!res?.session || !webConfig?.setting?.requestEncrypt) return
+  const sessionKey = EncryptUtil.RSADecryptRaw(res.session, RSA_PRIVATE_KEY)
+  if (sessionKey) localStorage.setItem(V4_SESSION_KEY, sessionKey)
+}
+
+export function setV4AccessToken(res) {
+  const payload = unwrapV4LoginPayload(res)
+  if (!payload?.access_token) return
+  localStorage.setItem(ACCESS_TOKEN, payload.access_token)
+  let timestamp = new Date().getTime() // 当前的时间戳
+  timestamp += (payload.expire ?? 0) * 60 * 1000
   const dateAfter = new Date(timestamp)
-  setAuthorization({ token: res.access_token, expireAt: dateAfter })
+  setAuthorization({ token: payload.access_token, expireAt: dateAfter })
+  setV4SessionKey(payload)
 }
 
-export function startLogin (options) {
+export function startLogin(options) {
   const { name, password, store } = options
   const setting = store.state.setting
   switch (setting.compatible) {

package/vue.config.js

@@ -11,13 +11,13 @@ const productionGzipExtensions = ['js', 'css']
 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 geoserver = 'http://192.168.50.67:31567'
+const liuli = 'https://192.168.50.105:31467'
+const v3Server = 'https://192.168.50.105:31467'
+const geoserver = 'https://192.168.50.105:31467'
 // const gateway = 'http://192.168.50.67:31467'
 // const testUpload = 'http://123.60.214.109:8406'
 const OSSServerDev = 'http://192.168.50.67:30351'
-const revenue = 'http://192.168.50.67:31567'
+const revenue = 'https://192.168.50.105:31467'
 // const revenue = 'http://127.0.0.1:31467'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
@@ -225,13 +225,13 @@ module.exports = {
   css: {
     extract: !isProd
       ? {
-          filename: 'css/[name].css',
-          chunkFilename: 'css/[name].css',
-          ignoreOrder: true
-        }
+        filename: 'css/[name].css',
+        chunkFilename: 'css/[name].css',
+        ignoreOrder: true
+      }
       : {
-          ignoreOrder: true
-        },
+        ignoreOrder: true
+      },
     loaderOptions: {
       less: {
         lessOptions: {