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 0000000..b055d5b Binary files /dev/null and b/online-taxi-public/internal-common/target/classes/com/internal/Main.class differ 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 0000000..63c481e Binary files /dev/null and b/online-taxi-public/internal-common/target/classes/com/internal/contant/CommonStatusEnum.class differ diff --git a/online-taxi-public/internal-common/target/classes/com/internal/dto/ResponseResult.class b/online-taxi-public/internal-common/target/classes/com/internal/dto/ResponseResult.class new file mode 100644 index 0000000..7579579 Binary files /dev/null and b/online-taxi-public/internal-common/target/classes/com/internal/dto/ResponseResult.class differ diff --git a/online-taxi-public/internal-common/target/classes/com/internal/response/NumberResponse.class b/online-taxi-public/internal-common/target/classes/com/internal/response/NumberResponse.class new file mode 100644 index 0000000..a3fc57e Binary files /dev/null and b/online-taxi-public/internal-common/target/classes/com/internal/response/NumberResponse.class differ 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; } }