miaofuhao 2 vuotta sitten
vanhempi
commit
016165562d

+ 4 - 2
WebChart/js/sm2/decrypt.js

@@ -10,11 +10,13 @@ function encryptFn(value){
10 10
 }
11 11
 //解密
12 12
 function decryptFn(value){
13
-	var decryptText = sm2.doDecrypt(value.slice(2), privateKey,0);
13
+	var decryptText = ""
14
+	if(value){
15
+		decryptText = sm2.doDecrypt(value.slice(2), privateKey,0);
16
+	}
14 17
 	return decryptText
15 18
 }
16 19
 function phoneTableClick(ele,data){
17
-	console.log(decryptFn(data))
18 20
 	ele.innerText =decryptFn(data)
19 21
 }
20 22
 function addPhoneHtml(ele,data,dataShow){

+ 4 - 3
WebChartNewest/js/sm2/decrypt.js

@@ -6,16 +6,17 @@ var privateKey ="BF1F907B4E0487F798DC80AFD7BC2A6201E8514233002272EA3BE2FC6F79784
6 6
 //加密
7 7
 function encryptFn(value){
8 8
 	var encrText = sm2.doEncrypt(value, publicKey,0);
9
-	console.log(encrText)
10 9
     return encrText
11 10
 }
12 11
 //解密
13 12
 function decryptFn(value){
14
-	var decryptText = sm2.doDecrypt(value.slice(2), privateKey,0);
13
+	var decryptText = ""
14
+	if(value){
15
+		decryptText = sm2.doDecrypt(value.slice(2), privateKey,0);
16
+	}
15 17
 	return decryptText
16 18
 }
17 19
 function phoneTableClick(ele,data){
18
-	console.log(decryptFn(data))
19 20
 	ele.innerText =decryptFn(data)
20 21
 }
21 22
 function addPhoneHtml(ele,data,dataShow){

+ 4 - 2
WebUI/CallCenterWeb.UI/js/sm2/decrypt.js

@@ -10,11 +10,13 @@ function encryptFn(value){
10 10
 }
11 11
 //解密
12 12
 function decryptFn(value){
13
-	var decryptText = sm2.doDecrypt(value.slice(2), privateKey,0);
13
+	var decryptText = ""
14
+	if(value){
15
+		decryptText = sm2.doDecrypt(value.slice(2), privateKey,0);
16
+	}
14 17
 	return decryptText
15 18
 }
16 19
 function phoneTableClick(ele,data){
17
-	console.log(decryptFn(data))
18 20
 	ele.innerText =decryptFn(data)
19 21
 }
20 22
 function addPhoneHtml(ele,data,dataShow){

+ 0 - 6
WebUI/CallCenterWeb.UI/login.html

@@ -389,12 +389,6 @@
389 389
 						var currenttime = CurentTime();
390 390
 						var datatime = currenttime.split(' ')[1].split(':').join('')
391 391
 						var encrypted = encryptFn($.md5(zx_psw))
392
-//						var key = CryptoJS.enc.Utf8.parse(")O[9d]6,YF}+efcaj{+8>Z'e9M" + datatime);
393
-//						var zx_psw = CryptoJS.enc.Utf8.parse($.md5(zx_psw));
394
-//						var encrypted = CryptoJS.AES.encrypt(zx_psw, key, {
395
-//							mode: CryptoJS.mode.ECB,
396
-//							padding: CryptoJS.pad.Pkcs7
397
-//						});
398 392
 						/*请求后台*/
399 393
 						$.cookie("extno", zx_fj);
400 394
 						$.cookie("zx_user", zx_user);

+ 4 - 2
webChartLogin/js/sm2/decrypt.js

@@ -10,11 +10,13 @@ function encryptFn(value){
10 10
 }
11 11
 //解密
12 12
 function decryptFn(value){
13
-	var decryptText = sm2.doDecrypt(value.slice(2), privateKey,0);
13
+	var decryptText = ""
14
+	if(value){
15
+		decryptText = sm2.doDecrypt(value.slice(2), privateKey,0);
16
+	}
14 17
 	return decryptText
15 18
 }
16 19
 function phoneTableClick(ele,data){
17
-	console.log(decryptFn(data))
18 20
 	ele.innerText =decryptFn(data)
19 21
 }
20 22
 function addPhoneHtml(ele,data,dataShow){