付智勇 / koa2_Sequelize_project

转到一个项目
Toggle navigation Toggle navigation pinning
付智勇
4f0831fe 1 parent 337c4a5a

修改课堂信息

内嵌 并排对比
正在显示 9 个修改的文件 包含 72 行增加 和 28 行删除
@@ -81,9 +81,10 @@ meetingController.prototype.delMeeting = async(ctx,next) =>{ @@ -81,9 +81,10 @@ meetingController.prototype.delMeeting = async(ctx,next) =>{
81 } 81 }
82 meetingController.prototype.updateMeeting = async(ctx,next) =>{ 82 meetingController.prototype.updateMeeting = async(ctx,next) =>{
83 try { 83 try {
84 - let e = await emailUtil.sendMail('1401289819@qq.com','这是测试邮件', 'Hi Amor,这是一封测试邮件')  
85 - console.log(e)  
86 - return e 84 + let params = ctx.request.body;
  85 + const meetingId = ctx.params.meetingId;
  86 + let updateMeeting = meetingService.updateMeeting(params,meetingId)
  87 + return updateMeeting;
87 } catch (error) { 88 } catch (error) {
88 console.log(error) 89 console.log(error)
89 throw error 90 throw error
@@ -56,6 +56,7 @@ userController.prototype.addUser = async(ctx, next) =>{ @@ -56,6 +56,7 @@ userController.prototype.addUser = async(ctx, next) =>{
56 userName:params.userName, 56 userName:params.userName,
57 IDcard:params.IDcard, 57 IDcard:params.IDcard,
58 salt:pw.salt, 58 salt:pw.salt,
  59 + time:params.time,
59 userType:params.userType, 60 userType:params.userType,
60 userRole:params.userRole, 61 userRole:params.userRole,
61 userEmail:params.userEmail, 62 userEmail:params.userEmail,
@@ -64,7 +65,10 @@ userController.prototype.addUser = async(ctx, next) =>{ @@ -64,7 +65,10 @@ userController.prototype.addUser = async(ctx, next) =>{
64 endTime:new Date(params.endTime), 65 endTime:new Date(params.endTime),
65 groupId:params.groupId 66 groupId:params.groupId
66 } 67 }
67 - return await userService.addUser(user) 68 + let uData= await userService.addUser(user);
  69 + delete uData.password;
  70 + delete uData.salt;
  71 + return uData;
68 }catch (e){ 72 }catch (e){
69 throw new Error(e); 73 throw new Error(e);
70 } 74 }
@@ -81,6 +85,7 @@ userController.prototype.login = async(ctx, next) =>{ @@ -81,6 +85,7 @@ userController.prototype.login = async(ctx, next) =>{
81 let redisCode = await redis.getToken('qwe123') 85 let redisCode = await redis.getToken('qwe123')
82 console.log(redisCode) 86 console.log(redisCode)
83 if(redisCode != body.code ){ 87 if(redisCode != body.code ){
  88 + return status.paramError('code');
84 }else if(!body.loginName&&!body.userEmail){ 89 }else if(!body.loginName&&!body.userEmail){
85 return status.paramError('userEmail loginName'); 90 return status.paramError('userEmail loginName');
86 }else if(!body.password){ 91 }else if(!body.password){
@@ -27,13 +27,13 @@ @@ -27,13 +27,13 @@
27 { 27 {
28 "loginName": "尼安德特", // 登录名 28 "loginName": "尼安德特", // 登录名
29 "password": "123456", //登录密码 29 "password": "123456", //登录密码
30 - "companyName":"bat", //  
31 - "userName":"尼安德特人",  
32 - "userRole":0,  
33 - "userEmail":"kengni@buyouyu.com",  
34 - "userMobile":123124,  
35 - "content":"2017-09-01",  
36 - "groupId":1 30 + "companyName":"bat", //公司名字
  31 + "userName":"尼安德特人", //用户名
  32 + "userRole":0, // 用户角色 0超级管理员，1管理员，2监课，3老师，4学生
  33 + "userEmail":"kengni@buyouyu.com", // 用户邮箱
  34 + "userMobile":123124, // 用户手机号
  35 + "content":"2017-09-01", // 用户简介
  36 + "groupId":1 //用户组id
37 } 37 }
38 返回参数： 38 返回参数：
39 39
@@ -70,8 +70,10 @@ @@ -70,8 +70,10 @@
70 70
71 名称|类型|描述 71 名称|类型|描述
72 :--|:--|:-- 72 :--|:--|:--
73 -|name |string |必须, 登录名 |  
74 -|password |string |必须，密码 | 73 +|loginName |string |, 登录名 |
  74 +|password |string |必须，密码 |
  75 +|code |string |必须，手机号验证码 |
  76 +
75 77
76 78
77 请求示例： 79 请求示例：
@@ -80,9 +82,25 @@ @@ -80,9 +82,25 @@
80 82
81 body 83 body
82 { 84 {
83 - "name":"admin",  
84 - "password":"123456" 85 + "loginName":"尼安德特",
  86 + "password":"123456",
  87 + "code":"qwe123"
85 } 88 }
86 返回参数： 89 返回参数：
  90 +
  91 + {
  92 + "code": 200,
  93 + "returnData": {
  94 + "data": {
  95 + "id": "qvoP3Y8geAOWmb9rYLJyN1D5Mz0xlGa6",
  96 + "loginName": "尼安德特",
  97 + "userType": 1,
  98 + "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6InF2b1AzWThnZUFPV21iOXJZTEp5TjFENU16MHhsR2E2IiwibmFtZSI6IuWwvOWuieW-t-eJueS6uiIsInVzZXJSb2xlIjowLCJpYXQiOjE1MDM4OTk2NzYsImV4cCI6MTUwNzQ5OTY3Nn0.H73LobalRvgNUOhUecXuc6dohgEsNYsPt61LJSVghCA",
  99 + "createTime": "2017-08-24 02:47:36" //请求接口的时候需要在herds 中传
  100 + }
  101 + }
  102 + }
87 103
88 104
  105 +
  106 +
不能预览此文件类型
1 var sequelize = require('../config'); 1 var sequelize = require('../config');
2 var Sequelize = require('sequelize'); 2 var Sequelize = require('sequelize');
3 -const uuid = require('../util/UuidUtil') 3 +var uuid = require('../util/UuidUtil')
4 4
5 5
6 var user = sequelize.define('3m_user', { 6 var user = sequelize.define('3m_user', {
@@ -39,6 +39,20 @@ meetingService.prototype.delMeeting = async(meetingId) =>{ @@ -39,6 +39,20 @@ meetingService.prototype.delMeeting = async(meetingId) =>{
39 } 39 }
40 } 40 }
41 41
  42 +meetingService.prototype.updateMeeting = async(params,meetingId) =>{
  43 + try {
  44 + let Meeting = await meetingModel.findOne({where:{id:meetingId}});
  45 + if(!Meeting){
  46 + return {code:11,msg:'课堂不存在'}
  47 + }
  48 + let backMeeting = await meetingModel.update({where:{id:meetingId}});
  49 + return backMeeting
  50 + } catch (error) {
  51 + console.error(error);
  52 + throw error
  53 + }
  54 +}
  55 +
42 56
43 57
44 module.exports = new meetingService(); 58 module.exports = new meetingService();
@@ -4,6 +4,7 @@ var saitMd5 = require('../util/saltMD5'); @@ -4,6 +4,7 @@ var saitMd5 = require('../util/saltMD5');
4 var sequelize = require('../config'); 4 var sequelize = require('../config');
5 var tokenUtil = require('../util/tokenUtil'); 5 var tokenUtil = require('../util/tokenUtil');
6 var co = require('co'); 6 var co = require('co');
  7 +const emailUtil = require('../util/emailUtil')
7 8
8 9
9 function userService(){ 10 function userService(){
@@ -13,6 +14,7 @@ function userService(){ @@ -13,6 +14,7 @@ function userService(){
13 userService.prototype.addUser = async(data)=>{ 14 userService.prototype.addUser = async(data)=>{
14 15
15 try{ 16 try{
  17 + var t = await sequelize.transaction({ autocommit: true })
16 var queryData = [ 18 var queryData = [
17 {userMobile:data.userMobile}, 19 {userMobile:data.userMobile},
18 {loginName:data.loginName }, 20 {loginName:data.loginName },
@@ -22,22 +24,27 @@ try{ @@ -22,22 +24,27 @@ try{
22 if(oldUser){ 24 if(oldUser){
23 return {code:400,msg:'用户已存在'} 25 return {code:400,msg:'用户已存在'}
24 } 26 }
25 - let newUser = await userModel.create(data) 27 + let newUser = await userModel.create(data,{transaction: t})
  28 + console.log(newUser);
  29 + if(newUser.userRole ==3 && data.time == 1){
  30 + let e = await emailUtil.sendMail(newUser.userEmail,'认证邮件', '您已经成为学点云网校认证老师')
  31 + }
  32 + t.commit();
26 return newUser; 33 return newUser;
27 }catch (err){ 34 }catch (err){
  35 + console.error(err);
  36 + t.rollback();
28 throw new Error(err); 37 throw new Error(err);
29 } 38 }
30 } 39 }
31 40
32 userService.prototype.login = async(loginName,pw,userEmail) => { 41 userService.prototype.login = async(loginName,pw,userEmail) => {
33 try{ 42 try{
34 - let query;  
35 - if(!loginName){  
36 - query = {userEmail:userEmail};  
37 - }else if(!userEmail){  
38 - query = {loginName:loginName};  
39 - }  
40 - let User = await userModel.find({where:query}) 43 + let queryData = [
  44 + {userEmail:loginName},
  45 + {loginName:loginName}
  46 + ];
  47 + let User = await userModel.find({where:{$or:queryData}})
41 console.dir(User) 48 console.dir(User)
42 if(!User){ 49 if(!User){
43 return {code:300,msg:'用户不存在'} 50 return {code:300,msg:'用户不存在'}
@@ -16,7 +16,7 @@ smtpTransport = nodemailer.createTransport(smtpTransport({ @@ -16,7 +16,7 @@ smtpTransport = nodemailer.createTransport(smtpTransport({
16 service: "QQ", 16 service: "QQ",
17 auth: { 17 auth: {
18 user: "756884223@qq.com", 18 user: "756884223@qq.com",
19 - pass: "dxaugzzhaqbjbfbg" 19 + pass: "zouboddwgilgbgaa"
20 } 20 }
21 })); 21 }));
22 22
@@ -33,10 +33,9 @@ email.prototype.sendMail = async(recipient, subject, html) => { @@ -33,10 +33,9 @@ email.prototype.sendMail = async(recipient, subject, html) => {
33 33
34 return await smtpTransport.sendMail({ 34 return await smtpTransport.sendMail({
35 from: "756884223@qq.com", 35 from: "756884223@qq.com",
36 - to: "15314352870@163.com", 36 + to: recipient,
37 subject: subject, 37 subject: subject,
38 html: html 38 html: html
39 -  
40 }) 39 })
41 40
42 } 41 }
1 -module.exports = ["/users/addUser",]  
  1 +module.exports = ["/users/addUser","/users/login",'/users/addUser?time=1']