Commit 650186f4 authored by 常学朋's avatar 常学朋

Merge branch 'feature-202510141738-useresResetPwd' into 'master'

Feature 202510141738 useres reset pwd

See merge request !129
parents b0ba389e 2db3d272
...@@ -340,6 +340,7 @@ public class SessionServiceImpl implements ISessionService { ...@@ -340,6 +340,7 @@ public class SessionServiceImpl implements ISessionService {
useIdKeys.forEach(key -> { useIdKeys.forEach(key -> {
log.info("[deleteByUserId]删除用户userId={}的缓存信息", userId); log.info("[deleteByUserId]删除用户userId={}的缓存信息", userId);
String token = stringRedisTemplate.opsForValue().get(String.valueOf(key)); String token = stringRedisTemplate.opsForValue().get(String.valueOf(key));
deleteOthrer(token);
String userTokenKey = getUserTokenKey(token, tenantId); String userTokenKey = getUserTokenKey(token, tenantId);
log.info("[deleteByUserId]删除用户userId={}的缓存信息,token:{},userTokenKey:{},key:{}", userId,token,userTokenKey,key); log.info("[deleteByUserId]删除用户userId={}的缓存信息,token:{},userTokenKey:{},key:{}", userId,token,userTokenKey,key);
stringRedisTemplate.delete(getUserTokenKey(token, tenantId)); stringRedisTemplate.delete(getUserTokenKey(token, tenantId));
...@@ -350,6 +351,7 @@ public class SessionServiceImpl implements ISessionService { ...@@ -350,6 +351,7 @@ public class SessionServiceImpl implements ISessionService {
} }
} }
private String getUserTokenKey(String token, Integer tenantId) { private String getUserTokenKey(String token, Integer tenantId) {
String tokenKey2; String tokenKey2;
if (tenantId == null || UserConstant.defaultTenantId.equals(tenantId)) { if (tenantId == null || UserConstant.defaultTenantId.equals(tenantId)) {
...@@ -414,18 +416,7 @@ public class SessionServiceImpl implements ISessionService { ...@@ -414,18 +416,7 @@ public class SessionServiceImpl implements ISessionService {
log.info("登出失败,token对应的用户和租户信息不匹配,token:{} , user: {}", token, JSON.toJSONString(user)); log.info("登出失败,token对应的用户和租户信息不匹配,token:{} , user: {}", token, JSON.toJSONString(user));
return; return;
} }
if(token.contains(prefix)){ deleteOthrer(token);
// 请求其他系统信息
HashMap<String, String> parameters = new HashMap<>();
HashMap<String, String> headers = new HashMap<>();
headers.put("qg-tenant-id", TenantUtil.TENANT_DEFAULT.toString());
parameters.put("token", token);
parameters.put("uuidAuth", UUID_AUTH);
log.info("通知finance-gateway登出请求参数parameters:{} , headers: {}", JSON.toJSONString(parameters), JSON.toJSONString(headers));
String resultStr = httpService.postJson(userHost + "/card-holder/common/notify/finance/logout", headers, parameters);
log.info("通知finance-gateway登出接口成功:{} , result: {}", token, resultStr);
}
String tokenKey2; String tokenKey2;
if (UserConstant.defaultTenantId.equals(tenantId)) { if (UserConstant.defaultTenantId.equals(tenantId)) {
tokenKey2 = Constants.Session.USER_SESSION_CACHE + sessionStruct.getSid(); tokenKey2 = Constants.Session.USER_SESSION_CACHE + sessionStruct.getSid();
...@@ -444,6 +435,28 @@ public class SessionServiceImpl implements ISessionService { ...@@ -444,6 +435,28 @@ public class SessionServiceImpl implements ISessionService {
} }
} }
/**
* 同步远程 删除token
* @param token
*/
private void deleteOthrer(String token) {
try{
if(StringUtils.isNotEmpty(token) &&token.contains(prefix)){
HashMap<String, String> parameters = new HashMap<>();
HashMap<String, String> headers = new HashMap<>();
headers.put("qg-tenant-id", TenantUtil.TENANT_DEFAULT.toString());
parameters.put("token", token);
parameters.put("uuidAuth", UUID_AUTH);
log.info("通知finance-gateway登出请求参数parameters:{} , headers: {}", JSON.toJSONString(parameters), JSON.toJSONString(headers));
String resultStr = httpService.postJson(userHost + "/card-holder/common/notify/finance/logout", headers, parameters);
log.info("通知finance-gateway登出接口成功:{} , result: {}", token, resultStr);
}
}catch (Exception e){
log.error("通知finance-gateway登出异常", e);
}
}
@Override @Override
public void persistSessionExchange(String token, SessionValue sessionValue, long expire, Integer tenantId) { public void persistSessionExchange(String token, SessionValue sessionValue, long expire, Integer tenantId) {
Timestamp current = new Timestamp(System.currentTimeMillis()); Timestamp current = new Timestamp(System.currentTimeMillis());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment