From 040ca6824819ff9d0944c5bf35b8679638d860db Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Thu, 4 Apr 2024 18:51:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BF=AE=E5=A4=8D):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BAknife4j=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 1 + .idea/misc.xml | 5 ++ .../common/config/WebMvcConfiguration.java | 4 ++ model/pom.xml | 3 +- service/service-acl/pom.xml | 5 +- .../ssyx/acl/ServiceAclApplication.java | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../product/ServiceProductApplication.java | 5 +- .../src/main/resources/application.yml | 6 +-- .../ssyx/search/ServiceSearchApplication.java | 5 +- .../ssyx/search/config/Knife4jConfig.java | 54 +++++++++++++++++++ .../src/main/resources/application.yml | 6 +-- .../ssyx/sys/ServiceSysApplication.java | 4 +- .../ssyx/sys/config/Knife4jConfig.java | 2 +- .../src/main/resources/application.yml | 6 +-- 16 files changed, 93 insertions(+), 19 deletions(-) create mode 100644 service/service-search/src/main/java/com/atguigu/ssyx/search/config/Knife4jConfig.java diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 3a83e53..b9c37f9 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -17,6 +17,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 132404b..a1d25e0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,6 +7,11 @@ + diff --git a/common/service-util/src/main/java/com/atguigu/ssyx/common/config/WebMvcConfiguration.java b/common/service-util/src/main/java/com/atguigu/ssyx/common/config/WebMvcConfiguration.java index 23ad6be..22208c4 100644 --- a/common/service-util/src/main/java/com/atguigu/ssyx/common/config/WebMvcConfiguration.java +++ b/common/service-util/src/main/java/com/atguigu/ssyx/common/config/WebMvcConfiguration.java @@ -21,5 +21,9 @@ public class WebMvcConfiguration implements WebMvcConfigurer { .allowCredentials(true)// 是否允许在跨域的情况下传递Cookie .allowedOrigins("*")// 允许请求来源的域规则 .allowedMethods("*").allowedHeaders("*");// 允许所有的请求头 + registry.addMapping("/api/**")// 添加路径规则 + .allowCredentials(true)// 是否允许在跨域的情况下传递Cookie + .allowedOrigins("*")// 允许请求来源的域规则 + .allowedMethods("*").allowedHeaders("*");// 允许所有的请求头 } } \ No newline at end of file diff --git a/model/pom.xml b/model/pom.xml index 2a1b98a..bda3779 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -33,8 +33,7 @@ com.github.xiaoymin knife4j-spring-boot-starter - - provided + 3.0.3 diff --git a/service/service-acl/pom.xml b/service/service-acl/pom.xml index db664ba..8c4ed7e 100644 --- a/service/service-acl/pom.xml +++ b/service/service-acl/pom.xml @@ -20,7 +20,10 @@ - + + com.github.xiaoymin + knife4j-spring-boot-starter + diff --git a/service/service-acl/src/main/java/com/atguigu/ssyx/acl/ServiceAclApplication.java b/service/service-acl/src/main/java/com/atguigu/ssyx/acl/ServiceAclApplication.java index dad9e58..7c3f112 100644 --- a/service/service-acl/src/main/java/com/atguigu/ssyx/acl/ServiceAclApplication.java +++ b/service/service-acl/src/main/java/com/atguigu/ssyx/acl/ServiceAclApplication.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication -@ComponentScan(basePackages = {"com.atguigu.ssyx.common"}) +@ComponentScan(basePackages = {"com.atguigu.ssyx.common", "com.atguigu.ssyx.acl"}) @EnableTransactionManagement public class ServiceAclApplication { public static void main(String[] args) { diff --git a/service/service-acl/src/main/resources/application-dev.yml b/service/service-acl/src/main/resources/application-dev.yml index e5bc728..7a15ab8 100644 --- a/service/service-acl/src/main/resources/application-dev.yml +++ b/service/service-acl/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8200 + port: 8201 bunny: datasource: diff --git a/service/service-acl/src/main/resources/application.yml b/service/service-acl/src/main/resources/application.yml index 5c9022d..6d0694c 100644 --- a/service/service-acl/src/main/resources/application.yml +++ b/service/service-acl/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8200 + port: 8201 spring: application: name: service-acl diff --git a/service/service-product/src/main/java/com/atguigu/ssyx/product/ServiceProductApplication.java b/service/service-product/src/main/java/com/atguigu/ssyx/product/ServiceProductApplication.java index 77b7367..2a967b3 100644 --- a/service/service-product/src/main/java/com/atguigu/ssyx/product/ServiceProductApplication.java +++ b/service/service-product/src/main/java/com/atguigu/ssyx/product/ServiceProductApplication.java @@ -6,7 +6,10 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication -@ComponentScan(basePackages = {"com.atguigu.ssyx.common", "com.atguigu.ssyx.mq"}) +@ComponentScan(basePackages = { + "com.atguigu.ssyx.common", + "com.atguigu.ssyx.mq", + "com.atguigu.ssyx.product"}) @EnableTransactionManagement public class ServiceProductApplication { public static void main(String[] args) { diff --git a/service/service-product/src/main/resources/application.yml b/service/service-product/src/main/resources/application.yml index 95db11c..4399515 100644 --- a/service/service-product/src/main/resources/application.yml +++ b/service/service-product/src/main/resources/application.yml @@ -64,9 +64,9 @@ mybatis-plus: logging: level: - com.atguigu.ssyx.acl.mapper: debug - com.atguigu.ssyx.acl.controller: info - com.atguigu.ssyx.acl.service: info + com.atguigu.ssyx.product.mapper: debug + com.atguigu.ssyx.product.controller: info + com.atguigu.ssyx.product.service: info pattern: dateformat: HH:mm:ss:SSS file: diff --git a/service/service-search/src/main/java/com/atguigu/ssyx/search/ServiceSearchApplication.java b/service/service-search/src/main/java/com/atguigu/ssyx/search/ServiceSearchApplication.java index fd78dfe..80fa2f2 100644 --- a/service/service-search/src/main/java/com/atguigu/ssyx/search/ServiceSearchApplication.java +++ b/service/service-search/src/main/java/com/atguigu/ssyx/search/ServiceSearchApplication.java @@ -8,7 +8,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; @SpringBootApplication(exclude = DataSourceAutoConfiguration.class) -@ComponentScan(basePackages = {"com.atguigu.ssyx.common", "com.atguigu.ssyx.mq"}) +@ComponentScan(basePackages = { + "com.atguigu.ssyx.common", + "com.atguigu.ssyx.mq", + "com.atguigu.ssyx.search"}) @EnableFeignClients(basePackages = {"com.atguigu.ssyx.client"}) @EnableDiscoveryClient public class ServiceSearchApplication { diff --git a/service/service-search/src/main/java/com/atguigu/ssyx/search/config/Knife4jConfig.java b/service/service-search/src/main/java/com/atguigu/ssyx/search/config/Knife4jConfig.java new file mode 100644 index 0000000..d35c421 --- /dev/null +++ b/service/service-search/src/main/java/com/atguigu/ssyx/search/config/Knife4jConfig.java @@ -0,0 +1,54 @@ +package com.atguigu.ssyx.search.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.ParameterBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.schema.ModelRef; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.service.Parameter; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; + +import java.util.ArrayList; +import java.util.List; + +@Configuration +@EnableSwagger2WebMvc +public class Knife4jConfig { + @Bean + public Docket adminApiConfig() { + List pars = new ArrayList<>(); + ParameterBuilder tokenPar = new ParameterBuilder(); + tokenPar.name("adminId") + .description("用户token") + .defaultValue("1") + .modelRef(new ModelRef("string")) + .parameterType("header") + .required(false) + .build(); + pars.add(tokenPar.build()); + + return new Docket(DocumentationType.SWAGGER_2) + .groupName("搜索ES相关API") + .apiInfo(adminApiInfo()) + .select() + .apis(RequestHandlerSelectors.basePackage("com.atguigu.ssyx.search.controller")) + .paths(PathSelectors.regex("/api/.*")) + .build() + .globalOperationParameters(pars); + } + + private ApiInfo adminApiInfo() { + return new ApiInfoBuilder() + .title("后台管理系统-API文档") + .description("本文档描述了尚上优选后台系统服务接口定义") + .version("1.0") + .contact(new Contact("atguigu", "http://atguigu.com", "atguigu")) + .build(); + } +} \ No newline at end of file diff --git a/service/service-search/src/main/resources/application.yml b/service/service-search/src/main/resources/application.yml index da807b7..ee3868e 100644 --- a/service/service-search/src/main/resources/application.yml +++ b/service/service-search/src/main/resources/application.yml @@ -72,9 +72,9 @@ feign: logging: level: - com.atguigu.ssyx.acl.mapper: debug - com.atguigu.ssyx.acl.controller: info - com.atguigu.ssyx.acl.service: info + com.atguigu.ssyx.search.mapper: debug + com.atguigu.ssyx.search.controller: info + com.atguigu.ssyx.search.service: info pattern: dateformat: HH:mm:ss:SSS file: diff --git a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/ServiceSysApplication.java b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/ServiceSysApplication.java index d7734eb..2e64406 100644 --- a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/ServiceSysApplication.java +++ b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/ServiceSysApplication.java @@ -7,7 +7,9 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication @EnableTransactionManagement -@ComponentScan(basePackages = {"com.atguigu.ssyx.common"}) +@ComponentScan(basePackages = { + "com.atguigu.ssyx.common", + "com.atguigu.ssyx.sys"}) public class ServiceSysApplication { public static void main(String[] args) { SpringApplication.run(ServiceSysApplication.class, args); diff --git a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/config/Knife4jConfig.java b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/config/Knife4jConfig.java index 8c01a06..990b1c8 100644 --- a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/config/Knife4jConfig.java +++ b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/config/Knife4jConfig.java @@ -40,7 +40,7 @@ public class Knife4jConfig { .select() // 只显示api路径下的页面 .apis(RequestHandlerSelectors.basePackage("com.atguigu.ssyx.sys")) - .paths(PathSelectors.regex("/admin/sys/regionWare/.*|/system/.*")) + .paths(PathSelectors.regex("/admin/.*")) .build() .globalOperationParameters(pars); } diff --git a/service/service-sys/src/main/resources/application.yml b/service/service-sys/src/main/resources/application.yml index 8a4d40a..6002948 100644 --- a/service/service-sys/src/main/resources/application.yml +++ b/service/service-sys/src/main/resources/application.yml @@ -47,9 +47,9 @@ mybatis-plus: logging: level: - com.atguigu.ssyx.acl.mapper: debug - com.atguigu.ssyx.acl.controller: info - com.atguigu.ssyx.acl.service: info + com.atguigu.ssyx.sys.mapper: debug + com.atguigu.ssyx.sys.controller: info + com.atguigu.ssyx.sys.service: info pattern: dateformat: HH:mm:ss:SSS file: