Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

puzhibing

2024-08-19 7d348d54c93e1333951c6d20f8ead81d389cd262

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SwaggerHandler.java

@@ -1,6 +1,7 @@
package com.ruoyi.gateway.handler;

import java.util.Optional;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -16,41 +17,34 @@

@RestController
@RequestMapping("/swagger-resources")
public class SwaggerHandler
{
    @Autowired(required = false)
    private SecurityConfiguration securityConfiguration;

    @Autowired(required = false)
    private UiConfiguration uiConfiguration;

    private final SwaggerResourcesProvider swaggerResources;

    @Autowired
    public SwaggerHandler(SwaggerResourcesProvider swaggerResources)
    {
        this.swaggerResources = swaggerResources;
    }

    @GetMapping("/configuration/security")
    public Mono<ResponseEntity<SecurityConfiguration>> securityConfiguration()
    {
        return Mono.just(new ResponseEntity<>(
                Optional.ofNullable(securityConfiguration).orElse(SecurityConfigurationBuilder.builder().build()),
                HttpStatus.OK));
    }

    @GetMapping("/configuration/ui")
    public Mono<ResponseEntity<UiConfiguration>> uiConfiguration()
    {
        return Mono.just(new ResponseEntity<>(
                Optional.ofNullable(uiConfiguration).orElse(UiConfigurationBuilder.builder().build()), HttpStatus.OK));
    }

    @SuppressWarnings("rawtypes")
    @GetMapping("")
    public Mono<ResponseEntity> swaggerResources()
    {
        return Mono.just((new ResponseEntity<>(swaggerResources.get(), HttpStatus.OK)));
    }
public class SwaggerHandler {
   private final SwaggerResourcesProvider swaggerResources;
   @Autowired(required = false)
   private SecurityConfiguration securityConfiguration;
   @Autowired(required = false)
   private UiConfiguration uiConfiguration;
	
   @Autowired
   public SwaggerHandler(SwaggerResourcesProvider swaggerResources) {
      this.swaggerResources = swaggerResources;
   }
	
   @GetMapping("/configuration/security")
   public Mono<ResponseEntity<SecurityConfiguration>> securityConfiguration() {
      return Mono.just(new ResponseEntity<>(
            Optional.ofNullable(securityConfiguration).orElse(SecurityConfigurationBuilder.builder().build()),
            HttpStatus.OK));
   }
	
   @GetMapping("/configuration/ui")
   public Mono<ResponseEntity<UiConfiguration>> uiConfiguration() {
      return Mono.just(new ResponseEntity<>(
            Optional.ofNullable(uiConfiguration).orElse(UiConfigurationBuilder.builder().build()), HttpStatus.OK));
   }
	
   @SuppressWarnings("rawtypes")
   @GetMapping("")
   public Mono<ResponseEntity> swaggerResources() {
      return Mono.just((new ResponseEntity<>(swaggerResources.get(), HttpStatus.OK)));
   }
}