新建service-passenger-user项目

.idea/compiler.xml

@@ -7,8 +7,9 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="api-passenger" />
         <module name="internal-common" />
+        <module name="api-passenger" />
+        <module name="service-passenger-user" />
         <module name="service-verificationcode" />
       </profile>
     </annotationProcessing>
@@ -17,6 +18,7 @@
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
       <module name="api-passenger" options="-parameters" />
       <module name="internal-common" options="-parameters" />
+      <module name="service-passenger-user" options="-parameters" />
       <module name="service-verificationcode" options="-parameters" />
     </option>
   </component>

.idea/encodings.xml

@@ -3,6 +3,7 @@
   <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="file://$PROJECT_DIR$/api-passenger/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/internal-common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/service-passenger-user/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/service-verificationcode/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />

api-passenger/src/main/java/com/mashibing/apipassenger/service/VerificationCodeService.java

@@ -1,10 +1,12 @@
 package com.mashibing.apipassenger.service;
 
 import com.mashibing.apipassenger.remote.ServiceVefificationcodeClient;
+import com.mashibing.common.constant.CommonStatusEnum;
 import com.mashibing.common.dto.ResponseResult;
 import com.mashibing.common.response.NumberCodeResponse;
 import com.mashibing.common.response.TokenResponse;
 import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -24,7 +26,7 @@ public class VerificationCodeService {
     /**
      * 生成验证码
      * @param passengerPhone
-     * @return
+     * @return ResponseResult
      */
     public ResponseResult generatorCode(String passengerPhone){
         //调用验证码服务，获取验证码
@@ -51,7 +53,7 @@ public class VerificationCodeService {
      * 校验验证码
      * @param passengerPhone
      * @param verificationCode
-     * @return
+     * @return ResponseResult
      */
     public ResponseResult checkCode(String passengerPhone, String verificationCode) {
         System.out.println("根据手机号和验证码，查询redis");
@@ -60,7 +62,12 @@ public class VerificationCodeService {
         System.out.println("code in redis:" + codeRedis);
 
         System.out.println("校验验证码");
-
+        if(StringUtils.isBlank(codeRedis)){
+            return ResponseResult.fail(CommonStatusEnum.VERIFICATION_CODE_FAIL.getCode(),CommonStatusEnum.VERIFICATION_CODE_FAIL.getMsg());
+        }
+        if(!verificationCode.trim().equals(codeRedis.trim())){
+            return ResponseResult.fail(CommonStatusEnum.VERIFICATION_CODE_FAIL.getCode(),CommonStatusEnum.VERIFICATION_CODE_FAIL.getMsg());
+        }
         System.out.println("判断是否有用户，没有则新增用户");
 
         System.out.println("颁发token");

internal-common/src/main/java/com/mashibing/common/constant/CommonStatusEnum.java

@@ -4,6 +4,11 @@ import lombok.Data;
 import lombok.Getter;
 
 public enum CommonStatusEnum {
+
+    /**
+     *验证码错误
+     */
+    VERIFICATION_CODE_FAIL(1001,"验证码错误！"),
     /**
      * 成功
      */
@@ -12,6 +17,7 @@ public enum CommonStatusEnum {
      * 失败
      */
     FAIL(0,"fail");
+
     @Getter
     private int code;
     @Getter

pom.xml

@@ -18,6 +18,7 @@
         <module>api-passenger</module>
         <module>service-verificationcode</module>
         <module>internal-common</module>
+        <module>service-passenger-user</module>
     </modules>
 
     <packaging>pom</packaging>

service-passenger-user/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>online-taxi-public</artifactId>
+        <groupId>org.mashibing</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-passenger-user</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-commons</artifactId>
+        </dependency>
+    </dependencies>
+
+
+
+</project>

service-passenger-user/src/main/java/com/mashibing/serviceDriverUser/ServicePassengerUserApplication.java

@@ -0,0 +1,13 @@
+package com.mashibing.serviceDriverUser;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+@SpringBootApplication
+@EnableDiscoveryClient
+public class ServicePassengerUserApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(ServicePassengerUserApplication.class);
+    }
+}

service-passenger-user/src/main/java/com/mashibing/serviceDriverUser/controller/TestController.java

@@ -0,0 +1,14 @@
+package com.mashibing.serviceDriverUser.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+public class TestController {
+    @GetMapping
+    public String test(){
+        return "service-passenger-user";
+    }
+}

service-passenger-user/src/main/resources/application.yml

@@ -0,0 +1,3 @@
+server:
+  port: 8083
+