From 2782f3e576b56a9ca078055026394646d57440f8 Mon Sep 17 00:00:00 2001 From: inleft <inleft@qq.com> Date: Sun, 27 Feb 2022 23:36:26 +0800 Subject: [PATCH] 接口文档显示配置调整 --- snowy-main/src/main/resources/application-local.yml | 2 ++ snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SwaggerConfig.java | 2 ++ snowy-main/src/main/java/vip/xiaonuo/modular/blogStatistics/BlogStatisticsController.java | 4 +++- 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SwaggerConfig.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SwaggerConfig.java index 25c5863..b8ec4db 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SwaggerConfig.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SwaggerConfig.java @@ -25,6 +25,7 @@ package vip.xiaonuo.sys.config; import cn.hutool.core.collection.CollectionUtil; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import springfox.documentation.builders.ApiInfoBuilder; @@ -55,6 +56,7 @@ **/ @Configuration @EnableSwagger2WebMvc +@ConditionalOnProperty(name = "swagger.enable", havingValue = "true") public class SwaggerConfig { private List<Parameter> getParameters() { diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/blogStatistics/BlogStatisticsController.java b/snowy-main/src/main/java/vip/xiaonuo/modular/blogStatistics/BlogStatisticsController.java index 47f6dc4..372919e 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/modular/blogStatistics/BlogStatisticsController.java +++ b/snowy-main/src/main/java/vip/xiaonuo/modular/blogStatistics/BlogStatisticsController.java @@ -156,7 +156,9 @@ archiveVo = new BlogArchiveVo(); archiveVo.setYear(key.toString()); - detailGroup = groupMap.get(key).stream() + detailGroup = groupMap.get(key).stream().sorted( + Comparator.comparing(BlogArticle::getSeparateMonth) + .thenComparing(BlogArticle::getSeparateDay).reversed()) .collect(Collectors.groupingBy(e -> e.getSeparateMonth().toString() + "月" + e.getSeparateDay() + "日", LinkedHashMap::new, Collectors.mapping(e -> { BlogArchiveDetailVo.simpleVo simpleVo = new BlogArchiveDetailVo.simpleVo(); diff --git a/snowy-main/src/main/resources/application-local.yml b/snowy-main/src/main/resources/application-local.yml index 54dd04b..d9ba22a 100644 --- a/snowy-main/src/main/resources/application-local.yml +++ b/snowy-main/src/main/resources/application-local.yml @@ -17,6 +17,8 @@ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +swagger: + enable: true # Oracle数据库 #spring: -- Gitblit v1.9.1