From d5eb1ddcf936e14409fcbd0d040eb35736c9aa37 Mon Sep 17 00:00:00 2001
From: 付智勇 <fuzhiyong@efangtec.com>
Date: Sat, 23 Sep 2017 16:53:22 +0800
Subject: [PATCH] no message
---
model/oldMeetingRecording.js | 37 +++++++++++++++++++++++++++++++++++++
routes/tgp.txt | 0
routes/upload.js | 10 ++++++++++
services/meetingService.js | 20 ++++++++++++++++++--
4 files changed, 65 insertions(+), 2 deletions(-)
create mode 100644 model/oldMeetingRecording.js
create mode 100644 routes/tgp.txt
diff --git a/model/oldMeetingRecording.js b/model/oldMeetingRecording.js
new file mode 100644
index 0000000..27ffb5a
--- /dev/null
+++ b/model/oldMeetingRecording.js
@@ -0,0 +1,37 @@
+var sequelize = require('../db2.config');
+var Sequelize = require('sequelize');
+const uuid = require('../util/UuidUtil')
+
+
+var recordingMeeting = sequelize.define('3m_recording_meeting', {
+ id: {
+ type: Sequelize.STRING(32),
+ defaultValue:uuid.db32(),
+ allowNull: false,
+ unique: true,
+ primaryKey: true,
+ field: "id"
+ },
+ meetingId: {
+ type:Sequelize.STRING(32),
+ field: "meeting_id"
+ },
+ configFile: {
+ type:Sequelize.STRING(32),
+ field: "config_file"
+ },
+ startTime:{
+ type:Sequelize.DATE,
+ field: "start_time"
+ },
+ endTime:{
+ type:Sequelize.DATE,
+ field: "end_time"
+ },
+},{
+ timestamps: false,
+ freezeTableName: true
+})
+
+
+module.exports = recordingMeeting;
\ No newline at end of file
diff --git a/routes/tgp.txt b/routes/tgp.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/routes/tgp.txt
diff --git a/routes/upload.js b/routes/upload.js
index a4b29c7..a827ebb 100644
--- a/routes/upload.js
+++ b/routes/upload.js
@@ -32,6 +32,16 @@ router.post('/upLoadDoc',uploaddemo, async (ctx, next) => {
}
})
+router.post('/tgpCallback', async (ctx, next) => {
+
+ //let s = await uploaddemo(ctx.req,ctx.res,next)
+ //let w = await fs.rename('/Users/fzy/project/koa2_Sequelize_project/uploads/'+'19543f72d9682d0bedf67fc98da4597b','/Users/fzy/project/koa2_Sequelize_project/uploads/'+'www.jpg')
+ let f = await fs.appendFileSync(path.join(__dirname, 'tgp.txt'),JSON.stringify(ctx.request.body)+'/n')
+ ctx.body = {
+ filename:2
+ }
+ })
+
module.exports = router
diff --git a/services/meetingService.js b/services/meetingService.js
index 1cf400a..97f892b 100644
--- a/services/meetingService.js
+++ b/services/meetingService.js
@@ -1,11 +1,18 @@
var meetingModel = require('../model/meetingModel');
var oldMeetingModel = require('../model/oldMeetingModel');
+var oldMeetingRecording = require('../model/oldMeetingRecording');
var status = require('../util/resTemplate');
var saitMd5 = require('../util/saltMD5');
var sequelize = require('../config');
var tokenUtil = require('../util/tokenUtil');
+var saitMd5 = require('../util/saltMD5')
var co = require('co');
+const xml2js = require('xml2js');
+const requestUtil = require('../util/requestUtil')
+const builder = new xml2js.Builder(); // JSON->xml
+const parser = new xml2js.Parser(); //xml -> json
+
function meetingService(){
}
@@ -158,7 +165,6 @@ meetingService.prototype.getAllMeetingBySiteID = async(params)=>{
meetingService.prototype.recording = async(params)=>{
try {
let newURL = 'http://'+params.siteId+'.xuedianyun.com/3m/doPlayRecord.do?meetingNumber=';
- let oldURL = 'http://saas.3mang.com:80/3m/attend.do?meetingNumber='+meetingId+'&streamNameOfRecord='+meetingId+'_';
let Meeting = await meetingModel.findOne({where:{id:params.meetingId}});
if(Meeting){
return {url:newURL+Meeting.meetingNumber}
@@ -167,7 +173,17 @@ meetingService.prototype.recording = async(params)=>{
if(!oldMeeting){
return {code:11,msg:'课堂不存在'}
}else{
-
+ let oldURL = 'http://saas.3mang.com:80/3m/attend.do?meetingNumber='+oldMeeting.meetingNumber+'&streamNameOfRecord=';
+ let oldMRecording = await oldMeetingRecording.findOne({where:{meetingId:oldMeeting.meetingNumber}});
+ if(!oldMRecording){
+ throw new Error('课堂没有录制')
+ }
+ var d = oldMRecording.configFile.split('.')[0]
+ let a = oldURL+d+"&userRole=record&userName="+params.username+"&password="+oldMeeting.attendeePassword;
+ return {url:a}
+ // var xml = builder.buildObject(recordInfo);
+ // let info = await requestUtil.post('http://markettest.xuedianyun.com/3m/meeting/join_mtg.do',xml);
+ // var jsonXml = await requestUtil.json2xml(info);
}
}
return {meeting:Meeting.concat(oldMeeting)}
--
libgit2 0.24.0