Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -332,6 +332,9 @@
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <activatedProperties>dev</activatedProperties>
+                <nacos.host>39.107.77.235</nacos.host>
+                <nacos.port>18848</nacos.port>
+                <nacos.namespace>6d0ee265-2a92-44cc-a6de-f34b3ea104e6</nacos.namespace>
             </properties>
             <activation>
                 <!-- 默认环境 -->
@@ -343,6 +346,9 @@
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <activatedProperties>test</activatedProperties>
+                <nacos.host>172.17.0.1</nacos.host>
+                <nacos.port>18848</nacos.port>
+                <nacos.namespace></nacos.namespace>
             </properties>
         </profile>
         <profile>
@@ -350,7 +356,11 @@
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <activatedProperties>prod</activatedProperties>
+                <nacos.host>172.17.0.1</nacos.host>
+                <nacos.port>18848</nacos.port>
+                <nacos.namespace></nacos.namespace>
             </properties>
+
         </profile>
     </profiles>
 

xueyi-auth/Dockerfile

@@ -7,6 +7,7 @@ MAINTAINER xueyi
 VOLUME /home/xueyi
 # 创建目录
 RUN mkdir -p /home/xueyi
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 # 指定路径
 WORKDIR /home/xueyi
 # 复制jar文件到路径

xueyi-auth/src/main/resources/bootstrap.yml

@@ -9,21 +9,17 @@ spring:
     name: xueyi-auth
   profiles:
     # 环境配置
-    active: dev
+    active: @activatedProperties@
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.17.0.1:18848
-        #namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
-        # 配置中心地址
-        #server-addr: 39.107.77.235:18848
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
       config:
         # 配置中心地址
-        server-addr: 172.17.0.1:18848
-#        namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
-        # 配置中心地址
-#        server-addr: 39.107.77.235:18848
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
         # 配置文件格式
         file-extension: yml
         # 共享配置

xueyi-gateway/Dockerfile

@@ -7,6 +7,7 @@ MAINTAINER xueyi
 VOLUME /home/xueyi
 # 创建目录
 RUN mkdir -p /home/xueyi
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 # 指定路径
 WORKDIR /home/xueyi
 # 复制jar文件到路径

xueyi-gateway/pom.xml

@@ -104,7 +104,21 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <configuration>
+                    <delimiters>@</delimiters>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                </configuration>
+            </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 
 </project>

xueyi-gateway/src/main/resources/bootstrap.yml

@@ -9,19 +9,18 @@ spring:
     name: xueyi-gateway
   profiles:
     # 环境配置
-    active: dev
+    active: @activatedProperties@
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.17.0.1:18848
-        #namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
-        #server-addr: 39.107.77.235:18848
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
       config:
         # 配置中心地址
-        server-addr: 172.17.0.1:18848
-        #namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
-        #server-addr: 39.107.77.235:18848
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
+
         # 配置文件格式
         file-extension: yml
         # 共享配置

xueyi-modules/xueyi-file/Dockerfile

@@ -7,6 +7,7 @@ MAINTAINER xueyi
 VOLUME /home/xueyi
 # 创建目录
 RUN mkdir -p /home/xueyi
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 # 指定路径
 WORKDIR /home/xueyi
 # 复制jar文件到路径

xueyi-modules/xueyi-file/pom.xml

@@ -88,7 +88,21 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <configuration>
+                    <delimiters>@</delimiters>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                </configuration>
+            </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
    
 </project>

xueyi-modules/xueyi-file/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: xueyi-file
   profiles:
     # 环境配置
-    active: dev
+    active: @activatedProperties@
   servlet:
     multipart:
       max-request-size: 10MB
@@ -18,10 +18,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.17.0.1:18848
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
       config:
         # 配置中心地址
-        server-addr: 172.17.0.1:18848
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
         # 配置文件格式
         file-extension: yml
         # 共享配置

xueyi-modules/xueyi-job/Dockerfile

@@ -7,6 +7,7 @@ MAINTAINER xueyi
 VOLUME /home/xueyi
 # 创建目录
 RUN mkdir -p /home/xueyi
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 # 指定路径
 WORKDIR /home/xueyi
 # 复制jar文件到路径

xueyi-modules/xueyi-job/pom.xml

@@ -81,7 +81,21 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <configuration>
+                    <delimiters>@</delimiters>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                </configuration>
+            </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 
 </project>

xueyi-modules/xueyi-job/src/main/resources/bootstrap.yml

@@ -9,15 +9,17 @@ spring:
     name: xueyi-job
   profiles:
     # 环境配置
-    active: dev
+    active: @activatedProperties@
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.17.0.1:18848
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
       config:
         # 配置中心地址
-        server-addr: 172.17.0.1:18848
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
         # 配置文件格式
         file-extension: yml
         # 共享配置

xueyi-modules/xueyi-message/Dockerfile

@@ -7,6 +7,7 @@ MAINTAINER xueyi
 VOLUME /home/xueyi
 # 创建目录
 RUN mkdir -p /home/xueyi
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 # 指定路径
 WORKDIR /home/xueyi
 # 复制jar文件到路径

xueyi-modules/xueyi-message/pom.xml

@@ -106,6 +106,20 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <configuration>
+                    <delimiters>@</delimiters>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                </configuration>
+            </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 </project>

xueyi-modules/xueyi-message/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9700
+  port: 9900
 
 # Spring
 spring: 
@@ -17,11 +17,15 @@ spring:
   cloud:
     nacos:
       discovery:
+
         # 服务注册地址
-        server-addr: 172.17.0.1:18848
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
+
       config:
         # 配置中心地址
-        server-addr: 172.17.0.1:18848
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
         # 配置文件格式
         file-extension: yml
         # 共享配置

xueyi-modules/xueyi-system/Dockerfile

@@ -7,6 +7,7 @@ MAINTAINER xueyi
 VOLUME /home/xueyi
 # 创建目录
 RUN mkdir -p /home/xueyi
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 # 指定路径
 WORKDIR /home/xueyi
 # 复制jar文件到路径

xueyi-modules/xueyi-system/pom.xml

@@ -116,6 +116,20 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <configuration>
+                    <delimiters>@</delimiters>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                </configuration>
+            </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 </project>

xueyi-modules/xueyi-system/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: xueyi-system
   profiles:
     # 环境配置
-    active: dev
+    active: @activatedProperties@
   servlet:
     multipart:
       max-request-size: 20MB
@@ -18,15 +18,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.17.0.1:18848
-        #server-addr: 39.107.77.235:18848
-#        namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
 
       config:
-#        namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
         # 配置中心地址
-        #server-addr: 39.107.77.235:18848
-        server-addr: 172.17.0.1:18848
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
+
         # 配置文件格式
         file-extension: yml
         # 共享配置

xueyi-modules/xueyi-tenant/Dockerfile

@@ -7,6 +7,7 @@ MAINTAINER xueyi
 VOLUME /home/xueyi
 # 创建目录
 RUN mkdir -p /home/xueyi
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 # 指定路径
 WORKDIR /home/xueyi
 # 复制jar文件到路径

xueyi-modules/xueyi-tenant/pom.xml

@@ -81,6 +81,20 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <configuration>
+                    <delimiters>@</delimiters>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                </configuration>
+            </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 </project>

xueyi-modules/xueyi-tenant/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: xueyi-tenant
   profiles:
     # 环境配置
-    active: dev
+    active: @activatedProperties@
   servlet:
     multipart:
       max-request-size: 20MB
@@ -18,10 +18,13 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.17.0.1:18848
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
+
       config:
         # 配置中心地址
-        server-addr: 172.17.0.1:18848
+        server-addr: @nacos.host@:@nacos.port@
+        namespace: @nacos.namespace@
         # 配置文件格式
         file-extension: yml
         # 共享配置