diff --git a/.idea/encodings.xml b/.idea/encodings.xml index b7c3c07..03ad38a 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -4,6 +4,7 @@ + diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index abb532a..c7ea920 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -1,6 +1,11 @@ + + \ No newline at end of file diff --git a/api-passenger/src/main/java/com/kaiupup/apipassenger/ApiPassengerApplication.java b/api-passenger/src/main/java/com/kaiupup/apipassenger/ApiPassengerApplication.java index f03d123..168375c 100644 --- a/api-passenger/src/main/java/com/kaiupup/apipassenger/ApiPassengerApplication.java +++ b/api-passenger/src/main/java/com/kaiupup/apipassenger/ApiPassengerApplication.java @@ -2,6 +2,8 @@ package com.kaiupup.apipassenger; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * @projectName: online-taxi-public @@ -14,6 +16,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; */ @SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients public class ApiPassengerApplication { public static void main(String[] args) { diff --git a/api-passenger/src/main/java/com/kaiupup/apipassenger/controller/VerificationCodeController.java b/api-passenger/src/main/java/com/kaiupup/apipassenger/controller/VerificationCodeController.java new file mode 100644 index 0000000..ea6a9c9 --- /dev/null +++ b/api-passenger/src/main/java/com/kaiupup/apipassenger/controller/VerificationCodeController.java @@ -0,0 +1,35 @@ +package com.kaiupup.apipassenger.controller; + +import com.kaiupup.apipassenger.service.VerificationCodeService; +import com.kaiupup.internalcommon.dto.ResponseResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @projectName: online-taxi-public + * @package: com.kaiupup.apipassenger.controller + * @className: VerificationCodeController + * @author: kaiupup + * @description: TODO + * @date: 2023/7/26 20:42 + * @version: 1.0 + */ + +@RestController +@RequestMapping("/api") +public class VerificationCodeController { + + @Autowired + private VerificationCodeService verificationCodeService; + + + @GetMapping("numberCode/{size}") + public ResponseResult getNumberCode(@PathVariable("size") int size){ + ResponseResult responseResult = verificationCodeService.numberCode(size); + return responseResult; + } + +} diff --git a/api-passenger/src/main/java/com/kaiupup/apipassenger/remote/ServiceVerificationCodeClient.java b/api-passenger/src/main/java/com/kaiupup/apipassenger/remote/ServiceVerificationCodeClient.java new file mode 100644 index 0000000..399ec6b --- /dev/null +++ b/api-passenger/src/main/java/com/kaiupup/apipassenger/remote/ServiceVerificationCodeClient.java @@ -0,0 +1,15 @@ +package com.kaiupup.apipassenger.remote; + +import com.kaiupup.internalcommon.dto.ResponseResult; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; + +@FeignClient("service-verificationcode") +public interface ServiceVerificationCodeClient { + + @RequestMapping("/numberCode/{size}") + ResponseResult numberCode(@PathVariable("size") int size); + + +} diff --git a/api-passenger/src/main/java/com/kaiupup/apipassenger/service/VerificationCodeService.java b/api-passenger/src/main/java/com/kaiupup/apipassenger/service/VerificationCodeService.java new file mode 100644 index 0000000..f4ce9f1 --- /dev/null +++ b/api-passenger/src/main/java/com/kaiupup/apipassenger/service/VerificationCodeService.java @@ -0,0 +1,29 @@ +package com.kaiupup.apipassenger.service; + +import com.kaiupup.apipassenger.remote.ServiceVerificationCodeClient; +import com.kaiupup.internalcommon.dto.ResponseResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @projectName: online-taxi-public + * @package: com.kaiupup.apipassenger.service + * @className: VerificationCodeService + * @author: kaiupup + * @description: TODO + * @date: 2023/7/26 20:39 + * @version: 1.0 + */ +@Service +public class VerificationCodeService { + + @Autowired + private ServiceVerificationCodeClient serviceVerificationCodeClient; + + public ResponseResult numberCode(int size){ + ResponseResult responseResult = serviceVerificationCodeClient.numberCode(size); + System.out.println("responseResult = " + responseResult); + return responseResult; + } + +} diff --git a/api-passenger/target/api-passenger-1.0-SNAPSHOT.jar b/api-passenger/target/api-passenger-1.0-SNAPSHOT.jar deleted file mode 100644 index 6f0689b..0000000 Binary files a/api-passenger/target/api-passenger-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/api-passenger/target/maven-archiver/pom.properties b/api-passenger/target/maven-archiver/pom.properties deleted file mode 100644 index 9cffe24..0000000 --- a/api-passenger/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=api-passenger -groupId=com.kaiupup -version=1.0-SNAPSHOT diff --git a/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 1c8f7b3..0000000 --- a/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,2 +0,0 @@ -com/kaiupup/ApiPassengerApplication.class -com/kaiupup/controller/TestController.class diff --git a/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 9609f29..0000000 --- a/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,2 +0,0 @@ -/Users/zhaokai/Desktop/study/java/code/online-taxi/online-taxi-public/api-passenger/src/main/java/com/kaiupup/controller/TestController.java -/Users/zhaokai/Desktop/study/java/code/online-taxi/online-taxi-public/api-passenger/src/main/java/com/kaiupup/ApiPassengerApplication.java diff --git a/api-passenger/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/api-passenger/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/internal-common/pom.xml b/internal-common/pom.xml index 77a2ddb..8234b69 100644 --- a/internal-common/pom.xml +++ b/internal-common/pom.xml @@ -2,27 +2,27 @@ - 4.0.0 + com.kaiupup online-taxi-public 1.0-SNAPSHOT + 4.0.0 + com.kaiupup internal-common + 1.0-SNAPSHOT - - 8 - 8 - UTF-8 - + com.fasterxml.jackson.core jackson-core 2.12.0 + com.fasterxml.jackson.core jackson-databind @@ -35,7 +35,6 @@ 2.12.0 - diff --git a/internal-common/src/main/java/com/kaiupup/internalcommon/response/NumberCodeResponse.java b/internal-common/src/main/java/com/kaiupup/internalcommon/response/NumberCodeResponse.java new file mode 100644 index 0000000..fd873c0 --- /dev/null +++ b/internal-common/src/main/java/com/kaiupup/internalcommon/response/NumberCodeResponse.java @@ -0,0 +1,20 @@ +package com.kaiupup.internalcommon.response; + +import lombok.Data; + +/** + * @projectName: online-taxi-public + * @package: com.kaiupup.internalcommon.response + * @className: NumberCodeResponse + * @author: kaiupup + * @description: TODO + * @date: 2023/7/26 07:54 + * @version: 1.0 + */ + +@Data +public class NumberCodeResponse { + + private int numberCode; + +} diff --git a/service-verificationcode/pom.xml b/service-verificationcode/pom.xml index a2534a2..514b75c 100644 --- a/service-verificationcode/pom.xml +++ b/service-verificationcode/pom.xml @@ -11,12 +11,6 @@ service-verificationcode - - 8 - 8 - UTF-8 - - org.springframework.boot @@ -35,6 +29,11 @@ spring-cloud-starter-alibaba-nacos-discovery + + com.kaiupup + internal-common + 1.0-SNAPSHOT + diff --git a/service-verificationcode/src/main/java/com/kaiupup/serviceverificationcode/controller/NumberCodeController.java b/service-verificationcode/src/main/java/com/kaiupup/serviceverificationcode/controller/NumberCodeController.java index 536be39..d307d9c 100644 --- a/service-verificationcode/src/main/java/com/kaiupup/serviceverificationcode/controller/NumberCodeController.java +++ b/service-verificationcode/src/main/java/com/kaiupup/serviceverificationcode/controller/NumberCodeController.java @@ -1,8 +1,11 @@ package com.kaiupup.serviceverificationcode.controller; import com.kaiupup.internalcommon.dto.ResponseResult; +import com.kaiupup.internalcommon.response.NumberCodeResponse; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** @@ -16,12 +19,30 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController +@RequestMapping("/numberCode") +@Slf4j public class NumberCodeController { - @GetMapping("/numberCode/{size}") + @GetMapping("/{size}") public ResponseResult numberCode(@PathVariable("size") int size){ - return null; + + log.info("进入生成验证码方法体,参数:{}",size); + double mathRandom = (Math.random() * 9 + 1) * (Math.pow(10, size - 1)); + + log.info("生成的验证码::{}",mathRandom); + + int result = (int) mathRandom; + + log.info("生成的验证码(int)::{}",result); + + NumberCodeResponse response = new NumberCodeResponse(); + response.setNumberCode(result); + + log.info("进入生成验证码完成,返回值:,{}",response); + return ResponseResult.success(response); + } + }