Merge remote-tracking branch 'origin/master'

pom.xml

@@ -67,12 +67,6 @@
     </dependencyManagement>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -83,11 +77,20 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 
+    <distributionManagement>
+        <repository>
+            <id>releases</id>
+            <name>Internal Releases</name>
+            <url>http://dev.unififi.com:8081/repository/maven-releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>snapshots</id>
+            <name>Internal Snapshots</name>
+            <url>http://dev.unififi.com:8081/repository/maven-snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+
 </project>

unififi-demo-api/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>unififi-demo-api</artifactId>
     <version>${unififi-api.version}</version>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>

unififi-demo-api/src/main/java/com/unififi/api/UserApi.java

 package com.unififi.api;
 
 import com.unififi.model.User;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -10,7 +9,6 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @FeignClient(value = "unififi-demo2-service")
-@Api(tags = "用户操作")
 public interface UserApi {
 
     @RequestMapping(value = "/echo/{string}", method = RequestMethod.GET)

unififi-demo1-service/pom.xml

@@ -134,4 +134,19 @@
             </exclusions>
         </dependency>
     </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>

unififi-demo2-service/pom.xml

@@ -117,4 +117,19 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

unififi-demo2-service/src/main/java/com/unififi/controller/Demo2Controller.java

 package com.unififi.controller;
 
 
-import com.unififi.config.AppConfig;
 import com.unififi.api.UserApi;
+import com.unififi.config.AppConfig;
 import com.unififi.model.User;
 import com.unififi.service.UserService;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -13,6 +14,7 @@ import java.util.Date;
 import java.util.List;
 
 @RestController
+@Api(tags = "用户操作")
 public class Demo2Controller implements UserApi {
 
     @Autowired
@@ -57,7 +59,7 @@ public class Demo2Controller implements UserApi {
         return user;
     }
 
-    @GetMapping("/config/username")
+    @GetMapping("/config/username1")
     public String get() throws InterruptedException {
         return appConfig.getUsername();
     }

unififi-demo2-service/src/main/resources/logback-spring.xml

@@ -38,17 +38,12 @@
 
     <logger name="org.springframework" level="WARN"/>
 
-    <!-- 开发环境输出到控制台 -->
-    <springProfile name="dev">
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
-        </root>
-    </springProfile>
-
-    <!-- 生产环境输出到文件 -->
-    <springProfile name="prod">
-        <root level="INFO">
         <appender-ref ref="ASYNC"/>
     </root>
+
+    <!-- 开发环境输出到控制台 -->
+    <springProfile name="dev">
     </springProfile>
 </configuration>

unififi-gateway/pom.xml

@@ -54,4 +54,20 @@
         <!--            <artifactId>sentinel-datasource-nacos</artifactId>-->
         <!--        </dependency>-->
     </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

unififi-gateway/src/main/resources/logback-spring.xml

@@ -49,17 +49,12 @@
 
     <logger name="org.springframework" level="WARN"/>
 
-    <!-- 开发环境输出到控制台 -->
-    <springProfile name="dev">
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
-        </root>
-    </springProfile>
-
-    <!-- 生产环境输出到文件 -->
-    <springProfile name="prod">
-        <root level="INFO">
         <appender-ref ref="ASYNC"/>
     </root>
+
+    <!-- 开发环境输出到控制台 -->
+    <springProfile name="dev">
     </springProfile>
 </configuration>