@yoooloo42/beat 1.0.11 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yoooloo42/beat",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -17,7 +17,7 @@
   "homepage": "https://github.com/13993193075/beat#readme",
   "dependencies": {
     "@alicloud/pop-core": "^1.8.0",
-    "@yoooloo42/bean": "^1.0.11",
+    "@yoooloo42/bean": "^1.0.13",
     "nodemailer": "^7.0.10"
   },
   "exports": {

package/src/libs/Ali-SMS.js

@@ -6,25 +6,24 @@ const require = createRequire(import.meta.url);
 // 引入阿里云 SDK 核心依赖
 const Core = require('@alicloud/pop-core')
 
+/**
+ * 向指定手机号发送短信
+ * @param {string} cellphone 接收短信的手机号（例如: '13800000000'）
+ * @param {object} shortMessageCode 短信模板中的变量对象中code的值（短信有效内容）
+ * @param {object} clientBox 客户端参数
+ * @returns {Promise<object>} 返回阿里云 API 的响应对象
+ */
 const clientBoxInit = {
     action: 'SendSms',
     apiVersion: '2017-05-25',
-    accessKeyId: "LTAI5tJeX6TS7bqbLzKxJKrd",
-    accessKeySecret : "qIhbZJaUyYeLI60yXFyT28k1q4uUde",
     regionId: 'cn-hangzhou', // 短信服务 API 的区域，通常使用杭州(cn-hangzhou)
     endpoint: 'https://dysmsapi.aliyuncs.com', // 短信服务的 Endpoint
     signName: 'litafire',
-    templateCode: 'SMS_182679443',
+    templateCode: 'SMS_497935086'
 }
 
-/**
- * 向指定手机号发送短信
- * @param {string} cellphone 接收短信的手机号（例如: '13800000000'）
- * @param {object} shortMessageCode 短信模板中的变量对象中code的值（短信有效内容）
- * @param {object} clientBox 客户端参数
- * @returns {Promise<object>} 返回阿里云 API 的响应对象
- */
-function sms(cellphone, shortMessageCode, clientBox = clientBoxInit) {
+function sms(cellphone, shortMessageCode, clientBox) {
+    clientBox = Object.assign(clientBoxInit, clientBox)
     return new Promise(function (resolve, reject) {
         const client = new Core({
             accessKeyId: clientBox.accessKeyId,
@@ -47,6 +46,7 @@ function sms(cellphone, shortMessageCode, clientBox = clientBoxInit) {
 
         client.request(clientBox.action, params, requestOption).then(
             result => {
+                console.log('测试 000', result)
                 resolve({code: 0, message: '发送短信成功',
                     result
                 })
@@ -58,7 +58,9 @@ function sms(cellphone, shortMessageCode, clientBox = clientBoxInit) {
                 */
             },
             err => {
-                resolve({code: 1, message: '发送短信失败：' + err})
+                resolve({code: 1, message: '发送短信失败',
+                    err
+                })
             }
         )
     })
@@ -67,13 +69,9 @@ function sms(cellphone, shortMessageCode, clientBox = clientBoxInit) {
 // 发送验证码
 function sendVercode(cellphone, codeLength = 6){
     return new Promise(function (resolve, reject) {
-        const vercode = random.vercode6(codeLength);
+        const vercode = random.vercode6N(codeLength);
         sms(cellphone, vercode).then(result=>{
-            if(result.code === 0){
-                resolve({code: 0, message: `发送验证码${vercode}成功`})
-            }else{
-                resolve({code: 1, message: `发送验证码${vercode}失败`})
-            }
+            resolve(Object.assign(result, {vercode}))
         })
     })
 }
@@ -82,12 +80,4 @@ const beat = {
     sms,
     sendVercode
 }
-export default beat
-
-/*
-sendVercode('13993193075').then(result=>{
-    console.log(result.message)
-}).catch(err=>{
-    console.log(err)
-})
-*/
+export default beat