当前线程用户对象替换

sckw-common/sckw-common-core/src/main/java/com/sckw/core/aspect/DaoAspect.java

@@ -1,25 +1,24 @@
 package com.sckw.core.aspect;
 
-import com.sckw.core.model.auth.context.LoginUserHolder;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
-import jakarta.servlet.http.HttpServletRequest;
+import com.sckw.core.web.context.LoginUserHolder;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
 /**
  * DAO切面，插入创建人，创建时间，修改人，修改时间
+ *
  * @author zk
  * @date Oct 29, 2018
  */
@@ -56,11 +55,11 @@ public class DaoAspect {
         if (objects != null) {
             for (Object arg : objects) {
                 List<Object> objs = CollectionUtils.objectCastList(arg, Object.class);
-                if (CollectionUtils.isEmpty(objs)){
+                if (CollectionUtils.isEmpty(objs)) {
                     objs.add(arg);
                 }
                 Long userId = LoginUserHolder.getUserId();
-                objs.forEach(obj->{
+                objs.forEach(obj -> {
                     if (isProperty(obj, UPDATE_BY) && Objects.isNull(BeanUtils.getProperty(obj, UPDATE_BY)) && userId != null) {
                         BeanUtils.setProperty(obj, UPDATE_BY, userId);
                     }
@@ -84,7 +83,7 @@ public class DaoAspect {
         if (objects != null) {
             for (Object arg : objects) {
                 List<Object> objs = CollectionUtils.objectCastList(arg, Object.class);
-                if (CollectionUtils.isEmpty(objs)){
+                if (CollectionUtils.isEmpty(objs)) {
                     objs.add(arg);
                 }
                 Date date = new Date();

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/LoginFilter.java

@@ -74,7 +74,7 @@ public class LoginFilter implements Filter {
         //从redis获取用户信息
         String clientType = request.getHeader(RequestConstant.CLIENT_TYPE);
         String systemType = request.getHeader(RequestConstant.SYSTEM_TYPE);
-        Object object = RedissonUtils.get(Global.getFullUserLoginKey(Integer.parseInt(systemType), Long.parseLong(key), clientType));
+        Object object = RedissonUtils.getString(Global.getFullUserLoginKey(Integer.parseInt(systemType), Long.parseLong(key), clientType));
         if (Objects.isNull(object)) {
             throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.TOKEN_INVAILD);
         }

sckw-common/sckw-common-redis/src/main/java/com/sckw/redis/utils/RedissonUtils.java

@@ -64,11 +64,12 @@ public class RedissonUtils {
 
     /**
      * 批量删除
+     *
      * @param key 用*模糊匹配
      */
     public static void deleteBactch(String key) {
         Iterator<String> iterator = redissonUtils.redissonClient.getKeys().getKeysByPattern(key).iterator();
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             String word = iterator.next();
             RBucket<Object> bucket = redissonUtils.redissonClient.getBucket(word);
             bucket.delete();
@@ -227,12 +228,12 @@ public class RedissonUtils {
         return set.addAll(list);
     }
 
-    public static <T> boolean contains(String key, T value){
+    public static <T> boolean contains(String key, T value) {
         RSet<Object> set = redissonUtils.redissonClient.getSet(key);
-        return set.contains(value);
+        return set.isEmpty() ? Boolean.FALSE : set.contains(value);
     }
 
-    public static RSet<Object> getSet(String key){
+    public static RSet<Object> getSet(String key) {
         return redissonUtils.redissonClient.getSet(key);
     }
 

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/MessageService.java

@@ -1,10 +1,10 @@
 package com.sckw.message.service;
 
-import com.sckw.core.model.auth.context.LoginUserHolder;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.StringUtils;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.message.model.FindMessagePageParam;
 import com.sckw.message.model.KwmMessage;
 import com.sckw.message.model.KwmMessageUser;

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/SmsService.java

@@ -3,6 +3,7 @@ package com.sckw.message.service;
 import com.alibaba.fastjson2.JSON;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.utils.NumberUtils;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.message.constant.RedisConstant;
 import com.sckw.message.model.vo.req.SendSmsVerifyCoderReqVO;
 import com.sckw.redis.utils.RedissonUtils;
@@ -48,6 +49,7 @@ public class SmsService {
         Map<String, Object> params = new HashMap<>();
         params.put("code", NumberUtils.createRandomVcode());
         sckwSms.setParams(params);
+        sckwSms.setCreateBy(LoginUserHolder.getUserId());
         streamBridge.send("sckw-sms", JSON.toJSONString(sckwSms));
     }