From aff1e74c91387590bdb6371b1730fd76815bf489 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 七月 2025 16:06:55 +0800
Subject: [PATCH] 修改通用服务类
---
se-common/src/main/java/com/terra/common/service/CommonService.java | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/se-common/src/main/java/com/terra/common/service/CommonService.java b/se-common/src/main/java/com/terra/common/service/CommonService.java
index 664444b..a62e402 100644
--- a/se-common/src/main/java/com/terra/common/service/CommonService.java
+++ b/se-common/src/main/java/com/terra/common/service/CommonService.java
@@ -1,6 +1,7 @@
package com.terra.common.service;
import com.terra.common.entity.all.RedisCacheKey;
+import com.terra.common.entity.all.SettingData;
import com.terra.common.entity.lf.TokenPo;
import com.terra.common.entity.lf.UserPo;
import com.terra.common.helper.StringHelper;
@@ -13,7 +14,7 @@
import java.util.concurrent.TimeUnit;
/**
- * 浠ょ墝甯姪绫�
+ * 閫氱敤鏈嶅姟绫�
* @author WWW
*/
@Component
@@ -31,27 +32,15 @@
}
public UserPo getUserByToken(String token) {
- if (StringHelper.isNull(token)) {
- return null;
- }
+ if (StringHelper.isNull(token)) return null;
- // redis
- String userKey = RedisCacheKey.signUserKey(token);
- Object obj = redisService.get(userKey);
- if (obj instanceof UserPo) {
- return (UserPo) obj;
- }
+ TokenPo tokenPo = getTokenPo(token);
+ if (null == tokenPo) return null;
- // db
- UserPo po = mapper.selectByToken(token);
- if (null != po) {
- getEntityByToken(token);
- }
-
- return po;
+ return getUser(token);
}
- public TokenPo getEntityByToken(String token) {
+ public TokenPo getTokenPo(String token) {
String tokenKey = RedisCacheKey.signTokenKey(token);
// redis
@@ -61,18 +50,30 @@
}
// db
- TokenPo te = mapper.selectOneByToken(token);
- if (null != te) {
- long min = StringHelper.getMinuteDifference(te.getExpire());
- if (min > 0) {
- redisService.put(tokenKey, te, min, TimeUnit.MINUTES);
- }
+ TokenPo po = mapper.selectOneByToken(token);
+ if (null != po) {
+ long min = StringHelper.getMinuteDifference(po.getExpire());
+ redisService.put(tokenKey, po, min, TimeUnit.MINUTES);
}
- return te;
+ return po;
}
- public static String getCurrentUserName() {
- return null;
+ public UserPo getUser(String token) {
+ String userKey = RedisCacheKey.signUserKey(token);
+
+ // redis
+ Object obj = redisService.get(userKey);
+ if (obj instanceof UserPo) {
+ return (UserPo) obj;
+ }
+
+ // db
+ UserPo po = mapper.selectByToken(token);
+ if (null != po) {
+ redisService.put(userKey, po, SettingData.CACHE_EXPIRE, TimeUnit.MINUTES);
+ }
+
+ return po;
}
}
--
Gitblit v1.9.3