正在显示
4 个修改的文件
包含
67 行增加
和
1 行删除
| @@ -3,6 +3,8 @@ var saitMd5 = require('../util/saltMD5') | @@ -3,6 +3,8 @@ var saitMd5 = require('../util/saltMD5') | ||
| 3 | var status = require('../util/resTemplate') | 3 | var status = require('../util/resTemplate') |
| 4 | const meetingService = require('../services/meetingService') | 4 | const meetingService = require('../services/meetingService') |
| 5 | const uuid = require('../util/UuidUtil') | 5 | const uuid = require('../util/UuidUtil') |
| 6 | +const emailUtil = require('../util/emailUtil') | ||
| 7 | + | ||
| 6 | 8 | ||
| 7 | 9 | ||
| 8 | function meetingController(){ | 10 | function meetingController(){ |
| @@ -74,7 +76,17 @@ meetingController.prototype.delMeeting = async(ctx,next) =>{ | @@ -74,7 +76,17 @@ meetingController.prototype.delMeeting = async(ctx,next) =>{ | ||
| 74 | let delMeetingData = await meetingService.delMeeting(meetingId); | 76 | let delMeetingData = await meetingService.delMeeting(meetingId); |
| 75 | return delMeetingData | 77 | return delMeetingData |
| 76 | } catch (error) { | 78 | } catch (error) { |
| 77 | - | 79 | + throw error; |
| 80 | + } | ||
| 81 | +} | ||
| 82 | +meetingController.prototype.updateMeeting = async(ctx,next) =>{ | ||
| 83 | + try { | ||
| 84 | + let e = await emailUtil.sendMail('1401289819@qq.com','这是测试邮件', 'Hi Amor,这是一封测试邮件') | ||
| 85 | + console.log(e) | ||
| 86 | + return e | ||
| 87 | + } catch (error) { | ||
| 88 | + console.log(error) | ||
| 89 | + throw error | ||
| 78 | } | 90 | } |
| 79 | } | 91 | } |
| 80 | 92 |
| @@ -33,6 +33,15 @@ router.post('/createMeeting', async (ctx, next) => { | @@ -33,6 +33,15 @@ router.post('/createMeeting', async (ctx, next) => { | ||
| 33 | } | 33 | } |
| 34 | }) | 34 | }) |
| 35 | 35 | ||
| 36 | + router.put('/updateMeeting/:meetingId', async (ctx, next) => { | ||
| 37 | + try{ | ||
| 38 | + var data = await meetingContoller.updateMeeting(ctx, next); | ||
| 39 | + status.successTemp(ctx,200,data); | ||
| 40 | + }catch(e){ | ||
| 41 | + status.catchError(ctx,400,e.message); | ||
| 42 | + } | ||
| 43 | + }) | ||
| 44 | + | ||
| 36 | 45 | ||
| 37 | module.exports = router | 46 | module.exports = router |
| 38 | 47 |
util/emailUtil.js
0 → 100644
| 1 | +/** | ||
| 2 | + * | ||
| 3 | + * @Description 邮件发送 | ||
| 4 | + * 调用方法:sendMail('amor_zhang@qq.com','这是测试邮件', 'Hi Amor,这是一封测试邮件'); | ||
| 5 | + * @Author Amor | ||
| 6 | + * @Created 2016/04/26 15:10 | ||
| 7 | + * 技术只是解决问题的选择,而不是解决问题的根本... | ||
| 8 | + * 我是Amor,为发骚而生! | ||
| 9 | + * | ||
| 10 | + */ | ||
| 11 | + | ||
| 12 | +var nodemailer = require('nodemailer') | ||
| 13 | +var smtpTransport = require('nodemailer-smtp-transport'); | ||
| 14 | + | ||
| 15 | +smtpTransport = nodemailer.createTransport(smtpTransport({ | ||
| 16 | + service: "QQ", | ||
| 17 | + auth: { | ||
| 18 | + user: "756884223@qq.com", | ||
| 19 | + pass: "dxaugzzhaqbjbfbg" | ||
| 20 | + } | ||
| 21 | +})); | ||
| 22 | + | ||
| 23 | +/** | ||
| 24 | + * @param {String} recipient 收件人 | ||
| 25 | + * @param {String} subject 发送的主题 | ||
| 26 | + * @param {String} html 发送的html内容 | ||
| 27 | + */ | ||
| 28 | +function email(){ | ||
| 29 | + | ||
| 30 | +} | ||
| 31 | + | ||
| 32 | +email.prototype.sendMail = async(recipient, subject, html) => { | ||
| 33 | + | ||
| 34 | + return await smtpTransport.sendMail({ | ||
| 35 | + from: "756884223@qq.com", | ||
| 36 | + to: "15314352870@163.com", | ||
| 37 | + subject: subject, | ||
| 38 | + html: html | ||
| 39 | + | ||
| 40 | + }) | ||
| 41 | + | ||
| 42 | +} | ||
| 43 | + | ||
| 44 | +module.exports = new email(); |
| @@ -29,6 +29,7 @@ module.exports = { | @@ -29,6 +29,7 @@ module.exports = { | ||
| 29 | }; | 29 | }; |
| 30 | }, | 30 | }, |
| 31 | successTemp: (ctx,code,data)=>{ | 31 | successTemp: (ctx,code,data)=>{ |
| 32 | + console.log(code) | ||
| 32 | ctx.response.status= 200; | 33 | ctx.response.status= 200; |
| 33 | ctx.response.body= { | 34 | ctx.response.body= { |
| 34 | code:!data.code ? 200:data.code, | 35 | code:!data.code ? 200:data.code, |
-
请 注册 或 登录 后发表评论