yuang-framework-ui-common 1.0.101 → 1.0.103

package/lib/utils/dateUtils.ts

@@ -1,29 +1,67 @@
 import { setNumAddZero } from './dataUtils';
+import dayjs, { type Dayjs, type ConfigType } from 'dayjs';
+// 引入必要插件（按需加载，减小体积）
+import 'dayjs/locale/zh-cn'; // 中文语言包
+import relativeTime from 'dayjs/plugin/relativeTime'; // 相对时间插件（formatFromNow 用）
+import isSameOrAfter from 'dayjs/plugin/isSameOrAfter'; // 辅助比较插件
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
 
-import moment, { type MomentInput } from 'moment';
-// 可选：引入中文语言包（按需开启）
-import 'moment/locale/zh-cn';
+// 注册插件
+dayjs.extend(relativeTime);
+dayjs.extend(isSameOrAfter);
+dayjs.extend(isSameOrBefore);
+
+// 设置全局语言为中文
+dayjs.locale('zh-cn');
+
+
+
+
+// ===================== 常用日期格式常量（统一维护）=====================
+/** 完整时间格式（默认）：年-月-日 时:分:秒 */
+export const FORMAT_YYYY_MM_DD_HH_MM_SS = 'YYYY-MM-DD HH:mm:ss';
+/** 简化时间格式：年-月-日 时:分 */
+export const FORMAT_YYYY_MM_DD_HH_MM = 'YYYY-MM-DD HH:mm';
+/** 仅日期格式：年-月-日 */
+export const FORMAT_YYYY_MM_DD = 'YYYY-MM-DD';
+/** 年月格式：年-月 */
+export const FORMAT_YYYY_MM = 'YYYY-MM';
+/** 月日格式：月-日 */
+export const FORMAT_MM_DD = 'MM-DD';
+/** 仅时间格式：时:分:秒 */
+export const FORMAT_HH_MM_SS = 'HH:mm:ss';
+/** 仅时间简化格式：时:分 */
+export const FORMAT_HH_MM = 'HH:mm';
+/** 中文格式：年-月-日 时:分:秒 */
+export const FORMAT_YYYY_MM_DD_HH_MM_SS_CN = 'YYYY年MM月DD日 HH时mm分ss秒';
+/** 中文仅日期：年-月-日 */
+export const FORMAT_YYYY_MM_DD_CN = 'YYYY年MM月DD日';
+/** 紧凑格式（无分隔符）：年月日时分秒 */
+export const FORMAT_YYYYMMDDHHMMSS = 'YYYYMMDDHHmmss';
+/** 紧凑格式（无分隔符）：年月日 */
+export const FORMAT_YYYYMMDD = 'YYYYMMDD';
+/** 紧凑格式（无分隔符）：年月日时分秒 */
+export const FORMAT_YYYYMMDDHHMMSSSSS = 'YYYYMMDDHHmmssSSS';
 
-moment.locale('zh-cn');
 
 /**
  * 初始化日期对象（内部工具函数，不对外导出）
- * @param {string|number|Date|moment.Moment} date - 日期入参（不传则为当前时间）
- * @returns {moment.Moment} 格式化后的moment对象（无效则返回当前时间）
+ * @param {string|number|Date|Dayjs} date - 日期入参（不传则为当前时间）
+ * @returns {Dayjs} 格式化后的dayjs对象（无效则返回当前时间）
  */
-const initDate = (date?: MomentInput): moment.Moment => {
-    if (!date) return moment();
-    const momentDate = moment(date);
-    return momentDate.isValid() ? momentDate : moment();
+const initDate = (date?: ConfigType): Dayjs => {
+    if (!date) return dayjs();
+    const dayjsDate = dayjs(date);
+    return dayjsDate.isValid() ? dayjsDate : dayjs();
 };
 
 /**
  * 日期格式化（默认格式：YYYY-MM-DD HH:mm:ss）
- * @param {string|number|Date|moment.Moment} date - 要格式化的日期
+ * @param {string|number|Date|Dayjs} date - 要格式化的日期
  * @param {string} format - 自定义格式
  * @returns {string} 格式化后的日期字符串
  */
-const formatDate = (date, format = 'YYYY-MM-DD HH:mm:ss') => {
+const formatDate = (date: ConfigType, format = 'YYYY-MM-DD HH:mm:ss'): string => {
     return initDate(date).format(format);
 };
 
@@ -32,30 +70,35 @@ const formatDate = (date, format = 'YYYY-MM-DD HH:mm:ss') => {
  * @param {string} format - 自定义格式
  * @returns {string} 当前时间字符串
  */
-const getNow = (format = 'YYYY-MM-DD HH:mm:ss') => {
-    return moment().format(format);
+const getNow = (format = FORMAT_YYYY_MM_DD_HH_MM_SS): string => {
+    return dayjs().format(format);
 };
 
 /**
  * 日期加减计算
- * @param {string|number|Date|moment.Moment} date - 基准日期
+ * @param {string|number|Date|Dayjs} date - 基准日期
  * @param {number} num - 加减的数值（正数加，负数减）
  * @param {string} unit - 单位（year/month/day/hour/minute/second/week）
  * @param {string} format - 输出格式
  * @returns {string} 计算后的日期字符串
  */
-const addSubtractDate = (date, num, unit, format = 'YYYY-MM-DD HH:mm:ss') => {
-    const momentDate = initDate(date);
-    return momentDate.add(num, unit).format(format);
+const addSubtractDate = (
+    date: ConfigType,
+    num: number,
+    unit: dayjs.ManipulateType,
+    format = 'YYYY-MM-DD HH:mm:ss'
+): string => {
+    const dayjsDate = initDate(date);
+    return dayjsDate.add(num, unit).format(format);
 };
 
 /**
  * 比较两个日期的大小
- * @param {string|number|Date|moment.Moment} date1 - 日期1
- * @param {string|number|Date|moment.Moment} date2 - 日期2
+ * @param {string|number|Date|Dayjs} date1 - 日期1
+ * @param {string|number|Date|Dayjs} date2 - 日期2
  * @returns {number} 1: date1 > date2；-1: date1 < date2；0: 相等
  */
-const compareDate = (date1, date2) => {
+const compareDate = (date1: ConfigType, date2: ConfigType): number => {
     const m1 = initDate(date1);
     const m2 = initDate(date2);
     if (m1.isAfter(m2)) return 1;
@@ -65,73 +108,94 @@ const compareDate = (date1, date2) => {
 
 /**
  * 计算两个日期的差值
- * @param {string|number|Date|moment.Moment} date1 - 日期1
- * @param {string|number|Date|moment.Moment} date2 - 日期2
+ * @param {string|number|Date|Dayjs} date1 - 日期1
+ * @param {string|number|Date|Dayjs} date2 - 日期2
  * @param {string} unit - 差值单位（days/hours/minutes/seconds/months/years）
  * @returns {number} 差值（正数，date1 - date2 的绝对值）
  */
-const diffDate = (date1: MomentInput, date2: MomentInput, unit = 'days'): number => {
+const diffDate = (
+    date1: ConfigType,
+    date2: ConfigType,
+    unit: dayjs.OpUnitType = 'days'
+): number => {
     const m1 = initDate(date1);
     const m2 = initDate(date2);
-    // @ts-ignore
     return Math.abs(m1.diff(m2, unit));
 };
 
 /**
  * 验证日期是否有效
- * @param {string|number|Date|moment.Moment} date - 要验证的日期
+ * @param {string|number|Date|Dayjs} date - 要验证的日期
  * @returns {boolean} true: 有效；false: 无效
  */
-const isValidDate = (date) => {
-    return moment(date).isValid();
+const isValidDate = (date: ConfigType): boolean => {
+    return dayjs(date).isValid();
 };
 
 /**
  * 获取日期的指定部分（年/月/日/时/分/秒）
- * @param {string|number|Date|moment.Moment} date - 基准日期
+ * @param {string|number|Date|Dayjs} date - 基准日期
  * @param {string} unit - 要获取的单位（year/month/day/hour/minute/second/weekday）
  * @returns {number} 对应的值（month 从 1 开始，weekday 周日为 0）
  */
-const getDatePart = (date, unit) => {
-    const momentDate = initDate(date);
-    if (unit === 'month') {
-        return momentDate.month() + 1; // moment的month是0开始，转为1开始
+const getDatePart = (date: ConfigType, unit: string): number => {
+    const dayjsDate = initDate(date);
+    switch (unit) {
+        case 'year':
+            return dayjsDate.year();
+        case 'month':
+            return dayjsDate.month() + 1; // dayjs的month是0开始，转为1开始（和原逻辑一致）
+        case 'day':
+            return dayjsDate.date();
+        case 'hour':
+            return dayjsDate.hour();
+        case 'minute':
+            return dayjsDate.minute();
+        case 'second':
+            return dayjsDate.second();
+        case 'weekday':
+            return dayjsDate.day(); // 周日为0，和moment一致
+        default:
+            return 0;
     }
-    return momentDate[unit]();
 };
 
 /**
  * 转换为时间戳
- * @param {string|number|Date|moment.Moment} date - 基准日期
+ * @param {string|number|Date|Dayjs} date - 基准日期
  * @param {boolean} isMillisecond - 是否返回毫秒级（默认false：秒级）
  * @returns {number} 时间戳
  */
-const toDateTimestamp = (date, isMillisecond = false) => {
-    const momentDate = initDate(date);
-    return isMillisecond ? momentDate.valueOf() : momentDate.unix();
+const toDateTimestamp = (date: ConfigType, isMillisecond = false): number => {
+    const dayjsDate = initDate(date);
+    return isMillisecond ? dayjsDate.valueOf() : dayjsDate.unix();
 };
 
 /**
  * 格式化相对时间（如：几秒前、几小时前）
- * @param {string|number|Date|moment.Moment} date - 基准日期
+ * @param {string|number|Date|Dayjs} date - 基准日期
  * @returns {string} 相对时间字符串（中文）
  */
-const formatFromNow = (date) => {
+const formatFromNow = (date: ConfigType): string => {
     return initDate(date).fromNow();
 };
 
 /**
  * 获取当月的第一天/最后一天
- * @param {string|number|Date|moment.Moment} date - 基准日期
+ * @param {string|number|Date|Dayjs} date - 基准日期
  * @param {boolean} isFirst - true: 第一天；false: 最后一天
  * @param {string} format - 输出格式
  * @returns {string} 对应日期
  */
-const getMonthEdgeDate = (date, isFirst = true, format = 'YYYY-MM-DD') => {
-    const momentDate = initDate(date);
+const getMonthEdgeDate = (
+    date: ConfigType,
+    isFirst = true,
+    format = 'YYYY-MM-DD'
+): string => {
+    const dayjsDate = initDate(date);
     return isFirst
-        ? momentDate.startOf('month').format(format)
-        : momentDate.endOf('month').format(format);
+        ? dayjsDate.startOf('month').format(format)
+        : dayjsDate.endOf('month').format(format);
 };
 
 /**
@@ -140,38 +204,45 @@ const getMonthEdgeDate = (date, isFirst = true, format = 'YYYY-MM-DD') => {
  * @param onlyDate 超过30天是否仅返回日期
  * @returns {string} 语义化后的时间
  */
-const getTimeAgoString = (time, onlyDate) => {
+const getTimeAgoString = (time: ConfigType, onlyDate: boolean): string => {
     if (!time) return '';
+    // Day.js 原生支持 '-' 分隔的日期，无需替换为 '/'（兼容原逻辑，保留也可）
     if (typeof time === 'string') time = time.replace(/-/g, '/');
-    let arr = [ [], [] ];
-    let timestamp = new Date().getTime() - new Date(time).getTime();
+
+    let arr: string[][] = [ [], [] ];
+    const currentTime = dayjs().valueOf();
+    const targetTime = dayjs(time).valueOf();
+    let timestamp = currentTime - targetTime;
+
     // 30天以上返回具体日期
     if (timestamp > 1000 * 60 * 60 * 24 * 31) {
-        let date = new Date(time);
-        arr[0][0] = setNumAddZero(date.getFullYear(), 4);
-        arr[0][1] = setNumAddZero(date.getMonth() + 1);
-        arr[0][2] = setNumAddZero(date.getDate());
+        const date = dayjs(time);
+        arr[0][0] = setNumAddZero(date.year(), 4);
+        arr[0][1] = setNumAddZero(date.month() + 1);
+        arr[0][2] = setNumAddZero(date.date());
+
         // 是否输出时间
         if (!onlyDate) {
-            arr[1][0] = setNumAddZero(date.getHours());
-            arr[1][1] = setNumAddZero(date.getMinutes());
-            arr[1][2] = setNumAddZero(date.getSeconds());
+            arr[1][0] = setNumAddZero(date.hour());
+            arr[1][1] = setNumAddZero(date.minute());
+            arr[1][2] = setNumAddZero(date.second());
         }
         return arr[0].join('-') + ' ' + arr[1].join(':');
     }
+
     // 30天以内，返回“多久前”
     if (timestamp >= 1000 * 60 * 60 * 24) {
-        return ((timestamp / 1000 / 60 / 60 / 24) | 0) + '天前';
+        return Math.floor(timestamp / 1000 / 60 / 60 / 24) + '天前';
     } else if (timestamp >= 1000 * 60 * 60) {
-        return ((timestamp / 1000 / 60 / 60) | 0) + '小时前';
+        return Math.floor(timestamp / 1000 / 60 / 60) + '小时前';
     } else if (timestamp >= 1000 * 60 * 3) {  // 3分钟以内为：刚刚
-        return ((timestamp / 1000 / 60) | 0) + '分钟前';
+        return Math.floor(timestamp / 1000 / 60) + '分钟前';
     } else if (timestamp < 0) {
         return '未来';
     } else {
         return '刚刚';
     }
-}
+};
 
 export {
     formatDate,
@@ -184,8 +255,5 @@ export {
     toDateTimestamp,
     formatFromNow,
     getMonthEdgeDate,
-
-
     getTimeAgoString,
-
-}
+};

package/lib/utils/rsaAesUtils.ts

@@ -6,25 +6,49 @@ import { rsaEncrypt, rsaDecrypt } from "./rsaUtils";
  * rsaAes加密
  * @param rsaPublicKey rsa公钥
  * @param aesKey aes秘钥
- * @param oiginData 原始数据
+ * @param originalData 原始数据
  */
-const rsaAesEncrypt = (rsaPublicKey, aesKey, oiginData) => {
+const rsaAesEncrypt = (rsaPublicKey:string, aesKey:string, originalData:string) => {
+    if(!rsaPublicKey){
+        throw new Error('参数[rsaPublicKey]为空');
+    }
+    if(!aesKey){
+        throw new Error('参数[aesKey]为空');
+    }
+    if(!originalData){
+        throw new Error('参数[originalData]为空');
+    }
+    console.log(rsaPublicKey, aesKey, originalData);
     // 用登陆后后端生成并返回给前端的的RSA密钥对的公钥将AES16位密钥进行加密
-    const rsaAesKey = rsaEncrypt(gatewayPublicKey, aesKey);
+    const rsaAesKey = rsaEncrypt(rsaPublicKey, aesKey);
+
+    console.log('rsaAesKey', rsaAesKey);
+
     // 使用AES16位的密钥将请求报文加密（使用的是加密前的aes密钥）
-    const aesEncryptData = aesEncrypt(aesKey, oiginData);
+    const aesEncryptData = aesEncrypt(aesKey, originalData);
 
     return { rsaAesKey, aesEncryptData };
 }
 
 /**
- * rsaAes解密
+ * rsaAes解密  未验证成功，后面处理
  * @param rsaPrivateKey rsa私钥
  * @param rsaAesKey rsa私钥
  * @param encryptData 加密的数据
  */
-const rsaAesDecrypt = (rsaPrivateKey, rsaAesKey, encryptData) => {
-    let aesKey = rsaDecrypt(rsaPrivateKey, rsaAesKey);
+const rsaAesDecrypt = (rsaPrivateKey:string, rsaAesKey:string, encryptData:string) => {
+    if(!rsaPrivateKey){
+        throw new Error('参数[rsaPrivateKey]为空');
+    }
+    if(!rsaAesKey){
+        throw new Error('参数[rsaAesKey]为空');
+    }
+    if(!encryptData){
+        throw new Error('参数[encryptData]为空');
+    }
+    const aesKey: any = rsaDecrypt(rsaPrivateKey, rsaAesKey);
+
+    console.log('aesKey', aesKey);
 
     let decryptData = aesDecrypt(aesKey, encryptData);
 

package/lib/utils/rsaUtils.ts

@@ -42,12 +42,20 @@ const getRsaKeys = () => {
 /**
  * rsa加密
  * @param publicKey
- * @param oiginData
+ * @param originalData
  */
-const rsaEncrypt = (publicKey, oiginData) => {
+const rsaEncrypt = (publicKey: string, originalData: string) => {
+    if(!publicKey){
+        throw new Error('参数[publicKey]为空');
+    }
+    if(!originalData){
+        throw new Error('参数[originalData]为空');
+    }
     const encryptor = new JSEncrypt();
     encryptor.setPublicKey(publicKey);
-    return encryptor.encrypt(oiginData);
+
+    const encryptData = encryptor.encrypt(originalData);
+    return encryptData;
 }
 
 /**
@@ -55,13 +63,23 @@ const rsaEncrypt = (publicKey, oiginData) => {
  * @param privateKey
  * @param encryptData
  */
-const rsaDecrypt = (privateKey, encryptData) => {
+const rsaDecrypt = (privateKey:string, encryptData:string) => {
+    if(!privateKey){
+        throw new Error('参数[privateKey]为空');
+    }
+    if(!encryptData){
+        throw new Error('参数[encryptData]为空');
+    }
     const encryptor = new JSEncrypt();
     encryptor.setPrivateKey(privateKey);
-    return encryptor.decrypt(encryptData);
+    const decryptData = encryptor.decrypt(encryptData);
+
+    console.log('decryptData', decryptData);
+
+    return decryptData;
 }
 
-const convertText = (buffer, isPrivate = 0) => {
+const convertText = (buffer: any, isPrivate = 0) => {
     var binary = ''
     var bytes = new Uint8Array(buffer)
     var len = bytes.byteLength

package/lib/utils/ssoUtils.ts

@@ -120,41 +120,7 @@ const handleSsoAuth = (to : any, from : any) => {
     });
 }
 
-/**
- * 获取sso加密参数
- * 后续改成 rsaAesUtils 里面去实现
- * @param password
- */
-const getSsoEncrypt = (password = '') => {
-    let gatewayPublicKey = getLocalStorageItem('gatewayPublicKey');
-    // 每次请求生成aeskey
-    let aesKey = getAesRandomKey();
-    // 用登陆后后端生成并返回给前端的的RSA密钥对的公钥将AES16位密钥进行加密
-    const rsaAesKey = rsaEncrypt(gatewayPublicKey, aesKey);
-    // 使用AES16位的密钥将请求报文加密（使用的是加密前的aes密钥）
-    const encryptPassword = aesEncrypt(aesKey, password);
-
-    return { encryptPassword, rsaAesKey };
-}
 
-/**
- * 获取sso加密参数列表
- * @param password
- */
-const getSsoEncryptList = (passwordList = []) => {
-    let gatewayPublicKey = getLocalStorageItem('gatewayPublicKey');
-    // 每次请求生成aeskey
-    let aesKey = getAesRandomKey();
-    // 用登陆后后端生成并返回给前端的的RSA密钥对的公钥将AES16位密钥进行加密
-    const rsaAesKey = rsaEncrypt(gatewayPublicKey, aesKey);
-    // 使用AES16位的密钥将请求报文加密（使用的是加密前的aes密钥）
-    const encryptPasswordList = [];
-    for (let i = 0; i < passwordList.length; i++) {
-        encryptPasswordList[i] = aesEncrypt(aesKey, passwordList[i]);
-    }
-
-    return { encryptPasswordList, rsaAesKey };
-}
 
 
 const ssoAccessTokenCookieKey: string = 'Sso-Access-Token';
@@ -228,7 +194,7 @@ const clearSsoAccessToken = () => {
 
 }
 
-const setSsoIdentity = (ssoIdentity) => {
+const setSsoIdentity = (ssoIdentity:object) => {
     if(!ssoIdentity) {
         console.error('参数[ssoIdentity]为null');
         return;
@@ -258,9 +224,6 @@ export {
     getSsoLogoutUrl,
     handleSsoAuth,
 
-    getSsoEncrypt,
-    getSsoEncryptList,
-
     getSsoAccessToken,
     setSsoAccessToken,
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-common",
-  "version": "1.0.101",
+  "version": "1.0.103",
   "private": false,
   "type": "module",
   "scripts": {
@@ -29,11 +29,11 @@
     "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.7.3",
     "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.13",
     "element-plus": "^2.8.4",
     "js-cookie": "^3.0.5",
     "jsencrypt": "^3.3.2",
     "lodash": "^4.17.21",
-    "moment": "^2.30.1",
     "pinia": "^2.1.7",
     "safe-stringify": "^1.1.1",
     "vant": "^4.9.8",

package/src/router/index.ts

@@ -19,6 +19,10 @@ const router = createRouter({
             path: '/utils/rsa-utils',
             component: () => import('@/views/utils/rsa-utils.vue')
         },
+        {
+            path: '/utils/rsa-aes-utils',
+            component: () => import('@/views/utils/rsa-aes-utils.vue')
+        },
         {
             path: '/utils/sso-utils',
             component: () => import('@/views/utils/sso-utils.vue')

package/src/views/utils/rsa-aes-utils.vue

@@ -1,3 +1,6 @@
+<!--
+http://localhost:8020/framework-ui-common/utils/rsa-aes-utils
+-->
 <template>
 <div>encryptData：{{ encryptData }}</div>
 <div>decryptData：{{ decryptData }}</div>
@@ -6,20 +9,20 @@
 <script setup lang="ts">
 import {onMounted, ref} from 'vue';
 import { rsaAesDecrypt, rsaAesEncrypt } from '../../../lib/utils/rsaAesUtils';
-import { getLocalStorageItem } from "../../../lib/utils/storageUtils";
 import { getAesRandomKey } from "../../../lib/utils/aesUtils";
 
 let encryptData = ref({});
 let decryptData = ref('');
 
 onMounted(async () => {
-  let gatewayPublicKey = getLocalStorageItem('gatewayPublicKey');
+  let rsaPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlroQv10uuYLiupAw50WeqkHZ44Qw35IBz28xH4ZcMjUSn9mZhZpP9jMZqxxjS3W6vFsT+Wqp7XSl2q+rj91R7YxW5Mz3JazMCG+vj3dlgbTgqTgGf+QnQ4qIgSz3VKM56QLBXegcNv9IbGPmX+1gU14aB8cMQQYLEl0efNBFpzLnkfz+8HqHlbwc0tDDQTycf7HJXd0YziwQWmWsAZ9aNzhQBXOnI28MTqASHYRpVf1Cziu9aYBDM/Tqmb3wZKRR1s8RTUlzZfZ1XfRHsRu2xgVdb7+S0o5g4wVxFpGXK2PEAhidaTpnvasaWEU9/8KNdCC5hP8i+kMDv5MZ4RgDXQIDAQA";
+  let rsaPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCWuhC/XS65guK6kDDnRZ6qQdnjhDDfkgHPbzEfhlwyNRKf2ZmFmk/2MxmrHGNLdbq8WxP5aqntdKXar6uP3VHtjFbkzPclrMwIb6+Pd2WBtOCpOAZ/5CdDioiBLPdUoznpAsFd6Bw2/0hsY+Zf7WBTXhoHxwxBBgsSXR580EWnMueR/P7weoeVvBzS0MNBPJx/scld3RjOLBBaZawBn1o3OFAFc6cjbwxOoBIdhGlV/ULOK71pgEMz9OqZvfBkpFHWzxFNSXNl9nVd9EexG7bGBV1vv5LSjmDjBXEWkZcrY8QCGJ1pOme9qxpYRT3/wo10ILmE/yL6QwO/kxnhGANdAgMBAAECggEAE3CO/WdiwdlgLaiwLfvcMWBJ3l6rwQH/SsYwAz1cgbs3mjdB5inXW00O5/NC2TYnbeifRGFd5jrPs0tJ6MWmLemWQW8wBwNo00O4VFwVUuvFt/16VR9TcxIYdfSbN6bPrr5EuzxW+z7kk9o0mbWvYUE3QT6KVY6WeflZl8Zy3VPwKiqxcuI5+SbWrlSslCta1rg2pikQ6ALkWzQOeSpMafAW5GdQmCvyKQ2K1QCfXnGnqpPYiWcsGxXFRAFoa61IxedE6EKmIg49lF5G/5X2WHa/Ljb0s9z0EGf9sonmpYEfG8m5RceBjDWsUyUZG+WDgM+9umpkvGYnU+MScNQmoQKBgQDQAtayKVoZHL09XhjQoTlMjh00fZ9rihRZbY2yIfgsIGl3oZFOEnBSXye3mAQpjKuw81fw1UAqmzwMCleEs+WCs5CGqN1uLChH+WJPIi1qdWbUG6tSexW8qmZM0w5PBenV9HeaRzJJwfMYJglM90xH7M0XWLnttgDmf+ivc8tKcQKBgQC5gAKt1HKWzac2Z4xSfOHUclQTDhLZYGL/JDITAUsmoaC9FjUH/SAnKkf5SLdvj90ZH8pM/O5Ct8UcHCNWYYn1w08swILnx96x2WvfweuHaCof1yBafBk5jhMPxhOfognGKwrolhzqEKPtZQcRbNBc7jgSOs3rJU7y86nr1KqFrQKBgQCZGT3EK8NwsEJopJVHGSL/QaolNEDd+ec4WvXroizy7Xgy4Ov9tnyNZBPrgSuvGSZVOwYC8DImKdNsWUBJH89Q/7DkK+2uZTnQn7DH5bPfo0Fn5GWYc5dwIUriSIVDjGqrWx+cocJVnza5E2XNDEdMuPHKuTc/yrGm9YXhfSynQQKBgQCAQy4XCdWtxkc/S/vvsV/pKKBPiKSp34a0ClABahyPeqSM+gTzICgSTJ71lD0aC6yCScP01dLdGPpWxHH+sXTWFRTyya36G+40pTR8xDZaK0EtQO+jATnj3QP7HSfGciE1/98MEXeutJDUfc2UU9wC1ci5eiWV2Pcs8CRm52Z9BQKBgQDDqI2a5aCi5QxRMuapSC6DYvSNssyFOb1dZzGkVOaZg1sdDH6YEqOGaboMqAHnFooyPUYGp8s4nagYRt9X2Hc/RFHrH6jSlwXwKtiXNhMDjzKoDft2VfeDRui3TYRCLOZNpt6U1sq5Q/4sHQCUL5bXX5a58VMRqrvmidTzimJd9A=";
   let aesKey = getAesRandomKey();
-  encryptData.value  = rsaAesEncrypt(gatewayPublicKey, aesKey, '测试');
+  encryptData.value  = rsaAesEncrypt(rsaPublicKey, aesKey, '测试');
+  console.log('encryptData.value',encryptData.value);
 
-  let rsaPrivateKey = '';
-  decryptData = rsaAesDecrypt(rsaPrivateKey, encryptData.value.rsaAesKey, encryptData.value.encryptData);
 
+  decryptData.value = rsaAesDecrypt(rsaPrivateKey, encryptData.value.rsaAesKey, encryptData.value.aesEncryptData);
  })
 
 </script>