From 3019093dc3c2a3f05412351978ca4360a6055c28 Mon Sep 17 00:00:00 2001 From: xiongxiaoyang <773861846@qq.com> Date: Sat, 28 May 2022 18:51:47 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E6=8D=A2=E8=A1=8C/=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xxyopen/novel/core/config/WebConfig.java | 12 +++++------ .../manager/cache/AuthorInfoCacheManager.java | 10 +++++----- .../cache/BookCategoryCacheManager.java | 4 ++-- .../cache/BookChapterCacheManager.java | 4 ++-- .../cache/BookContentCacheManager.java | 4 ++-- .../manager/cache/BookInfoCacheManager.java | 15 +++++++------- .../manager/cache/BookRankCacheManager.java | 20 +++++++++---------- .../manager/cache/FriendLinkCacheManager.java | 4 ++-- .../manager/cache/HomeBookCacheManager.java | 4 ++-- .../novel/manager/cache/NewsCacheManager.java | 4 ++-- .../manager/cache/UserInfoCacheManager.java | 6 +++--- .../manager/redis/VerifyCodeManager.java | 8 +++----- .../service/impl/DbSearchServiceImpl.java | 4 ++-- .../service/impl/EsSearchServiceImpl.java | 14 ++++++------- 14 files changed, 55 insertions(+), 58 deletions(-) diff --git a/src/main/java/io/github/xxyopen/novel/core/config/WebConfig.java b/src/main/java/io/github/xxyopen/novel/core/config/WebConfig.java index 58a06d4..18f9276 100644 --- a/src/main/java/io/github/xxyopen/novel/core/config/WebConfig.java +++ b/src/main/java/io/github/xxyopen/novel/core/config/WebConfig.java @@ -37,15 +37,15 @@ public class WebConfig implements WebMvcConfigurer { // 权限认证拦截 registry.addInterceptor(authInterceptor) // 拦截会员中心相关请求接口 - .addPathPatterns(ApiRouterConsts.API_FRONT_USER_URL_PREFIX + "/**" + .addPathPatterns(ApiRouterConsts.API_FRONT_USER_URL_PREFIX + "/**", // 拦截作家后台相关请求接口 - , ApiRouterConsts.API_AUTHOR_URL_PREFIX + "/**" + ApiRouterConsts.API_AUTHOR_URL_PREFIX + "/**", // 拦截平台后台相关请求接口 - , ApiRouterConsts.API_ADMIN_URL_PREFIX + "/**") + ApiRouterConsts.API_ADMIN_URL_PREFIX + "/**") // 放行登录注册相关请求接口 - .excludePathPatterns(ApiRouterConsts.API_FRONT_USER_URL_PREFIX + "/register" - , ApiRouterConsts.API_FRONT_USER_URL_PREFIX + "/login" - , ApiRouterConsts.API_ADMIN_URL_PREFIX + "/login"); + .excludePathPatterns(ApiRouterConsts.API_FRONT_USER_URL_PREFIX + "/register", + ApiRouterConsts.API_FRONT_USER_URL_PREFIX + "/login", + ApiRouterConsts.API_ADMIN_URL_PREFIX + "/login"); // Token 解析拦截器 registry.addInterceptor(tokenParseInterceptor) diff --git a/src/main/java/io/github/xxyopen/novel/manager/cache/AuthorInfoCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/cache/AuthorInfoCacheManager.java index c48ac8c..7aeb1cb 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/cache/AuthorInfoCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/cache/AuthorInfoCacheManager.java @@ -28,8 +28,8 @@ public class AuthorInfoCacheManager { /** * 查询作家信息，并放入缓存中 */ - @Cacheable(cacheManager = CacheConsts.REDIS_CACHE_MANAGER - , value = CacheConsts.AUTHOR_INFO_CACHE_NAME, unless = "#result == null") + @Cacheable(cacheManager = CacheConsts.REDIS_CACHE_MANAGER, + value = CacheConsts.AUTHOR_INFO_CACHE_NAME, unless = "#result == null") public AuthorInfoDto getAuthor(Long userId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper @@ -45,9 +45,9 @@ public class AuthorInfoCacheManager { .status(authorInfo.getStatus()).build(); } - @CacheEvict(cacheManager = CacheConsts.REDIS_CACHE_MANAGER - , value = CacheConsts.AUTHOR_INFO_CACHE_NAME) - public void evictAuthorCache(){ + @CacheEvict(cacheManager = CacheConsts.REDIS_CACHE_MANAGER, + value = CacheConsts.AUTHOR_INFO_CACHE_NAME) + public void evictAuthorCache() { // 调用此方法自动清除作家信息的缓存 } diff --git a/src/main/java/io/github/xxyopen/novel/manager/cache/BookCategoryCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/cache/BookCategoryCacheManager.java index a592a4a..817b8fe 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/cache/BookCategoryCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/cache/BookCategoryCacheManager.java @@ -27,8 +27,8 @@ public class BookCategoryCacheManager { /** * 根据作品方向查询小说分类列表，并放入缓存中 */ - @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER - , value = CacheConsts.BOOK_CATEGORY_LIST_CACHE_NAME) + @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER, + value = CacheConsts.BOOK_CATEGORY_LIST_CACHE_NAME) public List listCategory(Integer workDirection) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(DatabaseConsts.BookCategoryTable.COLUMN_WORK_DIRECTION, workDirection); diff --git a/src/main/java/io/github/xxyopen/novel/manager/cache/BookChapterCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/cache/BookChapterCacheManager.java index fe45fbe..83a0665 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/cache/BookChapterCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/cache/BookChapterCacheManager.java @@ -23,8 +23,8 @@ public class BookChapterCacheManager { /** * 查询小说章节信息，并放入缓存中 */ - @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER - , value = CacheConsts.BOOK_CHAPTER_CACHE_NAME) + @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER, + value = CacheConsts.BOOK_CHAPTER_CACHE_NAME) public BookChapterRespDto getChapter(Long chapterId) { BookChapter bookChapter = bookChapterMapper.selectById(chapterId); return BookChapterRespDto.builder() diff --git a/src/main/java/io/github/xxyopen/novel/manager/cache/BookContentCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/cache/BookContentCacheManager.java index ea21719..3f8fa50 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/cache/BookContentCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/cache/BookContentCacheManager.java @@ -24,8 +24,8 @@ public class BookContentCacheManager { /** * 查询小说内容，并放入缓存中 */ - @Cacheable(cacheManager = CacheConsts.REDIS_CACHE_MANAGER - , value = CacheConsts.BOOK_CONTENT_CACHE_NAME) + @Cacheable(cacheManager = CacheConsts.REDIS_CACHE_MANAGER, + value = CacheConsts.BOOK_CONTENT_CACHE_NAME) public String getBookContent(Long chapterId) { QueryWrapper contentQueryWrapper = new QueryWrapper<>(); contentQueryWrapper.eq(DatabaseConsts.BookContentTable.COLUMN_CHAPTER_ID, chapterId) diff --git a/src/main/java/io/github/xxyopen/novel/manager/cache/BookInfoCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/cache/BookInfoCacheManager.java index ba509c5..82f4365 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/cache/BookInfoCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/cache/BookInfoCacheManager.java @@ -32,17 +32,17 @@ public class BookInfoCacheManager { /** * 从缓存中查询小说信息（先判断缓存中是否已存在，存在则直接从缓存中取，否则执行方法体中的逻辑后缓存结果） */ - @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER - , value = CacheConsts.BOOK_INFO_CACHE_NAME) + @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER, + value = CacheConsts.BOOK_INFO_CACHE_NAME) public BookInfoRespDto getBookInfo(Long id) { return cachePutBookInfo(id); } /** * 缓存小说信息（不管缓存中是否存在都执行方法体中的逻辑，然后缓存起来） - * */ - @CachePut(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER - , value = CacheConsts.BOOK_INFO_CACHE_NAME) + */ + @CachePut(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER, + value = CacheConsts.BOOK_INFO_CACHE_NAME) public BookInfoRespDto cachePutBookInfo(Long id) { // 查询基础信息 BookInfo bookInfo = bookInfoMapper.selectById(id); @@ -73,12 +73,11 @@ public class BookInfoCacheManager { } - /** * 查询每个类别下最新更新的 500 个小说ID列表，并放入缓存中 1 个小时 */ - @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER - , value = CacheConsts.LAST_UPDATE_BOOK_ID_LIST_CACHE_NAME) + @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER, + value = CacheConsts.LAST_UPDATE_BOOK_ID_LIST_CACHE_NAME) public List getLastUpdateIdList(Long categoryId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(DatabaseConsts.BookTable.COLUMN_CATEGORY_ID, categoryId) diff --git a/src/main/java/io/github/xxyopen/novel/manager/cache/BookRankCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/cache/BookRankCacheManager.java index e616d52..a98cad9 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/cache/BookRankCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/cache/BookRankCacheManager.java @@ -27,39 +27,39 @@ public class BookRankCacheManager { /** * 查询小说点击榜列表，并放入缓存中 */ - @Cacheable(cacheManager = CacheConsts.REDIS_CACHE_MANAGER - , value = CacheConsts.BOOK_VISIT_RANK_CACHE_NAME) + @Cacheable(cacheManager = CacheConsts.REDIS_CACHE_MANAGER, + value = CacheConsts.BOOK_VISIT_RANK_CACHE_NAME) public List listVisitRankBooks() { QueryWrapper bookInfoQueryWrapper = new QueryWrapper<>(); bookInfoQueryWrapper.orderByDesc(DatabaseConsts.BookTable.COLUMN_VISIT_COUNT); - return getBookRankRespDtos(bookInfoQueryWrapper); + return listRankBooks(bookInfoQueryWrapper); } /** * 查询小说新书榜列表，并放入缓存中 */ - @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER - , value = CacheConsts.BOOK_NEWEST_RANK_CACHE_NAME) + @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER, + value = CacheConsts.BOOK_NEWEST_RANK_CACHE_NAME) public List listNewestRankBooks() { QueryWrapper bookInfoQueryWrapper = new QueryWrapper<>(); bookInfoQueryWrapper .orderByDesc(DatabaseConsts.CommonColumnEnum.CREATE_TIME.getName()); - return getBookRankRespDtos(bookInfoQueryWrapper); + return listRankBooks(bookInfoQueryWrapper); } /** * 查询小说更新榜列表，并放入缓存中 */ - @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER - , value = CacheConsts.BOOK_UPDATE_RANK_CACHE_NAME) + @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER, + value = CacheConsts.BOOK_UPDATE_RANK_CACHE_NAME) public List listUpdateRankBooks() { QueryWrapper bookInfoQueryWrapper = new QueryWrapper<>(); bookInfoQueryWrapper .orderByDesc(DatabaseConsts.CommonColumnEnum.UPDATE_TIME.getName()); - return getBookRankRespDtos(bookInfoQueryWrapper); + return listRankBooks(bookInfoQueryWrapper); } - private List getBookRankRespDtos(QueryWrapper bookInfoQueryWrapper) { + private List listRankBooks(QueryWrapper bookInfoQueryWrapper) { bookInfoQueryWrapper.last(DatabaseConsts.SqlEnum.LIMIT_30.getSql()); return bookInfoMapper.selectList(bookInfoQueryWrapper).stream().map(v -> { BookRankRespDto respDto = new BookRankRespDto(); diff --git a/src/main/java/io/github/xxyopen/novel/manager/cache/FriendLinkCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/cache/FriendLinkCacheManager.java index b1876d8..d0eba3c 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/cache/FriendLinkCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/cache/FriendLinkCacheManager.java @@ -27,8 +27,8 @@ public class FriendLinkCacheManager { /** * 友情链接列表查询，并放入缓存中 */ - @Cacheable(cacheManager = CacheConsts.REDIS_CACHE_MANAGER - , value = CacheConsts.HOME_FRIEND_LINK_CACHE_NAME) + @Cacheable(cacheManager = CacheConsts.REDIS_CACHE_MANAGER, + value = CacheConsts.HOME_FRIEND_LINK_CACHE_NAME) public List listFriendLinks() { // 从友情链接表中查询出友情链接列表 QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/src/main/java/io/github/xxyopen/novel/manager/cache/HomeBookCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/cache/HomeBookCacheManager.java index c94a95a..5e648f8 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/cache/HomeBookCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/cache/HomeBookCacheManager.java @@ -36,8 +36,8 @@ public class HomeBookCacheManager { /** * 查询首页小说推荐，并放入缓存中 */ - @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER - , value = CacheConsts.HOME_BOOK_CACHE_NAME) + @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER, + value = CacheConsts.HOME_BOOK_CACHE_NAME) public List listHomeBooks() { // 从首页小说推荐表中查询出需要推荐的小说 QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/src/main/java/io/github/xxyopen/novel/manager/cache/NewsCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/cache/NewsCacheManager.java index 6ffc5c8..65fd458 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/cache/NewsCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/cache/NewsCacheManager.java @@ -27,8 +27,8 @@ public class NewsCacheManager { /** * 最新新闻列表查询，并放入缓存中 */ - @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER - , value = CacheConsts.LATEST_NEWS_CACHE_NAME) + @Cacheable(cacheManager = CacheConsts.CAFFEINE_CACHE_MANAGER, + value = CacheConsts.LATEST_NEWS_CACHE_NAME) public List listLatestNews() { // 从新闻信息表中查询出最新发布的两条新闻 QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/src/main/java/io/github/xxyopen/novel/manager/cache/UserInfoCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/cache/UserInfoCacheManager.java index 050db89..90ee1eb 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/cache/UserInfoCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/cache/UserInfoCacheManager.java @@ -25,11 +25,11 @@ public class UserInfoCacheManager { /** * 查询用户信息，并放入缓存中 */ - @Cacheable(cacheManager = CacheConsts.REDIS_CACHE_MANAGER - , value = CacheConsts.USER_INFO_CACHE_NAME) + @Cacheable(cacheManager = CacheConsts.REDIS_CACHE_MANAGER, + value = CacheConsts.USER_INFO_CACHE_NAME) public UserInfoDto getUser(Long userId) { UserInfo userInfo = userInfoMapper.selectById(userId); - if(Objects.isNull(userInfo)){ + if (Objects.isNull(userInfo)) { return null; } return UserInfoDto.builder() diff --git a/src/main/java/io/github/xxyopen/novel/manager/redis/VerifyCodeManager.java b/src/main/java/io/github/xxyopen/novel/manager/redis/VerifyCodeManager.java index d6578c2..78100b3 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/redis/VerifyCodeManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/redis/VerifyCodeManager.java @@ -30,8 +30,8 @@ public class VerifyCodeManager { public String genImgVerifyCode(String sessionId) throws IOException { String verifyCode = ImgVerifyCodeUtils.getRandomVerifyCode(4); String img = ImgVerifyCodeUtils.genVerifyCodeImg(verifyCode); - stringRedisTemplate.opsForValue().set(CacheConsts.IMG_VERIFY_CODE_CACHE_KEY + sessionId - , verifyCode, Duration.ofMinutes(5)); + stringRedisTemplate.opsForValue().set(CacheConsts.IMG_VERIFY_CODE_CACHE_KEY + sessionId, + verifyCode, Duration.ofMinutes(5)); return img; } @@ -39,9 +39,7 @@ public class VerifyCodeManager { * 校验图片验证码 */ public boolean imgVerifyCodeOk(String sessionId, String verifyCode) { - return Objects.equals( - stringRedisTemplate.opsForValue().get(CacheConsts.IMG_VERIFY_CODE_CACHE_KEY + sessionId) - , verifyCode); + return Objects.equals(stringRedisTemplate.opsForValue().get(CacheConsts.IMG_VERIFY_CODE_CACHE_KEY + sessionId), verifyCode); } /** diff --git a/src/main/java/io/github/xxyopen/novel/service/impl/DbSearchServiceImpl.java b/src/main/java/io/github/xxyopen/novel/service/impl/DbSearchServiceImpl.java index 4418344..052886a 100644 --- a/src/main/java/io/github/xxyopen/novel/service/impl/DbSearchServiceImpl.java +++ b/src/main/java/io/github/xxyopen/novel/service/impl/DbSearchServiceImpl.java @@ -35,8 +35,8 @@ public class DbSearchServiceImpl implements SearchService { page.setCurrent(condition.getPageNum()); page.setSize(condition.getPageSize()); List bookInfos = bookInfoMapper.searchBooks(page, condition); - return RestResp.ok(PageRespDto.of(condition.getPageNum(), condition.getPageSize(), page.getTotal() - , bookInfos.stream().map(v -> BookInfoRespDto.builder() + return RestResp.ok(PageRespDto.of(condition.getPageNum(), condition.getPageSize(), page.getTotal(), + bookInfos.stream().map(v -> BookInfoRespDto.builder() .id(v.getId()) .bookName(v.getBookName()) .categoryId(v.getCategoryId()) diff --git a/src/main/java/io/github/xxyopen/novel/service/impl/EsSearchServiceImpl.java b/src/main/java/io/github/xxyopen/novel/service/impl/EsSearchServiceImpl.java index b03dcb8..0c67460 100644 --- a/src/main/java/io/github/xxyopen/novel/service/impl/EsSearchServiceImpl.java +++ b/src/main/java/io/github/xxyopen/novel/service/impl/EsSearchServiceImpl.java @@ -64,10 +64,10 @@ public class EsSearchServiceImpl implements SearchService { searchBuilder.from((condition.getPageNum() - 1) * condition.getPageSize()) .size(condition.getPageSize()); // 设置高亮显示 - searchBuilder.highlight(h -> h.fields(EsConsts.BookIndex.FIELD_BOOK_NAME - , t -> t.preTags("").postTags("")) - .fields(EsConsts.BookIndex.FIELD_AUTHOR_NAME - , t -> t.preTags("").postTags(""))); + searchBuilder.highlight(h -> h.fields(EsConsts.BookIndex.FIELD_BOOK_NAME, + t -> t.preTags("").postTags("")) + .fields(EsConsts.BookIndex.FIELD_AUTHOR_NAME, + t -> t.preTags("").postTags(""))); return searchBuilder; }, @@ -113,9 +113,9 @@ public class EsSearchServiceImpl implements SearchService { if (!StringUtils.isBlank(condition.getKeyword())) { // 关键词匹配 b.must((q -> q.multiMatch(t -> t - .fields(EsConsts.BookIndex.FIELD_BOOK_NAME + "^2" - , EsConsts.BookIndex.FIELD_AUTHOR_NAME + "^1.8" - , EsConsts.BookIndex.FIELD_BOOK_DESC + "^0.1") + .fields(EsConsts.BookIndex.FIELD_BOOK_NAME + "^2", + EsConsts.BookIndex.FIELD_AUTHOR_NAME + "^1.8", + EsConsts.BookIndex.FIELD_BOOK_DESC + "^0.1") .query(condition.getKeyword()) ) ));