From 26d24ed5f9a8ea8c1e9a909273fa6c0a42f56610 Mon Sep 17 00:00:00 2001 From: yh <1844516659@qq.com> Date: Sat, 16 Jul 2022 09:01:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E6=BB=B4=E5=87=BA=E8=A1=8C=E7=BD=91?= =?UTF-8?q?=E7=BA=A6=E8=BD=A62022-=E4=B9=98=E5=AE=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=AA=A8=E6=9E=B6=E4=BB=A3=E7=A0=81=E7=BC=96?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-passenger/pom.xml | 8 ----- .../controller/VerificationController.java | 3 +- .../request/VerificationCodeDTO.java | 2 +- pom.xml | 12 ++++++-- .../controller/UserController.java | 29 +++++++++++++++++++ .../service/UserService.java | 21 ++++++++++++++ service-verificationcode/pom.xml | 7 ----- 7 files changed, 61 insertions(+), 21 deletions(-) rename {api-passenger/src/main/java/com/mashibing/apipassenger => internal-common/src/main/java/com/mashibing/internalcommon}/request/VerificationCodeDTO.java (75%) create mode 100644 service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/controller/UserController.java create mode 100644 service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/service/UserService.java diff --git a/api-passenger/pom.xml b/api-passenger/pom.xml index c28661c..8efad10 100644 --- a/api-passenger/pom.xml +++ b/api-passenger/pom.xml @@ -27,14 +27,6 @@ spring-cloud-starter-alibaba-nacos-discovery - - - com.mashibing - internal-common - 1.0-SNAPSHOT - compile - - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/api-passenger/src/main/java/com/mashibing/apipassenger/controller/VerificationController.java b/api-passenger/src/main/java/com/mashibing/apipassenger/controller/VerificationController.java index 4291918..6531691 100644 --- a/api-passenger/src/main/java/com/mashibing/apipassenger/controller/VerificationController.java +++ b/api-passenger/src/main/java/com/mashibing/apipassenger/controller/VerificationController.java @@ -1,7 +1,6 @@ package com.mashibing.apipassenger.controller; -import com.mashibing.apipassenger.remote.ServiceVerificationcodeClient; -import com.mashibing.apipassenger.request.VerificationCodeDTO; +import com.mashibing.internalcommon.request.VerificationCodeDTO; import com.mashibing.apipassenger.service.VerificationCodeService; import com.mashibing.internalcommon.dto.ResponseResult; import org.springframework.beans.factory.annotation.Autowired; diff --git a/api-passenger/src/main/java/com/mashibing/apipassenger/request/VerificationCodeDTO.java b/internal-common/src/main/java/com/mashibing/internalcommon/request/VerificationCodeDTO.java similarity index 75% rename from api-passenger/src/main/java/com/mashibing/apipassenger/request/VerificationCodeDTO.java rename to internal-common/src/main/java/com/mashibing/internalcommon/request/VerificationCodeDTO.java index e2c260a..c78bb8a 100644 --- a/api-passenger/src/main/java/com/mashibing/apipassenger/request/VerificationCodeDTO.java +++ b/internal-common/src/main/java/com/mashibing/internalcommon/request/VerificationCodeDTO.java @@ -1,4 +1,4 @@ -package com.mashibing.apipassenger.request; +package com.mashibing.internalcommon.request; import lombok.Data; diff --git a/pom.xml b/pom.xml index 09942da..7a8daf5 100644 --- a/pom.xml +++ b/pom.xml @@ -31,9 +31,10 @@ - - + + + com.alibaba.cloud spring-cloud-alibaba-dependencies @@ -41,7 +42,6 @@ pom import - org.springframework.cloud spring-cloud-dependencies @@ -49,11 +49,17 @@ pom import + + + com.mashibing + internal-common + 1.0-SNAPSHOT + net.sf.json-lib json-lib diff --git a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/controller/UserController.java b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/controller/UserController.java new file mode 100644 index 0000000..6a6690a --- /dev/null +++ b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/controller/UserController.java @@ -0,0 +1,29 @@ +package com.mashibing.servicepassengeruser.controller; + +import com.mashibing.internalcommon.dto.ResponseResult; +import com.mashibing.internalcommon.request.VerificationCodeDTO; +import com.mashibing.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 service; + + @PostMapping("/user") + public ResponseResult loginOrReg(@RequestBody VerificationCodeDTO verificationCodeDTO){ + + String passengerPhone = verificationCodeDTO.getPassengerPhone(); + System.out.println("手机号："+passengerPhone); + + // 调用接口实现 + service.loginOrRegister(passengerPhone); + + return ResponseResult.success(""); + } + +} diff --git a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/service/UserService.java b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/service/UserService.java new file mode 100644 index 0000000..7f58382 --- /dev/null +++ b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/service/UserService.java @@ -0,0 +1,21 @@ +package com.mashibing.servicepassengeruser.service; + +import com.mashibing.internalcommon.dto.ResponseResult; +import org.springframework.stereotype.Service; + +@Service +public class UserService { + + public ResponseResult loginOrRegister(String passengerPhone){ + + System.out.println("user service 被调用，手机号码为："+passengerPhone); + + //根据手机号查询用户信息 + + //判断用户信息是否存在 + + //如果不存在，插入用户信息 + + return ResponseResult.success(); + } +} diff --git a/service-verificationcode/pom.xml b/service-verificationcode/pom.xml index e76f97c..262dc84 100644 --- a/service-verificationcode/pom.xml +++ b/service-verificationcode/pom.xml @@ -39,13 +39,6 @@ spring-cloud-starter-alibaba-nacos-discovery - - com.mashibing - internal-common - 1.0-SNAPSHOT - compile - -