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 4dce8b1..6a11cc4 100644
Binary files a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/controller/VerificationCodeController.class and b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/controller/VerificationCodeController.class differ
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 133f7d4..0000000
Binary files a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/request/VerificationCodeDTO.class and /dev/null differ
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 8f3b50d..5f97979 100644
Binary files a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/service/VerificationCodeService.class and b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/service/VerificationCodeService.class differ
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";
- }
-}