Ver Fonte

fix score

he2802 há 2 anos atrás
pai
commit
51c4095ddf

+ 1 - 1
run-dev.sh

@@ -65,7 +65,7 @@ docker run \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
 -v /data/logs/dev_admin:/logs \
--v /var/run/docker.sock:/var/run/docker.sock \
+-v /usr/local/nginx/conf/vhost:/nginx/conf/vhost \
 -v /mydata/app/${app_admin_name}/logs:/var/logs \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'

+ 6 - 3
zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -363,9 +363,12 @@ public class CommonController
     }
 
     @ApiOperation("重启服务restart")
-    @GetMapping("common/free/webRestart")
-    public AjaxResult<Void> webRestart(ConfigQueryBo bo) {
-        webService.restartWebService(bo.getUrl());
+    @PostMapping("common/free/webRestart")
+    public AjaxResult<Void> webRestart(@RequestBody ConfigQueryBo bo) {
+        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+            return AjaxResult.error("签名错误");
+        }
+        webService.restartWebService();
         return AjaxResult.success();
     }
 }

+ 9 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ConfigQueryBo.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -22,7 +23,13 @@ public class ConfigQueryBo extends BaseEntity {
 
 	@ApiModelProperty("版本号")
 	private String version;
-	@ApiModelProperty("url")
-	private String url;
+
+	@ApiModelProperty("当前时间戳")
+	@NotBlank(message = "当前时间戳不能为空")
+	private Long stamp;
+
+	@ApiModelProperty("签名")
+	@NotBlank(message = "签名不能为空")
+	private String sign;
 
 }

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysWebService.java

@@ -12,5 +12,5 @@ import java.util.List;
  * @author zhongzheng
  */
 public interface ISysWebService {
-    Boolean restartWebService(String url);
+    Boolean restartWebService();
 }

+ 3 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysWebServiceImpl.java

@@ -42,12 +42,12 @@ public class SysWebServiceImpl implements ISysWebService {
 
 
     @Override
-    public Boolean restartWebService(String url) {
+    public Boolean restartWebService() {
         String respone = "";
         try {
-            String url1 = "http://172.17.0.1:2929/v1.39/containers/nginx-test/stop";
+            String url = "http://172.17.0.1:2929/v1.39/containers/nginx-test/stop";
             Map<String, String> paramMap = new HashMap<>();
-            respone = HttpUtils.postFormBody(url1, paramMap);
+            respone = HttpUtils.postFormBody(url, paramMap);
             System.out.println(respone);
         } catch (IOException e) {
             throw new CustomException("重启请求错误"+e.getMessage());