From 386ae84941cca7500e04c93196b1a9b92fbe3e26 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Wed, 17 Feb 2021 23:08:57 +0800
Subject: [PATCH] =?UTF-8?q?swagger=E5=AF=86=E7=A0=81=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=20#2253?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/jeecg/config/Swagger2Config.java |  1 -
 .../src/main/resources/application-dev.yml             |  5 ++---
 .../src/main/resources/application-prod.yml            |  7 +++----
 .../src/main/resources/application-test.yml            |  5 ++---
 .../jeecg-boot-starter-cloud/nacos/jeecg-dev.yaml      | 10 +++++++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
index 41e73892..8789ec4f 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
@@ -36,7 +36,6 @@ import java.util.List;
 @EnableSwagger2
 @EnableKnife4j
 @Import(BeanValidatorPluginsConfiguration.class)
-@ConditionalOnProperty(name = "swagger.enable", havingValue = "true")
 public class Swagger2Config implements WebMvcConfigurer {
 
     /**
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
index 2267d4fd..4a4f4001 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
@@ -251,9 +251,8 @@ cas:
 logging:
   level:
     org.jeecg.modules.system.mapper : info
-#enable swagger
-swagger:
-  enable: true
+#swagger
+knife4j:
   production: false
   basic:
     enable: false
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
index 1bcb4830..87ff386a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
@@ -251,12 +251,11 @@ cas:
 logging:
   level:
     org.jeecg.modules.system.mapper : info
-#enable swagger
-swagger:
-  enable: true
+#swagger
+knife4j:
   production: false
   basic:
-    enable: false
+    enable: true
     username: jeecg
     password: jeecg1314
 #第三方登录
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
index 96044d29..febe4b6f 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
@@ -251,9 +251,8 @@ logging:
 #cas单点登录
 cas:
   prefixUrl: http://cas.example.org:8443/cas
-#enable swagger
-swagger:
-  enable: true
+#swagger
+knife4j:
   production: false
   basic:
     enable: false
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg-dev.yaml b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg-dev.yaml
index e0206afa..496f7846 100644
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg-dev.yaml
+++ b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg-dev.yaml
@@ -156,9 +156,13 @@ logging:
 #cas单点登录
 cas:
   prefixUrl: http://localhost:8888/cas
-#enable swagger
-swagger:
-  enable: true
+#swagger
+knife4j:
+  production: false
+  basic:
+    enable: false
+    username: jeecg
+    password: jeecg1314
 
 #第三方登录
 justauth: