From 771c01585bc4d561fdccadc259246f5d5906cd23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 25 Aug 2022 17:07:23 +0800
Subject: [PATCH] 1

---
 .../print_server/app_server/verify_code.go    | 79 +++++++++++--------
 1 file changed, 45 insertions(+), 34 deletions(-)

diff --git a/services/print_server/app_server/verify_code.go b/services/print_server/app_server/verify_code.go
index 671e8d3..d90c271 100644
--- a/services/print_server/app_server/verify_code.go
+++ b/services/print_server/app_server/verify_code.go
@@ -1,5 +1,17 @@
 package app_server
 
+import (
+	"errors"
+	"fmt"
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-print/globals"
+	"git.rosy.net.cn/jx-print/putils"
+	"git.rosy.net.cn/jx-print/services/api"
+	aliyunsmsclient "github.com/KenmyZhang/aliyun-communicate"
+	"math/rand"
+	"time"
+)
+
 type SendVerifyCode struct {
 }
 
@@ -7,44 +19,43 @@ var SendVerifyCodeServer = new(SendVerifyCode)
 
 // SendCode 获取手机短信验证码
 func (s *SendVerifyCode) SendCode(mobile string) (string, error) {
-	//// 获取code
-	//smsCode := fmt.Sprintf("%06d", rand.Intn(1000000))
-	//
-	//// 发送短信
-	//response, err := api.SMSClient.Execute(globals.AliKey, globals.AliSecret, mobile, globals.SmsSignName, globals.SmsMobileVerifyTemplate, string(utils.MustMarshal(map[string]interface{}{
-	//	"code": smsCode,
-	//})))
-	//
-	//if err != nil {
-	//	return "", err
-	//}
-	//if response.Code != aliyunsmsclient.ResponseCodeOk {
-	//	return "", fmt.Errorf("发送短信出错:%s", response.Message)
-	//}
-	//
-	//if err := putils.SetKey(response.BizId+"_"+mobile, smsCode, time.Minute*2); err != nil {
-	//	globals.SugarLogger.Debugf("redis set key err key[%s] value[%s]:", mobile, smsCode)
-	//	return "", err
-	//}
-	//
-	//return response.BizId, nil
-	return "111111", nil
+	// 获取code
+	smsCode := fmt.Sprintf("%06d", rand.Intn(1000000))
+
+	// 发送短信
+	response, err := api.SMSClient.Execute(globals.AliKey, globals.AliSecret, mobile, globals.SmsSignName, globals.SmsMobileVerifyTemplate, string(utils.MustMarshal(map[string]interface{}{
+		"code": smsCode,
+	})))
+
+	if err != nil {
+		return "", err
+	}
+	if response.Code != aliyunsmsclient.ResponseCodeOk {
+		return "", fmt.Errorf("发送短信出错:%s", response.Message)
+	}
+
+	if err := putils.SetKey(response.BizId+"_"+mobile, smsCode, time.Minute*2); err != nil {
+		globals.SugarLogger.Debugf("redis set key err key[%s] value[%s]:", mobile, smsCode)
+		return "", err
+	}
+
+	return response.BizId, nil
 }
 
 // VerifySecret 检查验证码
 func (s *SendVerifyCode) VerifySecret(mobile, bizId, code string) (bool, error) {
-	//result := putils.GetKey(bizId + "_" + mobile)
-	//fmt.Println(utils.IsNil(result))
-	//fmt.Println(result)
-	//if utils.IsNil(result) || result == "" || result == nil {
-	//	return false, errors.New("验证码过期")
-	//}
-	//
-	//if result.(string) != code {
-	//	return false, errors.New("验证码错误,重新确认")
-	//}
-	//
-	//defer putils.DelKey(bizId + "_" + mobile)
+	result := putils.GetKey(bizId + "_" + mobile)
+	fmt.Println(utils.IsNil(result))
+	fmt.Println(result)
+	if utils.IsNil(result) || result == "" || result == nil {
+		return false, errors.New("验证码过期")
+	}
+
+	if result.(string) != code {
+		return false, errors.New("验证码错误,重新确认")
+	}
+
+	defer putils.DelKey(bizId + "_" + mobile)
 
 	return true, nil
 }