.idea/encodings.xml

@@ -17,6 +17,7 @@
     <file url="file://$PROJECT_DIR$/service-client/service-product-client/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/service-client/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/service-client/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/service-gateway/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/service/service-acl/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/service/service-product/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/service/service-search/src/main/java" charset="UTF-8" />

.idea/misc.xml

@@ -7,6 +7,11 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="ignoredFiles">
+      <set>
+        <option value="$PROJECT_DIR$/service-gateway/pom.xml" />
+      </set>
+    </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />

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("*");// 允许所有的请求头
     }
 }

model/pom.xml

@@ -33,8 +33,7 @@
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-spring-boot-starter</artifactId>
-            <!--在引用时请在maven中央仓库搜索2.X最新版本号-->
+            <version>3.0.3</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>

service/service-acl/pom.xml

@@ -20,7 +20,10 @@
     </properties>
 
     <dependencies>
-
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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) {

service/service-acl/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8200
+  port: 8201
 
 bunny:
   datasource:

service/service-acl/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8200
+  port: 8201
 spring:
   application:
     name: service-acl

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) {

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.product.mapper: debug
-    com.atguigu.ssyx.acl.controller: info
+    com.atguigu.ssyx.product.controller: info
-    com.atguigu.ssyx.acl.service: info
+    com.atguigu.ssyx.product.service: info
   pattern:
     dateformat: HH:mm:ss:SSS
   file:

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 {

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<Parameter> 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();
+    }
+}

service/service-search/src/main/resources/application.yml

@@ -72,9 +72,9 @@ feign:
 
 logging:
   level:
-    com.atguigu.ssyx.acl.mapper: debug
+    com.atguigu.ssyx.search.mapper: debug
-    com.atguigu.ssyx.acl.controller: info
+    com.atguigu.ssyx.search.controller: info
-    com.atguigu.ssyx.acl.service: info
+    com.atguigu.ssyx.search.service: info
   pattern:
     dateformat: HH:mm:ss:SSS
   file:

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);

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);
     }

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.sys.mapper: debug
-    com.atguigu.ssyx.acl.controller: info
+    com.atguigu.ssyx.sys.controller: info
-    com.atguigu.ssyx.acl.service: info
+    com.atguigu.ssyx.sys.service: info
   pattern:
     dateformat: HH:mm:ss:SSS
   file: