af-mobile-client-vue3 1.4.10 → 1.4.11-cs

package/.env

@@ -8,3 +8,4 @@ VITE_APP_WEB_CONFIG_KEY=admin.webconfig
 VITE_APP_SYSTEM_NAME=af-system
 # 最低兼容性 V4（最新产品）V3(V3产品) OA(公司OA)
 VITE_APP_COMPATIBLE=V4
+VITE_RSA_PRIVATE_KEY=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIRrmftLDHCQqREEJ132Onu+W3vmFbdF7QD751SrcDDGDTfzuz1zBuElvkHhuDBb7KZkXrCIe+MhvX2IvxcLObl3faX+evYlnfj2HRbF0hIpQLuIq22tL06ZcV5w7wqLxUZRpFElIFm8gZTkUvfKXVuHw89e4daDVhU5hK3GHNGTAgMBAAECgYABiINrFaE1E8pkBYx1JJA5yuhL73aUktfd2TeCU00vFg6kyrWCI85Sa2RKu/6CJNZWeOFgdubEUv7a22tRrNIZb3yUMaqtTwSso78mspIOJqjWXTkTH9WPElfTcdpdIse/lgZtPz6egxkuhadSvwrM9Y6NgusiW/5+x95Ct08iOQJBAN5aK+7uISURvGQj2EaRtgGEd8+d4oHl+BYvvTeG3qSgUikHQW3j0sp4gXPw2kxw6sjVgLFOc4FB6LGqwzOTzokCQQCYdYG8ty3Uo/ebUlNzeJFxHXjy/KvBSytAUzAXkRu3nZrkEaPQsi3dgOkZgk+F1fMDzfQ4EbDIU6xvqOoZXHg7AkATCW9XfoXR8anKfRMoP5Nwn9HOMbtR2cmaxK2TknV/bMZ8AsYETYwfj5+tuIJIJybC2RyykX/sIiN1CqS5xr7ZAkArj19rMRdaKyMi8MnBM1Cy9g3Jt2HHj5ejAGG8SgyWUOShh1y70z0BjcSMMkxQXAncK2s83ekZw7aADM4eQupjAkARRgTwwMOnn3IoKmQusKhZk0uxilZ4Zc2LH6Z4GiWnvteM0W8Zw4Z1lJUcjgQq3dGqL2RdmzeQZ+HgPIOXrZVK

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.4.10",
+  "version": "1.4.11-cs",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {
@@ -44,7 +44,9 @@
     "vue-i18n": "^11.1.10",
     "vue-router": "^4.5.1",
     "vue3-hash-calendar": "^1.1.3",
-    "weixin-js-sdk": "^1.6.5"
+    "weixin-js-sdk": "^1.6.5",
+    "jsencrypt": "^3.3.2",
+    "bcryptjs": "^2.4.3"
   },
   "devDependencies": {
     "@antfu/eslint-config": "4.17.0",

package/src/components/data/XFormItem/index.vue

@@ -37,7 +37,7 @@ import {
   Switch as VanSwitch,
   TimePicker as VanTimePicker,
 } from 'vant'
-import { computed, defineEmits, defineModel, defineProps, getCurrentInstance, onBeforeMount, ref, watch } from 'vue'
+import { computed, defineEmits, defineModel, defineProps, getCurrentInstance, onBeforeMount, ref, watch, nextTick } from 'vue'
 
 const props = defineProps({
   attr: {
@@ -620,7 +620,9 @@ function onCalendarConfirm(values) {
 // js 函数作为数据源
 async function updateOptions() {
   if (attr.keyName && (attr.keyName.toString().includes('async ') || attr.keyName.toString().includes('function '))) {
-    option.value = await executeStrFunctionByContext(currInst, attr.keyName, [props.form, runLogic, props.mode, getConfigByNameAsync, post])
+    await nextTick(async () => {
+      option.value = await executeStrFunctionByContext(currInst, attr.keyName, [props.form, runLogic, props.mode, getConfigByNameAsync, post])
+    })
   }
 }
 

package/src/stores/modules/setting.ts

@@ -21,6 +21,7 @@ export interface WebConfig {
   homeAppList: Array<any>
   slideshowList: Array<any>
   registerRequire: boolean
+  requestEncrypt: boolean
 }
 
 //  存放 webConfig 中的 setting 配置
@@ -56,7 +57,6 @@ export const useSettingStore = defineStore('setting', () => {
       const res = await getConfigByNameAsync('webMobileConfig')
       if (res.setting) {
         useStore.set(APP_WEB_CONFIG_KEY, res)
-        console.log('res.setting', res.setting)
         setSetting(res.setting)
         // homeAppList 仅在用户缓存没有时才回填
         if (!homeAppStore.homeAppList?.length && res.setting.homeAppList) {

package/src/stores/modules/user.ts

@@ -17,6 +17,7 @@ import {
 } from '@af-mobile-client-vue3/stores/mutation-type'
 import { getPlatformRoutePrefix } from '@af-mobile-client-vue3/types/platform'
 import crypto from '@af-mobile-client-vue3/utils/crypto'
+import { encryptUtil } from '@af-mobile-client-vue3/utils/EncryptUtil'
 import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
 import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
 import { defineStore } from 'pinia'
@@ -212,6 +213,9 @@ export const useUserStore = defineStore('app-user', () => {
         setToken(data.access_token)
         // 第三方教培系统鉴权兼容
         const LoginTicket = crypto.AESEncrypt(JSON.stringify(params), '3KMKqvgwR8ULbR8Z')
+        if (data.session && useSettingStore().getSetting()?.requestEncrypt) {
+          localStorage.setItem('v4-session-key', encryptUtil.RSADecrypt(data.session as string))
+        }
         Storage.set('LoginTicket', LoginTicket)
       }
       return Promise.resolve(data)

package/src/utils/EncryptUtil.ts

@@ -0,0 +1,246 @@
+import CryptoJS from 'crypto-js'
+import JSEncrypt from 'jsencrypt'
+
+/**
+ * 加密工具类
+ * 提供AES和RSA加密解密功能
+ */
+class EncryptUtil {
+  /**
+   * RSA公钥
+   */
+  private readonly RSA_PUBLIC_KEY = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB'
+
+  /**
+   * RSA私钥
+   */
+  private readonly RSA_PRIVATE_KEY = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKo++i9J9dzAFtbxwowKDCo2mxi7MXxE8A8VvssaydWjjgmEz/HHMPLOhi1182a1si4pWL0/MizKnquD7T2Bu4jpQbAFnkNYEMEyq/kw904Xl0JCQHYFuvnI99RE8Q3KlTP6kEUGDjV34EL6vBGJcQvArLtj1xoP8y0nIfJ2Pw5TAgMBAAECgYAGGB8IllMwxceLhjf6n1l0IWRH7FuHIUieoZ6k0p6rASHSgWiYNRMxfecbtX8zDAoG0QAWNi7rn40ygpR5gS1fWDAKhmnhKgQIT6wW0VmD4hraaeyP78iy8BLhlvblri2nCPIhDH5+l96v7D47ZZi3ZSOzcj89s1eS/k7/N4peEQJBAPEtGGJY+lBoCxQMhGyzuzDmgcS1Un1ZE2pt+XNCVl2b+T8fxWJH3tRRR8wOY5uvtPiK1HM/IjT0T5qwQeH8Yk0CQQC0tcv3d/bDb7bOe9QzUFDQkUSpTdPWAgMX2OVPxjdq3Sls9oA5+fGNYEy0OgyqTjde0b4iRzlD1O0OhLqPSUMfAkEAh5FIvqezdRU2/PsYSR4yoAdCdLdT+h/jGRVefhqQ/6eYUJJkWp15tTFHQX3pIe9/s6IeT/XyHYAjaxmevxAmlQJBAKSdhvQjf9KAjZKDEsa7vyJ/coCXuQUWSCMNHbcR5aGfXgE4e45UtUoIE1eKGcd6AM6LWhx3rR6xdFDpb9je8BkCQB0SpevGfOQkMk5i8xkEt9eeYP0fi8nv6eOUcK96EXbzs4jV2SAoQJ9oJegPtPROHbhIvVUmNQTbuP10Yjg59+8='
+
+  /**
+   * AES ECB模式加密
+   * @param word 待加密的字符串
+   * @param encryKey 加密密钥
+   * @returns 加密后的字符串
+   */
+  AESEncrypt(word: string, encryKey: string): string {
+    try {
+      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,
+      })
+      return encrypted.toString()
+    }
+    catch (error) {
+      throw new Error(`AES ECB加密失败: ${error}`)
+    }
+  }
+
+  /**
+   * AES ECB模式解密
+   * @param word 待解密的字符串
+   * @param encryKey 解密密钥
+   * @returns 解密后的数据（可能是字符串或对象）
+   */
+  AESDecrypt(word: string, encryKey: string): string | object {
+    try {
+      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()
+
+      try {
+        return JSON.parse(ret)
+      }
+      catch {
+        return ret
+      }
+    }
+    catch (error) {
+      throw new Error(`AES ECB解密失败: ${error}`)
+    }
+  }
+
+  /**
+   * RSA公钥加密
+   *
+   * @param data 需要加密的数据
+   * @param publicKey PEM格式的公钥
+   * @returns Base64编码的加密结果
+   */
+  RSAEncrypt(data: string, publicKey: string): string {
+    try {
+      const encryptor = new JSEncrypt()
+      encryptor.setPublicKey(publicKey)
+      const encrypted = encryptor.encrypt(data)
+
+      if (!encrypted) {
+        throw new Error('加密失败：空结果')
+      }
+      return encrypted
+    }
+    catch (error) {
+      console.error('RSA加密错误:', error)
+      throw new Error('RSA加密失败，请检查公钥格式')
+    }
+  }
+
+  /**
+   * RSA私钥解密
+   *
+   * @param encryptedData Base64编码的加密数据
+   * @returns 解密后的原始字符串
+   */
+  RSADecrypt(encryptedData: string): string {
+    try {
+      const decryptor = new JSEncrypt()
+      decryptor.setPrivateKey(import.meta.env.VITE_RSA_PRIVATE_KEY)
+      const decrypted = decryptor.decrypt(encryptedData)
+
+      if (!decrypted) {
+        throw new Error('解密失败：空结果')
+      }
+      return decrypted
+    }
+    catch (error) {
+      console.error('RSA解密错误:', error)
+      throw new Error('RSA解密失败，请检查私钥格式')
+    }
+  }
+
+  /**
+   * AES CBC模式加密
+   * @param data 待加密的数据
+   * @param cryptoKey 十六进制格式的加密密钥
+   * @returns 组合格式的加密结果
+   */
+  AESEncryptCBC(data: any, cryptoKey: string): string {
+    try {
+      // 生成随机IV（每次加密不同）
+      const iv = CryptoJS.lib.WordArray.random(16)
+
+      // 使用 AES CBC 模式进行加密
+      const encrypted = CryptoJS.AES.encrypt(
+        JSON.stringify(data),
+        CryptoJS.enc.Hex.parse(cryptoKey),
+        {
+          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}`
+    }
+    catch (error) {
+      throw new Error(`AES CBC加密失败: ${error}`)
+    }
+  }
+
+  /**
+   * AES CBC模式解密
+   * @param combinedText 格式：Base64(iv):Base64(ciphertext)
+   * @param hexKey 十六进制格式的加密密钥
+   * @returns 解密后的原始字符串
+   */
+  AESDecryptCBC(combinedText: string, hexKey: string): string {
+    try {
+      // 分离 IV 和 密文
+      const parts = combinedText.split(':')
+      if (parts.length !== 2) {
+        throw new Error('Invalid encrypted data format')
+      }
+
+      const ivBase64 = parts[0]
+      const encryptedBase64 = parts[1]
+
+      // 解析IV和密文
+      const iv = CryptoJS.enc.Base64.parse(ivBase64)
+      const key = CryptoJS.enc.Hex.parse(hexKey)
+
+      // 解密
+      const decrypted = CryptoJS.AES.decrypt(encryptedBase64, key, {
+        iv,
+        mode: CryptoJS.mode.CBC,
+        padding: CryptoJS.pad.Pkcs7,
+      })
+
+      // 将解密后的数据转换为字符串
+      return decrypted.toString(CryptoJS.enc.Utf8)
+    }
+    catch (error) {
+      throw new Error(`AES-CBC解密失败: ${error}`)
+    }
+  }
+
+  /**
+   * 安全的AES-CBC解密（失败时返回null）
+   * 用于响应自动解密，解密失败时不抛出异常
+   * @param combinedText 格式：Base64(iv):Base64(ciphertext)
+   * @param hexKey 十六进制格式的密钥
+   * @returns 解密后的字符串，失败时返回null
+   */
+  safeAESDecryptCBC(combinedText: string, hexKey: string): string | null {
+    try {
+      return this.AESDecryptCBC(combinedText, hexKey)
+    }
+    catch {
+      // AES-CBC解密失败，静默处理
+      return null
+    }
+  }
+
+  /**
+   * 智能响应解密
+   * 自动检测响应数据格式并进行解密
+   * @param responseData 响应数据
+   * @param sessionKey 会话密钥
+   * @returns 解密后的数据，失败时返回原数据
+   */
+  decryptResponse(responseData: any, sessionKey: string): any {
+    try {
+      let dataStr = ''
+
+      // 处理不同类型的响应数据
+      if (typeof responseData === 'string') {
+        dataStr = responseData
+      }
+      else if (typeof responseData === 'object') {
+        dataStr = JSON.stringify(responseData)
+      }
+      else {
+        dataStr = String(responseData)
+      }
+
+      // 尝试解密
+      const decryptedStr = this.safeAESDecryptCBC(dataStr, sessionKey)
+      if (decryptedStr) {
+        try {
+          return JSON.parse(decryptedStr)
+        }
+        catch {
+          return decryptedStr
+        }
+      }
+    }
+    catch (error) {
+      console.warn('响应解密处理失败:', error)
+      // 响应解密处理失败，静默处理
+    }
+
+    // 解密失败或数据格式不正确时，返回原数据
+    return responseData
+  }
+}
+
+// 创建单例实例
+const encryptUtil = new EncryptUtil()
+
+export { EncryptUtil, encryptUtil }

package/src/utils/http/index.ts

@@ -2,6 +2,7 @@ import type { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } fro
 import { ContentTypeEnum, ResultEnum } from '@af-mobile-client-vue3/enums/requestEnum'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { ACCESS_TOKEN } from '@af-mobile-client-vue3/stores/mutation-type'
+import { encryptUtil } from '@af-mobile-client-vue3/utils/EncryptUtil'
 import axios from 'axios'
 import { showToast } from 'vant'
 
@@ -32,6 +33,17 @@ class Http {
         // 如果 token 存在
         if (savedToken)
           config.headers[ACCESS_TOKEN] = savedToken
+        const v4SessionKey = localStorage.getItem('v4-session-key')
+        if (['post'].includes(config.method.toLowerCase()) && v4SessionKey) {
+          if (config.data && !(config.data instanceof FormData)) {
+            config.data = {
+              encrypted: encryptUtil.AESEncryptCBC(config.data, v4SessionKey),
+            }
+            config.headers['X-Sec'] = '1'
+            config.headers['X-Rand'] = Math.random().toString(36).substr(2, 5)
+            config.headers['X-Ts'] = Date.now()
+          }
+        }
         return config
       },
       (error: AxiosError) => {
@@ -48,6 +60,18 @@ class Http {
   private httpInterceptorsResponse(): void {
     Http.axiosInstance.interceptors.response.use(
       async (response: AxiosResponse) => {
+        // 判断是否需要解密
+        if (response.headers && response.headers['x-encrypted'] === '1') {
+          const v4SessionKey = localStorage.getItem('v4-session-key')
+          if (v4SessionKey && response.data) {
+            const decryptedData = encryptUtil.decryptResponse(response?.data, v4SessionKey)
+            // 如果解密成功且不等于原数据，说明解密有效
+            if (decryptedData !== response.data) {
+              // 响应解密成功
+              response.data = decryptedData
+            }
+          }
+        }
         const compatible = import.meta.env.VITE_APP_COMPATIBLE
         if (compatible !== 'V4') {
           return response.data

package/src/views/user/login/LoginForm.vue

@@ -10,6 +10,7 @@ import { UserType } from '@af-mobile-client-vue3/types/auth'
 import { isWechat } from '@af-mobile-client-vue3/utils/platform-auth'
 import { funcToRouter, loadRoutes } from '@af-mobile-client-vue3/utils/routerUtil'
 import { secureStorageBatchWrite, secureStorageRead } from '@af-mobile-client-vue3/utils/secureStorage'
+import bcrypt from 'bcryptjs'
 import {
   closeToast,
   showDialog,
@@ -123,7 +124,7 @@ function handleSubmit() {
         console.warn(setting)
         const data: any = await userState.Login({
           username,
-          password,
+          password: bcrypt.hashSync(password, 10),
           resourceName: setting.getSetting()?.routerName || '智慧手机',
         })
         login.f = data

package/vite.config.ts

@@ -11,8 +11,8 @@ export default ({ mode }: ConfigEnv): UserConfig => {
 
   const appProxys = {}
 
-  const v4Server = 'http://192.168.50.67:31567'
-  const v3Server = 'http://192.168.50.67:31567'
+  const v4Server = 'http://117.35.109.162:31577'
+  const v3Server = 'http://117.35.109.162:31577'
   const OSSServerDev = 'http://192.168.50.67:30351'
   const geoserver = 'http://39.104.49.8:30372'
   const mockServer = 'http://127.0.0.1:8086'