Merge branch 'master' into taobao_model

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/zuul/controller/ConfigChannelController.java

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

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/zuul/controller/ZuulErrorController.java

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