付智勇 / 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) =>{
}
meetingController.prototype.updateMeeting = async(ctx,next) =>{
try {
let e = await emailUtil.sendMail('1401289819@qq.com','这是测试邮件', 'Hi Amor,这是一封测试邮件')
console.log(e)
return e
let params = ctx.request.body;
const meetingId = ctx.params.meetingId;
let updateMeeting = meetingService.updateMeeting(params,meetingId)
return updateMeeting;
} catch (error) {
console.log(error)
throw error
... ...
... ... @@ -56,6 +56,7 @@ userController.prototype.addUser = async(ctx, next) =>{
userName:params.userName,
IDcard:params.IDcard,
salt:pw.salt,
time:params.time,
userType:params.userType,
userRole:params.userRole,
userEmail:params.userEmail,
... ... @@ -64,7 +65,10 @@ userController.prototype.addUser = async(ctx, next) =>{
endTime:new Date(params.endTime),
groupId:params.groupId
}
return await userService.addUser(user)
let uData= await userService.addUser(user);
delete uData.password;
delete uData.salt;
return uData;
}catch (e){
throw new Error(e);
}
... ... @@ -81,6 +85,7 @@ userController.prototype.login = async(ctx, next) =>{
let redisCode = await redis.getToken('qwe123')
console.log(redisCode)
if(redisCode != body.code ){
return status.paramError('code');
}else if(!body.loginName&&!body.userEmail){
return status.paramError('userEmail loginName');
}else if(!body.password){
... ...
... ... @@ -27,13 +27,13 @@
{
"loginName": "尼安德特", // 登录名
"password": "123456", //登录密码
"companyName":"bat", //
"userName":"尼安德特人",
"userRole":0,
"userEmail":"kengni@buyouyu.com",
"userMobile":123124,
"content":"2017-09-01",
"groupId":1
"companyName":"bat", //公司名字
"userName":"尼安德特人", //用户名
"userRole":0, // 用户角色 0超级管理员，1管理员，2监课，3老师，4学生
"userEmail":"kengni@buyouyu.com", // 用户邮箱
"userMobile":123124, // 用户手机号
"content":"2017-09-01", // 用户简介
"groupId":1 //用户组id
}
返回参数：
... ... @@ -70,8 +70,10 @@
名称|类型|描述
:--|:--|:--
|name |string |必须, 登录名 |
|password |string |必须，密码 |
|loginName |string |, 登录名 |
|password |string |必须，密码 |
|code |string |必须，手机号验证码 |
请求示例：
... ... @@ -80,9 +82,25 @@
body
{
"name":"admin",
"password":"123456"
"loginName":"尼安德特",
"password":"123456",
"code":"qwe123"
}
返回参数：
{
"code": 200,
"returnData": {
"data": {
"id": "qvoP3Y8geAOWmb9rYLJyN1D5Mz0xlGa6",
"loginName": "尼安德特",
"userType": 1,
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6InF2b1AzWThnZUFPV21iOXJZTEp5TjFENU16MHhsR2E2IiwibmFtZSI6IuWwvOWuieW-t-eJueS6uiIsInVzZXJSb2xlIjowLCJpYXQiOjE1MDM4OTk2NzYsImV4cCI6MTUwNzQ5OTY3Nn0.H73LobalRvgNUOhUecXuc6dohgEsNYsPt61LJSVghCA",
"createTime": "2017-08-24 02:47:36" //请求接口的时候需要在herds 中传
}
}
}
... ...
不能预览此文件类型
var sequelize = require('../config');
var Sequelize = require('sequelize');
const uuid = require('../util/UuidUtil')
var uuid = require('../util/UuidUtil')
var user = sequelize.define('3m_user', {
... ...
... ... @@ -39,6 +39,20 @@ meetingService.prototype.delMeeting = async(meetingId) =>{
}
}
meetingService.prototype.updateMeeting = async(params,meetingId) =>{
try {
let Meeting = await meetingModel.findOne({where:{id:meetingId}});
if(!Meeting){
return {code:11,msg:'课堂不存在'}
}
let backMeeting = await meetingModel.update({where:{id:meetingId}});
return backMeeting
} catch (error) {
console.error(error);
throw error
}
}
module.exports = new meetingService();
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@ var saitMd5 = require('../util/saltMD5');
var sequelize = require('../config');
var tokenUtil = require('../util/tokenUtil');
var co = require('co');
const emailUtil = require('../util/emailUtil')
function userService(){
... ... @@ -13,6 +14,7 @@ function userService(){
userService.prototype.addUser = async(data)=>{
try{
var t = await sequelize.transaction({ autocommit: true })
var queryData = [
{userMobile:data.userMobile},
{loginName:data.loginName },
... ... @@ -22,22 +24,27 @@ try{
if(oldUser){
return {code:400,msg:'用户已存在'}
}
let newUser = await userModel.create(data)
let newUser = await userModel.create(data,{transaction: t})
console.log(newUser);
if(newUser.userRole ==3 && data.time == 1){
let e = await emailUtil.sendMail(newUser.userEmail,'认证邮件', '您已经成为学点云网校认证老师')
}
t.commit();
return newUser;
}catch (err){
console.error(err);
t.rollback();
throw new Error(err);
}
}
userService.prototype.login = async(loginName,pw,userEmail) => {
try{
let query;
if(!loginName){
query = {userEmail:userEmail};
}else if(!userEmail){
query = {loginName:loginName};
}
let User = await userModel.find({where:query})
let queryData = [
{userEmail:loginName},
{loginName:loginName}
];
let User = await userModel.find({where:{$or:queryData}})
console.dir(User)
if(!User){
return {code:300,msg:'用户不存在'}
... ...
... ... @@ -16,7 +16,7 @@ smtpTransport = nodemailer.createTransport(smtpTransport({
service: "QQ",
auth: {
user: "756884223@qq.com",
pass: "dxaugzzhaqbjbfbg"
pass: "zouboddwgilgbgaa"
}
}));
... ... @@ -33,10 +33,9 @@ email.prototype.sendMail = async(recipient, subject, html) => {
return await smtpTransport.sendMail({
from: "756884223@qq.com",
to: "15314352870@163.com",
to: recipient,
subject: subject,
html: html
})
}
... ...
module.exports = ["/users/addUser",]
\ No newline at end of file
module.exports = ["/users/addUser","/users/login",'/users/addUser?time=1']
\ No newline at end of file
... ...