修改配置

nafmii-admin/src/main/java/org/nafmii/admin/swagger/SwaggerConfig.java

 package org.nafmii.admin.swagger;
 package org.nafmii.admin.swagger;
 
 
 
 
+import io.swagger.annotations.ApiOperation;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -36,11 +37,13 @@ public class SwaggerConfig {
         pars.add(ticketPar.build());    //根据每个方法名也知道当前方法在设置什么参数
         pars.add(ticketPar.build());    //根据每个方法名也知道当前方法在设置什么参数
 
 
         return new Docket (DocumentationType.SWAGGER_2)
         return new Docket (DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
                 .select()
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("org.nafmii.admin"))
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
                 .paths(PathSelectors.any())
                 .paths(PathSelectors.any())
                 .build().globalOperationParameters(pars)
                 .build().globalOperationParameters(pars)
-                .apiInfo(apiInfo());
+                .useDefaultResponseMessages(false)
+                .enableUrlTemplating(false);
     }
     }
 
 
     private static ApiInfo apiInfo() {
     private static ApiInfo apiInfo() {

nafmii-app/src/main/java/org/nafmii/app/swagger/SwaggerConfig.java

 package org.nafmii.app.swagger;
 package org.nafmii.app.swagger;
 
 
 
 
+import io.swagger.annotations.ApiOperation;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -36,11 +37,14 @@ public class SwaggerConfig {
         pars.add(ticketPar.build());    //根据每个方法名也知道当前方法在设置什么参数
         pars.add(ticketPar.build());    //根据每个方法名也知道当前方法在设置什么参数
 
 
         return new Docket (DocumentationType.SWAGGER_2)
         return new Docket (DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
                 .select()
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("org.nafmii.app"))
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
                 .paths(PathSelectors.any())
                 .paths(PathSelectors.any())
                 .build().globalOperationParameters(pars)
                 .build().globalOperationParameters(pars)
-                .apiInfo(apiInfo());
+                .useDefaultResponseMessages(false)
+                .enableUrlTemplating(false);
+
     }
     }
 
 
     private static ApiInfo apiInfo() {
     private static ApiInfo apiInfo() {

nafmii-common/src/main/java/org/nafmii/common/utils/TreeUtil.java

+package org.nafmii.common.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.List;
+
+/**
+ * @author lvyp
+ * @Description Tree
+ * @date 2021/5/8
+ */
+public class TreeUtil {
+
+    /**
+     * jsonArray 转成 List
+     * @param array
+     * @param clazz
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> arrayToList(JSONArray array, Class<T> clazz){
+        String jsonStr = JSON.toJSONString(array);
+        return JSONObject.parseArray(jsonStr,clazz);
+    }
+
+    /**
+     - listToTree
+     - <p>方法说明<p>
+     - 将JSONArray数组转为树状结构
+     - @param arr 需要转化的数据
+     - @param id 数据唯一的标识键值
+     - @param pid 父id唯一标识键值
+     - @param child 子节点键值
+     - @return JSONArray
+     */
+    public static JSONArray listToTree(JSONArray arr, String id, String pid, String child) {
+        JSONArray r = new JSONArray();
+        JSONObject hash = new JSONObject();
+        //将数组转为Object的形式，key为数组中的id
+        for (int i = 0; i < arr.size(); i++) {
+            JSONObject json = (JSONObject) arr.get(i);
+            hash.put(json.getString(id), json);
+        }
+        //遍历结果集
+        for (int j = 0; j < arr.size(); j++) {
+            //单条记录
+            JSONObject aVal = (JSONObject) arr.get(j);
+            //在hash中取出key为单条记录中pid的值
+            String pidStr = "";
+            Object pidObj = aVal.get(pid);
+            if (aVal.get(pid) != null) {
+                pidStr = aVal.get(pid).toString();
+            }
+            JSONObject hashVP = (JSONObject) hash.get(pidStr);
+            //如果记录的pid存在，则说明它有父节点，将她添加到孩子节点的集合中
+            if (hashVP != null) {
+                //检查是否有child属性
+                if (hashVP.get(child) != null) {
+                    JSONArray ch = (JSONArray) hashVP.get(child);
+                    ch.add(aVal);
+                    hashVP.put(child, ch);
+                } else {
+                    JSONArray ch = new JSONArray();
+                    ch.add(aVal);
+                    hashVP.put(child, ch);
+                }
+            } else {
+                r.add(aVal);
+            }
+        }
+        return r;
+    }
+}

nafmii-gateway/src/main/java/org/nafmii/gateway/NafmiiGatewayApplication.java

@@ -3,10 +3,12 @@ package org.nafmii.gateway;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
 
 @SpringBootApplication(exclude= {DataSourceAutoConfiguration.class},scanBasePackages={"org.nafmii","org.nafmii.exception"})
 @SpringBootApplication(exclude= {DataSourceAutoConfiguration.class},scanBasePackages={"org.nafmii","org.nafmii.exception"})
 @EnableEurekaClient
 @EnableEurekaClient
+@EnableDiscoveryClient
 public class NafmiiGatewayApplication {
 public class NafmiiGatewayApplication {
     public static void main(String[] args) {
     public static void main(String[] args) {
         SpringApplication.run(NafmiiGatewayApplication.class, args);
         SpringApplication.run(NafmiiGatewayApplication.class, args);

nafmii-gateway/src/main/resources/application-dev.yml

@@ -12,14 +12,14 @@ spring:
       discovery:
       discovery:
         locator:
         locator:
           enabled: true
           enabled: true
-          lower-case-service-id: true
+          lower-case-service-id: true # 服务名小写
       routes:
       routes:
         - id: nafmii-app
         - id: nafmii-app
           uri: lb://nafmii-app
           uri: lb://nafmii-app
           predicates:
           predicates:
             - Path=/nafmii-app/**
             - Path=/nafmii-app/**
           filters:
           filters:
-            - StripPrefix=1
+            - StripPrefix=1 # 加上StripPrefix=1，否则转发到后端服务时会带上nafmii-app前缀
         - id: nafmii-admin
         - id: nafmii-admin
           uri: lb://nafmii-admin
           uri: lb://nafmii-admin
           predicates:
           predicates:

nafmii-monitor/pom.xml

@@ -14,7 +14,7 @@
     <description>Demo project for Spring Boot</description>
     <description>Demo project for Spring Boot</description>
     <properties>
     <properties>
         <java.version>1.8</java.version>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Hoxton.RELEASE</spring-cloud.version>
+        <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
     </properties>
     </properties>
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>