Merge branch 'master' into docker_package

renren-admin/pom.xml

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

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

@@ -52,6 +52,7 @@
                 <include>*.json</include>
                 <include>db/*.sql</include>
                 <include>domain/**</include>
+                <include>logback-spring.xml</include>
             </includes>
             <excludes>
                 <exclude>application-bt.yml</exclude>