vue2-client 1.11.6 → 1.12.2

package/src/services/user.js

@@ -1,90 +1,92 @@
-import {
-  LOGIN,
-  MODIFY_PASSWORD,
-  ROUTES,
-  V4_GET_INFO,
-  V4_LOGIN,
-  V4_LOGOUT
-} from '@vue2-client/services/apiService'
-import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
-import EncryptUtil from '@vue2-client/utils/EncryptUtil'
-import axios from 'axios'
-
-/**
- * 登录服务
- * @param name 账户名
- * @param password 账户密码
- * @returns {Promise<AxiosResponse<T>>}
- */
-export async function login (name, password) {
-  let data = {
-    name: name,
-    password: password
-  }
-  data = '$' + EncryptUtil.RSAEncrypt(JSON.stringify(data))
-  return request(LOGIN, METHOD.POST, data)
-}
-
-export async function modifyPassword (name, password, newPassword) {
-  return request(MODIFY_PASSWORD, METHOD.POST, {
-    data: {
-      ename: name,
-      password: password,
-      newpassword: newPassword,
-      affirmpassword: newPassword
-    }
-  })
-}
-
-export async function V4Login (name, password, routeName) {
-  return request(V4_LOGIN, METHOD.POST, {
-    username: name,
-    password: password,
-    resourceName: routeName
-  })
-}
-
-export async function V4RefreshToken () {
-  const { AESDecrypt } = EncryptUtil
-  const info = AESDecrypt(localStorage.getItem('SinglePage_TOKEN'), '3KMKqvgwR8ULbR8Z')
-  return axios.post(V4_LOGIN, {
-    username: info.name,
-    password: info.password,
-    resourceName: '智慧燃气'
-  })
-}
-
-export async function V4GetInfo () {
-  return request(V4_GET_INFO, METHOD.POST, {})
-}
-
-export async function getRoutesConfig (value, routeName = '智慧燃气') {
-  return request(ROUTES + '/' + routeName, METHOD.POST, value)
-}
-
-/**
- * 退出登录
- */
-export function logout () {
-  if (window.__MICRO_APP_ENVIRONMENT__) {
-    window.microApp.dispatch({ type: 'logout' })
-  }
-  return new Promise((resolve, reject) => {
-    request(V4_LOGOUT, METHOD.DELETE, {}).then(() => {
-      resolve()
-    }).catch(error => {
-      reject(error)
-    }).finally(() => {
-      localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
-      localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
-      localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
-      removeAuthorization()
-    })
-  })
-}
-export default {
-  login,
-  logout,
-  getRoutesConfig,
-  V4RefreshToken
-}
+import {
+  LOGIN,
+  MODIFY_PASSWORD,
+  ROUTES,
+  V4_GET_INFO,
+  V4_LOGIN,
+  V4_LOGOUT
+} from '@vue2-client/services/apiService'
+import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
+import EncryptUtil from '@vue2-client/utils/EncryptUtil'
+import axios from 'axios'
+import { V4_SESSION_KEY } from '@vue2-client/store/mutation-types'
+
+/**
+ * 登录服务
+ * @param name 账户名
+ * @param password 账户密码
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+export async function login (name, password) {
+  let data = {
+    name: name,
+    password: password
+  }
+  data = '$' + EncryptUtil.RSAEncrypt(JSON.stringify(data))
+  return request(LOGIN, METHOD.POST, data)
+}
+
+export async function modifyPassword (name, password, newPassword) {
+  return request(MODIFY_PASSWORD, METHOD.POST, {
+    data: {
+      ename: name,
+      password: password,
+      newpassword: newPassword,
+      affirmpassword: newPassword
+    }
+  })
+}
+
+export async function V4Login (name, password, routeName) {
+  return request(V4_LOGIN, METHOD.POST, {
+    username: name,
+    password: password,
+    resourceName: routeName
+  })
+}
+
+export async function V4RefreshToken () {
+  const { AESDecrypt } = EncryptUtil
+  const info = AESDecrypt(localStorage.getItem('SinglePage_TOKEN'), '3KMKqvgwR8ULbR8Z')
+  return axios.post(V4_LOGIN, {
+    username: info.name,
+    password: info.password,
+    resourceName: '智慧燃气'
+  })
+}
+
+export async function V4GetInfo () {
+  return request(V4_GET_INFO, METHOD.POST, {})
+}
+
+export async function getRoutesConfig (value, routeName = '智慧燃气') {
+  return request(ROUTES + '/' + routeName, METHOD.POST, value)
+}
+
+/**
+ * 退出登录
+ */
+export function logout () {
+  if (window.__MICRO_APP_ENVIRONMENT__) {
+    window.microApp.dispatch({ type: 'logout' })
+  }
+  return new Promise((resolve, reject) => {
+    request(V4_LOGOUT, METHOD.DELETE, {}).then(() => {
+      resolve()
+    }).catch(error => {
+      reject(error)
+    }).finally(() => {
+      localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
+      localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
+      localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
+      localStorage.removeItem(V4_SESSION_KEY)
+      removeAuthorization()
+    })
+  })
+}
+export default {
+  login,
+  logout,
+  getRoutesConfig,
+  V4RefreshToken
+}

package/src/store/mutation-types.js

@@ -1,3 +1,4 @@
 export const ACCESS_TOKEN = 'Access-Token'
 export const V4_ACCESS_TOKEN = 'Authorization'
 export const SYSTEM_VERSION = 'systemVersion'
+export const V4_SESSION_KEY = 'v4-session-key'

package/src/utils/EncryptUtil.js

@@ -1,4 +1,5 @@
 import AesEncryptJS from 'crypto-js'
+import CryptoJS from 'crypto-js'
 import RsaEncryptJS from 'jsencrypt'
 
 export default {
@@ -50,4 +51,26 @@ export default {
     const resdata = encrypt.decrypt(word)
     return JSON.parse(resdata.toString())
   },
+
+  AESEncryptCBC (data, CRYPTO_KEY) {
+    // 生成随机IV（每次加密不同）
+    const iv = CryptoJS.lib.WordArray.random(16)
+
+    // 使用 AES CBC 模式进行加密
+    const encrypted = CryptoJS.AES.encrypt(
+      JSON.stringify(data),
+      CryptoJS.enc.Hex.parse(CRYPTO_KEY),
+      {
+        iv: iv, // IV
+        mode: CryptoJS.mode.CBC,
+        padding: CryptoJS.pad.Pkcs7
+      }
+    )
+
+    // 组合IV和密文，分别Base64编码：IV(base64) + : + 密文(base64)
+    const ivBase64 = iv.toString(CryptoJS.enc.Base64)
+    const encryptedBase64 = encrypted.toString()
+
+    return `${ivBase64}:${encryptedBase64}`
+  }
 }