Merge branch 'master' into docker_package

Merge branch 'dev'
配置文件assembly 赋权755
2022-12-28 09:46:45 +08:00 · 2022-12-28 09:46:38 +08:00 · 2022-12-28 09:46:29 +08:00
1 changed files with 1 additions and 0 deletions
--- 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打包到目录下-->
Author	SHA1	Message	Date
wangliwen	c4d16537f1	Merge branch 'master' into docker_package	2022-12-28 09:46:45 +08:00
wangliwen	b4078b6537	Merge branch 'dev'	2022-12-28 09:46:38 +08:00
wangliwen	2e02838c73	配置文件assembly 赋权755	2022-12-28 09:46:29 +08:00