From cad3c4afe2c066cf4e5d8b0fe5969327ac7abde2 Mon Sep 17 00:00:00 2001
From: xuyuxiang <YJLP2014>
Date: Thu, 25 Mar 2021 09:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91SwaggerConf?=
 =?UTF-8?q?ig=E5=8F=AA=E6=89=AB=E6=8F=8F=E5=9F=BA=E7=A1=80=E5=8C=85?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cn/xiaonuo/sys/config/SwaggerConfig.java |  3 ++-
 .../controller/DatasourceExampleController.java       | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/config/SwaggerConfig.java b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/config/SwaggerConfig.java
index a8e35346..af4a2323 100644
--- a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/config/SwaggerConfig.java
+++ b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/config/SwaggerConfig.java
@@ -25,6 +25,7 @@ XiaoNuo采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注
 package com.cn.xiaonuo.sys.config;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.cn.xiaonuo.core.consts.CommonConstant;
 import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.context.annotation.Bean;
@@ -70,7 +71,7 @@ public class SwaggerConfig {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                .apis(RequestHandlerSelectors.basePackage(CommonConstant.DEFAULT_PACKAGE_NAME))
                 .paths(PathSelectors.any())
                 .build()
                 .globalOperationParameters(parameters);
diff --git a/xiaonuo-main/src/main/java/com/cn/xiaonuo/modular/controller/DatasourceExampleController.java b/xiaonuo-main/src/main/java/com/cn/xiaonuo/modular/controller/DatasourceExampleController.java
index b6e265eb..70f46f5a 100644
--- a/xiaonuo-main/src/main/java/com/cn/xiaonuo/modular/controller/DatasourceExampleController.java
+++ b/xiaonuo-main/src/main/java/com/cn/xiaonuo/modular/controller/DatasourceExampleController.java
@@ -27,6 +27,7 @@ package com.cn.xiaonuo.modular.controller;
 import com.cn.xiaonuo.core.pojo.response.ResponseData;
 import com.cn.xiaonuo.core.pojo.response.SuccessResponseData;
 import com.cn.xiaonuo.modular.service.DatasourceExampleService;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -45,28 +46,28 @@ public class DatasourceExampleController {
     @Resource
     private DatasourceExampleService datasourceService;
 
-    @RequestMapping("/niceDay")
+    @GetMapping("/niceDay")
     public ResponseData niceDay() {
         return new SuccessResponseData("nice day");
     }
 
-    @RequestMapping("/masterDatasource")
+    @GetMapping("/masterDatasource")
     public ResponseData masterDatasource() {
         return new SuccessResponseData(datasourceService.masterDatasource());
     }
 
-    @RequestMapping("/backupDatasource")
+    @GetMapping("/backupDatasource")
     public ResponseData backupDatasource() {
         return new SuccessResponseData(datasourceService.backupDatasource());
     }
 
-    @RequestMapping("/datasourceTransactionNone")
+    @GetMapping("/datasourceTransactionNone")
     public ResponseData datasourceTransactionNone() {
         datasourceService.datasourceTransactionNone();
         return new SuccessResponseData();
     }
 
-    @RequestMapping("/datasourceTransaction")
+    @GetMapping("/datasourceTransaction")
     public ResponseData datasourceTransaction() {
         datasourceService.datasourceTransaction();
         return new SuccessResponseData();