no message

@@ -76,6 +76,7 @@ meetingController.prototype.createMeeting = async(ctx,next)=>{
         }
         }
         
         
         builder.options.rootName = 'param'
         builder.options.rootName = 'param'
+        console.log(JSON.stringify(meeting))
         var xml =  builder.buildObject(meeting);
         var xml =  builder.buildObject(meeting);
         console.log(xml)
         console.log(xml)
         let info = await requestUtil.post('http://markettest.xuedianyun.com/3m/meeting/join_mtg.do',xml);
         let info = await requestUtil.post('http://markettest.xuedianyun.com/3m/meeting/join_mtg.do',xml);
@@ -94,7 +95,6 @@ meetingController.prototype.createMeeting = async(ctx,next)=>{
 meetingController.prototype.getMeeting = async(ctx,next) =>{
 meetingController.prototype.getMeeting = async(ctx,next) =>{
     try {
     try {
         let meetingbody = ctx.request.body;
         let meetingbody = ctx.request.body;
-        console.log(meetingbody)        
         if(!meetingbody.siteId){
         if(!meetingbody.siteId){
             return status.paramError('siteId');            
             return status.paramError('siteId');            
         }
         }

@@ -21,7 +21,7 @@ var userController =function (){
 userController.prototype.addUser = async(ctx, next) =>{
 userController.prototype.addUser = async(ctx, next) =>{
     try{
     try{
     var params = ctx.request.body;
     var params = ctx.request.body;
-    var  pw = saitMd5.md5AddSalt(params.password)    
+    var  pw = saitMd5.md5(params.password)    
 
 
     if(!params.loginName){
     if(!params.loginName){
         return status.paramError('loginName');
         return status.paramError('loginName');
@@ -51,11 +51,9 @@ userController.prototype.addUser = async(ctx, next) =>{
     var user = {
     var user = {
         id:id,
         id:id,
         loginName:params.loginName,
         loginName:params.loginName,
-        password:pw.md5Pass,
+        password:pw,
         companyName:params.companyName,
         companyName:params.companyName,
         userName:params.userName,
         userName:params.userName,
-        IDcard:params.IDcard,
-        salt:pw.salt,
         time:params.time,
         time:params.time,
         userType:params.userType,
         userType:params.userType,
         userRole:params.userRole,
         userRole:params.userRole,

@@ -19,8 +19,6 @@ meetingService.prototype.createMeeting = async(meetingInfo) =>{
 }
 }
 meetingService.prototype.getMeeting = async(queryData,page = 1,pageno =12) =>{
 meetingService.prototype.getMeeting = async(queryData,page = 1,pageno =12) =>{
     try {
     try {
-        console.log(queryData)
-        console.log(pageno,page,(page-1)*pageno)
         let backMeeting = await meetingModel.findAll({where:queryData,order:[['createTime', 'DESC']], offset: (page-1)*pageno, limit: pageno});
         let backMeeting = await meetingModel.findAll({where:queryData,order:[['createTime', 'DESC']], offset: (page-1)*pageno, limit: pageno});
         let count = await meetingModel.count({where:queryData})
         let count = await meetingModel.count({where:queryData})
         return {meetingInfo:backMeeting,count:count,page:page,pageno:pageno};        
         return {meetingInfo:backMeeting,count:count,page:page,pageno:pageno};        

@@ -46,10 +46,10 @@ userService.prototype.login = async(loginName,pw,userEmail) => {
         ];
         ];
         let User = await userModel.find({where:{$or:queryData}}) 
         let User = await userModel.find({where:{$or:queryData}}) 
         console.dir(User)
         console.dir(User)
-        console.log(User.password, saitMd5.md5Salt(pw,User.salt))
+        console.log(User.password, saitMd5.md5(pw,User.salt))
         if(!User){
         if(!User){
             return {code:300,msg:'用户不存在'}
             return {code:300,msg:'用户不存在'}
-        }else if(User.password != saitMd5.md5Salt(pw,User.salt)){
+        }else if(User.password != saitMd5.md5(pw)){
             return {code:300,msg:'密码不正确'}
             return {code:300,msg:'密码不正确'}
         }
         }
         let token = await tokenUtil.getSession(User);
         let token = await tokenUtil.getSession(User);

@@ -4,7 +4,7 @@ module.exports={
 		md5AddSalt:function(password){
 		md5AddSalt:function(password){
 			var salt=Math.floor(Math.random()*100);
 			var salt=Math.floor(Math.random()*100);
 			var decipher = crypto.createHash('md5',key);
 			var decipher = crypto.createHash('md5',key);
-			var md5Pass=decipher.update(password+""+salt).digest("hex");
+			var md5Pass=decipher.update(password).digest("hex");
 			return {
 			return {
 				salt:salt,
 				salt:salt,
 				md5Pass:md5Pass
 				md5Pass:md5Pass
@@ -15,10 +15,7 @@ module.exports={
 			return md5Pass
 			return md5Pass
 		},
 		},
 		md5Salt:function(password,salt){
 		md5Salt:function(password,salt){
-      if(salt == null){
-        salt = '';
-      }
 			var decipher = crypto.createHash('md5',key);
 			var decipher = crypto.createHash('md5',key);
-			return decipher.update(password+salt).digest("hex");
+			return decipher.update(password).digest("hex");
 		}
 		}
 };
 };