后台登录优化

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

@@ -12,6 +12,7 @@ import com.mmc.iuav.user.model.vo.BackUserAccountVO;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
 import com.mmc.iuav.user.model.vo.UserAccountVO;
 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.stereotype.Component;
@@ -29,7 +30,7 @@ public class AuthHandler {
 
     @Autowired
     private RoleDao roleDao;
-    
+
     @Autowired
     private CompanyService companyService;
 
@@ -53,6 +54,8 @@ public class AuthHandler {
     }
 
     public LoginSuccessDTO addPcLoginCache(BackUserAccountVO user) {
+        // 清楚之前的登录信息
+        this.removePcLoginCache(user.getId());
         // 查询单位信息
         CompanyInfoVO companyInfoVO = companyService.getCompanyInfoByBackUserAccountId(user.getId());
         companyInfoVO.setLeader(1);
@@ -69,7 +72,36 @@ public class AuthHandler {
         stringRedisTemplate.opsForValue().set(
                 token, JSONObject.toJSONString(loginSuccessDTO),
                 JwtConstant.EXPIRATION, TimeUnit.MILLISECONDS);
-        loginSuccessDTO.setToken(token);
+        // 标记
+        stringRedisTemplate.opsForValue().set(
+                UserTypeEnums.PC.getTypeCode() + "_TOKEN_" + user.getId(), token,
+                JwtConstant.EXPIRATION, TimeUnit.MILLISECONDS);
         return loginSuccessDTO;
     }
+
+    /**
+     * @param userAccountId
+     * @description 删除小程序用户token
+     * redis key :APP_TOKEN_{ID}
+     */
+    public void removeAppLoginCache(Integer userAccountId) {
+        String appUserToken = stringRedisTemplate.opsForValue().get(UserTypeEnums.APP.getTypeCode() + "_TOKEN_" + userAccountId);
+        if (!StringUtils.isBlank(appUserToken)) {
+            stringRedisTemplate.delete(appUserToken);
+            stringRedisTemplate.delete(UserTypeEnums.APP.getTypeCode() + "_TOKEN_" + userAccountId);
+        }
+    }
+
+    /**
+     * @param backUserAccountId
+     * @description 删除PC用户token
+     * redis key :PC_TOKEN_{ID}
+     */
+    public void removePcLoginCache(Integer backUserAccountId) {
+        String pcUserToken = stringRedisTemplate.opsForValue().get(UserTypeEnums.PC.getTypeCode() + "_TOKEN_" + backUserAccountId);
+        if (!StringUtils.isBlank(pcUserToken)) {
+            stringRedisTemplate.delete(pcUserToken);
+            stringRedisTemplate.delete(UserTypeEnums.PC.getTypeCode() + "_TOKEN_" + backUserAccountId);
+        }
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/enums/UserTypeEnums.java

@@ -5,11 +5,12 @@ package com.mmc.iuav.user.enums;
  * @Date: 2023/8/14 16:52
  */
 public enum UserTypeEnums {
-    PC(0, "后台用户"), APP(100, "小程序用户");
+    PC(0, "后台用户", "PC"), APP(100, "小程序用户", "APP");
 
-    UserTypeEnums(Integer type, String typeName) {
+    UserTypeEnums(Integer type, String typeName, String typeCode) {
         this.type = type;
         this.typeName = typeName;
+        this.typeCode = typeCode;
     }
 
     public Integer getType() {
@@ -20,6 +21,11 @@ public enum UserTypeEnums {
         return typeName;
     }
 
+    public String getTypeCode() {
+        return typeCode;
+    }
+
     private Integer type;
     private String typeName;
+    private String typeCode;
 }

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

@@ -24,6 +24,7 @@ public class SmsUtil {
     private static String COOPERATION_TEMPLATE_PASS_CODE_2 = "SMS_462240459";
     private static String COOPERATION_TEMPLATE_PASS_CODE_3 = "SMS_462620535";
     private static String COOPERATION_TEMPLATE_PASS_CODE_4 = "SMS_462605558";
+    private static String COOPERATION_TEMPLATE_PASS_CODE_5 = "SMS_462575668";
 
     /**
      * 加盟审核未通过
@@ -31,7 +32,7 @@ public class SmsUtil {
     private static String COOPERATION_TEMPLATE_CODE_1 = "SMS_462095054";
 
     public static String sendPassCooperationApply(String phone) {
-        return send(CLOUD_JOIN_WEBSITE, COOPERATION_TEMPLATE_PASS_CODE_4, null, phone);
+        return send(CLOUD_JOIN_WEBSITE, COOPERATION_TEMPLATE_PASS_CODE_5, null, phone);
     }
 
     public static String sendNotPassCooperationApply(String phone) {