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

Merge branch 'master' into docker_package 

# Conflicts:
#	renren-admin/src/main/java/io/renren/common/controller/AdminController.java
This commit is contained in:
wangliwen 2022-11-08 10:23:17 +08:00
parent b2d6161dc9 ff844bc432
commit 6528698751
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
renren-admin/src/main/java/io/renren/common/controller/AdminController.java
View File

@ -6,9 +6,11 @@ import io.renren.common.utils.Result;
import io.renren.common.utils.UpdateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -21,6 +23,8 @@ public class AdminController {
@Autowired
private UpdateUtil updateUtil;
@Value("${spring.profiles.active}")
private String active; // 现有生效
/**
* @param updateFile 更新包下载地址
@ -31,8 +35,11 @@ public class AdminController {
@ApiOperation("进行后台程序更新")
@LogOperation("进行后台程序更新")
public Result<String> update(String updateFile, String active) {
updateUtil.update(updateFile, active);
return new Result<String>().ok("");
if (StringUtils.isEmpty(active)) {
active = this.active;
}
boolean success = updateUtil.update(updateFile, active);
return new Result<String>().ok(String.valueOf(success));
}
}