Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/PostFilter.java

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/DidiFilterProcessor.java

@@ -18,11 +18,15 @@ public class DidiFilterProcessor extends FilterProcessor {
        try {
            return super.processZuulFilter(filter);
        } catch (ZuulException e) {
            ZuulException e1 = new ZuulException("123456",10085,"10000");
            RequestContext ctx = RequestContext.getCurrentContext();
            ctx.set("failed.exception", e1);
            ctx.set("failed.filter", filter);
            throw e1 ;
            if (e.nStatusCode==500){
                RequestContext ctx = RequestContext.getCurrentContext();
                ZuulException e1 = new ZuulException("123456",10085,"10000");
                ctx.set("failed.exception", e1);
                ctx.set("failed.filter", filter);
                throw e1 ;
            }else {
                throw e;
            }
        }
    }
}