Merge branch 'ic-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into ic-deliver

f5ed17b7 · v_vjyjiang · f4637429 · 83cf946f · f5ed17b7
Commit f5ed17b7 authored Aug 14, 2020 by v_vjyjiang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ic-deliver/app/base/system.js
+2 -2

No files found.
--- a/ic-deliver/app/base/system.js
+++ b/ic-deliver/app/base/system.js
@@ -306,7 +306,7 @@ class System {
  */
 	static encryptStr (opStr) {
 		if (!opStr) {
-			return "opStr is empty";
+			return opStr;
 		}
 		let keyHex = cryptoJS.enc.Utf8.parse(settings.encrypt_key);
 		let ivHex = cryptoJS.enc.Utf8.parse(settings.encrypt_secret.substring(0, 8));
@@ -319,7 +319,7 @@ class System {
 	 */
 	static decryptStr (opStr) {
 		if (!opStr) {
-			return "opStr is empty";
+			return opStr;
 		}
 		try {
 			let keyHex = cryptoJS.enc.Utf8.parse(settings.encrypt_key);