From 1707976c2f30199565c2ddbea0e2c33edd4688a9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 26 九月 2023 09:11:51 +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 | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 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 01aa00c..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
@@ -66,6 +66,7 @@
@Value("${password-free.secret-key:9fbd170bd83eb869}")
private String secretKey;//搴旂敤绉橀挜
+
@Autowired
private BladeRedis bladeRedis;
@@ -161,27 +162,25 @@
/**
* 鍗曠偣鐧诲綍
- * @param servletRequest
+ * @param empCode
* @return
* @throws Exception
*/
@Override
- public String ssoFreeLogin(ServletRequest servletRequest) throws Exception {
- HttpServletRequest request = (HttpServletRequest) servletRequest;
- // String empCode = Func.isEmpty(request.getHeader("empCode")) ? request.getParameter("empCode"):request.getHeader("empCode");
- String empCode = "test";
-// if(Func.isBlank(content)){
-// throw new ServiceException("鏈幏鍙栧埌empCode鍙傛暟");
-// }
- //鍔犲瘑
- String str1 = aesEncrypt(empCode, clientId);
- String str2 = aesEncrypt(str1, secretKey);
-
- String enStr1 = aesDecrypt(str2, secretKey);
- String enStr2 = aesDecrypt(enStr1, clientId);
+ public String ssoFreeLogin(String empCode) throws Exception {
+ if(Func.isBlank(empCode)){
+ throw new ServiceException("鏈幏鍙栧埌empCode鍙傛暟");
+ }
+ String enStr2;
+ try {
+ String enStr1 = aesDecrypt(empCode, secretKey);
+ enStr2 = aesDecrypt(enStr1, clientId);
+ }catch (Exception e){
+ throw new ServiceException("empCode鍙傛暟瑙ｅ瘑澶辫触锛佸師鍥�:"+e.getMessage());
+ }
// 瑙ｅ瘑
log.debug("鍗曠偣鐧诲綍鍙傛暟瑙ｅ瘑鍚庯細"+enStr2);
- String token = this.passwordFreeLogin("pwdfree");
+ String token = this.passwordFreeLogin(enStr2);
return token;
}
--
Gitblit v1.9.3