diff --git a/acku-core/src/main/java/io/xream/acku/remote/acku/AckuServiceRemote.java b/acku-core/src/main/java/io/xream/acku/remote/acku/AckuServiceRemote.java index 83160d4..d079810 100644 --- a/acku-core/src/main/java/io/xream/acku/remote/acku/AckuServiceRemote.java +++ b/acku-core/src/main/java/io/xream/acku/remote/acku/AckuServiceRemote.java @@ -18,8 +18,10 @@ import io.xream.acku.bean.dto.AckuDto; import io.xream.acku.bean.dto.ConsumedAckuDto; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.service.annotation.HttpExchange; +import org.springframework.web.service.annotation.PostExchange; /** @@ -28,19 +30,19 @@ @HttpExchange("http://${acku.app}/message" ) public interface AckuServiceRemote { - @RequestMapping("/create") - AckuDto create(AckuDto dto); + @PostExchange("/create") + AckuDto create(@RequestBody AckuDto dto); - @RequestMapping("/produce") - boolean produce(AckuDto dto); + @PostExchange("/produce") + boolean produce(@RequestBody AckuDto dto); - @RequestMapping("/consume") - boolean consume(ConsumedAckuDto dto); + @PostExchange("/consume") + boolean consume(@RequestBody ConsumedAckuDto dto); - @RequestMapping("/tryToConfirm") + @PostExchange("/tryToConfirm") boolean tryToConfirm(String msgId); - @RequestMapping("/cancel") + @PostExchange("/cancel") boolean cancel(String msgId); } diff --git a/acku-core/src/main/java/io/xream/acku/remote/acku/FailedServiceRemote.java b/acku-core/src/main/java/io/xream/acku/remote/acku/FailedServiceRemote.java index 3340f04..1a84cb6 100644 --- a/acku-core/src/main/java/io/xream/acku/remote/acku/FailedServiceRemote.java +++ b/acku-core/src/main/java/io/xream/acku/remote/acku/FailedServiceRemote.java @@ -1,8 +1,10 @@ package io.xream.acku.remote.acku; import io.xream.acku.bean.entity.AckuMessage; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.service.annotation.GetExchange; import org.springframework.web.service.annotation.HttpExchange; import java.util.List; @@ -15,16 +17,16 @@ public interface FailedServiceRemote { - @RequestMapping(value = "/find", method = RequestMethod.GET) + @GetExchange(value = "/find") List findFailed(); - @RequestMapping(value = "/find/{topic}", method = RequestMethod.GET) - List findFailedByTopic(); + @GetExchange(value = "/find/{topic}") + List findFailedByTopic(@PathVariable("topic") String topic); - @RequestMapping(value = "/retryAll", method = RequestMethod.GET) + @GetExchange(value = "/retryAll") boolean retryAll(); - @RequestMapping(value = "/retry/{messageId}", method = RequestMethod.GET) - boolean retry(String messageId); + @GetExchange(value = "/retry/{messageId}") + boolean retry(@PathVariable("messageId") String messageId); } diff --git a/acku-message-center/acku-dashboard/src/main/java/io/xream/acku/remote/AuthorizationServiceRemote.java b/acku-message-center/acku-dashboard/src/main/java/io/xream/acku/remote/AuthorizationServiceRemote.java index 8d2fa04..2aee923 100644 --- a/acku-message-center/acku-dashboard/src/main/java/io/xream/acku/remote/AuthorizationServiceRemote.java +++ b/acku-message-center/acku-dashboard/src/main/java/io/xream/acku/remote/AuthorizationServiceRemote.java @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.service.annotation.GetExchange; import org.springframework.web.service.annotation.HttpExchange; /** @@ -26,6 +27,6 @@ @HttpExchange("http://${acku.dashboard.authorization.url.server}" ) public interface AuthorizationServiceRemote { - @RequestMapping(value = "/{token}/{userId}", method = RequestMethod.GET) + @GetExchange(value = "/{token}/{userId}") boolean verify(String token, String userId); } diff --git a/acku-message-center/acku-schedule/src/main/java/io/xream/acku/remote/ScheduledAckuServiceRemote.java b/acku-message-center/acku-schedule/src/main/java/io/xream/acku/remote/ScheduledAckuServiceRemote.java index 44f17c9..64c5a24 100644 --- a/acku-message-center/acku-schedule/src/main/java/io/xream/acku/remote/ScheduledAckuServiceRemote.java +++ b/acku-message-center/acku-schedule/src/main/java/io/xream/acku/remote/ScheduledAckuServiceRemote.java @@ -19,7 +19,9 @@ import io.xream.acku.bean.entity.AckuMessage; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.service.annotation.GetExchange; import org.springframework.web.service.annotation.HttpExchange; +import org.springframework.web.service.annotation.PostExchange; import java.util.List; @@ -30,18 +32,18 @@ public interface ScheduledAckuServiceRemote { - @RequestMapping(value = "/retry") + @PostExchange(value = "/retry") boolean retry(AckuMessage message); - @RequestMapping(value = "/listForRetry", method = RequestMethod.GET) + @GetExchange(value = "/listForRetry") List listForRetry(); - @RequestMapping(value = "/tryToFinish",method = RequestMethod.GET) + @GetExchange(value = "/tryToFinish") boolean tryToFinish(); - @RequestMapping(value = "/tryToProduceNext",method = RequestMethod.GET) + @GetExchange(value = "/tryToProduceNext") boolean tryToProduceNext(); - @RequestMapping(value = "/clean",method = RequestMethod.GET) + @GetExchange(value = "/clean") boolean clean(); } diff --git a/pom.xml b/pom.xml index 3453f53..da1591b 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 17 17 true - 3.1.6 + 3.1.7 @@ -70,7 +70,7 @@ org.springframework.boot spring-boot-dependencies - 3.1.5 + 3.2.2 pom import @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.1.0 sign-artifacts