From fef89fc0bcfdf89f77202529e9b4aa35d7eb7a9a Mon Sep 17 00:00:00 2001 From: kezhen0805 Date: Wed, 12 Jul 2023 09:50:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E6=88=90=E5=9B=BA=E5=AE=9A=E6=A0=BC=E5=BC=8F=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 1 + .idea/inspectionProfiles/Project_Default.xml | 63 +++++++++++++++++++ .idea/misc.xml | 9 +++ internal-common/pom.xml | 20 ++++++ .../constant/CommonStatusEnum.java | 29 +++++++++ .../internalcommon/dto/ResponseResult.java | 60 ++++++++++++++++++ .../response/NumberCodeResponse.java | 13 ++++ pom.xml | 21 +++++++ .../controller/NumberCodeController.java | 9 ++- 9 files changed, 223 insertions(+), 2 deletions(-) create mode 100644 internal-common/pom.xml create mode 100644 internal-common/src/main/java/com/mashibing/internalcommon/constant/CommonStatusEnum.java create mode 100644 internal-common/src/main/java/com/mashibing/internalcommon/dto/ResponseResult.java create mode 100644 internal-common/src/main/java/com/mashibing/internalcommon/response/NumberCodeResponse.java diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 52b6aab..77c3274 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -3,6 +3,7 @@ + diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 68ce32a..ad768be 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,8 +1,71 @@ \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3f2837e..022f504 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,13 +1,22 @@ + + + + diff --git a/internal-common/pom.xml b/internal-common/pom.xml new file mode 100644 index 0000000..939d006 --- /dev/null +++ b/internal-common/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.mashibing + taxi2022 + 1.0-SNAPSHOT + + + internal-common + + + 8 + 8 + UTF-8 + + + \ No newline at end of file diff --git a/internal-common/src/main/java/com/mashibing/internalcommon/constant/CommonStatusEnum.java b/internal-common/src/main/java/com/mashibing/internalcommon/constant/CommonStatusEnum.java new file mode 100644 index 0000000..e2be164 --- /dev/null +++ b/internal-common/src/main/java/com/mashibing/internalcommon/constant/CommonStatusEnum.java @@ -0,0 +1,29 @@ +package com.mashibing.internalcommon.constant; + +import lombok.Data; +import lombok.Getter; + +/** + * @author kezhen + * @date 2023/7/12 + * @description + */ +@Getter +public enum CommonStatusEnum { + /** + * 成功 + */ + SUCCESS(1,"success"), + /** + * 失败 + */ + FAIL(0,"fail") + ; + private int code; + private String value; + + CommonStatusEnum(int code, String value) { + this.code = code; + this.value = value; + } +} diff --git a/internal-common/src/main/java/com/mashibing/internalcommon/dto/ResponseResult.java b/internal-common/src/main/java/com/mashibing/internalcommon/dto/ResponseResult.java new file mode 100644 index 0000000..bfc1f6f --- /dev/null +++ b/internal-common/src/main/java/com/mashibing/internalcommon/dto/ResponseResult.java @@ -0,0 +1,60 @@ +package com.mashibing.internalcommon.dto; + +import com.mashibing.internalcommon.constant.CommonStatusEnum; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * @author kezhen + * @date 2023/7/12 + * @description + */ +@Data +@Accessors(chain = true)//链式调用 +public class ResponseResult { + private int code; + private String value; + private T data; + + /** + * 成功响应的方法 + * @param data + * @return + * @param + */ + public static ResponseResult success(T data){ + return new ResponseResult().setCode(CommonStatusEnum.SUCCESS.getCode()).setValue(CommonStatusEnum.SUCCESS.getValue()).setData(data); + } + + /** + * 默认的错误 + * @param data + * @return + * @param + */ + public static ResponseResult fail(T data){ + return new ResponseResult().setData(data); + } + + /** + * 失败，自定义失败，错误码和提示信息 + * @param code + * @param message + * @return + */ + public static ResponseResult fail(int code,String message){ + return new ResponseResult().setCode(code).setValue(message); + } + + /** + * 失败，自定义失败 + * @param code + * @param message + * @param data + * @return + */ + public static ResponseResult fail(int code,String message,String data){ + return new ResponseResult().setCode(code).setValue(message).setData(data); + + } +} diff --git a/internal-common/src/main/java/com/mashibing/internalcommon/response/NumberCodeResponse.java b/internal-common/src/main/java/com/mashibing/internalcommon/response/NumberCodeResponse.java new file mode 100644 index 0000000..34495f4 --- /dev/null +++ b/internal-common/src/main/java/com/mashibing/internalcommon/response/NumberCodeResponse.java @@ -0,0 +1,13 @@ +package com.mashibing.internalcommon.response; + +import lombok.Data; + +/** + * @author kezhen + * @date 2023/7/12 + * @description + */ +@Data +public class NumberCodeResponse { + private int numberCode; +} diff --git a/pom.xml b/pom.xml index 981bf79..61ad5fa 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,29 @@ api-passenger service-verificationcode + internal-common + + + org.projectlombok + lombok + + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + + com.mashibing + internal-common + 1.0-SNAPSHOT + + + 8 8 diff --git a/service-verificationcode/src/main/java/com/mashibing/controller/NumberCodeController.java b/service-verificationcode/src/main/java/com/mashibing/controller/NumberCodeController.java index 8cedafe..b4c69e2 100644 --- a/service-verificationcode/src/main/java/com/mashibing/controller/NumberCodeController.java +++ b/service-verificationcode/src/main/java/com/mashibing/controller/NumberCodeController.java @@ -1,5 +1,7 @@ package com.mashibing.controller; +import com.mashibing.internalcommon.dto.ResponseResult; +import com.mashibing.internalcommon.response.NumberCodeResponse; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; @@ -13,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; public class NumberCodeController { @GetMapping("/numberCode/{size}") - public String numberCode(@PathVariable("size") int size) { + public ResponseResult numberCode(@PathVariable("size") int size) { System.out.println("size = " + size); // 获取随机数生成验证码 @@ -22,7 +24,10 @@ public class NumberCodeController { int resultInt = (int) mathRandom; System.out.println("resultInt = " + resultInt); - return Integer.toString(resultInt); + NumberCodeResponse numberCodeResponse = new NumberCodeResponse(); + numberCodeResponse.setNumberCode(resultInt); + + return ResponseResult.success(numberCodeResponse); } }