redis缓存

pom.xml

@@ -369,6 +369,11 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-hibernate4</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -4,14 +4,12 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.jsontype.DefaultBaseTypeLimitingValidator;
-import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
-import com.fasterxml.jackson.datatype.hibernate4.Hibernate4Module;
 import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
-import org.springframework.boot.autoconfigure.cache.RedisCacheManagerBuilderCustomizer;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -21,12 +19,10 @@ import org.springframework.data.redis.cache.RedisCacheWriter;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
-import java.time.Duration;
 
 @Configuration
 @AutoConfigureAfter({RedisAutoConfiguration.class, CacheAutoConfiguration.class})
@@ -47,7 +43,10 @@ public class CacheConfig {
         mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance,
                 ObjectMapper.DefaultTyping.NON_FINAL,
                 JsonTypeInfo.As.WRAPPER_ARRAY);
-        mapper.registerModule(new Hibernate5Module());
+        mapper.registerModule(new Hibernate5Module()
+                .enable(Hibernate5Module.Feature.FORCE_LAZY_LOADING));
+        mapper.registerModule(new JavaTimeModule());
+        mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
         serializer.setObjectMapper(mapper);
 
         template.setValueSerializer(serializer);

src/main/java/com/izouma/nineth/domain/UserToken.java

@@ -1,30 +1,20 @@
 package com.izouma.nineth.domain;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.redis.core.RedisHash;
 
-import javax.persistence.*;
 
 @Data
-@Entity
 @AllArgsConstructor
 @NoArgsConstructor
-@Builder
-@Table(indexes = {@Index(columnList = "userId")})
-public class UserToken extends BaseEntity {
+@RedisHash("UserToken")
+public class UserToken {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
-
-    private Long userId;
+    private String username;
 
     private String token;
-
-    public UserToken(Long userId, String token) {
-        this.userId = userId;
-        this.token = token;
-    }
 }

src/main/java/com/izouma/nineth/dto/UserDTO.java

@@ -7,6 +7,16 @@ import lombok.Data;
 @Data
 public class UserDTO extends User {
 
+    private String password;
+
+    private String nftAccount;
+
+    private String kmsId;
+
+    private String publicKey;
+
+    private String tradeCode;
+
     @ApiModelProperty("是否关注")
     private boolean follow;
 

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

@@ -1,11 +1,14 @@
 package com.izouma.nineth.repo;
 
 import com.izouma.nineth.domain.Collection;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
+import javax.annotation.Nonnull;
 import javax.transaction.Transactional;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -17,6 +20,9 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
     @Transactional
     void softDelete(Long id);
 
+    @Cacheable("collection")
+    Optional<Collection> findById(Long id);
+
     Optional<Collection> findByIdAndDelFalse(Long id);
 
     @Query("update Collection t set t.likes = t.likes + ?2 where t.id = ?1")
@@ -29,4 +35,8 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
     List<Collection> userLikes(Long userId);
 
     List<Collection> findByScheduleSaleTrueAndOnShelfFalseAndStartTimeBeforeAndDelFalse(LocalDateTime time);
+
+    @Nonnull
+    @CachePut(value = "collection", key = "#collection.id")
+    Collection save(@Nonnull Collection collection);
 }

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

@@ -18,7 +18,7 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
     @Query("update User u set u.del = true where u.id = ?1")
     void softDelete(Long id);
 
-    Optional<User> findByUsernameAndDelFalse(String username);
+    User findByUsernameAndDelFalse(String username);
 
     List<User> findAllByAuthoritiesContainsAndDelFalse(Authority authority);
 

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

@@ -3,14 +3,12 @@ package com.izouma.nineth.repo;
 import com.izouma.nineth.domain.UserToken;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
 import javax.transaction.Transactional;
 import java.util.Optional;
 
-public interface UserTokenRepo extends JpaRepository<UserToken, Long> {
-    @Modifying
-    @Transactional
-    int deleteByUserId(Long userId);
-
-    Optional<UserToken> findFirstByToken(String token);
+@Repository
+public interface UserTokenRepo extends CrudRepository<UserToken, String> {
 }

src/main/java/com/izouma/nineth/security/Authority.java

@@ -1,6 +1,7 @@
 package com.izouma.nineth.security;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.izouma.nineth.enums.AuthorityName;
 import lombok.*;
 
@@ -15,8 +16,9 @@ import java.util.Objects;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(value = {"hibernateLazyInitializer"}, ignoreUnknown = true)
 public class Authority implements Serializable {
 
     public static Authority get(AuthorityName name) {
@@ -47,16 +49,4 @@ public class Authority implements Serializable {
 
         return Objects.equals(name, authority.name);
     }
-
-    @Override
-    public int hashCode() {
-        return name != null ? name.hashCode() : 0;
-    }
-
-    @Override
-    public String toString() {
-        return "Authority{" +
-                "name='" + name + '\'' +
-                "}";
-    }
 }

src/main/java/com/izouma/nineth/security/JwtAuthorizationTokenFilter.java

@@ -27,13 +27,11 @@ public class JwtAuthorizationTokenFilter extends OncePerRequestFilter {
     private final UserDetailsService userDetailsService;
     private final JwtTokenUtil       jwtTokenUtil;
     private final String             tokenHeader;
-    private final UserTokenRepo      userTokenRepo;
 
-    public JwtAuthorizationTokenFilter(@Qualifier("jwtUserDetailsService") UserDetailsService userDetailsService, JwtTokenUtil jwtTokenUtil, @Value("${jwt.header}") String tokenHeader, UserTokenRepo userTokenRepo) {
+    public JwtAuthorizationTokenFilter(@Qualifier("jwtUserDetailsService") UserDetailsService userDetailsService, JwtTokenUtil jwtTokenUtil, @Value("${jwt.header}") String tokenHeader) {
         this.userDetailsService = userDetailsService;
         this.jwtTokenUtil = jwtTokenUtil;
         this.tokenHeader = tokenHeader;
-        this.userTokenRepo = userTokenRepo;
     }
 
     @Override

src/main/java/com/izouma/nineth/security/JwtTokenUtil.java

@@ -62,7 +62,7 @@ public class JwtTokenUtil implements Serializable {
 
     private Boolean isTokenExpired(String token) {
         final Date expiration = getExpirationDateFromToken(token);
-        return expiration.before(clock.now()) || !userTokenRepo.findFirstByToken(token).isPresent();
+        return expiration.before(clock.now()) || !userTokenRepo.findById(getUsernameFromToken(token)).isPresent();
     }
 
     private Boolean isCreatedBeforeLastPasswordReset(Date created, Date lastPasswordReset) {
@@ -78,8 +78,8 @@ public class JwtTokenUtil implements Serializable {
         JwtUser jwtUser = (JwtUser) userDetails;
         Map<String, Object> claims = new HashMap<>();
         String token = doGenerateToken(claims, userDetails.getUsername());
-        userTokenRepo.deleteByUserId(jwtUser.getUser().getId());
-        userTokenRepo.save(new UserToken(jwtUser.getUser().getId(), token));
+        userTokenRepo.deleteById(jwtUser.getUser().getUsername());
+        userTokenRepo.save(new UserToken(jwtUser.getUser().getUsername(), token));
         return token;
     }
 

src/main/java/com/izouma/nineth/security/JwtUserDetailsService.java

@@ -1,7 +1,6 @@
 package com.izouma.nineth.security;
 
-import com.izouma.nineth.domain.User;
-import com.izouma.nineth.repo.UserRepo;
+import com.izouma.nineth.dto.UserDTO;
 import com.izouma.nineth.service.UserService;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -16,7 +15,7 @@ public class JwtUserDetailsService implements UserDetailsService {
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        User user = userService.findByUsernameAndDelFalse(username).orElse(null);
+        UserDTO user = userService.findByUsernameAndDelFalse(username);
 
         if (user == null) {
             throw new UsernameNotFoundException(String.format("No user found with username '%s'.", username));

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

@@ -61,7 +61,7 @@ public class UserService {
     private FollowService  followService;
     private FollowRepo     followRepo;
 
-    //    @CacheEvict(value = "user", key = "#user.username")
+    @CacheEvict(value = "user", key = "#user.username")
     public User update(User user) {
         User orig = userRepo.findById(user.getId()).orElseThrow(new BusinessException("无记录"));
         ObjUtils.merge(orig, user);
@@ -73,9 +73,18 @@ public class UserService {
         return orig;
     }
 
-    //    @Cacheable("user")
-    public Optional<User> findByUsernameAndDelFalse(String username) {
-        return userRepo.findByUsernameAndDelFalse(username);
+    @Cacheable("user")
+    public UserDTO findByUsernameAndDelFalse(String username) {
+        User user = userRepo.findByUsernameAndDelFalse(username);
+        if (user != null) {
+            UserDTO dto = new UserDTO();
+            BeanUtils.copyProperties(user, dto);
+            if (user.getAuthorities() != null) {
+                dto.setAuthorities(new HashSet<>(user.getAuthorities()));
+            }
+            return dto;
+        }
+        return null;
     }
 
     public Page<User> all(PageQuery pageQuery) {
@@ -308,6 +317,9 @@ public class UserService {
     public UserDTO toDTO(User user, boolean join) {
         UserDTO userDTO = new UserDTO();
         BeanUtils.copyProperties(user, userDTO);
+        if (user.getAuthorities() != null) {
+            userDTO.setAuthorities(new HashSet<>(user.getAuthorities()));
+        }
         if (join) {
             if (SecurityUtils.getAuthenticatedUser() != null) {
                 userDTO.setFollow(followService.isFollow(SecurityUtils.getAuthenticatedUser().getId(), user.getId()));

src/main/resources/application.yaml

@@ -31,6 +31,7 @@ spring:
     properties:
       hibernate:
         enable_lazy_load_no_trans: true
+    open-in-view: true
   redis:
     host: 118.178.226.110
     port: 6379

src/test/java/com/izouma/nineth/service/UserServiceTest.java

@@ -0,0 +1,17 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.ApplicationTests;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.junit.Assert.*;
+
+public class UserServiceTest extends ApplicationTests {
+
+    @Autowired
+    private UserService userService;
+
+    @Test
+    public void findByUsernameAndDelFalse1() {
+    }
+}