wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
dinggang 2022-05-06 17:05:56 +08:00
parent 2b65f9f9d8 497a9b6d43
commit e9e2354a16
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
renren-admin/src/main/resources/assembly/assembly.xml
View File

@ -12,8 +12,17 @@
<!--第三方依赖设置--> <!--第三方依赖设置-->
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<!--使用项目中的artifact,第三方包打包进tar.gz文件的lib目录下--> <!-- 是否把当前项目的输出jar包并使用，true则会把当前项目输出为jar包到输出目录,false不输出 -->
<useProjectArtifact>true</useProjectArtifact> <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> <outputDirectory>lib</outputDirectory>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>
@ -34,10 +43,10 @@
<filtered>true</filtered> <filtered>true</filtered>
</fileSet> </fileSet>
<fileSet> <!-- <fileSet>-->
<directory>${project.basedir}/lib</directory> <!-- <directory>${project.basedir}/lib</directory>-->
<outputDirectory>lib/</outputDirectory> <!-- <outputDirectory>lib/</outputDirectory>-->
</fileSet> <!-- </fileSet>-->
<!-- src/main/resources/config目录下配置文件打包到config目录下 --> <!-- src/main/resources/config目录下配置文件打包到config目录下 -->
<fileSet> <fileSet>

2
renren-admin/src/main/resources/assembly/bin/renren-admin.sh
View File

@ -13,7 +13,7 @@ LOG_PATH=/dev/null
#开始方法 #开始方法
start() { start() {
cd $JAR_ROOT 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." echo "$JAR_PATH start success."
} }