Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
付智勇
/
koa2_Sequelize_project
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
付智勇
8 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d5eb1ddcf936e14409fcbd0d040eb35736c9aa37
d5eb1ddc
1 parent
eae298b8
no message
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
65 行增加
和
2 行删除
model/oldMeetingRecording.js
routes/tgp.txt
routes/upload.js
services/meetingService.js
model/oldMeetingRecording.js
0 → 100644
查看文件 @
d5eb1dd
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
...
...
routes/tgp.txt
0 → 100644
查看文件 @
d5eb1dd
routes/upload.js
查看文件 @
d5eb1dd
...
...
@@ -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
...
...
services/meetingService.js
查看文件 @
d5eb1dd
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
)}
...
...
请
注册
或
登录
后发表评论