diff --git a/online-taxi-public/api-passenger/pom.xml b/online-taxi-public/api-passenger/pom.xml index 7660fee..675afdd 100644 --- a/online-taxi-public/api-passenger/pom.xml +++ b/online-taxi-public/api-passenger/pom.xml @@ -39,6 +39,11 @@ 1.0-SNAPSHOT + + org.springframework.boot + spring-boot-starter-data-redis + + org.springframework.cloud spring-cloud-starter-loadbalancer 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 3bd5540..19801a5 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,5 +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; @@ -14,8 +15,7 @@ public class VerificationCodeController { public VerificationCodeService verificationCodeService; @GetMapping("/verification-code") - public String verificationCode(@RequestBody VerificationCodeDTO verificationCodeDTO){ - + public ResponseResult verificationCode(@RequestBody VerificationCodeDTO verificationCodeDTO){ String passengerPhone = verificationCodeDTO.getPassengerPhone(); System.out.println("接受到的手机号码参数："+passengerPhone); return verificationCodeService.generatorCode(passengerPhone); 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 f8e36f0..405e16d 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 @@ -5,29 +5,36 @@ import com.internal.response.NumberResponse; import com.taxi.apipassenger.remote.ServiceVerificatoncodeClient; import net.sf.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; +import java.util.concurrent.TimeUnit; + @Service public class VerificationCodeService { @Autowired private ServiceVerificatoncodeClient serviceVerificatoncodeClient; - public String generatorCode(String passenegerPhone) { + //乘客验证码的前缀 + private String verificationCodePrefix = "passenger-verificatioin-code-"; + + @Autowired + private StringRedisTemplate stringRedisTemplate; + + public ResponseResult generatorCode(String passenegerPhone) { //调用验证码服务，获取验证码 System.out.println("调用验证码服务，获取验证码"); - ResponseResult responseResult = serviceVerificatoncodeClient.getNumberCode(6); - int code = responseResult.getData().getNumberCode(); - System.out.println("访问service-verificationcode服务，获取验证码：" + code ); - + int numberCode = responseResult.getData().getNumberCode(); + System.out.println("访问service-verificationcode服务，获取验证码：" + numberCode ); + //key,value,过期时间 + String key = verificationCodePrefix + passenegerPhone; //存入redis - System.out.println("存入redis"); + stringRedisTemplate.opsForValue().set(key,numberCode+"",2, TimeUnit.MINUTES); - //返回值 - JSONObject result = new JSONObject(); - result.put("code", code); - result.put("message", "success"); - return result.toString(); + //通过短信服务商，将对应的验证码发送到手机上。阿里短信服务，腾讯短信通，容联 + + return ResponseResult.success(); } } diff --git a/online-taxi-public/api-passenger/src/main/resources/application.yaml b/online-taxi-public/api-passenger/src/main/resources/application.yaml index e90ecf4..584f00c 100644 --- a/online-taxi-public/api-passenger/src/main/resources/application.yaml +++ b/online-taxi-public/api-passenger/src/main/resources/application.yaml @@ -6,4 +6,8 @@ spring: discovery: server-addr: 127.0.0.1:8848 application: - name: api-passenger \ No newline at end of file + name: api-passenger + redis: + host: 127.0.0.1 + port: 6379 + database: 0 \ No newline at end of file diff --git a/online-taxi-public/api-passenger/target/classes/application.yaml b/online-taxi-public/api-passenger/target/classes/application.yaml index e90ecf4..584f00c 100644 --- a/online-taxi-public/api-passenger/target/classes/application.yaml +++ b/online-taxi-public/api-passenger/target/classes/application.yaml @@ -6,4 +6,8 @@ spring: discovery: server-addr: 127.0.0.1:8848 application: - name: api-passenger \ No newline at end of file + name: api-passenger + redis: + host: 127.0.0.1 + port: 6379 + database: 0 \ No newline at end of file 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 36bba9b..8c4d44f 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/service/VerificationCodeService.class b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/service/VerificationCodeService.class index 027f2a0..dc541ab 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/internal-common/src/main/java/com/internal/dto/ResponseResult.java b/online-taxi-public/internal-common/src/main/java/com/internal/dto/ResponseResult.java index 75d0603..a25098c 100644 --- a/online-taxi-public/internal-common/src/main/java/com/internal/dto/ResponseResult.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/dto/ResponseResult.java @@ -9,6 +9,13 @@ public class ResponseResult { private String message; private T Data; + public static ResponseResult success(){ + ResponseResult reponseResult = new ResponseResult(); + reponseResult.setCode(CommonStatusEnum.SUCCESS.getCode()); + reponseResult.setMessage(CommonStatusEnum.SUCCESS.getMessage()); + return reponseResult; + } + public static ResponseResult success(T data){ ResponseResult reponseResult = new ResponseResult(); reponseResult.setCode(CommonStatusEnum.SUCCESS.getCode());