校验redis中的验证码、创建乘客用户服务

online-taxi-public/.idea/compiler.xml

@@ -2,12 +2,14 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <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 +19,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>

online-taxi-public/.idea/encodings.xml

@@ -4,6 +4,7 @@
     <file url="file://$PROJECT_DIR$/api-passenger/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/api-passenger/src/main/resources" 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" />

online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/VerificationCodeService.java

@@ -1,5 +1,6 @@
 package com.taxi.apipassenger.service;
 
+import com.internal.contant.CommonStatusEnum;
 import com.internal.dto.ResponseResult;
 import com.internal.response.CheckCodeResponse;
 import com.internal.response.NumberResponse;
@@ -19,7 +20,6 @@ public class VerificationCodeService {
     private ServiceVerificatoncodeClient serviceVerificatoncodeClient;
 
 
-
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
@@ -28,11 +28,11 @@ public class VerificationCodeService {
         System.out.println("调用验证码服务，获取验证码");
         ResponseResult<NumberResponse> responseResult = serviceVerificatoncodeClient.getNumberCode(6);
         int numberCode = responseResult.getData().getNumberCode();
-        System.out.println("访问service-verificationcode服务，获取验证码：" + numberCode );
+        System.out.println("访问service-verificationcode服务，获取验证码：" + numberCode);
         //key,value,过期时间
         String key = Utils.getVerificationCodePrefixKey(passenegerPhone);
         //存入redis
-        stringRedisTemplate.opsForValue().set(key,numberCode+"",2, TimeUnit.MINUTES);
+        stringRedisTemplate.opsForValue().set(key, numberCode + "", 2, TimeUnit.MINUTES);
 
         //通过短信服务商，将对应的验证码发送到手机上。阿里短信服务，腾讯短信通，容联
 
@@ -40,22 +40,31 @@ public class VerificationCodeService {
     }
 
     /**
-     *
      * @param passenegerPhone
      * @param verificationCode
      * @return
      */
-    public ResponseResult checkCode(String passenegerPhone,String verificationCode) {
+    public ResponseResult checkCode(String passenegerPhone, String verificationCode) {
         //一、根据手机号，reids-key规则，查询验证码
         String key = Utils.getVerificationCodePrefixKey(passenegerPhone);
         String codeRedis = stringRedisTemplate.opsForValue().get(key);
-        System.out.println("redis中的code:"+codeRedis);
+        System.out.println("redis中的code:" + codeRedis);
 
         //二、判断验证码是否正确
+        if (codeRedis != null && verificationCode != null) {
+            verificationCode = verificationCode.trim();
+            if (!codeRedis.trim().equals(verificationCode)) {
+                CommonStatusEnum.VERIFICATION_CODE_ERROR.setMessage("验证码输入有误！");
+                return ResponseResult.fail(CommonStatusEnum.VERIFICATION_CODE_ERROR);
+            } else {
+                //三、判断这个手机号是否存在用户，并进行对应的处理
 
-        //三、判断这个手机号是否存在用户，并进行对应的处理
+                //四、颁发令牌
-
+            }
-        //四、颁发令牌
+        } else {
+            CommonStatusEnum.VERIFICATION_CODE_ERROR.setMessage("验证码错误！");
+            return ResponseResult.fail(CommonStatusEnum.VERIFICATION_CODE_ERROR);
+        }
 
         CheckCodeResponse checkCodeResponse = new CheckCodeResponse();
         checkCodeResponse.setToken("getToken");

online-taxi-public/internal-common/src/main/java/com/internal/contant/CommonStatusEnum.java

@@ -1,8 +1,11 @@
 package com.internal.contant;
 
-import lombok.Getter;
 
 public enum CommonStatusEnum {
+    /**
+     *
+     */
+    VERIFICATION_CODE_ERROR(1099,"验证码错误"),
     /**
      * 成功
      */
@@ -12,13 +15,29 @@ public enum CommonStatusEnum {
      */
     FAIL(0,"fail");
 
-    @Getter
+
     private int code;
-    @Getter
+
     private String message;
 
     CommonStatusEnum(int code,String message){
         this.code = code;
         this.message = message;
     }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
 }

online-taxi-public/internal-common/src/main/java/com/internal/dto/ResponseResult.java

@@ -31,4 +31,11 @@ public class ResponseResult<T> {
         reponseResult.setData(data);
         return reponseResult;
     }
+
+    public static <T> ResponseResult fail(CommonStatusEnum commonStatusEnum){
+        ResponseResult reponseResult = new ResponseResult();
+        reponseResult.setCode(commonStatusEnum.getCode());
+        reponseResult.setMessage(commonStatusEnum.getMessage());
+        return reponseResult;
+    }
 }

online-taxi-public/internal-common/src/main/java/com/internal/response/CheckCodeResponse.java

@@ -1,7 +1,6 @@
 package com.internal.response;
 
 import lombok.Data;
-import lombok.Getter;
 
 @Data
 public class CheckCodeResponse {

online-taxi-public/pom.xml

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

online-taxi-public/service-passenger-user/pom.xml

@@ -0,0 +1,21 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.taxi</groupId>
+        <artifactId>online-taxi-public</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>service-passenger-user</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

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

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

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

@@ -0,0 +1,15 @@
+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";
+    }
+}

online-taxi-public/service-passenger-user/src/main/resources/application.yaml

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

online-taxi-public/service-passenger-user/target/classes/application.yaml

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