From 36a5181b2bbe1dd98d4b01277ffbcc821cf02689 Mon Sep 17 00:00:00 2001 From: kaiupup Date: Wed, 26 Jul 2023 21:27:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 1 + .idea/jarRepositories.xml | 5 +++ api-passenger/pom.xml | 10 ++++- .../apipassenger/ApiPassengerApplication.java | 4 ++ .../VerificationCodeController.java | 35 ++++++++++++++++++ .../remote/ServiceVerificationCodeClient.java | 15 ++++++++ .../service/VerificationCodeService.java | 29 +++++++++++++++ .../target/api-passenger-1.0-SNAPSHOT.jar | Bin 3292 -> 0 bytes .../target/maven-archiver/pom.properties | 3 -- .../compile/default-compile/createdFiles.lst | 2 - .../compile/default-compile/inputFiles.lst | 2 - .../default-testCompile/inputFiles.lst | 0 internal-common/pom.xml | 13 +++---- .../response/NumberCodeResponse.java | 20 ++++++++++ service-verificationcode/pom.xml | 11 +++--- .../controller/NumberCodeController.java | 25 ++++++++++++- 16 files changed, 151 insertions(+), 24 deletions(-) create mode 100644 api-passenger/src/main/java/com/kaiupup/apipassenger/controller/VerificationCodeController.java create mode 100644 api-passenger/src/main/java/com/kaiupup/apipassenger/remote/ServiceVerificationCodeClient.java create mode 100644 api-passenger/src/main/java/com/kaiupup/apipassenger/service/VerificationCodeService.java delete mode 100644 api-passenger/target/api-passenger-1.0-SNAPSHOT.jar delete mode 100644 api-passenger/target/maven-archiver/pom.properties delete mode 100644 api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst delete mode 100644 api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst delete mode 100644 api-passenger/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst create mode 100644 internal-common/src/main/java/com/kaiupup/internalcommon/response/NumberCodeResponse.java 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 6f0689b9e9258b86f3cd486ac3ac45aae27fceb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3292 zcmb7H3pms3AOA^iqhq-pBPqG$zKTVep_Caj_oz6UsU2f$n@c&h$fX?jW>Tp{gdHXF zqBw3<6QL#y001(;4!#BKtz9hj(bye^_Lf-m4r^x@1N$9>ght3+IMkXG{;~RFm7J>b zQ1h)8tCFPNqi{UTt}ZD%f>HEBB5=%fRp3sYkYJ0D+CIl`Kto(g2DBj?EX@aw8FAeme5cMfO zG#Vjr{}-_fyMVh|l9~neks$m&*tueTC=?PA??We&0}T!Zkn9s$zzrZ}-NTWe3r839 z{{C6>Z-RoKbBfL^$4_6lzVX4Uekl4QdPM7(?Q=7ez7h3Qnn#Et;&2@jkdsnhx9px? z_|$k901V~8@V?SB73bm-rknR>1Q&Pci;>bBGQ%{AOdiTxJ9)_J4rKQ`hNj#=IqvVP z>mrnKjQ3TG#U5^w<|dCPxcy3@<`p3Tc(V)uxZll9@7EQwq!4jmztfWML+~WTZa0}@c#uZ*6i9a>rpV?5+G-u+jb!mMzHd|%j zQ2xGG%$9W#`>lx4^DlRXY8-`}hh&WBUANWBvfa}eIrw*491Kxu6GCiuh?GyKx5~gz zpJ}a~ygpgJ$}IE49omMG4A!$eyJnZn0~~fott+k96cTSAnjCgn(&2Msr~hhL-_7+I zC*yD9&_s<3Zb^8h$MHezScU4Y&o?6xGv%RC!q?s%nAlC%z}Lb5p#E7F7$0-KktLU9 zIhwDjt)0MnG3vzdZLIG}a8Q`}c&bBP^WB6v`O(G7TE+@EId$Jz9c;RzmrD1sPkFT} zv4#0%QO2<^OaY+|?IOodak%;M+*ql>DW&S&fBnHQQ^kn}OSBgqq>rysW^P8RX5FnW z&F`$9u?iLo1-?!9-3zQZKQP^U!F1~iq?_*qx)5meZHoue;7h{Gu)-UlN1FTByn?LV zqao6pRAmoQhssz*_z6kilyt^wB{Y@8{+W*MiGZApkbap3?bGPZFMbVsFpI2AXZLh_ zdkN8tJ1k%r=UrEQE=RjY4`;SEsBBoiyK8UsxZ|?x6;JR)#TJO}{cZed`=VT5hyvquni9 za?S;Jw_3IOyyuXRC~Duc*9cZ_1E+Yl{65lKrh2|I_3BZM$#F=&l*T6C&e#i@7IbE4didVy)Pc9lUJC2mEbM`H;rV0gJ+jIdig4>^WG{dZS=*~zw z?lv?b9W*3nd>S_pYtIM|ey50 zp!V^Xvu~>s1uS%-0i+tHJ-G`m6+JdDe|{{bH6TU}w`XJ{$)a4rX7h+GCa$2JwH%$$ z#z1+@(UX3IEhF8Y)6h0o^FG^C_)OFL(z}L1kAvH^tP?yH^XN$3+bD)+Y0cjBgKwG) z<<=%XefBUm4LZVPE3mF;?}8fI#1}km>l6N9qcy?Q>oL#sy*2r}dj|(Oipq}QoT^{( zVUB`I)Vg88oDsTFRZT6*F}EIzKb8dl+-Z(VV^31`QkL@CD6vQcNNSo0^sF*mLdrd}%gYgLZcw9NJe=am|~4}NvAru(M5CrlPQ z(i@6K=gy~v_Fe+3`$<l?5=d#UD6&d4e~co z52m8a!)9YBLSUg0S|%s_b3+7*`?qC>b03R4na>_AF#O!1Ea0KQs3n`9fgkoG$HIek zg2M&>!j-x(ksyNWU=|v8qW9pC|4LkHF0P|lXk4T^cx?HReAShoM9_P1O#_d_10-2o zsjq&Ar(F=tbv!(9^!H%?g0Yket`p!9RW42RZRJ^@pb=l(9{1XcHYUyVMIV_0I&l5l?sEdmHS@+_&<>-mmB~9 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); + } + }