From 8acfcd6e349ef2d1b797a7483940a2f3f2dfcfe6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:49:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils.js | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 61b28c5..fb3811a 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,6 +1,7 @@
import React from 'react'
import moment from 'moment'
import md5 from 'md5'
+// import NodeRSA from 'node-rsa'
const formatKeys = [
{ key: 'select', value: ' msltk ' },
@@ -119,10 +120,8 @@
* @description sql鍔犲瘑
* @return {String} value
*/
- static formatOptions (value) {
+ static formatOptions (value, exec_type = '') {
if (!value) return ''
-
- let salt = 'minKe' // 鐩愬��
value = value.replace(/\n/ig, ' \n ')
// 鏇挎崲鍏抽敭瀛�
@@ -136,13 +135,43 @@
if (window.GLOB.externalDatabase !== null) {
value = value.replace(/@db@/ig, window.GLOB.externalDatabase)
}
- // encode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛�
- value = window.btoa(window.encodeURIComponent(value))
- // 鎻掑叆瀛楃
- let index = Math.floor(value.length / 2)
- value = value.slice(0, index) + salt + value.slice(index)
- // base64鍔犲瘑
- value = window.btoa(value)
+
+ // if (exec_type === 'x') {
+ // // let publicKey = `-----BEGIN PUBLIC KEY-----
+ // // MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwGxFURiCrk5a2xfWuM3W
+ // // 2lkS3ioZhUFXpkK1inMivItsA/J8MTaBB3EAVxC29xdVCU+xOzs512PuD2b1sjzX
+ // // jwO6kx433NtB2okqGiP4RkzhEJHwdyc9dPUKdjirDznUWI9R7WayAf5Z4COhMsj2
+ // // IbkyJgkb6Ivn0UgU0GSWc92HqJJmnb3Ti2gk6A2+oybz2RE3+xB/yOaNu3xav4yi
+ // // xxo6harVLNBiaU+D7aDed1W3kE20gLOnEAvcLMjpe3n/QvF5RtELsm3T+vH3TIT2
+ // // GI9+8cT20NZ2d7i41+j/AQZiPJNS3MVmc3aIhuyCOsNPLmvbZZi1KPSJIqkCwdEg
+ // // mQIDAQAB
+ // // -----END PUBLIC KEY-----`
+
+ // // let pubKey = new NodeRSA(publicKey, 'pkcs8-public')
+
+ // // value = window.encodeURIComponent(value)
+ // // value = pubKey.encrypt(value, 'base64')
+
+ // // const priKey = new NodeRSA(privateKey, 'pkcs8-private')
+ // // const res = priKey.decrypt(value, 'utf8')
+ // } else {
+ // encode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛�
+ // let str = window.encodeURIComponent(value)
+
+ // if (str.length % 3 === 1) {
+ // str += '%2F*123*%2F'
+ // } else if (str.length % 3 === 2) {
+ // str += '%2F*12*%2F'
+ // }
+
+ value = window.btoa(window.encodeURIComponent(value))
+ // 鎻掑叆瀛楃
+ let salt = 'minKe' // 鐩愬��
+ let index = Math.floor(value.length / 2)
+ value = value.slice(0, index) + salt + value.slice(index)
+ // base64鍔犲瘑
+ value = window.btoa(value)
+ // }
return value
}
--
Gitblit v1.8.0