Merge branch 'master' into eureka

eureka
tanghc 5 years ago
commit 5ac8b46bb3
  1. 2
      sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/zuul/controller/ConfigChannelController.java
  2. 1
      sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/zuul/controller/ZuulErrorController.java

@ -43,7 +43,7 @@ public class ConfigChannelController {
@Value("${sop.secret}") @Value("${sop.secret}")
private String secret; private String secret;
@PostMapping("/configChannelMsg") @PostMapping("/sop/configChannelMsg")
public String configChannel(HttpServletRequest request) throws IOException { public String configChannel(HttpServletRequest request) throws IOException {
String requestJson = RequestUtil.getText(request); String requestJson = RequestUtil.getText(request);
String sign = request.getHeader("sign"); String sign = request.getHeader("sign");

@ -37,6 +37,7 @@ public class ZuulErrorController implements ErrorController {
, response.getStatus() , response.getStatus()
, ZuulContext.getApiParam() , ZuulContext.getApiParam()
, throwable); , throwable);
RequestContext.getCurrentContext().setRequest(request);
return this.buildResult(throwable); return this.buildResult(throwable);
} }

Loading…
Cancel
Save