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

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-11-08 15:01:34 +08:00
parent 04c0c75ad4 45a8f3f6cb
commit e602da0be5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
renren-admin/src/main/java/io/renren/common/utils/UpdateUtil.java
View File

@ -14,6 +14,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@ -89,7 +90,7 @@ public class UpdateUtil {
private void execUpdate(String updateFilePath, String active) {
String[] cmd = {"/bin/sh", "-c", String.format("cd %s && sh update.sh %s %s %s %s", pwd, pwd, updateFilePath, "renren-admin", active)};
// String cmd = String.format("cd %s && sh update.sh %s %s", pwd, pwd, updateFilePath, "renren-admin", active);
logger.info("执行指令：{}", cmd);
logger.info("执行指令：{}", Arrays.asList(cmd).toString());
logger.info(RuntimeUtil.execForStr(cmd));
}
}

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

@ -105,5 +105,5 @@ fi
rm -rf ${APP_DIR}/tmp/*
# 重启平台
sh ${APP_DIR}/renren-admin.sh start ${$PROFILES_ACTIVE}
sh ${APP_DIR}/renren-admin.sh start ${PROFILES_ACTIVE}
exit 0