From 1c6c3acdd28c345d370289a8b0b65721385c9826 Mon Sep 17 00:00:00 2001 From: ksice <17670659687@163.com> Date: Thu, 11 Aug 2022 20:10:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1=E3=80=81fix=20transcation=20invalid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/apollo/openapi/service/ConsumerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java index 234fb210565..e6a67845a39 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java @@ -146,11 +146,12 @@ public Consumer getConsumerByConsumerId(long consumerId) { return consumerRepository.findById(consumerId).orElse(null); } + @Transactional(rollbackFor = Exception.class) public List assignNamespaceRoleToConsumer(String token, String appId, String namespaceName) { return assignNamespaceRoleToConsumer(token, appId, namespaceName, null); } - @Transactional + @Transactional(rollbackFor = Exception.class) public List assignNamespaceRoleToConsumer(String token, String appId, String namespaceName, String env) { Long consumerId = getConsumerIdByToken(token); if (consumerId == null) { From abf5a034596f8eff13a4ba8ece70b469c8d5cbc4 Mon Sep 17 00:00:00 2001 From: xiongtao <17670659687@163.com> Date: Mon, 15 Aug 2022 09:56:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81fix=20assignNamespaceRoleToConsum?= =?UTF-8?q?er=20transcation=20isvalid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/apollo/openapi/service/ConsumerService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java index e6a67845a39..2ddcf8ecdea 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java @@ -146,12 +146,12 @@ public Consumer getConsumerByConsumerId(long consumerId) { return consumerRepository.findById(consumerId).orElse(null); } - @Transactional(rollbackFor = Exception.class) + @Transactional public List assignNamespaceRoleToConsumer(String token, String appId, String namespaceName) { return assignNamespaceRoleToConsumer(token, appId, namespaceName, null); } - @Transactional(rollbackFor = Exception.class) + @Transactional public List assignNamespaceRoleToConsumer(String token, String appId, String namespaceName, String env) { Long consumerId = getConsumerIdByToken(token); if (consumerId == null) { From 04b3473be8eb645655d45a3066d694d993a08259 Mon Sep 17 00:00:00 2001 From: ksice <17670659687@163.com> Date: Thu, 11 Aug 2022 20:10:24 +0800 Subject: [PATCH 3/3] Fix assignNamespaceRoleToConsumer transcation invalid --- .../ctrip/framework/apollo/openapi/service/ConsumerService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java index 234fb210565..2ddcf8ecdea 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java @@ -146,6 +146,7 @@ public Consumer getConsumerByConsumerId(long consumerId) { return consumerRepository.findById(consumerId).orElse(null); } + @Transactional public List assignNamespaceRoleToConsumer(String token, String appId, String namespaceName) { return assignNamespaceRoleToConsumer(token, appId, namespaceName, null); }