Merge pull request #30 from linhaojun857/dev

merge dev

aurora-springboot/src/main/java/com/aurora/config/RabbitMQConfig.java

@@ -7,7 +7,7 @@ import org.springframework.amqp.core.Queue;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import static com.aurora.constant.MQPrefixConstant.*;
+import static com.aurora.constant.RabbitMQConstant.*;
 
 @Configuration
 public class RabbitMQConfig {

aurora-springboot/src/main/java/com/aurora/constant/RabbitMQConstant.java

@@ -1,6 +1,6 @@
 package com.aurora.constant;
 
-public class MQPrefixConstant {
+public class RabbitMQConstant {
 
     public static final String MAXWELL_QUEUE = "maxwell_queue";
 

aurora-springboot/src/main/java/com/aurora/constant/RedisConstant.java

@@ -1,6 +1,6 @@
 package com.aurora.constant;
 
-public class RedisPrefixConstant {
+public class RedisConstant {
 
     public static final long CODE_EXPIRE_TIME = 15 * 60;
 
@@ -22,6 +22,6 @@ public class RedisPrefixConstant {
 
     public static final String LOGIN_USER = "login_user";
 
-    public static final String ARTICLE_ACCESS = "article_access";
+    public static final String ARTICLE_ACCESS = "article_access:";
 
 }

aurora-springboot/src/main/java/com/aurora/consumer/CommentNoticeConsumer.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
 
 
 import static com.aurora.constant.CommonConstant.*;
-import static com.aurora.constant.MQPrefixConstant.EMAIL_QUEUE;
+import static com.aurora.constant.RabbitMQConstant.EMAIL_QUEUE;
 
 /**
  * @author 花未眠

aurora-springboot/src/main/java/com/aurora/consumer/MaxWellConsumer.java

@@ -11,7 +11,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import static com.aurora.constant.MQPrefixConstant.MAXWELL_QUEUE;
+import static com.aurora.constant.RabbitMQConstant.MAXWELL_QUEUE;
 
 
 /**

aurora-springboot/src/main/java/com/aurora/consumer/SubscribeConsumer.java

@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static com.aurora.constant.CommonConstant.TRUE;
-import static com.aurora.constant.MQPrefixConstant.SUBSCRIBE_QUEUE;
+import static com.aurora.constant.RabbitMQConstant.SUBSCRIBE_QUEUE;
 
 @Component
 @RabbitListener(queues = SUBSCRIBE_QUEUE)

aurora-springboot/src/main/java/com/aurora/quartz/AuroraQuartz.java

@@ -27,7 +27,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.aurora.constant.CommonConstant.UNKNOWN;
-import static com.aurora.constant.RedisPrefixConstant.*;
+import static com.aurora.constant.RedisConstant.*;
 
 @Slf4j
 @Component("auroraQuartz")

aurora-springboot/src/main/java/com/aurora/service/impl/ArticleServiceImpl.java

@@ -39,8 +39,8 @@ import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
-import static com.aurora.constant.MQPrefixConstant.SUBSCRIBE_EXCHANGE;
-import static com.aurora.constant.RedisPrefixConstant.*;
+import static com.aurora.constant.RabbitMQConstant.SUBSCRIBE_EXCHANGE;
+import static com.aurora.constant.RedisConstant.*;
 import static com.aurora.enums.ArticleStatusEnum.*;
 import static com.aurora.enums.StatusCodeEnum.ARTICLE_ACCESS_FAIL;
 
@@ -123,7 +123,7 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
         if (articleForCheck.getStatus().equals(2)) {
             Boolean isAccess;
             try {
-                isAccess = redisService.sIsMember(ARTICLE_ACCESS + ":" + UserUtil.getUserDetailsDTO().getId(), articleId);
+                isAccess = redisService.sIsMember(ARTICLE_ACCESS + UserUtil.getUserDetailsDTO().getId(), articleId);
             } catch (Exception exception) {
                 throw new BizException(ARTICLE_ACCESS_FAIL);
             }
@@ -167,7 +167,7 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
             throw new BizException("文章不存在");
         }
         if (article.getPassword().equals(articlePasswordVO.getArticlePassword())) {
-            redisService.sAdd(ARTICLE_ACCESS + ":" + UserUtil.getUserDetailsDTO().getId(), articlePasswordVO.getArticleId());
+            redisService.sAdd(ARTICLE_ACCESS + UserUtil.getUserDetailsDTO().getId(), articlePasswordVO.getArticleId());
         } else {
             throw new BizException("密码错误");
         }

aurora-springboot/src/main/java/com/aurora/service/impl/AuroraInfoServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 import static com.aurora.constant.CommonConstant.*;
-import static com.aurora.constant.RedisPrefixConstant.*;
+import static com.aurora.constant.RedisConstant.*;
 
 @Service
 public class AuroraInfoServiceImpl implements AuroraInfoService {

aurora-springboot/src/main/java/com/aurora/service/impl/CommentServiceImpl.java

@@ -40,7 +40,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 import static com.aurora.constant.CommonConstant.*;
-import static com.aurora.constant.MQPrefixConstant.EMAIL_EXCHANGE;
+import static com.aurora.constant.RabbitMQConstant.EMAIL_EXCHANGE;
 import static com.aurora.enums.CommentTypeEnum.*;
 
 @Service

aurora-springboot/src/main/java/com/aurora/service/impl/TokenServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.Optional;
 import java.util.UUID;
 
 import static com.aurora.constant.AuthConstant.*;
-import static com.aurora.constant.RedisPrefixConstant.LOGIN_USER;
+import static com.aurora.constant.RedisConstant.LOGIN_USER;
 
 
 @Service

aurora-springboot/src/main/java/com/aurora/service/impl/UserAuthServiceImpl.java

@@ -38,8 +38,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static com.aurora.constant.MQPrefixConstant.EMAIL_EXCHANGE;
-import static com.aurora.constant.RedisPrefixConstant.*;
+import static com.aurora.constant.RabbitMQConstant.EMAIL_EXCHANGE;
+import static com.aurora.constant.RedisConstant.*;
 import static com.aurora.enums.UserAreaTypeEnum.getUserAreaType;
 import static com.aurora.util.CommonUtil.checkEmail;
 import static com.aurora.util.CommonUtil.getRandomCode;

aurora-springboot/src/main/java/com/aurora/service/impl/UserInfoServiceImpl.java

@@ -30,7 +30,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.aurora.constant.RedisPrefixConstant.USER_CODE_KEY;
+import static com.aurora.constant.RedisConstant.USER_CODE_KEY;
 import static com.aurora.util.PageUtil.getLimitCurrent;
 import static com.aurora.util.PageUtil.getSize;