Merge branch 'master' into 4.1

src/main/java/com/gogirl/application/common/xcx/impl/GogirlTokenServiceImpl.java

@@ -116,6 +116,9 @@ public class GogirlTokenServiceImpl implements GogirlTokenService {
         if (responseResult.getErrcode() != null) {
             throw new RRException(responseResult.getErrmsg());
         }
+        if (!smsService.checkSmsCode(phone, messageCode)) {
+            throw new RRException("验证码错误");
+        }
 
         String openid = responseResult.getOpenid();
 

src/main/java/com/gogirl/infrastructure/service/sms/SmsService.java

@@ -12,4 +12,13 @@ public interface SmsService {
      * @return
      */
     SmsSingleSenderResult sendBindSmsCode(String phoneNumber, String code);
+
+    /**
+     * 验证短信
+     *
+     * @param phoneNumber
+     * @param code
+     * @return
+     */
+    Boolean checkSmsCode(String phoneNumber, String code);
 }

src/main/java/com/gogirl/infrastructure/service/sms/impl/QCloudSmsServiceImpl.java

@@ -5,8 +5,10 @@ import com.github.qcloudsms.SmsSingleSenderResult;
 import com.gogirl.infrastructure.service.sms.SmsService;
 import lombok.extern.slf4j.Slf4j;
 import org.json.JSONException;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.xml.ws.http.HTTPException;
 import java.io.IOException;
 
@@ -16,7 +18,8 @@ import java.io.IOException;
 @Service
 @Slf4j
 public class QCloudSmsServiceImpl implements SmsService {
-
+    @Resource
+    StringRedisTemplate stringRedisTemplate;
 
     @Override
     public SmsSingleSenderResult sendBindSmsCode(String phoneNumber, String code) {
@@ -30,6 +33,8 @@ public class QCloudSmsServiceImpl implements SmsService {
         try {
             SmsSingleSender sender = new SmsSingleSender(SmsConstant.appid, SmsConstant.appkey);
             result = sender.sendWithParam("86", phoneNumber, templateId, params, smsSign, "", "");
+            stringRedisTemplate.opsForValue().set(phoneNumber, code);
+
         }
         // HTTP响应码错误 json解析错误 网络IO错误
         catch (HTTPException | JSONException | IOException | com.github.qcloudsms.httpclient.HTTPException e) {
@@ -38,4 +43,9 @@ public class QCloudSmsServiceImpl implements SmsService {
         return result;
     }
 
+    @Override
+    public Boolean checkSmsCode(String phoneNumber, String code) {
+        return code.equals(stringRedisTemplate.opsForValue().get(phoneNumber));
+    }
+
 }