From f9874ad45a74f58d3022d6d83c7ad4dcb0c3af0f Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Wed, 28 Dec 2022 09:07:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=96=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 renren-admin/pom.xml                                  | 2 ++
 renren-admin/src/main/resources/assembly/assembly.xml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/renren-admin/pom.xml b/renren-admin/pom.xml
index 678c6c53..c5dc7fe0 100644
--- a/renren-admin/pom.xml
+++ b/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>
diff --git a/renren-admin/src/main/resources/assembly/assembly.xml b/renren-admin/src/main/resources/assembly/assembly.xml
index 75ae41db..acd89324 100644
--- a/renren-admin/src/main/resources/assembly/assembly.xml
+++ b/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>

From 2e02838c73502effcd5c7e97958e5000d7bf580d Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Wed, 28 Dec 2022 09:46:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6assembl?=
 =?UTF-8?q?y=20=E8=B5=8B=E6=9D=83755?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 renren-admin/src/main/resources/assembly/assembly.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/renren-admin/src/main/resources/assembly/assembly.xml b/renren-admin/src/main/resources/assembly/assembly.xml
index acd89324..e345abc6 100644
--- a/renren-admin/src/main/resources/assembly/assembly.xml
+++ b/renren-admin/src/main/resources/assembly/assembly.xml
@@ -66,6 +66,7 @@
             </excludes>
             <filtered>true</filtered>
             <outputDirectory>${file.separator}config</outputDirectory>
+            <fileMode>0755</fileMode>
         </fileSet>
 
         <!-- 将target目录下的启动jar打包到目录下-->