Merge branch 'master' into docker_package
This commit is contained in:
commit
cad1176216
|
@ -1,11 +1,9 @@
|
|||
package io.renren.common.controller;
|
||||
|
||||
|
||||
import io.renren.common.annotation.LogOperation;
|
||||
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;
|
||||
|
@ -32,8 +30,6 @@ public class AdminController {
|
|||
* @return
|
||||
*/
|
||||
@PostMapping(value = "/update")
|
||||
@ApiOperation("进行后台程序更新")
|
||||
@LogOperation("进行后台程序更新")
|
||||
public Result<String> update(String updateFile, String active) {
|
||||
if (StringUtils.isEmpty(active)) {
|
||||
active = this.active;
|
||||
|
|
Loading…
Reference in New Issue