From ff807a64412545d23f06bfe9efe633e644af6a84 Mon Sep 17 00:00:00 2001
From: chengkun <chengkun@ishangstudy.com>
Date: Fri, 30 May 2025 14:32:02 +0800
Subject: [PATCH] 提交

---
 app/model/notice.model.php |   37 ++++++++++++++++++-------------------
 1 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/app/model/notice.model.php b/app/model/notice.model.php
index b12d67a..65057cd 100644
--- a/app/model/notice.model.php
+++ b/app/model/notice.model.php
@@ -307,9 +307,10 @@
                 return array('status' => -1, 'msg' => '该手机号已被禁止使用');
             }
         }
-        if (!$this->_isKey('content', $data) || $data['content'] == '') {
-            return array('status' => -1, 'msg' => '短信内容为空');
-        }
+
+//        if (!$this->_isKey('content', $data) || $data['content'] == '') {
+//            return array('status' => -1, 'msg' => '短信内容为空');
+//        }
         
         //发送短信
         $row = array(
@@ -319,7 +320,7 @@
             'sy_sms_sign_name'  => $this->config['sy_sms_sign_name'],
             'template_id'       => $data['template_id'],
             'phone'             => $data['mobile'],
-            'code'              => $data['code'],
+            'template_param'    => $data['template_param'],
         );
         
         $location = '';
@@ -425,11 +426,11 @@
             if (isset($tpl['status'])) {
                 return $tpl;
             }
-            $content = $tpl['content'];
+//            $content = $tpl['content'];
             $template_id = $tpl['template_id'];
         }
-        
-        $data['content'] = $content;
+
+//        $data['content'] = $content;
         $data['template_id'] = $template_id;
         return $this->sendSMS($data);
     }
@@ -512,8 +513,7 @@
             return false;
         }
         $time = time();
-        $data = is_numeric($data) ?: 0;
-        $ctime = round($time - $data, 2);
+        $ctime = round($time - intval($data));
         if ($ctime <= $cert_validity) {
             return true;
         } else {
@@ -536,7 +536,7 @@
         $time = time();
         $overtime = $time - $validity;
         $today = strtotime('today');
-        $code = gt_Generate_code($length); //验证码
+        $code = strval(gt_Generate_code($length)); //验证码
         $lastSend = [];
         $result = [];
         if ($kind == 'msg') {
@@ -605,7 +605,7 @@
             if ($ipSendNum >= $this->config['ip_msgnum']) {
                 return array('error' => 104, 'msg' => '同一IP一天最多发送' . $this->config['ip_msgnum'] . '条');
             }
-            $result = $this->sendType($sended, $type, $code, 'msg', $user, $port);
+            $result = $this->sendType($sended, $type, [$code], 'msg', $user, $port);
             
         } elseif ($kind == 'email') {
             if (!CheckRegEmail($sended)) {
@@ -701,12 +701,12 @@
     private function sendType($sended, $type, $code, $kind = 'msg', $user = array(), $port = null) {
         $finfo = $this->forsend($user);       //用户信息
         $data = array(
-            'uid'      => $finfo['uid'],
-            'username' => $finfo['name'],
-            'cuid'     => $finfo['cuid'],
-            'cname'    => $finfo['cname'],
-            'type'     => $type,
-            'code'     => $code
+            'uid'            => $finfo['uid'],
+            'username'       => $finfo['name'],
+            'cuid'           => $finfo['cuid'],
+            'cname'          => $finfo['cname'],
+            'type'           => $type,
+            'template_param' => $code
         );
         $result = [];
         if ($kind == 'msg') {
@@ -827,13 +827,12 @@
         $version = "2021-01-11";
         $action = "SendSms";
         
-        //////数字转字符串 //////
         $params = [
             'PhoneNumberSet'   => ['+86' . $data['phone']],
             'SmsSdkAppId'      => $data['sy_sms_sdk_app_id'],
             'TemplateId'       => $data['template_id'],
             'SignName'         => $data['sy_sms_sign_name'],
-            'TemplateParamSet' => [strval($data['code'])]
+            'TemplateParamSet' => $data['template_param'], // 短信模板中的变量
         ];
         $payload = json_encode($params, JSON_UNESCAPED_UNICODE);
         $endpoint = "https://sms.tencentcloudapi.com";

--
Gitblit v1.9.0