diff --git a/online-taxi-public/api-passenger/pom.xml b/online-taxi-public/api-passenger/pom.xml index 675afdd..9ec09ee 100644 --- a/online-taxi-public/api-passenger/pom.xml +++ b/online-taxi-public/api-passenger/pom.xml @@ -33,12 +33,6 @@ spring-cloud-starter-openfeign - - com.internal - internal-common - 1.0-SNAPSHOT - - org.springframework.boot spring-boot-starter-data-redis 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 c44f748..4402547 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,7 +1,6 @@ package com.taxi.apipassenger.controller; import com.internal.dto.ResponseResult; -import com.taxi.apipassenger.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/request/VerificationCodeDTO.java b/online-taxi-public/internal-common/src/main/java/com/internal/request/VerificationCodeDTO.java similarity index 78% rename from online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/request/VerificationCodeDTO.java rename to online-taxi-public/internal-common/src/main/java/com/internal/request/VerificationCodeDTO.java index 48ec1c4..859c38b 100644 --- a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/request/VerificationCodeDTO.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/request/VerificationCodeDTO.java @@ -1,4 +1,4 @@ -package com.taxi.apipassenger.request; +package com.internal.request; import lombok.Data; diff --git a/online-taxi-public/pom.xml b/online-taxi-public/pom.xml index 90b86f3..df5e43a 100644 --- a/online-taxi-public/pom.xml +++ b/online-taxi-public/pom.xml @@ -40,6 +40,12 @@ lombok 1.18.24 + + + com.internal + internal-common + 1.0-SNAPSHOT + diff --git a/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/controller/UserController.java b/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/controller/UserController.java new file mode 100644 index 0000000..e654777 --- /dev/null +++ b/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/controller/UserController.java @@ -0,0 +1,23 @@ +package com.taxi.servicepassengeruser.controller; + +import com.internal.dto.ResponseResult; +import com.internal.request.VerificationCodeDTO; +import com.taxi.servicepassengeruser.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class UserController { + + @Autowired + private UserService userService; + + @PostMapping("/user") + public ResponseResult loginOrReg(@RequestBody VerificationCodeDTO verificationCodeDTO){ + String passengerPhone = verificationCodeDTO.getPassengerPhone(); + System.out.println("手机号:" + passengerPhone); + return userService.loginOrReg(passengerPhone); + } +} diff --git a/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/service/UserService.java b/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/service/UserService.java new file mode 100644 index 0000000..aec4df4 --- /dev/null +++ b/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/service/UserService.java @@ -0,0 +1,19 @@ +package com.taxi.servicepassengeruser.service; + +import com.internal.dto.ResponseResult; +import org.springframework.stereotype.Service; + +@Service +public class UserService { + + + public ResponseResult loginOrReg(String passengerPhone){ + System.out.println("UserService 被调用, 手机号: " + passengerPhone); + //根据手机号查询用户信息 + + //判断用户信息是否存在 + + //如果不存在,插入用户信息 + return ResponseResult.success(); + } +} diff --git a/online-taxi-public/service-verificationcode/pom.xml b/online-taxi-public/service-verificationcode/pom.xml index 4ff3bc2..ad5e203 100644 --- a/online-taxi-public/service-verificationcode/pom.xml +++ b/online-taxi-public/service-verificationcode/pom.xml @@ -28,12 +28,6 @@ test - - com.internal - internal-common - 1.0-SNAPSHOT - - com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery