Merge branch 'dev' into 特权藏品

src/main/java/com/izouma/nineth/listener/RegisterListener.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 @Service
 @Slf4j
@@ -44,7 +45,14 @@ public class RegisterListener implements RocketMQListener<RegisterEvent> {
             redisTemplate.opsForValue().set("register::" + registerEvent.getPhone(), map, Duration.ofSeconds(600));
         } catch (Exception e) {
             map.put("status", "fail");
-            map.put("data", e.getMessage());
+            String message = e.getMessage();
+            if (Pattern.matches(".*SQL.*constraint.*user_index_phone.*", e.getMessage())) {
+                message = "手机号已注册";
+            }
+            if (Pattern.matches(".*SQL.*constraint.*username.*", e.getMessage())) {
+                message = "用户名已存在";
+            }
+            map.put("data", message);
             redisTemplate.opsForValue().set("register::" + registerEvent.getPhone(), map, Duration.ofSeconds(600));
         }
     }

src/main/java/com/izouma/nineth/repo/UserRepo.java

@@ -172,6 +172,8 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
 
     List<User> findAllByCreatedAtIsAfterAndAuthoritiesContains(LocalDateTime createdAt, Authority authorities);
 
+    List<User> findAllByCreatedAtIsAfterAndAdminFalse(LocalDateTime createdAt);
+
     List<User> findBySettleAccountIdIsNotNull();
 
     @Transactional

src/main/java/com/izouma/nineth/service/StatisticService.java

@@ -63,7 +63,7 @@ public class StatisticService {
     public Map<String, Long> userTrend(int day) {
         LocalDateTime date = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
         LocalDateTime start = date.minusDays(day);
-        List<User> users = userRepo.findAllByCreatedAtIsAfterAndAuthoritiesContains(start, Authority.get(AuthorityName.ROLE_USER));
+        List<User> users = userRepo.findAllByCreatedAtIsAfterAndAdminFalse(start);
         return users.stream().collect(Collectors.groupingBy(
                 item -> DateTimeFormatter.ofPattern("yyyy-MM-dd").format(item.getCreatedAt()), Collectors.counting()));
     }