Merge branch 'develop'

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/LoginSuccessDTO.java

 package com.mmc.iuav.user.model.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/auth/AuthHandler.java

 package com.mmc.iuav.user.auth;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.google.gson.Gson;
 import com.mmc.iuav.auth.JwtConstant;
 import com.mmc.iuav.auth.JwtUtil;
 import com.mmc.iuav.user.dao.RoleDao;
@@ -12,6 +13,7 @@ import com.mmc.iuav.user.service.CompanyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
@@ -41,8 +43,9 @@ public class AuthHandler {
         String token = JwtUtil.createJwt(map);
         LoginSuccessDTO loginSuccessDTO = LoginSuccessDTO.builder().token(token).openId(userAccountVO.getOpenId()).userAccountId(userAccountVO.getId()).uid(userAccountVO.getId() + "")
                 .userName(userAccountVO.getUserName()).nickName(userAccountVO.getNickName()).phoneNum(userAccountVO.getPhoneNum()).portType(UserTypeEnums.APP.getType()).build();
+        stringRedisTemplate.setValueSerializer(RedisSerializer.json());
         stringRedisTemplate.opsForValue().set(
-                token, JSONObject.toJSONString(loginSuccessDTO),
+                token, new Gson().toJson(loginSuccessDTO),
                 JwtConstant.EXPIRATION, TimeUnit.MILLISECONDS);
 
         AppUserSucVO appUserSucVO = AppUserSucVO.builder().token(token).uid(userAccountVO.getUid()).phoneNum(userAccountVO.getPhoneNum())
@@ -56,8 +59,9 @@ public class AuthHandler {
         String token = JwtUtil.createJwt(map);
         LoginSuccessDTO loginSuccessDTO = LoginSuccessDTO.builder().token(token).userAccountId(userAccountVO.getId())
                 .phoneNum(userAccountVO.getPhoneNum()).portType(UserTypeEnums.APP.getType()).build();
+        stringRedisTemplate.setValueSerializer(RedisSerializer.json());
         stringRedisTemplate.opsForValue().set(
-                token, JSONObject.toJSONString(loginSuccessDTO),
+                token, new Gson().toJson(loginSuccessDTO),
                 JwtConstant.EXPIRATION, TimeUnit.MILLISECONDS);
         WebUserSucVO webUserSucVO = WebUserSucVO.builder().token(token).phoneNum(userAccountVO.getPhoneNum())
                 .nickName(userAccountVO.getNickName()).userAccountId(userAccountVO.getId()).build();
@@ -78,8 +82,9 @@ public class AuthHandler {
                 .userName(user.getUserName()).nickName(user.getUserName()).phoneNum(user.getPhoneNum()).portType(UserTypeEnums.PC.getType())
                 .companyInfoVO(companyInfoVO == null ? null : companyInfoVO)
                 .roleInfo(roleInfoDO.buildRoleInfoDTO()).build();
+        stringRedisTemplate.setValueSerializer(RedisSerializer.json());
         stringRedisTemplate.opsForValue().set(
-                token, JSONObject.toJSONString(loginSuccessDTO),
+                token, new Gson().toJson(loginSuccessDTO),
                 JwtConstant.EXPIRATION, TimeUnit.MILLISECONDS);
         // 标记
         stringRedisTemplate.opsForValue().set(

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/auth/TokenCheckHandleInterceptor.java

@@ -7,6 +7,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
@@ -41,6 +43,7 @@ public class TokenCheckHandleInterceptor implements HandlerInterceptor {
             exceptionProcess(response);
             return false;
         }
+        stringRedisTemplate.setValueSerializer(RedisSerializer.json());
         String tokenJson = stringRedisTemplate.opsForValue().get(token);
         if (StringUtils.isBlank(tokenJson)) {
             exceptionProcess(response);

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/BaseController.java

@@ -12,6 +12,7 @@ import io.jsonwebtoken.Claims;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.serializer.RedisSerializer;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -54,6 +55,7 @@ public abstract class BaseController {
         if (StringUtils.isBlank(token)){
             throw new BizException(ResultEnum.LOGIN_ACCOUNT_STATUS_ERROR);
         }
+        stringRedisTemplate.setValueSerializer(RedisSerializer.json());
         String json = stringRedisTemplate.opsForValue().get(token);
         if (StringUtils.isBlank(json)){
             throw new BizException(ResultEnum.LOGIN_ACCOUNT_STATUS_ERROR);

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/MessageServiceImpl.java

@@ -130,7 +130,9 @@ public class MessageServiceImpl implements MessageService {
         if(messageDao.insertUserMessage(userMessageDO) != 0){
             UserAccountDO userAccount = userServiceDao.getUserAccountById(userMessageDO.getReceiverUserId());
             UserDO userDO = userAccount.buildUserDO();
+            if(scheduledTaskUtil.check(userDO.getUserAccountId()) == 1){
                 scheduledTaskUtil.create(userDO);
+            }
             if(messageDao.isUserMessageLog(userMessageDO.getReceiverUserId(), userMessageDO.getSenderUserId()) == null){
                 UserMessageLogDO userMessageLogDO = new UserMessageLogDO();
                 userMessageLogDO.setSenderUserId(userMessageDO.getSenderUserId());

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/util/ScheduledTaskUtil.java

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.time.Instant;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -48,6 +49,30 @@ public class ScheduledTaskUtil {
         scheduledTasks.put(userDO.getUserAccountId(), scheduledFuture);
     }
 
+//    public void destroy(Integer userAccountId){
+//        redisTemplate.setValueSerializer(RedisSerializer.json());
+//        Set<String> keys = redisTemplate.keys("task" + userAccountId + "*");
+//        if(keys == null || keys.isEmpty()){
+//            return;
+//        }
+//        for (String key : keys) {
+//            redisTemplate.setValueSerializer(RedisSerializer.json());
+//            String s = redisTemplate.opsForValue().get(key);
+//            MyTask task = new Gson().fromJson(s, MyTask.class);
+//            ScheduledFuture<?> scheduledFuture = scheduledTasks.get(userAccountId);
+//            if (task != null && scheduledFuture != null) {
+//                scheduledFuture.cancel(false);
+//                redisTemplate.delete(key);
+//                scheduledTasks.remove(userAccountId);
+//            }
+//        }
+//        System.out.println("定时任务已取消");
+////        String s = redisTemplate.opsForValue().get("task" + userAccountId);
+////        if(s == null || s == ""){
+////            return;
+////        }
+//
+//    }
     public void destroy(Integer userAccountId){
         redisTemplate.setValueSerializer(RedisSerializer.json());
         String s = redisTemplate.opsForValue().get("task" + userAccountId);
@@ -63,4 +88,12 @@ public class ScheduledTaskUtil {
             System.out.println("定时任务已取消");
         }
     }
+    public int check(Integer userAccountId){
+        redisTemplate.setValueSerializer(RedisSerializer.json());
+        String s = redisTemplate.opsForValue().get("task" + userAccountId);
+        if(s == null || s == ""){
+            return 1;
+        }
+        return 0;
+    }
 }

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: dc89a6cdd82582e2e1308b924144dd3c8b2253bc
+  newTag: a7f5f1113aff6dd1891c5220ebb5dcb10f014899