From 8470a4ae665d8b7f7621479c09664c7a3ff0f210 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 25 九月 2023 17:26:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
index dce0809..6229b63 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
@@ -173,16 +173,14 @@
}
String enStr2;
try {
- /*String pwdfree = aesEncrypt("pwdfree", secretKey);
- String s = aesEncrypt(pwdfree, clientId);*/
- // String enStr1 = aesDecrypt(empCode, secretKey);
- // enStr2 = aesDecrypt(enStr1, clientId);
+ String enStr1 = aesDecrypt(empCode, secretKey);
+ enStr2 = aesDecrypt(enStr1, clientId);
}catch (Exception e){
- throw new ServiceException("empCode鍙傛暟瑙ｅ瘑澶辫触锛佸師鍥�:"+e.getCause());
+ throw new ServiceException("empCode鍙傛暟瑙ｅ瘑澶辫触锛佸師鍥�:"+e.getMessage());
}
// 瑙ｅ瘑
- //log.debug("鍗曠偣鐧诲綍鍙傛暟瑙ｅ瘑鍚庯細"+enStr2);
- String token = this.passwordFreeLogin("pwdfree");
+ log.debug("鍗曠偣鐧诲綍鍙傛暟瑙ｅ瘑鍚庯細"+enStr2);
+ String token = this.passwordFreeLogin(enStr2);
return token;
}
--
Gitblit v1.9.3