From a75ed7b2ec701afa546895653903e9c1f35db2b1 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 26 十月 2023 12:09:51 +0800
Subject: [PATCH] 主数据添加 编码申请添加-ts时间戳bug
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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..3b4a571 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
@@ -4,6 +4,7 @@
import com.vci.ubcs.code.entity.TokenUserObject;
import com.vci.ubcs.code.service.IPasswordFreeLoginService;
import com.vci.ubcs.starter.util.HttpUtils;
+import com.vci.ubcs.system.cache.NacosConfigCache;
import io.jsonwebtoken.Claims;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.auth.AuthenticationException;
@@ -107,7 +108,7 @@
String token2 = JwtUtil.getToken(authToken);
BladeUser user = this.getUser(token2);
//涓嶅瓨鍦ㄥ氨璇锋眰
- if(Func.isEmpty(authToken) || Func.isEmpty(user)){
+ if(Func.isEmpty(authToken) || Func.isEmpty(user) || !user.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId())){
String responseBody = this.passwordFreeLogin(userName);
//鎷垮埌鍝嶅簲浣撳叾涓寘鍚玹oken,鐢╮equest涓殑ip鍦板潃浣滀负閿�硷紝灏唗oken瀛樺叆缂撳瓨
TokenUserObject tokenUserObject = null;
@@ -173,16 +174,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