用户登录注册联调

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;

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);
+
+}

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);
     }
 }

online-taxi-public/pom.xml

@@ -41,17 +41,18 @@
             <version>1.18.24</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.14.0</version>
+        </dependency>
+
         <dependency>
             <groupId>com.internal</groupId>
             <artifactId>internal-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>3.14.0</version>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>

online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/controller/TestController.java

@@ -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";
-    }
-}