1、重置密码 2、课堂模块添加

+var userModel =  require('../model/userModel');
+var saitMd5 = require('../util/saltMD5')
+var status = require('../util/resTemplate') 
+const uuid = require('../util/UuidUtil')
+
+
+var meetingController =function (){
+
+};
+
+meetingController.prototype.createMeeting = async(ctx,next)=>{
+    try {
+        
+    } catch (error) {
+        
+    }
+}
\ No newline at end of file

@@ -17,6 +17,7 @@ var userController =function (){
  * @param {object} next 
  */
 userController.prototype.addUser = async(ctx, next) =>{
+    try{
     var params = ctx.request.body;
     const pw = saitMd5.md5AddSalt(params.password)    
 
@@ -31,16 +32,24 @@ userController.prototype.addUser = async(ctx, next) =>{
     var user = {
         loginName:params.loginName,
         password:pw.md5Pass,
+        companyName:params.companyName,
+        userName:params.userName,
         salt:pw.salt,
-        userType:params.type
+        userType:params.userType,
+        userRole:params.userRole,
+        userEmail:params.userEmail,
+        userMobile:params.userMobile,
+        content:params.content,
+        endTime:new Date(params.endTime),
+        groupId:params.groupId
     }
-
-    try{
-        return await userService.addUser(user)        
+    return await userService.addUser(user)        
     }catch (e){ 
         throw new Error(e);         
     }
 }
+
+
 /**
  * 用户登录
  */
@@ -62,7 +71,11 @@ userController.prototype.login = async(ctx, next) =>{
             token:userData.token,
             createTime:userData.createTime
         }
-        return userBack;
+        if(!userData.code){
+            return userBack;
+        }else{
+            return userData;
+        }
     }catch (we){ 
         throw new Error(we)
     }
@@ -116,4 +129,20 @@ userController.prototype.delUserByUserId = async(ctx,next) => {
     }
 }
 
+
+userController.prototype.resetPasswordByUserId = async(ctx,next) =>{
+    const userId =  ctx.params.userId;
+    const pw = saitMd5.md5AddSalt('123056')    
+    
+    if(!userId){
+        return status.paramError('userId');
+    } 
+    try {
+        let deluser = userService.resetPasswordByUserId(userId,pw);
+        return deluser
+    } catch (error) {
+        throw new Error(error)        
+    }
+}
+
 module.exports = new userController();
\ No newline at end of file

+const router = require('koa-router')()
+var userModel =  require('../model/userModel');
+var saitMd5 = require('../util/saltMD5')
+var meetingContoller = require('../controller/meetingController')
+var status = require('../util/resTemplate') 
+
+
+router.prefix('/meeting')
+
+
+router.post('/createMeeting', async (ctx, next) => {
+    try{
+        var data = await meetingContoller.createMeeting(ctx, next);
+        status.successTemp(200,data);
+      }catch(e){
+        const err = {code:0,msg:e.message}
+        status.catchError(400,e.message);    
+      } 
+  })
+
+
+  module.exports = router
+   
\ No newline at end of file

@@ -7,9 +7,8 @@ router.prefix('/users')
 router.post('/addUser',async (ctx, next) => {
   try{
     var data = await userContoller.addUser(ctx, next);
-    status.successTemp(200,data);
+    status.successTemp(ctx,200,data);
   }catch(e){
-    const err = {code:0,msg:e.message}
     status.catchError(400,e.message);    
   } 
 })
@@ -41,6 +40,16 @@ router.put('/updateUserByUserId/:userId',async(ctx, next)=>{
   } 
 })
 
+router.put('/resetPasswordByUserId/:userId',async(ctx, next)=>{
+  try{
+    let updateBackData = await userContoller.resetPasswordByUserId(ctx, next);  
+    status.successTemp(ctx,200,updateBackData);
+  }catch(e){
+    console.log(e)
+    status.catchError(ctx,400,e.message);    
+  } 
+})
+
 router.delete('/delUserByUserId/:userId',async(ctx, next)=>{
   try{
     let delData = await userContoller.delUserByUserId(ctx, next); 

@@ -15,14 +15,8 @@ userService.prototype.addUser = async(data)=>{
 try{
    let oldUser = await userModel.find({where:{loginName:data.loginName}}) 
    if(oldUser){
-       return {code:0,msg:'用户已存在'}
+       return {code:400,msg:'用户已存在'}
    }
-}catch (err){
-    console.log(err)
-    throw new Error(err);         
-}
-   
-try{
     let newUser = await userModel.create(data) 
     return newUser;    
  }catch (err){
@@ -35,9 +29,9 @@ userService.prototype.login = async(name,pw) => {
         let User = await userModel.find({where:{loginName:name}}) 
         console.dir(User)
         if(!User){
-            return {code:0,msg:'用户不存在'}
+            return {code:300,msg:'用户不存在'}
         }else if(User.password != saitMd5.md5Salt(pw,User.salt)){
-            return {code:0,msg:'密码不正确'}
+            return {code:300,msg:'密码不正确'}
         }
         let token = await tokenUtil.getSession(User);
         return token
@@ -47,6 +41,8 @@ userService.prototype.login = async(name,pw) => {
      }
 }
 
+
+
 userService.prototype.getStu = async(type)=>{
     try {
         let User = await userModel.findAll({where:{userType:type}});
@@ -55,6 +51,24 @@ userService.prototype.getStu = async(type)=>{
         throw new Error(err);                 
     }
 }
+
+userService.prototype.resetPasswordByUserId = async(userId,pw) => {
+    try{
+        var t = await sequelize.transaction({  autocommit: true })        
+        let User = await userModel.findOne({where:{id:userId}}) 
+        if(!User){
+            t.rollback
+            return {code:0,msg:'用户不存在'}
+        }
+        let updateUser = await userModel.update({password:pw.md5Pass,salt:pw.salt},{where:{id:userId}}); 
+        t.commit();       
+        return updateUser
+     }catch (err){
+         t.rollback();
+         throw new Error(err);         
+     }
+}
+
 userService.prototype.updateUserByUserId = async(userId,data)=>{
     try {
         var t = await sequelize.transaction({  autocommit: true })