no message

src/biz/sms.ts

@@ -101,10 +101,10 @@ export function initSMS() {
  * @param phone 
  * @param code 
  */
-export async function sendRegisterCode(phone:string, code:string) {
+export async function sendRegisterCode(phone:string, code:string, codeType) {
     let sendPhoneList = [phone];
     let params = [code];
-    let sendRes:any = await sendMsmToPhoneNumber(sendPhoneList, SMSTYPE.单位会员注册, params);
+    let sendRes:any = await sendMsmToPhoneNumber(sendPhoneList, codeType, params);
 
     return sendRes.isError;
 }

src/config/enum.ts

@@ -358,6 +358,7 @@ export enum CERTIFICATETYPE {
  */
 export enum CODETYPE {
     单位会员注册 = 1,
+    个人会员注册,
 }
 
 
@@ -376,7 +377,9 @@ export enum SMSTYPE {
 export enum REGISTERFLOW {
     单位会员注册1 = 1,
     单位会员注册2,
-    单位会员注册3
+    单位会员注册3,
+    个人会员注册1,
+    个人会员注册2
 }
 
 

src/config/errorEnum.ts

@@ -21,7 +21,10 @@ export enum ERRORENUM {
     两次密码不一致,
     密码只能由6至18位字符和数字组成,
     发送验证码次数超限制,
-    发送验证码频率过快
+    发送验证码频率过快,
+    验证码错误,
+    验证码失效,
+    验证码过期
 }
 
 export enum ERRORCODEENUM {

src/data/models/model.ts

@@ -53,7 +53,7 @@
     },
  */
 
-import { MEMBERSTATE, USERREGISTERSTATE } from "../../config/enum";
+import { MEMBERSTATE, REGISTERFLOW, USERREGISTERSTATE } from "../../config/enum";
 
 
 
@@ -338,8 +338,8 @@ const ModelArray = [
             pwd:{ type:'String'},//密码
             token:{type:'String', default:''},//token
             tokenMs:{type:'Number', default:0},//token过期时间
-            phone:{type:'String', index:true},
-            mail:{type:'String', index:true},
+            phone:{type:'String', index:true},//联系电话
+            mail:{type:'String', index:true},//邮箱
             sex:'Number',//性别 枚举
             documentType:'Number',//证件类型 枚举
             documentId:'String',//证件id 身份证
@@ -379,7 +379,7 @@ const ModelArray = [
             personInChargeDesc:'String',//单位主要负责人或负责人集体描述
 
             /**单位会员信息 */
-            unitInfoType:'Number',//单位信息类型 枚举‘ ’
+            unitInfoType:'Number',//单位信息类型 枚举
             yuanXiaoBanXueLeiXing:'String',//院校办学类型
             yuanXiaoZhuGuanBuMen:'String',//院校主管部门
             yuanXiaoFuZeRen:'String',//院校主要负责人
@@ -438,7 +438,6 @@ const ModelArray = [
             membershipFeesType:'Number',//会费类别 枚举
             invoiceAdd:'String',//发票地址
             state:'Number',//状态 枚举
-
         }
     },
     {
@@ -446,11 +445,11 @@ const ModelArray = [
         source:TABLESOURCEENUM.mongo,
         schema:{
             codeId:{type:'String', index:true},
-            code:String,
-            sendMs:Number,//下发时间 时间戳
-            phone:{type:String, index:true},//用户电话
-            type:Number,//验证码类型 
-            isUse:{type:Boolean, default:false},//是否使用 默认false
+            codeNum:'String',
+            sendMs:'Number',//下发时间 时间戳
+            phone:{type:'String', index:true},//用户电话
+            type:'Number',//验证码类型 
+            isUse:{type:'Boolean', default:false},//是否使用 默认false
         }
     },
 ];

src/routers/public/router.ts

@@ -90,6 +90,12 @@ export const Config = {
             param:[],
             bindBiz:setEnumInterface(enumConfig.DWTYPE)
         },
+        {
+            apiName:"验证码类型",
+            subUrl:'/codetype', 
+            param:[],
+            bindBiz:setEnumInterface(enumConfig.CODETYPE)
+        },
     ],
 }
 

src/routers/router.ts

@@ -14,7 +14,7 @@ import * as memberRouter from "./member/router";
 import * as officalWebsiteRouter from "./officalWebsite/router";
 import * as asyncHandler from 'express-async-handler';
 
-const Look = true;//true更新文档
+const Look = false;//true更新文档
 
 export async function setRouter(httpServer){
     if (Look) {

src/tools/system.ts

@@ -43,12 +43,12 @@ export function generateUserId() {
 
 /**
  * 获取code的id
- * @param userId 用户Id
+ * @param loginId 用户Id
  * @param todaySendCount 今日发送次数
  * @returns ''
  */
- export function getSMSCodeId(userId:string, todaySendCount:number) {
-    return md5(`${userId}${todaySendCount}${new Date().valueOf()}`);
+ export function getSMSCodeId(loginId:string, todaySendCount:number) {
+    return md5(`${loginId}${todaySendCount}${new Date().valueOf()}`);
 }