From 888d1e0c4e268184fc330665c8241e8ffb59666c Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 4 Dec 2019 08:27:05 +0800 Subject: [PATCH 1/5] 2.5.7 --- .../com/gitee/sop/gateway/manager/DbRoutesProcessor.java | 8 +++++--- sop-gateway/src/main/resources/application-dev.properties | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/manager/DbRoutesProcessor.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/manager/DbRoutesProcessor.java index 375e248c..7dc34021 100644 --- a/sop-gateway/src/main/java/com/gitee/sop/gateway/manager/DbRoutesProcessor.java +++ b/sop-gateway/src/main/java/com/gitee/sop/gateway/manager/DbRoutesProcessor.java @@ -8,9 +8,9 @@ import com.gitee.sop.gatewaycommon.bean.InstanceDefinition; import com.gitee.sop.gatewaycommon.bean.ServiceRouteInfo; import com.gitee.sop.gatewaycommon.route.RoutesProcessor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.stream.Collectors; @@ -62,7 +62,9 @@ public class DbRoutesProcessor implements RoutesProcessor { // 删除serviceId下所有的路由 this.removeAllRoutes(serviceId); - // 批量保存 - configServiceRouteMapper.saveBatch(configServiceRoutes); + if (CollectionUtils.isNotEmpty(configServiceRoutes)) { + // 批量保存 + configServiceRouteMapper.saveBatch(configServiceRoutes); + } } } diff --git a/sop-gateway/src/main/resources/application-dev.properties b/sop-gateway/src/main/resources/application-dev.properties index 21b95d95..76a5792d 100644 --- a/sop-gateway/src/main/resources/application-dev.properties +++ b/sop-gateway/src/main/resources/application-dev.properties @@ -18,6 +18,8 @@ zipkin.url=http://127.0.0.1:9411/ pre.domain=localhost # ------- 需要改的配置end ------- +sop.restful.enable=true + # 入口地址，不用改，默认是/zuul zuul.servlet-path=/api # 禁用默认的过滤器，不能删，不用改 From 8f9acdffac49c86f73f78d1085feaf22d05808bc Mon Sep 17 00:00:00 2001 From: tanghc Date: Tue, 10 Dec 2019 10:56:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E4=BC=A0?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/gitee/sop/sdk/request/BaseRequest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/BaseRequest.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/BaseRequest.java index 940c0a51..66a4e6ff 100644 --- a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/BaseRequest.java +++ b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/BaseRequest.java @@ -36,10 +36,12 @@ import java.util.Map; */ public abstract class BaseRequest { + private static final String EMPTY_JSON = "{}"; + private String method; private String version; - private String bizContent; + private String bizContent = EMPTY_JSON; private Object bizModel; /** From 42ac4fff770573159125b8de48ae3f6578fc7d1a Mon Sep 17 00:00:00 2001 From: tanghc Date: Tue, 10 Dec 2019 20:02:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/docs/files/90100_常见问题.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/docs/files/90100_常见问题.md b/doc/docs/files/90100_常见问题.md index 67eb4f8b..81c9d7b9 100644 --- a/doc/docs/files/90100_常见问题.md +++ b/doc/docs/files/90100_常见问题.md @@ -129,3 +129,12 @@ sop.service.exclude=your-serviceId1,your-serviceId2 # 多个正则用英文分号(;)隔开 sop.service.exclude-regex=test\\-.* ``` + +## ISV公私钥 & 平台公私钥 + +```java +ISV私钥（必须）：ISV保存，用来生成签名 --> ISV公钥（必须）：平台保存，用来校验签名是否正确 +平台私钥（非必须）：平台保存，对返回结果生成签名 --> 平台公钥（非必须）：ISV保存，用来校验签名是否正确 +``` + +总结：私钥负责加密生成签名，公钥负责校验签名是否正确 From 7fabddcd11e485536b8516ca2e96e6193bedb88f Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 11 Dec 2019 10:32:10 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sop/storyweb/controller/TraditionalWebappController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/TraditionalWebappController.java b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/TraditionalWebappController.java index 9c199f1f..08e88f8e 100644 --- a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/TraditionalWebappController.java +++ b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/TraditionalWebappController.java @@ -84,6 +84,8 @@ public class TraditionalWebappController { public Food getById(@PathVariable("id") Integer id) { Food food = new Food(); food.setId(id); + food.setName("香蕉"); + food.setPrice(BigDecimal.valueOf(100)); return food; } From b03e908173f4eef074957186902b24ebe69f1a7b Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 11 Dec 2019 10:51:50 +0800 Subject: [PATCH 5/5] 2.5.7 --- sop-auth/pom.xml | 2 +- sop-common/pom.xml | 2 +- sop-common/sop-gateway-common/pom.xml | 4 ++-- sop-common/sop-service-common/pom.xml | 4 ++-- sop-example/sop-book/sop-book-web/pom.xml | 2 +- sop-example/sop-easyopen/pom.xml | 2 +- sop-example/sop-springmvc/pom.xml | 2 +- sop-example/sop-story/sop-story-web/pom.xml | 2 +- sop-gateway/pom.xml | 2 +- sop-website/pom.xml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sop-auth/pom.xml b/sop-auth/pom.xml index 56a660cd..ebd0a69e 100644 --- a/sop-auth/pom.xml +++ b/sop-auth/pom.xml @@ -26,7 +26,7 @@ com.gitee.sop sop-service-common - 2.5.6-SNAPSHOT + 2.5.7-SNAPSHOT diff --git a/sop-common/pom.xml b/sop-common/pom.xml index 04bd8b38..4fee2370 100644 --- a/sop-common/pom.xml +++ b/sop-common/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.gitee.sop sop-common - 2.5.6-SNAPSHOT + 2.5.7-SNAPSHOT pom diff --git a/sop-common/sop-gateway-common/pom.xml b/sop-common/sop-gateway-common/pom.xml index 0b8cc65f..2bcb7cdb 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 - 2.5.6-SNAPSHOT + 2.5.7-SNAPSHOT ../pom.xml sop-gateway-common - 2.5.6-SNAPSHOT + 2.5.7-SNAPSHOT jar sop-gateway-common diff --git a/sop-common/sop-service-common/pom.xml b/sop-common/sop-service-common/pom.xml index 42fe1731..089f3346 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 - 2.5.6-SNAPSHOT + 2.5.7-SNAPSHOT ../pom.xml sop-service-common - 2.5.6-SNAPSHOT + 2.5.7-SNAPSHOT jar sop-service-common diff --git a/sop-example/sop-book/sop-book-web/pom.xml b/sop-example/sop-book/sop-book-web/pom.xml index 2a5044c4..f1671681 100644 --- a/sop-example/sop-book/sop-book-web/pom.xml +++ b/sop-example/sop-book/sop-book-web/pom.xml @@ -28,7 +28,7 @@ com.gitee.sop sop-service-common - 2.5.6-SNAPSHOT + 2.5.7-SNAPSHOT com.gitee.sop diff --git a/sop-example/sop-easyopen/pom.xml b/sop-example/sop-easyopen/pom.xml index 5ea622ef..8fcaa615 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 - 2.5.6-SNAPSHOT + 2.5.7-SNAPSHOT diff --git a/sop-example/sop-story/sop-story-web/pom.xml b/sop-example/sop-story/sop-story-web/pom.xml index e02efb6b..7275e91a 100644 --- a/sop-example/sop-story/sop-story-web/pom.xml +++ b/sop-example/sop-story/sop-story-web/pom.xml @@ -28,7 +28,7 @@ com.gitee.sop sop-service-common - 2.5.6-SNAPSHOT + 2.5.7-SNAPSHOT com.gitee.sop diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml index 86509484..827bafe6 100644 --- a/sop-gateway/pom.xml +++ b/sop-gateway/pom.xml @@ -29,7 +29,7 @@ com.gitee.sop sop-gateway-common - 2.5.6-SNAPSHOT + 2.5.7-SNAPSHOT diff --git a/sop-website/pom.xml b/sop-website/pom.xml index b11423ee..124a18c7 100644 --- a/sop-website/pom.xml +++ b/sop-website/pom.xml @@ -35,7 +35,7 @@ com.gitee.sop sop-gateway-common - 2.5.6-SNAPSHOT + 2.5.7-SNAPSHOT