Browse Source

fix 文档问题

A17404李放 3 years ago
parent
commit
b0e65c1117

+ 2 - 2
nb-common/all-common/src/main/java/com/nb/common/notice/wechat/EnterpriseWeChatNotify.java

@@ -25,8 +25,8 @@ import org.springframework.stereotype.Component;
  * @Description 企业微信通知
  * @createTime 2022年07月19日 15:21:00
  */
-@Component
-@Profile("prod")
+//@Component
+//@Profile("prod")
 public class EnterpriseWeChatNotify {
     @Autowired
     private DiskSpaceHealthIndicator spaceHealthIndicator;

+ 0 - 50
nb-core/src/main/java/com/nb/core/doc/SwaggerConfig.java

@@ -55,58 +55,8 @@ public class SwaggerConfig implements WebMvcConfigurer {
                 .build();
     }
 
-    @Bean
-    @Profile("dev")
-    public Docket system(){
-        return new Docket(DocumentationType.SWAGGER_2)
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("com.nb.system.controller"))
-                .paths(PathSelectors.any())
-                .build()
-                .groupName("系统模块")
-                .apiInfo(apiInfo())
-                .securitySchemes(security())
-                .securityContexts(securityContexts())
-                .enable(true);
-    }
-
-    @Bean
-    public Docket bus(){
-        return new Docket(DocumentationType.SWAGGER_2)
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("com.nb.bus.controller"))
-                .paths(PathSelectors.any())
-                .build()
-                .groupName("业务模块")
-                .apiInfo(apiInfo())
-                .securitySchemes(security())
-                .securityContexts(securityContexts())
-                .enable(true);
-    }
 
 
-    @Bean
-    public Docket admin(){
-        ParameterBuilder ticketPar = new ParameterBuilder();
-        List<Parameter> pars = new ArrayList<Parameter>();
-        ticketPar.name("tenantId").description("租户id")
-                .modelRef(new ModelRef("string")).parameterType("query")
-                .required(true).build();
-        pars.add(ticketPar.build());
-
-        return new Docket(DocumentationType.SWAGGER_2)
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("com.nb.auth.controller"))
-                .paths(PathSelectors.any())
-                .build()
-                .groupName("授权模块")
-                .apiInfo(apiInfo())
-                .globalOperationParameters(pars)
-                .securitySchemes(security())
-                .securityContexts(securityContexts())
-                .enable(true);
-    }
-
     public List<SecurityScheme> security() {
         return Arrays.asList(new ApiKey("BASE_TOKEN", "Authorization",   In.HEADER.toValue()),
                 new ApiKey("租户id", "Tenant-Id",   In.HEADER.toValue()));

+ 64 - 0
nb-core/src/main/java/com/nb/core/doc/SwaggerDocConfig.java

@@ -0,0 +1,64 @@
+package com.nb.core.doc;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+import springfox.documentation.builders.ParameterBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.schema.ModelRef;
+import springfox.documentation.service.Parameter;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName SwaggerDocConfig.java
+ * @Description TODO
+ * @createTime 2022年08月01日 22:01:00
+ */
+@Component
+public class SwaggerDocConfig {
+    @Bean
+    @Profile("dev")
+    public Docket system(){
+        return new Docket(DocumentationType.SWAGGER_2)
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.nb.system.controller"))
+                .paths(PathSelectors.any())
+                .build()
+                .groupName("系统模块");
+    }
+
+    @Bean
+    public Docket bus(){
+        return new Docket(DocumentationType.SWAGGER_2)
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.nb.bus.controller"))
+                .paths(PathSelectors.any())
+                .build()
+                .groupName("业务模块");
+    }
+
+
+    @Bean
+    public Docket admin(){
+        ParameterBuilder ticketPar = new ParameterBuilder();
+        List<Parameter> pars = new ArrayList<Parameter>();
+        ticketPar.name("tenantId").description("租户id")
+                .modelRef(new ModelRef("string")).parameterType("query")
+                .required(true).build();
+        pars.add(ticketPar.build());
+
+        return new Docket(DocumentationType.SWAGGER_2)
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.nb.auth.controller"))
+                .paths(PathSelectors.any())
+                .build()
+                .groupName("授权模块");
+    }
+}

+ 3 - 1
nb-system/src/main/java/com/nb/bus/hospital/HospitalManagerRegister.java

@@ -71,7 +71,9 @@ public class HospitalManagerRegister {
             hospitalManager.refreshScript();
         }
         if(his){
-            hospitalManager.refreshUpdateConfig(hospitalManager.getInfo().getUpdateConfig());
+            if(hospitalManager.getInfo()!=null){
+                hospitalManager.refreshUpdateConfig(hospitalManager.getInfo().getUpdateConfig());
+            }
         }
     }