yuang-framework-ui-common 1.0.101 → 1.0.102

package/lib/utils/rsaAesUtils.ts

@@ -6,13 +6,26 @@ 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 };
 }
@@ -23,8 +36,19 @@ const rsaAesEncrypt = (rsaPublicKey, aesKey, oiginData) => {
  * @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

@@ -228,7 +228,7 @@ const clearSsoAccessToken = () => {
 
 }
 
-const setSsoIdentity = (ssoIdentity) => {
+const setSsoIdentity = (ssoIdentity:object) => {
     if(!ssoIdentity) {
         console.error('参数[ssoIdentity]为null');
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-common",
-  "version": "1.0.101",
+  "version": "1.0.102",
   "private": false,
   "type": "module",
   "scripts": {

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:8030/framework-ui-pc/utils/rsa-aes-utils
+-->
 <template>
 <div>encryptData：{{ encryptData }}</div>
 <div>decryptData：{{ decryptData }}</div>
@@ -6,20 +9,19 @@
 <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, '测试');
-
-  let rsaPrivateKey = '';
-  decryptData = rsaAesDecrypt(rsaPrivateKey, encryptData.value.rsaAesKey, encryptData.value.encryptData);
+  encryptData.value  = rsaAesEncrypt(rsaPublicKey, aesKey, '测试');
+  console.log('encryptData.value',encryptData.value);
 
+  decryptData.value = rsaAesDecrypt(rsaPrivateKey, encryptData.value.rsaAesKey, encryptData.value.aesEncryptData);
  })
 
 </script>