From cbc9250b33a955bc919a6afc5d4101ef65bbfafa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 12:53:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm

---
 src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java
index 571e3c7..f16f8f1 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zy.crm.manager.service.impl;
 
+import com.core.common.DateUtils;
 import com.core.common.R;
 import com.zy.crm.manager.mapper.SmsCodeMapper;
 import com.zy.crm.manager.entity.SmsCode;
@@ -42,16 +43,43 @@
     }
 
     @Override
+    public boolean sendSmsCodeText(String phone) {
+        String randomNum = "鍒嗛厤浜嗘柊鐨勮鍒掔敵璇峰崟浠诲姟锛�" ;//鑾峰彇鍏綅闅忔満鏁�
+        SmsCode smsCode = new SmsCode();
+        smsCode.setPhone(phone);
+        smsCode.setCode(randomNum);
+        smsCode.setStatus(0);
+        smsCode.setCreateTime(new Date());
+        if (this.baseMapper.insert(smsCode) <= 0) {
+            return false;
+        }
+
+        boolean sendSmsCode = SmsUtils.sendSmsCodeText(phone, "");
+        if (!sendSmsCode) {
+            return false;
+        }
+
+        smsCode.setSendTime(new Date());
+        smsCode.setStatus(1);
+        this.baseMapper.updateById(smsCode);
+        return true;
+    }
+
+    @Override
     public boolean verifySmsCode(String phone, String code) {
         SmsCode smsCode1 = this.baseMapper.selectByPhone(phone);
         if (smsCode1 == null) {
             return false;
         }
 
+        if (!smsCode1.getCode().equals(code)) {
+            return false;
+        }
+
         long createTime = smsCode1.getCreateTime().getTime();
         long nowTime = new Date().getTime();
         long diff = nowTime - createTime;
-        if (diff > (60000 * 5)) {//鐭俊鏃堕棿瓒呰繃浜斿垎閽燂紝宸插け鏁�
+        if (diff > (60000 * 10)) {//鐭俊鏃堕棿瓒呰繃鍗佸垎閽燂紝宸插け鏁�
             return false;
         }
 

--
Gitblit v1.9.1