From 68f60dd73d5e8d973926b4f9161a5ae3cc7ff5cc Mon Sep 17 00:00:00 2001 From: topsun Date: Wed, 12 Apr 2023 16:33:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=A3=E7=A0=81=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- online-taxi-public/.idea/compiler.xml | 2 + online-taxi-public/.idea/encodings.xml | 1 + online-taxi-public/.idea/uiDesigner.xml | 124 ++++++++++++++++++ online-taxi-public/internal-common/pom.xml | 16 +++ .../src/main/java/com/internal/Main.java | 7 + .../internal/contant/CommonStatusEnum.java | 24 ++++ .../java/com/internal/dto/ResponseResult.java | 27 ++++ .../com/internal/response/NumberResponse.java | 12 ++ .../target/classes/com/internal/Main.class | Bin 0 -> 572 bytes .../internal/contant/CommonStatusEnum.class | Bin 0 -> 1506 bytes .../com/internal/dto/ResponseResult.class | Bin 0 -> 3357 bytes .../internal/response/NumberResponse.class | Bin 0 -> 1332 bytes online-taxi-public/pom.xml | 7 + .../service-verificationcode/pom.xml | 6 + .../controller/NumberCodeController.java | 16 +-- 15 files changed, 233 insertions(+), 9 deletions(-) create mode 100644 online-taxi-public/.idea/uiDesigner.xml create mode 100644 online-taxi-public/internal-common/pom.xml create mode 100644 online-taxi-public/internal-common/src/main/java/com/internal/Main.java create mode 100644 online-taxi-public/internal-common/src/main/java/com/internal/contant/CommonStatusEnum.java create mode 100644 online-taxi-public/internal-common/src/main/java/com/internal/dto/ResponseResult.java create mode 100644 online-taxi-public/internal-common/src/main/java/com/internal/response/NumberResponse.java create mode 100644 online-taxi-public/internal-common/target/classes/com/internal/Main.class create mode 100644 online-taxi-public/internal-common/target/classes/com/internal/contant/CommonStatusEnum.class create mode 100644 online-taxi-public/internal-common/target/classes/com/internal/dto/ResponseResult.class create mode 100644 online-taxi-public/internal-common/target/classes/com/internal/response/NumberResponse.class diff --git a/online-taxi-public/.idea/compiler.xml b/online-taxi-public/.idea/compiler.xml index c17aacf..fbd19f2 100644 --- a/online-taxi-public/.idea/compiler.xml +++ b/online-taxi-public/.idea/compiler.xml @@ -7,6 +7,7 @@ + @@ -15,6 +16,7 @@ diff --git a/online-taxi-public/.idea/encodings.xml b/online-taxi-public/.idea/encodings.xml index f1169e1..b7c3c07 100644 --- a/online-taxi-public/.idea/encodings.xml +++ b/online-taxi-public/.idea/encodings.xml @@ -3,6 +3,7 @@ + diff --git a/online-taxi-public/.idea/uiDesigner.xml b/online-taxi-public/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/online-taxi-public/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/online-taxi-public/internal-common/pom.xml b/online-taxi-public/internal-common/pom.xml new file mode 100644 index 0000000..da899ed --- /dev/null +++ b/online-taxi-public/internal-common/pom.xml @@ -0,0 +1,16 @@ + + + 4.0.0 + + com.taxi + online-taxi-public + 1.0-SNAPSHOT + + + com.internal + internal-common + 1.0-SNAPSHOT + + \ No newline at end of file diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/Main.java b/online-taxi-public/internal-common/src/main/java/com/internal/Main.java new file mode 100644 index 0000000..2a302b8 --- /dev/null +++ b/online-taxi-public/internal-common/src/main/java/com/internal/Main.java @@ -0,0 +1,7 @@ +package com.internal; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/contant/CommonStatusEnum.java b/online-taxi-public/internal-common/src/main/java/com/internal/contant/CommonStatusEnum.java new file mode 100644 index 0000000..ade4e2e --- /dev/null +++ b/online-taxi-public/internal-common/src/main/java/com/internal/contant/CommonStatusEnum.java @@ -0,0 +1,24 @@ +package com.internal.contant; + +import lombok.Getter; + +public enum CommonStatusEnum { + /** + * 成功 + */ + SUCCESS(1,"success"), + /** + * 失败 + */ + FAIL(0,"fail"); + + @Getter + private int code; + @Getter + private String message; + + CommonStatusEnum(int code,String message){ + this.code = code; + this.message = message; + } +} diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/dto/ResponseResult.java b/online-taxi-public/internal-common/src/main/java/com/internal/dto/ResponseResult.java new file mode 100644 index 0000000..75d0603 --- /dev/null +++ b/online-taxi-public/internal-common/src/main/java/com/internal/dto/ResponseResult.java @@ -0,0 +1,27 @@ +package com.internal.dto; + +import com.internal.contant.CommonStatusEnum; +import lombok.Data; + +@Data +public class ResponseResult { + private int code; + private String message; + private T Data; + + public static ResponseResult success(T data){ + ResponseResult reponseResult = new ResponseResult(); + reponseResult.setCode(CommonStatusEnum.SUCCESS.getCode()); + reponseResult.setMessage(CommonStatusEnum.SUCCESS.getMessage()); + reponseResult.setData(data); + return reponseResult; + } + + public static ResponseResult fail(T data){ + ResponseResult reponseResult = new ResponseResult(); + reponseResult.setCode(CommonStatusEnum.FAIL.getCode()); + reponseResult.setMessage(CommonStatusEnum.FAIL.getMessage()); + reponseResult.setData(data); + return reponseResult; + } +} diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/response/NumberResponse.java b/online-taxi-public/internal-common/src/main/java/com/internal/response/NumberResponse.java new file mode 100644 index 0000000..11ae6e0 --- /dev/null +++ b/online-taxi-public/internal-common/src/main/java/com/internal/response/NumberResponse.java @@ -0,0 +1,12 @@ +package com.internal.response; + +import lombok.Data; +import lombok.Getter; + +@Data +public class NumberResponse { + + @Getter + private int numberCode; + +} diff --git a/online-taxi-public/internal-common/target/classes/com/internal/Main.class b/online-taxi-public/internal-common/target/classes/com/internal/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..b055d5bfc4aaaae3e8080b94f4b26ee33508d189 GIT binary patch literal 572 zcmZuuyH3ME5S+`)u`v(=3GYXs2^6?Nq5#n#A&LZ$f@r8N$tfJNeaJWD&ZT>|T(kp!{Fx~2zD9~}Ll30d8Tk3d^QV~(0 z-n?vG%R3o_G9Cn-G|};3FB>J3fxY}sS)kHZ>6Pi9$wWqqx@`11W|;KUk+$o&cF4BX z_2HoGVA;nCRt5ZH6^3T*-Xvka;b6^21M31)e>UWd@3l_5*Q%HPqB;+^sfze6X2?Qq zPC%8V|vfGCK?trv*Ltn4wC zGBS@bp8Zh+ah#cp2~1MNUf#{b$UPxf%|D~?E#R?4Rn95>5OGn#6#1&H(L8~U7;~8U E1T{5x-~a#s literal 0 HcmV?d00001 diff --git a/online-taxi-public/internal-common/target/classes/com/internal/contant/CommonStatusEnum.class b/online-taxi-public/internal-common/target/classes/com/internal/contant/CommonStatusEnum.class new file mode 100644 index 0000000000000000000000000000000000000000..63c481eb77f41f6fe13a595b52fd6f4eb5892ef7 GIT binary patch literal 1506 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 literal 0 HcmV?d00001 diff --git a/online-taxi-public/pom.xml b/online-taxi-public/pom.xml index 7b4b3da..cc360cb 100644 --- a/online-taxi-public/pom.xml +++ b/online-taxi-public/pom.xml @@ -17,6 +17,7 @@ api-passenger service-verificationcode + internal-common @@ -38,6 +39,12 @@ + + + org.projectlombok + lombok + 1.18.24 + \ No newline at end of file diff --git a/online-taxi-public/service-verificationcode/pom.xml b/online-taxi-public/service-verificationcode/pom.xml index 866931d..0c58611 100644 --- a/online-taxi-public/service-verificationcode/pom.xml +++ b/online-taxi-public/service-verificationcode/pom.xml @@ -32,6 +32,12 @@ spring-cloud-starter-alibaba-nacos-discovery 2021.1 + + + com.internal + internal-common + 1.0-SNAPSHOT + diff --git a/online-taxi-public/service-verificationcode/src/main/java/com/spring/serviceverificationcode/controller/NumberCodeController.java b/online-taxi-public/service-verificationcode/src/main/java/com/spring/serviceverificationcode/controller/NumberCodeController.java index 3c5813e..7e2b153 100644 --- a/online-taxi-public/service-verificationcode/src/main/java/com/spring/serviceverificationcode/controller/NumberCodeController.java +++ b/online-taxi-public/service-verificationcode/src/main/java/com/spring/serviceverificationcode/controller/NumberCodeController.java @@ -1,6 +1,7 @@ package com.spring.serviceverificationcode.controller; -import com.sun.org.glassfish.gmbal.ParameterNames; +import com.internal.dto.ResponseResult; +import com.internal.response.NumberResponse; import net.sf.json.JSONObject; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -10,20 +11,17 @@ 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); //获取随机数 double mathRandom =( Math.random()*9 + 1) * (Math.pow(10,size -1)); int numberCode = (int) mathRandom; - JSONObject resultObj = new JSONObject(); - resultObj.put("code",1); - resultObj.put("message","success"); - JSONObject jsonObjectData = new JSONObject(); - jsonObjectData.put("numberCode",numberCode); - resultObj.put("data",jsonObjectData); - return resultObj.toString(); + NumberResponse numberResponse = new NumberResponse(); + numberResponse.setNumberCode(numberCode); + ResponseResult responseResult = ResponseResult.success(numberResponse); + return responseResult; } }