Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer

src/biz/register.ts

@@ -10,7 +10,8 @@ import { TABLEENUM } from "../data/models/model";
 import { find, findCount, findOnce, findOnceToSort } from "../data/select";
 import { updateOneData } from "../data/update";
 import * as sysTools from "../tools/system";
-import { BizError, ConsoleError } from "../util/bizError";
+import { BizError } from "../util/bizError";
+import { logConsole } from "../util/log";
 import { extractData } from "../util/piecemeal";
 import { changeEnumValue, eccEnumValue } from "../util/verificationEnum";
 import { eccFormParam } from "../util/verificationParam";
@@ -504,6 +505,7 @@ export async function deleteSaveUnsubmitted() {
         /**判断今天是否已经是14天后 */
         if (time > futureDate) { //14天后，直接删除该用户信息
             await deleteOneData(TABLEENUM.用户表, {userId:info.userId});
+            logConsole(`用户超出14天未提交注册，已删除改用户信息 userid：${info.userId}`, time);
             // throw new ConsoleError(`用户超出14天未提交注册，已删除改用户信息 userid：${info.userId}`);
         }
     }

src/routers/member/router.ts

@@ -268,32 +268,32 @@ export const Config = {
                 {
                     key:"form", type:"Object", sub:
                     {
-                        name:{type:'String', desc:'真实姓名', notMustHave:true},
-                        sex:{type:'Number', desc:'性别', notMustHave:true},
-                        documentType:{type:'Number', desc:'证件类型', notMustHave:true},
-                        documentId:{type:'String', desc:'证件号码', notMustHave:true},
-                        birth:{type:'Number', desc:'出生年月', notMustHave:true},
-                        nation:{type:'Number', desc:'民族', notMustHave:true},
-                        sheng:{type:'String', desc:'省', notMustHave:true},
-                        shi:{type:'String', desc:'市', notMustHave:true},
-                        qu:{type:'String', desc:'区', notMustHave:true},
-                        addres:{type:'String', desc:'通信地址', notMustHave:true},
-                        education:{type:'Number', desc:'学历', notMustHave:true},
-                        photoUrl:{type:'String', desc:'蓝底证件照', notMustHave:true},
-                        unitName:{type:'String', desc:'工作单位', notMustHave:true},
-                        duties:{type:'String', desc:'职务', notMustHave:true},
-                        workTitle:{type:'String', desc:'职称', notMustHave:true},
-                        profCategory:{type:'[Number]', desc:'专业类别', notMustHave:true},
-                        studyResume:{type:'String', desc:'学习简历', notMustHave:true},
-                        workResume:{type:'String', desc:'工作简历', notMustHave:true},
-                        profAchievement:{type:'String', desc:'专业成果', notMustHave:true},
-                        otherEMP:{type:'String', desc:'在其他社会组织任职情况', notMustHave:true},
-                        otherPROF:{type:'String', desc:'其他与本学会专业有关的情况', notMustHave:true},
-                        cardUrlJust:{type:'String', desc:'个人身份证扫描件正面', notMustHave:true},
-                        cardUrlBack:{type:'String', desc:'个人身份证扫描件反面', notMustHave:true},
-                        academicCERTUrl:{type:'String', desc:'个人学历证明扫描件', notMustHave:true},
-                        professionalCERTUrl:{type:'String', desc:'个人工作证明扫描件', notMustHave:true},
-                        auxiliaryMaterial:{type:'[String]', desc:'论文发表等证明工作成果或成绩的材料', notMustHave:true},
+                        name:{type:'String', desc:'真实姓名'},
+                        sex:{type:'Number', desc:'性别'},
+                        documentType:{type:'Number', desc:'证件类型'},
+                        documentId:{type:'String', desc:'证件号码'},
+                        birth:{type:'Number', desc:'出生年月'},
+                        nation:{type:'Number', desc:'民族'},
+                        sheng:{type:'String', desc:'省'},
+                        shi:{type:'String', desc:'市'},
+                        qu:{type:'String', desc:'区'},
+                        addres:{type:'String', desc:'通信地址'},
+                        education:{type:'Number', desc:'学历'},
+                        photoUrl:{type:'String', desc:'蓝底证件照'},
+                        unitName:{type:'String', desc:'工作单位'},
+                        duties:{type:'String', desc:'职务'},
+                        workTitle:{type:'String', desc:'职称'},
+                        profCategory:{type:'[Number]', desc:'专业类别'},
+                        studyResume:{type:'String', desc:'学习简历'},
+                        workResume:{type:'String', desc:'工作简历'},
+                        profAchievement:{type:'String', desc:'专业成果'},
+                        otherEMP:{type:'String', desc:'在其他社会组织任职情况'},
+                        otherPROF:{type:'String', desc:'其他与本学会专业有关的情况'},
+                        cardUrlJust:{type:'String', desc:'个人身份证扫描件正面'},
+                        cardUrlBack:{type:'String', desc:'个人身份证扫描件反面'},
+                        academicCERTUrl:{type:'String', desc:'个人学历证明扫描件'},
+                        professionalCERTUrl:{type:'String', desc:'个人工作证明扫描件'},
+                        auxiliaryMaterial:{type:'[String]', desc:'论文发表等证明工作成果或成绩的材料'},
                     }
                 },
                 {

src/routers/router.ts

@@ -22,22 +22,22 @@ import * as asyncHandler from 'express-async-handler';
 import { payCallback } from "../biz/member/cost";
 import { checkUser } from "../middleware/user";
 
-const Look = false;//true更新文档
+const Look = true;//true更新文档
 
 export async function setRouter(httpServer){
     if (Look) {
         await getDoc();
         // await initDoc(portalRouter.FirstName, portalRouter.Config, portalRouter.FirstRouter);//网站编辑
         await initDoc(publicRouter.FirstName, publicRouter.Config, publicRouter.FirstRouter);//公用组件
-        // await initDoc(memberRouter.FirstName, memberRouter.Config, memberRouter.FirstRouter);//用户路由
-        await initDoc(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter);//官网路由
+        await initDoc(memberRouter.FirstName, memberRouter.Config, memberRouter.FirstRouter);//用户路由
+        // await initDoc(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter);//官网路由
         // await initDoc(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
         // await initDoc(costRouter.FirstName, costRouter.Config, costRouter.FirstRouter);//支付
         // await initDoc(outPutRouter.FirstName, outPutRouter.Config, outPutRouter.FirstRouter);//导出路由
         // await initDoc(labelRouter.FirstName, labelRouter.Config, labelRouter.FirstRouter);//标签路由
         // await initDoc("2.0", labelRouter.Config, labelRouter.FirstRouter);//标签路由
         // await initDoc("2.0", blacklistRouter.Config, blacklistRouter.FirstRouter);//黑名单路由
-        await initDoc("2.0", msgActivityRouter.Config, msgActivityRouter.FirstRouter);//消息活动通知路由
+        // await initDoc("2.0", msgActivityRouter.Config, msgActivityRouter.FirstRouter);//消息活动通知路由
     }
     analysisRouter(httpServer, portalRouter.Config, portalRouter.FirstRouter, true);//网站编辑
     analysisRouter(httpServer, publicRouter.Config, publicRouter.FirstRouter, false);//公用组件

src/util/bizError.ts

@@ -27,24 +27,24 @@ export class BizError extends Error {
 
 
 
-export class ConsoleError extends Error {
-    constructor(...msgs) {
-        let reqErrorMsg = '';
-        let logErrorMsg = '';
-        for (let i = 0; i <msgs.length; i++) {
-            if (!i) {
-                let msg = getBizMsg(msgs[i]);
-                reqErrorMsg = msg;
-                logErrorMsg = msg;
-            } else {
-                logErrorMsg += ` | ${msgs[i]} `;
-            }
-        }
-
-        logConsole(logErrorMsg);
-        super(reqErrorMsg);
-    }
-}
+// export class ConsoleError extends Error {
+//     constructor(...msgs) {
+//         let reqErrorMsg = '';
+//         let logErrorMsg = '';
+//         for (let i = 0; i <msgs.length; i++) {
+//             if (!i) {
+//                 let msg = getBizMsg(msgs[i]);
+//                 reqErrorMsg = msg;
+//                 logErrorMsg = msg;
+//             } else {
+//                 logErrorMsg += ` | ${msgs[i]} `;
+//             }
+//         }
+
+//         logConsole(logErrorMsg);
+//         super(reqErrorMsg);
+//     }
+// }
 
 
 

src/util/log.ts

@@ -73,8 +73,7 @@ log4js.configure(config);  //加载配置文件
 //调用预先定义的日志名称
 let errorLogger = log4js.getLogger("errorLogger");
 let handleLogger = log4js.getLogger("handleLogger");
-let consoleLogger = log4js.getLogger("rule-console");
-let recordLogger = log4js.getLogger("recordLogger");
+let recordLogger = log4js.getLogger("consoleLogger");
 
 //错误日志
 export function logError(...errStrs) {
@@ -91,6 +90,10 @@ export function logHandle(msgStr:string) {
 }
 
 //输出日志
-export function logConsole(logStr:string) {
-    consoleLogger.info(`logInfo =>   ${logStr}`);
+export function logConsole(logStr, time) {
+    let text = '------------response start------------'
+    text += `content: ${JSON.stringify(logStr)} \n`
+    text += `time: ${time} \n`
+
+    recordLogger.info(text);
 }