Merge remote-tracking branch 'origin/master'

jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java

@@ -1,12 +1,14 @@
 package org.jeecg.handler.swagger;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.swagger.web.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /** 已使用knife4j-gateway支持该功能
@@ -19,6 +21,9 @@ import java.util.List;
 public class SwaggerResourceController {
     private MySwaggerResourceProvider swaggerResourceProvider;
 
+    @Value("${knife4j.gateway.enabled:true}")
+    private Boolean enableSwagger;
+
     @Autowired
     public SwaggerResourceController(MySwaggerResourceProvider swaggerResourceProvider) {
         this.swaggerResourceProvider = swaggerResourceProvider;
@@ -36,6 +41,9 @@ public class SwaggerResourceController {
 
     @RequestMapping
     public ResponseEntity<List<SwaggerResource>> swaggerResources() {
+        if (!enableSwagger) {
+            return new ResponseEntity<>(new ArrayList<>(), HttpStatus.OK);
+        }
         return new ResponseEntity<>(swaggerResourceProvider.get(), HttpStatus.OK);
     }
 }

jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml

@@ -4,11 +4,6 @@ server:
 knife4j:
   gateway:
     enabled: true
-    strategy: discover
-    discover:
-      excluded-services: ${spring.application.name}
-      enabled: true
-      version: OpenAPI3
 
 spring:
   application: