perf: 优化缓存模块

提升可读性 & 减小内存占用

novel-admin/src/main/java/com/java2nb/novel/controller/FriendLinkController.java

@@ -9,7 +9,7 @@ import com.java2nb.novel.service.FriendLinkService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.annotation.Validated;
@@ -31,7 +31,7 @@ public class FriendLinkController {
     @Autowired
     private FriendLinkService friendLinkService;
     @Autowired
-    private RedisTemplate<Object, Object> redisTemplate;
+    private StringRedisTemplate redisTemplate;
 
     @GetMapping()
     @RequiresPermissions("novel:friendLink:friendLink")

novel-admin/src/main/java/com/java2nb/novel/controller/NewsController.java

@@ -9,7 +9,7 @@ import com.java2nb.novel.service.NewsService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -32,7 +32,7 @@ public class NewsController {
     @Autowired
     private NewsService newsService;
     @Autowired
-    private RedisTemplate<Object, Object> redisTemplate;
+    private StringRedisTemplate redisTemplate;
 
     @GetMapping()
     @RequiresPermissions("novel:news:news")

novel-common/src/main/java/com/java2nb/novel/core/cache/CacheKey.java

@@ -8,7 +8,7 @@ public interface CacheKey {
     /**
      * 首页小说设置
      * */
-    String INDEX_BOOK_SETTINGS_KEY = "indexBookSettingsKey";
+    String INDEX_BOOK_SETTINGS_KEY = "indexBookSettingsKey:v2";
 
     /**
      * 首页新闻

novel-common/src/main/java/com/java2nb/novel/core/cache/CacheService.java

@@ -1,55 +1,61 @@
 package com.java2nb.novel.core.cache;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import java.util.List;
+
 /**
  * @author 11797
  */
 public interface CacheService {
 
-	/**
+    /**
-	 * 根据key获取缓存的String类型数据
+     * 根据key获取缓存的String类型数据
-	 */
+     */
-	String get(String key);
+    String get(String key);
 
-	/**
+    /**
-	 * 设置String类型的缓存
+     * 设置String类型的缓存
-	 */
+     */
-	void set(String key, String value);
+    void set(String key, String value);
 
-	/**
+    /**
-	 * 设置一个有过期时间的String类型的缓存,单位秒
+     * 设置一个有过期时间的String类型的缓存,单位秒
-	 */
+     */
-	void set(String key, String value, long timeout);
+    void set(String key, String value, long timeout);
-	
+
-	/**
+    /**
-	 * 根据key获取缓存的Object类型数据
+     * 根据key获取缓存的Object类型数据
-	 */
+     */
-	Object getObject(String key);
+    <T> T getObject(String key, Class<T> clazz);
-	
+
-	/**
+    <T> List<T> getList(String key, Class<T> clazz);
-	 * 设置Object类型的缓存
+
-	 */
+    /**
-	void setObject(String key, Object value);
+     * 设置Object类型的缓存
-	
+     */
-	/**
+    void setObject(String key, Object value);
-	 * 设置一个有过期时间的Object类型的缓存,单位秒
+
-	 */
+    /**
+     * 设置一个有过期时间的Object类型的缓存,单位秒
+     */
     void setObject(String key, Object value, long timeout);
 
-	/**
+    /**
-	 * 根据key删除缓存的数据
+     * 根据key删除缓存的数据
-	 */
+     */
-	void del(String key);
+    void del(String key);
 
-	
+
-	/**
+    /**
-	 * 判断是否存在一个key
+     * 判断是否存在一个key
-	 * */
+     */
-	boolean contains(String key);
+    boolean contains(String key);
-	
+
-	/**
+    /**
-	 * 设置key过期时间
+     * 设置key过期时间
-	 * */
+     */
-	void expire(String key, long timeout);
+    void expire(String key, long timeout);
 
 
 }

novel-common/src/main/java/com/java2nb/novel/core/cache/impl/RedisServiceImpl.java

@@ -1,23 +1,35 @@
 package com.java2nb.novel.core.cache.impl;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.java2nb.novel.core.cache.CacheService;
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.redis.core.RedisTemplate;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 /**
  * @author xxy
  */
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class RedisServiceImpl implements CacheService {
 
     private final StringRedisTemplate stringRedisTemplate;
 
-    private final RedisTemplate<Object, Object> redisTemplate;
+    private ObjectMapper objectMapper;
+
+    @PostConstruct
+    public void init() {
+        objectMapper = new ObjectMapper();
+        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+    }
 
 
     @Override
@@ -37,34 +49,66 @@ public class RedisServiceImpl implements CacheService {
     }
 
     @Override
-    public Object getObject(String key) {
+    public <T> T getObject(String key, Class<T> clazz) {
-        return redisTemplate.opsForValue().get(key);
+        String result = get(key);
+        if (result != null) {
+            try {
+                return objectMapper.readValue(result, clazz);
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public <T> List<T> getList(String key, Class<T> clazz) {
+        String result = get(key);
+        if (result != null) {
+            try {
+                return objectMapper.readValue(result,
+                    objectMapper.getTypeFactory().constructCollectionType(List.class, clazz));
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return null;
     }
 
     @Override
     public void setObject(String key, Object value) {
-        redisTemplate.opsForValue().set(key, value);
+        if (value != null) {
+            try {
+                set(key, objectMapper.writeValueAsString(value));
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+        }
     }
 
     @Override
     public void setObject(String key, Object value, long timeout) {
-        redisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS);
+        if (value != null) {
+            try {
+                set(key, objectMapper.writeValueAsString(value), timeout);
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+        }
     }
 
     @Override
     public void del(String key) {
-        redisTemplate.delete(key);
         stringRedisTemplate.delete(key);
     }
 
     @Override
     public boolean contains(String key) {
-        return redisTemplate.hasKey(key) || stringRedisTemplate.hasKey(key);
+        return stringRedisTemplate.hasKey(key);
     }
 
     @Override
     public void expire(String key, long timeout) {
-        redisTemplate.expire(key, timeout, TimeUnit.SECONDS);
         stringRedisTemplate.expire(key, timeout, TimeUnit.SECONDS);
     }
 

novel-crawl/src/main/java/com/java2nb/novel/controller/CrawlController.java

@@ -72,17 +72,15 @@ public class CrawlController {
         if(url.startsWith("https://")||url.startsWith("http://")){
             String refreshCache="1";
             if(!refreshCache.equals(isRefresh)) {
-                Object cache = cacheService.getObject(CacheKey.BOOK_TEST_PARSE + url);
+                html = cacheService.get(CacheKey.BOOK_TEST_PARSE + url);
-                if (cache == null) {
+                if (html == null) {
                     isRefresh="1";
-                }else {
-                    html = (String) cache;
                 }
             }
             if(refreshCache.equals(isRefresh)){
                 html = HttpUtil.getByHttpClientWithChrome(url);
                 if (html != null) {
-                    cacheService.setObject(CacheKey.BOOK_TEST_PARSE + url, html, 60 * 10);
+                    cacheService.set(CacheKey.BOOK_TEST_PARSE + url, html, 60 * 10);
                 }else{
                     resultMap.put("msg","html is null");
                     return RestResult.ok(resultMap);

novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlParser.java

@@ -12,7 +12,6 @@ import io.github.xxyopen.util.IdWorker;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 

novel-front/src/main/java/com/java2nb/novel/controller/BookController.java

@@ -43,7 +43,7 @@ public class BookController extends BaseController {
      * 查询首页小说设置列表数据
      */
     @GetMapping("listBookSetting")
-    public RestResult<Map<Byte, List<BookSettingVO>>> listBookSetting() {
+    public RestResult<Map<String, List<BookSettingVO>>> listBookSetting() {
         return RestResult.ok(bookService.listBookSettingVO());
     }
 

novel-front/src/main/java/com/java2nb/novel/controller/page/PageController.java

@@ -82,7 +82,7 @@ public class PageController extends BaseController {
     @RequestMapping(path = {"/", "/index", "/index.html"})
     public String index(Model model) {
         //加载小说首页小说基本信息线程
-        CompletableFuture<Map<Byte, List<BookSettingVO>>> bookCompletableFuture = CompletableFuture.supplyAsync(
+        CompletableFuture<Map<String, List<BookSettingVO>>> bookCompletableFuture = CompletableFuture.supplyAsync(
             bookService::listBookSettingVO, threadPoolExecutor);
         //加载首页新闻线程
         CompletableFuture<List<News>> newsCompletableFuture = CompletableFuture.supplyAsync(newsService::listIndexNews,

novel-front/src/main/java/com/java2nb/novel/service/BookService.java

@@ -16,9 +16,10 @@ public interface BookService {
 
     /**
      * 查询首页小说设置列表数据
+     *
      * @return
-     * */
+     */
-    Map<Byte, List<BookSettingVO>> listBookSettingVO();
+    Map<String, List<BookSettingVO>> listBookSettingVO();
 
     /**
      * 查询首页点击榜单数据

novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java

@@ -1,6 +1,5 @@
 package com.java2nb.novel.service.impl;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.java2nb.novel.core.cache.CacheKey;
 import com.java2nb.novel.core.cache.CacheService;
@@ -25,7 +24,6 @@ import io.github.xxyopen.web.util.BeanUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.utils.DateUtils;
 import org.mybatis.dynamic.sql.SortSpecification;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
@@ -48,7 +46,6 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
 
 import static com.java2nb.novel.mapper.BookCategoryDynamicSqlSupport.bookCategory;
-import static com.java2nb.novel.mapper.BookCategoryDynamicSqlSupport.sort;
 import static com.java2nb.novel.mapper.BookCommentDynamicSqlSupport.bookComment;
 import static com.java2nb.novel.mapper.BookContentDynamicSqlSupport.bookContent;
 import static com.java2nb.novel.mapper.BookContentDynamicSqlSupport.content;
@@ -108,19 +105,19 @@ public class BookServiceImpl implements BookService {
 
     @SneakyThrows
     @Override
-    public Map<Byte, List<BookSettingVO>> listBookSettingVO() {
+    public Map<String, List<BookSettingVO>> listBookSettingVO() {
-        String result = cacheService.get(CacheKey.INDEX_BOOK_SETTINGS_KEY);
+        List<BookSettingVO> list = cacheService.getList(CacheKey.INDEX_BOOK_SETTINGS_KEY, BookSettingVO.class);
-        if (result == null || result.length() < Constants.OBJECT_JSON_CACHE_EXIST_LENGTH) {
+        if (list == null || list.isEmpty()) {
-            List<BookSettingVO> list = bookSettingMapper.listVO();
+            list = bookSettingMapper.listVO();
-            if (list.size() == 0) {
+            if (list.isEmpty()) {
                 //如果首页小说没有被设置，则初始化首页小说设置
                 list = initIndexBookSetting();
             }
-            result = new ObjectMapper().writeValueAsString(
+            cacheService.setObject(CacheKey.INDEX_BOOK_SETTINGS_KEY, list, 3600 * 24);
-                list.stream().collect(Collectors.groupingBy(BookSettingVO::getType)));
-            cacheService.set(CacheKey.INDEX_BOOK_SETTINGS_KEY, result, 3600 * 24);
         }
-        return new ObjectMapper().readValue(result, Map.class);
+        return list.stream().collect(
+            Collectors.groupingBy(book -> book.getType().toString())
+        );
     }
 
 
@@ -170,11 +167,10 @@ public class BookServiceImpl implements BookService {
         return new ArrayList<>(0);
     }
 
-
     @Override
     public List<Book> listClickRank() {
-        List<Book> result = (List<Book>) cacheService.getObject(CacheKey.INDEX_CLICK_BANK_BOOK_KEY);
+        List<Book> result = cacheService.getList(CacheKey.INDEX_CLICK_BANK_BOOK_KEY, Book.class);
-        if (result == null || result.size() == 0) {
+        if (result == null || result.isEmpty()) {
             result = listRank((byte) 0, 10);
             cacheService.setObject(CacheKey.INDEX_CLICK_BANK_BOOK_KEY, result, 5000);
         }
@@ -183,8 +179,8 @@ public class BookServiceImpl implements BookService {
 
     @Override
     public List<Book> listNewRank() {
-        List<Book> result = (List<Book>) cacheService.getObject(CacheKey.INDEX_NEW_BOOK_KEY);
+        List<Book> result = cacheService.getList(CacheKey.INDEX_NEW_BOOK_KEY, Book.class);
-        if (result == null || result.size() == 0) {
+        if (result == null || result.isEmpty()) {
             result = listRank((byte) 1, 10);
             cacheService.setObject(CacheKey.INDEX_NEW_BOOK_KEY, result, 3600);
         }
@@ -193,8 +189,8 @@ public class BookServiceImpl implements BookService {
 
     @Override
     public List<BookVO> listUpdateRank() {
-        List<BookVO> result = (List<BookVO>) cacheService.getObject(CacheKey.INDEX_UPDATE_BOOK_KEY);
+        List<BookVO> result = cacheService.getList(CacheKey.INDEX_UPDATE_BOOK_KEY, BookVO.class);
-        if (result == null || result.size() == 0) {
+        if (result == null || result.isEmpty()) {
             List<Book> bookPOList = listRank((byte) 2, 23);
             result = BeanUtil.copyList(bookPOList, BookVO.class);
             cacheService.setObject(CacheKey.INDEX_UPDATE_BOOK_KEY, result, 60 * 10);

novel-front/src/main/java/com/java2nb/novel/service/impl/FriendLinkServiceImpl.java

@@ -1,6 +1,5 @@
 package com.java2nb.novel.service.impl;
 
-import io.github.xxyopen.web.util.BeanUtil;
 import com.java2nb.novel.service.FriendLinkService;
 import com.java2nb.novel.core.cache.CacheKey;
 import com.java2nb.novel.core.cache.CacheService;
@@ -31,16 +30,16 @@ public class FriendLinkServiceImpl implements FriendLinkService {
 
     @Override
     public List<FriendLink> listIndexLink() {
-        List<FriendLink> result = (List<FriendLink>) cacheService.getObject(CacheKey.INDEX_LINK_KEY);
+        List<FriendLink> result = cacheService.getList(CacheKey.INDEX_LINK_KEY, FriendLink.class);
-        if(result == null || result.size() == 0) {
+        if (result == null || result.isEmpty()) {
-            SelectStatementProvider selectStatement = select(linkName,linkUrl)
+            SelectStatementProvider selectStatement = select(linkName, linkUrl)
-                    .from(friendLink)
+                .from(friendLink)
-                    .where(isOpen,isEqualTo((byte)1))
+                .where(isOpen, isEqualTo((byte) 1))
-                    .orderBy(sort)
+                .orderBy(sort)
-                    .build()
+                .build()
-                    .render(RenderingStrategies.MYBATIS3);
+                .render(RenderingStrategies.MYBATIS3);
-            result =  friendLinkMapper.selectMany(selectStatement);
+            result = friendLinkMapper.selectMany(selectStatement);
-            cacheService.setObject(CacheKey.INDEX_LINK_KEY,result,60 * 60 * 24);
+            cacheService.setObject(CacheKey.INDEX_LINK_KEY, result, 60 * 60 * 24);
         }
         return result;
     }

novel-front/src/main/java/com/java2nb/novel/service/impl/LikeServiceImpl.java

@@ -4,7 +4,7 @@ import com.java2nb.novel.service.LikeService;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.scripting.support.StaticScriptSource;
 import org.springframework.stereotype.Service;
@@ -20,7 +20,7 @@ import java.util.Collections;
 @Slf4j
 public class LikeServiceImpl implements LikeService {
 
-    private final RedisTemplate<Object, Object> redisTemplate;
+    private final StringRedisTemplate redisTemplate;
 
     private DefaultRedisScript<Long> toggleLikeScript;
 
@@ -33,19 +33,19 @@ public class LikeServiceImpl implements LikeService {
     public void init() {
         // Lua 脚本保证原子性操作
         String script = """
-            local key = KEYS[1]
+                local key = KEYS[1]
-            local userId = ARGV[1]
+                local userId = ARGV[1]
-
+            
-            local isLiked = redis.call('SISMEMBER', key, userId)
+                local isLiked = redis.call('SISMEMBER', key, userId)
-
+            
-            if isLiked == 1 then
+                if isLiked == 1 then
-                redis.call('SREM', key, userId)
+                    redis.call('SREM', key, userId)
-            else
+                else
-                redis.call('SADD', key, userId)
+                    redis.call('SADD', key, userId)
-            end
+                end
-
+            
-            return redis.call('SCARD', key)
+                return redis.call('SCARD', key)
-        """;
+            """;
 
         toggleLikeScript = new DefaultRedisScript<>();
         toggleLikeScript.setScriptSource(new StaticScriptSource(script));
@@ -89,6 +89,6 @@ public class LikeServiceImpl implements LikeService {
     }
 
     private Long executeToggle(String key, Long userId) {
-        return redisTemplate.execute(toggleLikeScript, Collections.singletonList(key), userId);
+        return redisTemplate.execute(toggleLikeScript, Collections.singletonList(key), String.valueOf(userId));
     }
 }

novel-front/src/main/java/com/java2nb/novel/service/impl/NewsServiceImpl.java

@@ -36,16 +36,16 @@ public class NewsServiceImpl implements NewsService {
 
     @Override
     public List<News> listIndexNews() {
-        List<News> result = (List<News>) cacheService.getObject(CacheKey.INDEX_NEWS_KEY);
+        List<News> result = cacheService.getList(CacheKey.INDEX_NEWS_KEY, News.class);
-        if(result == null || result.size() == 0) {
+        if (result == null || result.isEmpty()) {
-            SelectStatementProvider selectStatement = select(id, catName, catId, title,createTime)
+            SelectStatementProvider selectStatement = select(id, catName, catId, title, createTime)
-                    .from(news)
+                .from(news)
-                    .orderBy(createTime.descending())
+                .orderBy(createTime.descending())
-                    .limit(2)
+                .limit(2)
-                    .build()
+                .build()
-                    .render(RenderingStrategies.MYBATIS3);
+                .render(RenderingStrategies.MYBATIS3);
             result = newsMapper.selectMany(selectStatement);
-            cacheService.setObject(CacheKey.INDEX_NEWS_KEY,result,60 * 60 * 12);
+            cacheService.setObject(CacheKey.INDEX_NEWS_KEY, result, 60 * 60 * 12);
         }
         return result;
     }
@@ -53,25 +53,25 @@ public class NewsServiceImpl implements NewsService {
     @Override
     public News queryNewsInfo(Long newsId) {
         SelectStatementProvider selectStatement = select(news.allColumns())
-                .from(news)
+            .from(news)
-                .where(id,isEqualTo(newsId))
+            .where(id, isEqualTo(newsId))
-                .build()
+            .build()
-                .render(RenderingStrategies.MYBATIS3);
+            .render(RenderingStrategies.MYBATIS3);
         return newsMapper.selectMany(selectStatement).get(0);
 
     }
 
     @Override
     public PageBean<News> listByPage(int page, int pageSize) {
-        PageHelper.startPage(page,pageSize);
+        PageHelper.startPage(page, pageSize);
-        SelectStatementProvider selectStatement = select(id, catName, catId, title,createTime)
+        SelectStatementProvider selectStatement = select(id, catName, catId, title, createTime)
-                .from(news)
+            .from(news)
-                .orderBy(createTime.descending())
+            .orderBy(createTime.descending())
-                .build()
+            .build()
-                .render(RenderingStrategies.MYBATIS3);
+            .render(RenderingStrategies.MYBATIS3);
         List<News> news = newsMapper.selectMany(selectStatement);
         PageBean<News> pageBean = PageBuilder.build(news);
-        pageBean.setList(BeanUtil.copyList(news,NewsVO.class));
+        pageBean.setList(BeanUtil.copyList(news, NewsVO.class));
         return pageBean;
     }