From 52b1d7e7d50188f02e1146df4caab2f2ff8fa1c0 Mon Sep 17 00:00:00 2001 From: topsun Date: Fri, 14 Apr 2023 16:21:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VerificationCodeController.java | 1 + .../remote/ServicePassengerUserClient.java | 14 ++++++++++++ .../service/VerificationCodeService.java | 21 +++++++++++++----- .../VerificationCodeController.class | Bin 2160 -> 2133 bytes .../request/VerificationCodeDTO.class | Bin 2068 -> 0 bytes .../service/VerificationCodeService.class | Bin 3664 -> 4328 bytes online-taxi-public/pom.xml | 11 ++++----- .../controller/TestController.java | 15 ------------- 8 files changed, 37 insertions(+), 25 deletions(-) create mode 100644 online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/remote/ServicePassengerUserClient.java delete mode 100644 online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/request/VerificationCodeDTO.class delete mode 100644 online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/controller/TestController.java diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/VerificationCodeController.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/VerificationCodeController.java index 4402547..0b3d833 100644 --- a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/VerificationCodeController.java +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/VerificationCodeController.java @@ -1,6 +1,7 @@ package com.taxi.apipassenger.controller; import com.internal.dto.ResponseResult; +import com.internal.request.VerificationCodeDTO; import com.taxi.apipassenger.service.VerificationCodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/remote/ServicePassengerUserClient.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/remote/ServicePassengerUserClient.java new file mode 100644 index 0000000..6ba4203 --- /dev/null +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/remote/ServicePassengerUserClient.java @@ -0,0 +1,14 @@ +package com.taxi.apipassenger.remote; + +import com.internal.dto.ResponseResult; +import com.internal.request.VerificationCodeDTO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +@FeignClient("service-passenger-user") +public interface ServicePassengerUserClient { + + @RequestMapping(method = RequestMethod.POST,value = "/user") + ResponseResult loginOrReg(@RequestBody VerificationCodeDTO verificationCodeDTO); + +} diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/VerificationCodeService.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/VerificationCodeService.java index 36cb800..8d039c5 100644 --- a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/VerificationCodeService.java +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/VerificationCodeService.java @@ -1,10 +1,15 @@ package com.taxi.apipassenger.service; import com.internal.contant.CommonStatusEnum; +import com.internal.contant.IdentityConstant; import com.internal.dto.ResponseResult; +import com.internal.dto.TokenResult; +import com.internal.request.VerificationCodeDTO; import com.internal.response.CheckCodeResponse; import com.internal.response.NumberResponse; +import com.internal.util.JwtUtils; import com.internal.util.Utils; +import com.taxi.apipassenger.remote.ServicePassengerUserClient; import com.taxi.apipassenger.remote.ServiceVerificatoncodeClient; import net.sf.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; @@ -19,6 +24,9 @@ public class VerificationCodeService { @Autowired private ServiceVerificatoncodeClient serviceVerificatoncodeClient; + @Autowired + private ServicePassengerUserClient servicePassengerUserClient; + @Autowired private StringRedisTemplate stringRedisTemplate; @@ -58,16 +66,19 @@ public class VerificationCodeService { return ResponseResult.fail(CommonStatusEnum.VERIFICATION_CODE_ERROR); } else { //三、判断这个手机号是否存在用户，并进行对应的处理 - + VerificationCodeDTO verificationCodeDTO = new VerificationCodeDTO(); + verificationCodeDTO.setPassengerPhone(passenegerPhone); + servicePassengerUserClient.loginOrReg(verificationCodeDTO); //四、颁发令牌 + String token = JwtUtils.generatorToken(passenegerPhone, + IdentityConstant.PASSENGER_IDENTITY); + CheckCodeResponse checkCodeResponse = new CheckCodeResponse(); + checkCodeResponse.setToken(token); + return ResponseResult.success(checkCodeResponse); } } else { CommonStatusEnum.VERIFICATION_CODE_ERROR.setMessage("验证码错误！"); return ResponseResult.fail(CommonStatusEnum.VERIFICATION_CODE_ERROR); } - - CheckCodeResponse checkCodeResponse = new CheckCodeResponse(); - checkCodeResponse.setToken("getToken"); - return ResponseResult.success(checkCodeResponse); } } diff --git a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/controller/VerificationCodeController.class b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/controller/VerificationCodeController.class index 4dce8b12a7cd393ba824a0ad76a051067bf696b8..6a11cc49b956fdae5d5b0045ef003b02775a3cd7 100644 GIT binary patch delta 74 zcmew$a8+Q#L`HsJ4WH!vT>Z?vlGLKS#GJ`18N>Os(1m0-n=th;@oJ!{l-c}+rG^;* D`>PuK delta 48 ycmcaA@Ihe1L`J4Cjmh?m;*%FLhA|pLSu&fInEIF)4JSJ=iUB30H{WEbVFmzkVh(Nq diff --git a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/request/VerificationCodeDTO.class b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/request/VerificationCodeDTO.class deleted file mode 100644 index 133f7d4fc8bfca942a146d6b886aad8f3539d8f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2068 zcmb7FU31%15IxtHY}r*3$BCU7QV2Aq{)lTzTA+3kpiTNk+-90iX5b0M5wVJ68CmY| zTlfLwB@ZwI?hMQ@@KR>@4g3rqDdk*Aak1nFm}KtVySsPy?Ag8Y?|=XJGk~kuNn;lE z6cjY%vYy07n){|)K9IH#rSy@MZX|ItjWp^Sw&cF8;g*KmQoNJIU4iMI(eInxBh%S! z+g(#2yYtw1V$?cD_o%k#I#&0nA&_}uI@ae_%Wy5bd(%FoUt-7P<-vo zj@32q4~`E^=aF&H@#5JnqqA=~mOKYa#cf-Cfwi5MeOz;mudJHUvqng2j``)l?7Ox7 zP}Z$S4+v)V$aHr@sOO8NNx0|e8V-<~?gfo%5WdZOQxYQNz@p zYqY*-8a=NC92u|uTFdBeOW*=p+vvCbF0!Q@4R!b7-R3rdQ%*Q$f6#FSW+F&tSE9)@ z*Y;;eAiZY~oR)dZlEbhV=8YY_Eay!}4tX6}%;}iNoWPa;JsCP`SkbYB^Exg_=`|_6 zjVl5R;gP;EusVm5^9vII6~|k!q2nGtW_wnb!-Z~;oRW_BaGrzmGKb$;l4kUJX7^B_ zI%&8f^A><=;0?asS-$ib|Hz0ZkreJJaK4b|y1-M7yWp;tpF(`+xh--{_(~Kg>w)|V zUgb$hcDRmT{vNS!LzlIQmr3Y^%kl8#^u)`rW0~d1%yq9Y;w)EwKx{JZJbh#(K5i*V zA_S>nxqL^+@bKp3kn#T-QgS*9Iq!w!-~=fDR5a;Rp_ITX<1ZtX)c(SB z64mF(Cvlnons|;yUrde2xJWV-`JMtYt}~@l-NMjMCe#g`iQkD25(x79PJbL*W zsggtR2Scdb>zT&7vf+`qlxeg{p_ZwfAXyzE^_kRbbwwHqN?_3>u{14BChV#oHGmQ4 z+k6LW%&FoUe>vBfHO+6rHA0K?E3trgDJdQ~_n^F>LLoUqkPry*f=(~bF{#KwJ##qo zQN~qtV?KTpf=VAUr(mVUpOF6KDb8i}A*N)(+_KZYtVwx>%Mh9Hb5j5HoQgqR0`GfG Gxc(0`$$mrt diff --git a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/service/VerificationCodeService.class b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/service/VerificationCodeService.class index 8f3b50daa47b240a6c74b82e4e2d6bd7ef38531c..5f9797925a60880fdf6da29b527b7f31026b9185 100644 GIT binary patch delta 1483 zcma)*+gDXp6vlu1Tv&(AwgG4q4D~3XAW$a?l1pWYmq59MU`mu84_iEe=jb^bO^XOC zyQr0H%hXJzt5!l{h(dH7J=8<}3q6IShyH>ta}k3s_TV0S%(?bl-~85`-`wlRxswZf zzx(~l1W?L1Cb!d?%EPn;c*NvUHl-3`a~ff`m_%q-*d_tCDmqL|S_5p;KB~=Q+H{(9 zv0Z1yOycYau+uNx`thWaAen|kx8~ZVSGyID%UOF&a@ecQ6RA8&Pk^UP@x2=Nw4%=> zmsV}|Y366rc$ViB`vW|0@&Yd^UNR}vh(ZqNoPz-lDPC5*a(H|sn3J>vC9djqW%iZt2!Hik!oN%PGF1({Tyrs()0o*Fz z#7+95QjA-C#)R8v-W;rH7rmp-p6Ylk>4dfP zMv3Bci!b=nAiv+2pKI}z&OFc82ANmS9h@BO`}uU=)g#9y2M2#0?=vWqS!KBkJi+1q zlnLLB8A;oj8C>JGc+56fs>fMB6aD9?&8~PyG}e%4vO5gw3a)>I?k1HN%K2CS-A=SC zRJ+@05uY@;p~H^ZiLet-H0xO#l)L-9`R*?&-K|So-4K#{1ztRQoEY3GUn$~C^|jDS zT@#bZ{U_#?Z}~~YR=Gch~5BWp``z|Xxb6K`-I_X~HGYgv1HHFmztAM)h( zE@BRg36d{oED?MWw%jVsQ7ZWmo#xQ1#}`fWi{_OnHQL!8607O z_)!)Pjgh{s%J{ib+ReFPuUGKKhj3{6RR{s3IG5A delta 989 zcmZ9L$5T{65XOIRcOSF+7_gu$6pJ8&E-D643>d&1F@XV$perDVikL90m{Bo36N))| z0ksM#wLE(8V0rOmc~sGhe}R@gE2UMw_qKbwr~8}lo0;uOd!H13`|HJPU?h(m1~MQ0GSj=vzR3gOIfBUaqv^BSnl93&(8|uR~oa*nAHwzC^KE<4r^KGCu9q@ zc{~BuQxQ!iRR(K=8C5H4CivOt(1%)MHU-$s7C&{4_^qa{-p@A0c87Gc+z#V+n*1(B zgJSpDj~&mxTO}U%oiEir$eIG{PmA;n?M5sq49xKF$pwn-jyKiJFin>em%;)LcT&5Bc+)11)^Wtifu z<{YjCiu0NaTvS}rT&6{Hg{zuYuDLZ)nYq_#*4*Hx;+Ez%cPx5;dwjC1t?}#4#;(`y z=fn5Dv^I6Mwf%S{tnM0W_qgxYs$N!5*d(|wd~v-k{1u`4;!V||TFnDfbA^W%xo*3a z@T^sR^1011Q^#e>ArQK+6o+ z$+bwPr$njpjvz2rF=d3K^5-@k(aiFPN!c7gO_ zM2;dxY_`bAp_gQ`C6gyxkuOr`2%jQ}N|{8tPz+ZwjXI{Yiy0C16aR4gt3KSVUieC7 zo@lUXh-mf-c%^h2^>wo33}(vQELmFP`Dy-lv*nA8>_fm4*@tN|=@Aab&W#+lGN)Y# FzX3)~r>6h_ diff --git a/online-taxi-public/pom.xml b/online-taxi-public/pom.xml index cc1e342..7cae273 100644 --- a/online-taxi-public/pom.xml +++ b/online-taxi-public/pom.xml @@ -41,17 +41,18 @@ 1.18.24 + + com.auth0 + java-jwt + 3.14.0 + + com.internal internal-common 1.0-SNAPSHOT - - com.auth0 - java-jwt - 3.14.0 - diff --git a/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/controller/TestController.java b/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/controller/TestController.java deleted file mode 100644 index f9bf6b3..0000000 --- a/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/controller/TestController.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.taxi.servicepassengeruser.controller; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class TestController { - - @GetMapping("/test") - public String test(){ - - return "success"; - } -}