From 1318cbbea9bfa3ed1b4c7837bdfaa4069fd3c9a8 Mon Sep 17 00:00:00 2001
From: 付智勇 <fuzhiyong@efangtec.com>
Date: Tue, 5 Sep 2017 12:08:27 +0800
Subject: [PATCH] ad
---
services/studentMeetingService.js | 2 +-
util/Agora_Recording_SDK_for_Linux_FULL/samples/shellUtil.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/services/studentMeetingService.js b/services/studentMeetingService.js
index 7639e7e..46a249d 100644
--- a/services/studentMeetingService.js
+++ b/services/studentMeetingService.js
@@ -23,7 +23,7 @@ sutudentMeetingService.prototype.addStudentMeeting = async(body)=>{
let oldSutudentMeeting = await sutudentMeeting.findOne({where:{studentId:body.studentId,meetingId:body.meetingId}});
if(oldSutudentMeeting){
t.rollback();
- return {code:300,msg:'您已预约这堂课',data:oldSutudentMeeting}
+ return {code:300,msg:'您已预约这堂课'}
}
let Meeting = await meetingModel.findOne({where:{id:body.meetingId}});
if(!Meeting){
diff --git a/util/Agora_Recording_SDK_for_Linux_FULL/samples/shellUtil.js b/util/Agora_Recording_SDK_for_Linux_FULL/samples/shellUtil.js
index 05ad75a..9c73a36 100644
--- a/util/Agora_Recording_SDK_for_Linux_FULL/samples/shellUtil.js
+++ b/util/Agora_Recording_SDK_for_Linux_FULL/samples/shellUtil.js
@@ -11,7 +11,7 @@ shell.prototype.Recording =async(appId,uid,channel,channelKey)=>{
` --appId ` +appId +
` --uid ` +uid +
` --channel ` + channel +
- ` --channelKey ` + channelKey +
+ //` --channelKey ` + channelKey +
" --appliteDir \`pwd\`/../bin";
console.log(shell)
callfile.exec(shell,function(err, stdout, stderr){
--
libgit2 0.24.0