diff --git a/changelog.md b/changelog.md index 251584a7..a954581d 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # changelog +## 1.13.5 + +- 修复postJson下version获取不到问题 + ## 1.13.4 - 修复admin服务列表最后更新时间不显示问题 diff --git a/sop-admin/sop-admin-server/pom.xml b/sop-admin/sop-admin-server/pom.xml index ff05f7e3..b74deaf0 100644 --- a/sop-admin/sop-admin-server/pom.xml +++ b/sop-admin/sop-admin-server/pom.xml @@ -30,7 +30,7 @@ com.gitee.sop sop-registry-api - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT diff --git a/sop-common/pom.xml b/sop-common/pom.xml index b504064c..b9474842 100644 --- a/sop-common/pom.xml +++ b/sop-common/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.gitee.sop sop-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT pom diff --git a/sop-common/sop-gateway-common/pom.xml b/sop-common/sop-gateway-common/pom.xml index 69d81f49..4944f39f 100644 --- a/sop-common/sop-gateway-common/pom.xml +++ b/sop-common/sop-gateway-common/pom.xml @@ -5,11 +5,11 @@ com.gitee.sop sop-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT ../pom.xml sop-gateway-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT jar sop-gateway-common diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/param/GatewayParamBuilder.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/param/GatewayParamBuilder.java index be9f0b68..dcdbe855 100644 --- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/param/GatewayParamBuilder.java +++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/param/GatewayParamBuilder.java @@ -22,4 +22,9 @@ public class GatewayParamBuilder extends BaseParamBuilder { public String getIP(ServerWebExchange ctx) { return ctx.getRequest().getRemoteAddress().getAddress().getHostAddress(); } + + @Override + public void setVersionInHeader(ServerWebExchange ctx, String headerName, String version) { + ctx.getRequest().getHeaders().add(headerName, version); + } } diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/BaseParamBuilder.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/BaseParamBuilder.java index 36aa6458..daaddfac 100644 --- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/BaseParamBuilder.java +++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/BaseParamBuilder.java @@ -31,6 +31,14 @@ public abstract class BaseParamBuilder implements ParamBuilder { */ public abstract String getIP(T ctx); + /** + * 将版本号添加到header中 + * @param ctx 请求request + * @param headerName headerName + * @param version 版本号 + */ + public abstract void setVersionInHeader(T ctx, String headerName, String version); + @Override public ApiParam build(T ctx) { ApiParam apiParam = this.newApiParam(ctx); @@ -40,6 +48,7 @@ public abstract class BaseParamBuilder implements ParamBuilder { } this.initOtherProperty(apiParam); apiParam.setIp(this.getIP(ctx)); + this.setVersionInHeader(ctx, ParamNames.HEADER_VERSION_NAME, apiParam.fetchVersion()); return apiParam; } diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/ParamNames.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/ParamNames.java index c375ee99..a1c65cbc 100644 --- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/ParamNames.java +++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/ParamNames.java @@ -45,5 +45,7 @@ public class ParamNames { /** 返回sign名称 */ public static String RESPONSE_SIGN_NAME = "sign"; + public static String HEADER_VERSION_NAME = "sop-version"; + } diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/zuul/param/ZuulParamBuilder.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/zuul/param/ZuulParamBuilder.java index b219f8bf..c21f334f 100644 --- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/zuul/param/ZuulParamBuilder.java +++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/zuul/param/ZuulParamBuilder.java @@ -53,6 +53,11 @@ public class ZuulParamBuilder extends BaseParamBuilder { return RequestUtil.getIP(ctx.getRequest()); } + @Override + public void setVersionInHeader(RequestContext ctx, String headerName, String version) { + ctx.addZuulRequestHeader(headerName, version); + } + @Override protected ApiParam newApiParam(RequestContext ctx) { ApiParam apiParam = super.newApiParam(ctx); diff --git a/sop-common/sop-registry-api/pom.xml b/sop-common/sop-registry-api/pom.xml index f3bfcbe7..f2aa4b67 100644 --- a/sop-common/sop-registry-api/pom.xml +++ b/sop-common/sop-registry-api/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.gitee.sop sop-registry-api - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT UTF-8 diff --git a/sop-common/sop-service-common/pom.xml b/sop-common/sop-service-common/pom.xml index 2be58d1f..a0b12082 100644 --- a/sop-common/sop-service-common/pom.xml +++ b/sop-common/sop-service-common/pom.xml @@ -6,11 +6,11 @@ com.gitee.sop sop-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT ../pom.xml sop-service-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT jar sop-service-common diff --git a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/bean/ParamNames.java b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/bean/ParamNames.java index d717f627..d2e18d00 100644 --- a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/bean/ParamNames.java +++ b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/bean/ParamNames.java @@ -45,5 +45,7 @@ public class ParamNames { /** 时间戳格式 */ public static String TIMESTAMP_PATTERN = "yyyy-MM-dd HH:mm:ss"; + public static String HEADER_VERSION_NAME = "sop-version"; + } diff --git a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingRequestCondition.java b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingRequestCondition.java index fddad83f..e6a2739c 100644 --- a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingRequestCondition.java +++ b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingRequestCondition.java @@ -15,7 +15,6 @@ import javax.servlet.http.HttpServletRequest; @Slf4j public class ApiMappingRequestCondition implements RequestCondition { - public static final String UTF_8 = "UTF-8"; private String defaultVersion = ServiceConfig.getInstance().getDefaultVersion(); private ApiMappingInfo apiMappingInfo; @@ -46,7 +45,10 @@ public class ApiMappingRequestCondition implements RequestCondition com.gitee.sop sop-service-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT org.springframework.cloud diff --git a/sop-example/sop-book/sop-book-web/pom.xml b/sop-example/sop-book/sop-book-web/pom.xml index 04be1bc8..c1610423 100644 --- a/sop-example/sop-book/sop-book-web/pom.xml +++ b/sop-example/sop-book/sop-book-web/pom.xml @@ -24,7 +24,7 @@ com.gitee.sop sop-service-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT com.gitee.sop diff --git a/sop-example/sop-easyopen/pom.xml b/sop-example/sop-easyopen/pom.xml index d7422ed6..ce2fe39c 100644 --- a/sop-example/sop-easyopen/pom.xml +++ b/sop-example/sop-easyopen/pom.xml @@ -29,7 +29,7 @@ com.gitee.sop sop-service-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT org.springframework.cloud diff --git a/sop-example/sop-springmvc/pom.xml b/sop-example/sop-springmvc/pom.xml index 4652ae4f..84f68b37 100644 --- a/sop-example/sop-springmvc/pom.xml +++ b/sop-example/sop-springmvc/pom.xml @@ -20,7 +20,7 @@ com.gitee.sop sop-service-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT diff --git a/sop-example/sop-story/sop-story-web/pom.xml b/sop-example/sop-story/sop-story-web/pom.xml index 254cbf45..c80b2131 100644 --- a/sop-example/sop-story/sop-story-web/pom.xml +++ b/sop-example/sop-story/sop-story-web/pom.xml @@ -24,7 +24,7 @@ com.gitee.sop sop-service-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT com.gitee.sop diff --git a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/AlipayController.java b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/AlipayController.java index 6cc48ee7..577a595c 100644 --- a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/AlipayController.java +++ b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/AlipayController.java @@ -30,7 +30,7 @@ public class AlipayController { // http://localhost:2222/story_get // 原生的接口,可正常调用 @RequestMapping("story_get") - public Story getStory4() { + public Story story_get() { Story story = new Story(); story.setId(1); story.setName("海底小纵队(原生)"); @@ -117,7 +117,7 @@ public class AlipayController { // http://localhost:2222/getStory2?version=2.1 // 遗留接口具备开放平台能力,在原来的基础上加版本号 @ApiAbility(version = "2.1") - @RequestMapping("getStory2") + @GetMapping("getStory2") public Story getStory2_1() { Story story = new Story(); story.setId(1); diff --git a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/PostJsonController.java b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/PostJsonController.java index 0bc5e45a..8bed5cf8 100644 --- a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/PostJsonController.java +++ b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/PostJsonController.java @@ -37,5 +37,25 @@ public class PostJsonController { return story; } + /** + * 演示客户端使用json方式请求(application/json) + * @param param + * @return + */ + @ApiMapping(value = "demo.post.json", version = "1.2") + public Story postJson2(StoryParam param) { + // 获取开放平台请求参数 + OpenContext openContext = ServiceContext.getCurrentContext().getOpenContext(); + List params = Arrays.asList( + openContext.getAppId(), + openContext.getMethod(), + openContext.getVersion() + ); + Story story = new Story(); + story.setId(1); + story.setName("1.2 参数:" + param.getName() + ", openParams:" + StringUtils.join(params)); + return story; + } + } diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml index b82260e9..e0161288 100644 --- a/sop-gateway/pom.xml +++ b/sop-gateway/pom.xml @@ -23,7 +23,7 @@ com.gitee.sop sop-gateway-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT