From 048861c2c62fbe0dbe8f2fac486ddb366bbb1328 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 6 May 2022 16:49:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 renren-admin/src/main/resources/assembly/bin/renren-admin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renren-admin/src/main/resources/assembly/bin/renren-admin.sh b/renren-admin/src/main/resources/assembly/bin/renren-admin.sh
index 2464f423..71e9114b 100644
--- a/renren-admin/src/main/resources/assembly/bin/renren-admin.sh
+++ b/renren-admin/src/main/resources/assembly/bin/renren-admin.sh
@@ -13,7 +13,7 @@ LOG_PATH=/dev/null
 #开始方法
 start() {
     cd $JAR_ROOT
-    nohup java -Dfile.encoding=utf-8 -server -Xms256m -Xmx1g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./ -jar $JAR_PATH --server.port=8888 >$LOG_PATH 2>&1 &
+    nohup java -Dfile.encoding=utf-8 -server -Xms256m -Xmx1g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./ -jar $JAR_PATH >$LOG_PATH 2>&1 &
     echo "$JAR_PATH start success."
 }
 

From 25baa8b7751a852d5a0f76aff0590a2f0d1d9bb8 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 6 May 2022 17:00:37 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E6=8A=8A=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E9=A1=B9=E7=9B=AE=E7=9A=84=E8=BE=93=E5=87=BAjar?=
 =?UTF-8?q?=E5=8C=85=E5=B9=B6=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/assembly/assembly.xml        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/renren-admin/src/main/resources/assembly/assembly.xml b/renren-admin/src/main/resources/assembly/assembly.xml
index 34cb319e..8edcf41e 100644
--- a/renren-admin/src/main/resources/assembly/assembly.xml
+++ b/renren-admin/src/main/resources/assembly/assembly.xml
@@ -12,8 +12,17 @@
     <!--第三方依赖设置-->
     <dependencySets>
         <dependencySet>
-            <!--使用项目中的artifact,第三方包打包进tar.gz文件的lib目录下-->
-            <useProjectArtifact>true</useProjectArtifact>
+            <!-- 是否把当前项目的输出jar包并使用，true则会把当前项目输出为jar包到输出目录,false不输出 -->
+            <useProjectArtifact>false</useProjectArtifact>
+            <scope>system</scope>
+            <!-- 依赖输出目录，相对输出目录的根目录，当前示例把依赖输出到lib目录 -->
+            <outputDirectory>lib</outputDirectory>
+        </dependencySet>
+        <dependencySet>
+            <!-- 是否把当前项目的输出jar包并使用，true则会把当前项目输出为jar包到输出目录,false不输出 -->
+            <useProjectArtifact>false</useProjectArtifact>
+            <scope>runtime</scope>
+            <!-- 依赖输出目录，相对输出目录的根目录，当前示例把依赖输出到lib目录 -->
             <outputDirectory>lib</outputDirectory>
         </dependencySet>
     </dependencySets>

From 497a9b6d43fb5e4f503aa91297432f37a9b58fbf Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 6 May 2022 17:03:05 +0800
Subject: [PATCH 3/3] ...

---
 renren-admin/src/main/resources/assembly/assembly.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/renren-admin/src/main/resources/assembly/assembly.xml b/renren-admin/src/main/resources/assembly/assembly.xml
index 8edcf41e..525963e5 100644
--- a/renren-admin/src/main/resources/assembly/assembly.xml
+++ b/renren-admin/src/main/resources/assembly/assembly.xml
@@ -43,10 +43,10 @@
             <filtered>true</filtered>
         </fileSet>
 
-        <fileSet>
-            <directory>${project.basedir}/lib</directory>
-            <outputDirectory>lib/</outputDirectory>
-        </fileSet>
+<!--        <fileSet>-->
+<!--            <directory>${project.basedir}/lib</directory>-->
+<!--            <outputDirectory>lib/</outputDirectory>-->
+<!--        </fileSet>-->
 
         <!-- src/main/resources/config目录下配置文件打包到config目录下 -->
         <fileSet>