Merge branch 'dev'

src/main/java/com/izouma/nineth/config/CacheConfig.java

@@ -11,8 +11,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.izouma.nineth.domain.User;
-import com.izouma.nineth.utils.PageJacksonModule;
-import com.izouma.nineth.utils.SortJacksonModule;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
@@ -141,6 +139,9 @@ public class CacheConfig {
                 .entryTtl(Duration.ofMinutes(15))
                 .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisTemplate.getValueSerializer())));
 
+        cacheNamesConfigurationMap.put("blindBoxRare", RedisCacheConfiguration.defaultCacheConfig()
+                .entryTtl(Duration.ofSeconds(2))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisTemplate.getValueSerializer())));
 
         RedisCacheManager redisCacheManager = RedisCacheManager.builder()
                 .cacheWriter(RedisCacheWriter.nonLockingRedisCacheWriter(redisTemplate.getConnectionFactory()))

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

@@ -27,6 +27,7 @@ public class BlindBoxItemService {
         return PageWrapper.of(blindBoxItemRepo.findAll(JpaUtils.toSpecification(pageQuery, BlindBoxItem.class), JpaUtils.toPageRequest(pageQuery)));
     }
 
+    @Cacheable(value = "blindBoxRare", key = "#blindBoxId")
     public HashMap<String, String> getBlindBoxRare(Long blindBoxId) {
         HashMap<String, String> rare = new HashMap<>();
         Map<String, BigDecimal> ssrMap = blindBoxItemRepo.getBlindBoxRare(blindBoxId, "%" + Constants.Rarity.SSR + " #%", "%" + Constants.Rarity.U + " #%");

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

@@ -7,6 +7,7 @@ import com.izouma.nineth.repo.UserPropertyRepo;
 import com.izouma.nineth.repo.UserRepo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -44,6 +45,8 @@ public class EventMgmtService {
     }
 
     @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
     public class VipPointDTO {
         @ExcelProperty("用户ID")
         private Long userId;