From 28c1afd53c61017a2ea583b922b0bc78e3917c22 Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Mon, 6 Mar 2023 09:42:09 +0800
Subject: [PATCH] 工具类路径优化
---
huaheng-wms-core/src/main/java/org/jeecg/utils/Swagger3Config.java | 103 -------------------------------------------------------------------------------------------------------
huaheng-wms-core/src/main/java/org/jeecg/utils/config/Swagger3Config.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
huaheng-wms-core/src/main/resources/application.yml | 2 +-
3 files changed, 104 insertions(+), 104 deletions(-)
delete mode 100644 huaheng-wms-core/src/main/java/org/jeecg/utils/Swagger3Config.java
create mode 100644 huaheng-wms-core/src/main/java/org/jeecg/utils/config/Swagger3Config.java
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/Swagger3Config.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/Swagger3Config.java
deleted file mode 100644
index e0e9634..0000000
--- a/huaheng-wms-core/src/main/java/org/jeecg/utils/Swagger3Config.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.jeecg.utils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.jeecg.common.constant.CommonConstant;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
-
-import io.swagger.annotations.ApiOperation;
-import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.*;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @author 游杰
- */
-@Configuration
-@EnableSwagger2
-@EnableKnife4j
-@Import(BeanValidatorPluginsConfiguration.class)
-public class Swagger3Config implements WebMvcConfigurer {
-
- /**
- * 显示swagger-ui.html文档展示页，还必须注入swagger资源：
- * @param registry
- */
- @Override
- public void addResourceHandlers(ResourceHandlerRegistry registry) {
- registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
- registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
- registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
- }
-
- /**
- * swagger2的配置文件，这里可以配置swagger2的一些基本的内容，比如扫描的包等等
- * @return Docket
- */
- @Bean(value = "defaultApi2")
- public Docket defaultApi2() {
- return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select()
- // 此包路径下的类，才生成接口文档
- .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.wms.api"))
- // 加了ApiOperation注解的类，才生成接口文档
- .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class)).apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
- .paths(PathSelectors.any()).build().securitySchemes(Collections.singletonList(securityScheme())).securityContexts(securityContexts());
- // .globalOperationParameters(setHeaderToken());
- }
-
- /***
- * oauth2配置
- * 需要增加swagger授权回调地址
- * http://localhost:8888/webjars/springfox-swagger-ui/o2c.html
- * @return
- */
- @Bean
- SecurityScheme securityScheme() {
- return new ApiKey(CommonConstant.X_ACCESS_TOKEN, CommonConstant.X_ACCESS_TOKEN, "header");
- }
-
- /**
- * 新增 securityContexts 保持登录状态
- */
- private List<SecurityContext> securityContexts() {
- return Collections.singletonList(SecurityContext.builder().securityReferences(defaultAuth()).forPaths(PathSelectors.regex("^(?!auth).*$")).build());
- }
-
- /**
- * api文档的详细信息函数,注意这里的注解引用的是哪个
- * @return
- */
- private ApiInfo apiInfo() {
- return new ApiInfoBuilder()
- // //大标题
- .title("华恒仓储管理系统API接口文档")
- // 版本号
- .version("1.0")
-// .termsOfServiceUrl("NO terms of service")
- // 描述
- .description("后台API接口").license("The Apache License, Version 2.0").licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html").build();
- }
-
- private List<SecurityReference> defaultAuth() {
- AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
- AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
- authorizationScopes[0] = authorizationScope;
- return Collections.singletonList(new SecurityReference(CommonConstant.X_ACCESS_TOKEN, authorizationScopes));
- }
-
-}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/config/Swagger3Config.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/config/Swagger3Config.java
new file mode 100644
index 0000000..d62100e
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/utils/config/Swagger3Config.java
@@ -0,0 +1,103 @@
+package org.jeecg.utils.config;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.jeecg.common.constant.CommonConstant;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
+
+import io.swagger.annotations.ApiOperation;
+import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.*;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * @author 游杰
+ */
+@Configuration
+@EnableSwagger2
+@EnableKnife4j
+@Import(BeanValidatorPluginsConfiguration.class)
+public class Swagger3Config implements WebMvcConfigurer {
+
+ /**
+ * 显示swagger-ui.html文档展示页，还必须注入swagger资源：
+ * @param registry
+ */
+ @Override
+ public void addResourceHandlers(ResourceHandlerRegistry registry) {
+ registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+ registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
+ registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+ }
+
+ /**
+ * swagger2的配置文件，这里可以配置swagger2的一些基本的内容，比如扫描的包等等
+ * @return Docket
+ */
+ @Bean(value = "defaultApi2")
+ public Docket defaultApi2() {
+ return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select()
+ // 此包路径下的类，才生成接口文档
+ .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.wms.api"))
+ // 加了ApiOperation注解的类，才生成接口文档
+ .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class)).apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+ .paths(PathSelectors.any()).build().securitySchemes(Collections.singletonList(securityScheme())).securityContexts(securityContexts());
+ // .globalOperationParameters(setHeaderToken());
+ }
+
+ /***
+ * oauth2配置
+ * 需要增加swagger授权回调地址
+ * http://localhost:8888/webjars/springfox-swagger-ui/o2c.html
+ * @return
+ */
+ @Bean
+ SecurityScheme securityScheme() {
+ return new ApiKey(CommonConstant.X_ACCESS_TOKEN, CommonConstant.X_ACCESS_TOKEN, "header");
+ }
+
+ /**
+ * 新增 securityContexts 保持登录状态
+ */
+ private List<SecurityContext> securityContexts() {
+ return Collections.singletonList(SecurityContext.builder().securityReferences(defaultAuth()).forPaths(PathSelectors.regex("^(?!auth).*$")).build());
+ }
+
+ /**
+ * api文档的详细信息函数,注意这里的注解引用的是哪个
+ * @return
+ */
+ private ApiInfo apiInfo() {
+ return new ApiInfoBuilder()
+ // //大标题
+ .title("华恒仓储管理系统API接口文档")
+ // 版本号
+ .version("1.0")
+// .termsOfServiceUrl("NO terms of service")
+ // 描述
+ .description("后台API接口").license("The Apache License, Version 2.0").licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html").build();
+ }
+
+ private List<SecurityReference> defaultAuth() {
+ AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+ AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+ authorizationScopes[0] = authorizationScope;
+ return Collections.singletonList(new SecurityReference(CommonConstant.X_ACCESS_TOKEN, authorizationScopes));
+ }
+
+}
diff --git a/huaheng-wms-core/src/main/resources/application.yml b/huaheng-wms-core/src/main/resources/application.yml
index 641bf07..66b20ef 100644
--- a/huaheng-wms-core/src/main/resources/application.yml
+++ b/huaheng-wms-core/src/main/resources/application.yml
@@ -6,4 +6,4 @@ spring:
huaheng:
system:
- Id: HUAHENG-WMS4
+ id: HUAHENG-WMS4
--
libgit2 0.22.2