diff --git a/doc/docs/files/10100_提供restful接口.md b/doc/docs/files/10100_提供restful接口.md index fbf42923..a2ff0ae8 100644 --- a/doc/docs/files/10100_提供restful接口.md +++ b/doc/docs/files/10100_提供restful接口.md @@ -21,7 +21,7 @@ sop.restful.enable=true **注意,`2.4.1`开始多了一个服务id作为区分,这样做是为了避免各微服务之间url冲突,假如两个微服务都有一个叫`/getItems`这样的接口 那么调用`http://ip:port/rest/getItems`接口网关无法做出正确的路由,虽然可以在代码上进行规范,为了防止万一,还是强行加上了,避免采坑 -。可以指定`sop.restful.compatibility=true`强制使用老的调用方式** +。可以指定`sop.restful.old-model=true`强制使用老的调用方式** > 可在微服务端指定一个配置:`sop.restful.prefix=xxx`。请求路径将变成:`http://ip:port/rest/xxx/your_path` diff --git a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/manager/ApiMetaBuilder.java b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/manager/ApiMetaBuilder.java index c4844b4a..a7fc4ca7 100644 --- a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/manager/ApiMetaBuilder.java +++ b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/manager/ApiMetaBuilder.java @@ -102,8 +102,8 @@ public class ApiMetaBuilder { if (StringUtils.isEmpty(prefix)) { prefix = EnvironmentKeys.SPRING_APPLICATION_NAME.getValue(); } - String compatibilityValue = EnvironmentKeys.SOP_RESTFUL_COMPATIBILITY.getValue(); - if (!"true".equals(compatibilityValue) && StringUtils.hasText(prefix)) { + String oldModel = EnvironmentKeys.SOP_RESTFUL_OLD_MODEL.getValue(); + if (!"true".equals(oldModel) && StringUtils.hasText(prefix)) { name = "/" + prefix + "/" + StringUtils.trimLeadingCharacter(path, '/'); } ServiceApiInfo.ApiMeta apiMeta = new ServiceApiInfo.ApiMeta(name, path, ""); diff --git a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/manager/EnvironmentKeys.java b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/manager/EnvironmentKeys.java index 2254aa64..c3721019 100644 --- a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/manager/EnvironmentKeys.java +++ b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/manager/EnvironmentKeys.java @@ -15,9 +15,9 @@ public enum EnvironmentKeys { SOP_RESTFUL_PREFIX("sop.restful.prefix"), /** - * sop.restful.compatibility=true,兼容老的restful调用方式(2.4.1之前) + * sop.restful.old-model=true,兼容老的restful调用方式(2.4.1之前) */ - SOP_RESTFUL_COMPATIBILITY("sop.restful.compatibility", "false"); + SOP_RESTFUL_OLD_MODEL("sop.restful.old-model", "false"); private String key; private String defaultValue;