Merge branch 'master' into docker_package

renren-admin/pom.xml

@@ -353,8 +353,6 @@
                     <!-- 排除flyway管理的sql -->
                     <exclude>db/*.sql</exclude>
                     <exclude>domain/**</exclude>
-                    <!-- 日志配置文件 -->
-                    <exclude>logback-spring.xml</exclude>
                 </excludes>
             </resource>
             <resource>

renren-admin/src/main/docker/Dockerfile

@@ -16,4 +16,4 @@ HEALTHCHECK --interval=3m --timeout=3s --start-period=3m --retries=5 CMD curl --
 
 WORKDIR $VERTICLE_HOME/renren-admin
 ENTRYPOINT ["sh", "-c"]
-CMD ["exec java -jar -Dfile.encoding=utf-8 -server -Xshareclasses -Xtune:virtualized -Xms$Xms -Xmx$Xmx -Dspring.config.location=$VERTICLE_HOME/renren-admin/config/ -Dlogback.configurationFile=$VERTICLE_HOME/renren-admin/config/logback-spring.xml -XX:ReservedCodeCacheSize=240m -XX:InitialCodeCacheSize=240m -XX:+UnlockExperimentalVMOptions -XX:+UseZGC -XX:ConcGCThreads=1 -XX:ParallelGCThreads=2 -XX:ZCollectionInterval=120 -XX:ZAllocationSpikeTolerance=5 -Duser.timezone=GMT+08 $VERTICLE_HOME/renren-admin/$JAR_FILE --spring.profiles.active=$ACTIVE"]
+CMD ["exec java -jar -Dfile.encoding=utf-8 -server -Xshareclasses -Xtune:virtualized -Xms$Xms -Xmx$Xmx -XX:ReservedCodeCacheSize=240m -XX:InitialCodeCacheSize=240m -XX:+UnlockExperimentalVMOptions -XX:+UseZGC -XX:ConcGCThreads=1 -XX:ParallelGCThreads=2 -XX:ZCollectionInterval=120 -XX:ZAllocationSpikeTolerance=5 -Duser.timezone=GMT+08 $VERTICLE_HOME/renren-admin/$JAR_FILE --spring.profiles.active=$ACTIVE"]

renren-admin/src/main/resources/assembly/assembly.xml

@@ -52,7 +52,6 @@
                 <include>*.json</include>
                 <include>db/*.sql</include>
                 <include>domain/**</include>
-                <include>logback-spring.xml</include>
             </includes>
             <excludes>
                 <exclude>application-bt.yml</exclude>
@@ -66,7 +65,6 @@
             </excludes>
             <filtered>true</filtered>
             <outputDirectory>${file.separator}config</outputDirectory>
-            <fileMode>0755</fileMode>
         </fileSet>
 
         <!-- 将target目录下的启动jar打包到目录下-->