diff --git a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/ApiClient.java b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/ApiClient.java index 48d2e36..012686b 100644 --- a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/ApiClient.java +++ b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/ApiClient.java @@ -46,8 +46,7 @@ public interface ApiClient { } default HttpResponse post(String url, QueryParameter parameters, HttpHeaders headers, RequestBody body, Class responseClass) { - HttpRequest httpRequest = new HttpRequest.Builder() - .httpMethod(HttpMethod.POST) + HttpRequest httpRequest = new HttpRequest.Builder().httpMethod(HttpMethod.POST) .url(url) .parameters(parameters) .headers(headers) diff --git a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Nonce.java b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Nonce.java index c0628e1..5f5e117 100644 --- a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Nonce.java +++ b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Nonce.java @@ -17,4 +17,9 @@ public class Nonce { public static String ofNonce() { return UUID.randomUUID().toString().replace("-", "").toLowerCase(); } + + public static String ofShortNonce() { + // TODO 短ID + throw new IllegalArgumentException(); + } } diff --git a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/util/NonceTest.java b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/util/NonceTest.java new file mode 100644 index 0000000..d56cdaa --- /dev/null +++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/util/NonceTest.java @@ -0,0 +1,12 @@ +package com.czcb.scfs.api.core.util; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +class NonceTest { + + @Test + void ofNonce() { + Assertions.assertEquals(32, Nonce.ofNonce().length()); + } +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/EchoService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/EchoService.java index 967de50..83c1ac8 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/EchoService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/EchoService.java @@ -26,8 +26,7 @@ public class EchoService { public void echo() { String url = "/echo"; HttpHeaders headers = new HttpHeaders(); - EchoRequest request = new EchoRequest(); - request.setDatetime(DateTimes.ofNow()); + EchoRequest request = new EchoRequest().setDatetime(DateTimes.ofNow()); HttpResponse response = apiClient.post(url, headers, request.toJsonRequest(), EchoResponse.class); if (Objects.isNull(response.getServiceResponse()) || !response.getServiceResponse().ok()) { diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/model/EchoRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/model/EchoRequest.java index 0826ef5..52a6283 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/model/EchoRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/model/EchoRequest.java @@ -1,19 +1,15 @@ package com.czcb.scfs.api.service.echo.model; import com.czcb.scfs.api.core.ApiRequest; +import lombok.Data; +import lombok.experimental.Accessors; /** * @author wangwei * @since 2.0.0 */ +@Data +@Accessors(chain = true) public class EchoRequest implements ApiRequest { private String datetime; - - public String getDatetime() { - return datetime; - } - - public void setDatetime(String datetime) { - this.datetime = datetime; - } }