Skip to content

L
learn-online
提交 81328a89 authored 作者: GOD_ZYX's avatar GOD_ZYX
浏览文件
操作

新版本 接口修改

上级 9c9f9cee
显示空白字符变更
内嵌 并排
正在显示 包含 75 行增加 和 49 行删除
learnOnline/apiService/ChapterApi.js
浏览文件 @ 81328a89
......@@ -7,7 +7,7 @@ const util = require('../utils/util.js')
// 测试 用 cur_course_id：6438232736871219200 cur_video_id：6290435412296990720
const getChapterList = (cur_course_id, cur_semester_id, cur_video_id, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/education/courses/' + cur_semester_id + '/' + cur_course_id,
url: util.config.URL_PATH1 + '/v2/education/courses/' + cur_semester_id + '/' + cur_course_id,
callback: function (res) {
let i = 0, j = 0, nextVideo = {}, prevVideo = {};
/* 计算上一章 和 下一章 */
......@@ -80,7 +80,7 @@ const getChapterList = (cur_course_id, cur_semester_id, cur_video_id, callback)
/* 获取对应某个章节的详细信息 */
const getCurrentChapterDetail = (vid, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/education/video-streaming',
url: util.config.URL_PATH1 + '/v2/education/video-streaming',
method: 'POST',
data: {
vid: vid
......@@ -110,7 +110,7 @@ const getCurrentChapterDetail = (vid, callback) => {
// 测试 用 device_id : jjhz92fn0.le2a6c06c9g0.thhg7ekb1f8
const getProgress = (vid, did, sid, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/education/video/' + sid + '/' + vid + '/device',
url: util.config.URL_PATH1 + '/v2/education/video/' + sid + '/' + vid + '/device',
data: {
device_id: did
},
......@@ -122,7 +122,7 @@ const getProgress = (vid, did, sid, callback) => {
/* 提交进度信息 */
const updateProgress = (obj) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/analytics/upload-video',
url: util.config.URL_PATH1 + '/v2/analytics/upload-video',
data: {
d: obj.did,
i: obj.did,
......
learnOnline/apiService/CourseApi.js
浏览文件 @ 81328a89
......@@ -6,7 +6,7 @@ const util = require('../utils/util.js')
/* 获取学期分类信息 */
const getlearnFindList = (callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/education/semesters',
url: util.config.URL_PATH1 + '/v2/education/semesters',
callback: function (res) {
let json = [{ val: '-1', name: '全部' }]
for (let i = 0; i < res.data.length; i++) {
......@@ -23,7 +23,7 @@ const getlearnFindList = (callback) => {
/* 获取所有课程列表 - 选课广场 和 我的课程 共用同一个,通过 isMy判断 */
const getCourseList = (isMy, param, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/education/courses' + (isMy ? '/my' : '' ),
url: util.config.URL_PATH1 + '/v2/education/courses' + (isMy ? '/my' : '' ),
data: param, // json格式
callback: function (res) {
let json = [];
......@@ -51,7 +51,7 @@ const getCourseList = (isMy, param, callback) => {
/* 获取某个课程详细信息 - 课程考核 和 课程讨论单独获取 */
const getCourseDetail = (id, sid, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/education/courses/' + sid + '/' + id,
url: util.config.URL_PATH1 + '/v2/education/courses/' + sid + '/' + id,
callback: function (res) {
let cur = res.data, _cur = cur.curriculum
/* 课程类型 curriculum_elective_type 类型 改为 course_type 吴锚要求 */
......@@ -132,7 +132,7 @@ const getCourseDetail = (id, sid, callback) => {
/* 获取课程考核信息 */
const getCourseAssess = (cid, sid, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/analytics/courses/' + sid + '/' + cid + '/evaluation',
url: util.config.URL_PATH1 + '/v2/analytics/courses/' + sid + '/' + cid + '/evaluation',
callback: function (res) {
let cur = res.data
let video = [];
......@@ -188,7 +188,7 @@ const getCourseAssess = (cid, sid, callback) => {
/* 获取试题信息 */
const getExamDetail = (eid, sid, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/education/homeworks/' + sid + '/' + eid,
url: util.config.URL_PATH1 + '/v2/education/homeworks/' + sid + '/' + eid,
callback: function (res) {
callback(res)
}
......@@ -197,7 +197,7 @@ const getExamDetail = (eid, sid, callback) => {
/* 提交考试信息 */
const submitExamDetail = (param, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/education/homeworks',
url: util.config.URL_PATH1 + '/v2/education/homeworks',
method: 'POST',
data: param,
callback: function (res) {
......@@ -208,7 +208,7 @@ const submitExamDetail = (param, callback) => {
/* 选课 */
const selectCourse = (cid, sid, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/education/courses/major',
url: util.config.URL_PATH1 + '/v2/education/courses/major',
data: { course_id: cid, semester_id: sid },
method: 'POST',
callback: function (res) {
......@@ -219,7 +219,7 @@ const selectCourse = (cid, sid, callback) => {
/* 退课 */
const outSelectCourse = (cid, sid, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/education/courses/drop',
url: util.config.URL_PATH1 + '/v2/education/courses/drop',
data: { course_id: cid, semester_id: sid },
method: 'POST',
callback: function (res) {
......
learnOnline/apiService/DiscussApi.js
浏览文件 @ 81328a89
......@@ -10,7 +10,7 @@ const util = require('../utils/util.js')
*/
const getDiscussList = (path, dataJson, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/qa/questions' + path,
url: util.config.URL_PATH1 + '/v2/qa/questions' + path,
data: dataJson,
callback: function (res) {
let _data = res.data
......@@ -44,7 +44,7 @@ const getDiscussList = (path, dataJson, callback) => {
*/
const getCourseDiscussList = (cid, sid, dataJson, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/qa/questions/course/' + sid + '/' + cid,
url: util.config.URL_PATH1 + '/v2/qa/questions/course/' + sid + '/' + cid,
data: dataJson,
callback: function (res) {
let _data = res.data
......@@ -73,7 +73,7 @@ const getCourseDiscussList = (cid, sid, dataJson, callback) => {
/* 获取问题详情 */
const getDiscussDetail = (qid, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/qa/questions/' + qid,
url: util.config.URL_PATH1 + '/v2/qa/questions/' + qid,
callback: function (res) {
let _data = res.data
let json = {
......@@ -145,7 +145,7 @@ const getDiscussDetail = (qid, callback) => {
/* 删除提问 */
const deleteDiscuss = (qid, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/qa/questions/' + qid,
url: util.config.URL_PATH1 + '/v2/qa/questions/' + qid,
method: 'DELETE',
callback: function (res) {
let _data = res.data
......@@ -158,7 +158,7 @@ const deleteDiscuss = (qid, callback) => {
/* 提出问题 */
const publishQues = (param, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/qa/questions',
url: util.config.URL_PATH1 + '/v2/qa/questions',
method: 'POST',
data: param,
callback: function (res) {
......@@ -170,7 +170,7 @@ const publishQues = (param, callback) => {
/* 回答问题 */
const answerQues = (param, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/qa/answers',
url: util.config.URL_PATH1 + '/v2/qa/answers',
method: 'POST',
data: param,
callback: function (res) {
......@@ -184,7 +184,7 @@ const answerQues = (param, callback) => {
/* 删除回答 */
const deleteAnswer = (aid, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/qa/answers/' + aid,
url: util.config.URL_PATH1 + '/v2/qa/answers/' + aid,
method: 'DELETE',
callback: function (res) {
let _data = res.data
......@@ -197,7 +197,7 @@ const deleteAnswer = (aid, callback) => {
/* 回复评论 */
const callbackComment = (param, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/qa/comments',
url: util.config.URL_PATH1 + '/v2/qa/comments',
method: 'POST',
data: param,
callback: function (res) {
......@@ -211,7 +211,7 @@ const callbackComment = (param, callback) => {
/* 删除评论 */
const deleteComment = (cid, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/qa/comments/' + cid,
url: util.config.URL_PATH1 + '/v2/qa/comments/' + cid,
method: 'DELETE',
callback: function (res) {
let _data = res.data
......@@ -224,7 +224,7 @@ const deleteComment = (cid, callback) => {
/* 点赞 */
const like = (param, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/qa/tags',
url: util.config.URL_PATH1 + '/v2/qa/tags',
method: 'POST',
data: param,
callback: function (res) {
......@@ -238,7 +238,7 @@ const like = (param, callback) => {
/* 取消点赞 */
const unlike = (tagid, callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/qa/tags/' + tagid,
url: util.config.URL_PATH1 + '/v2/qa/tags/' + tagid,
method: 'DELETE',
callback: function (res) {
let _data = res.data
......
learnOnline/apiService/MsgApi.js
浏览文件 @ 81328a89
......@@ -6,7 +6,7 @@ const util = require('../utils/util.js')
/* 获取我的消息信息 */
const getMyMsg = (callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/education/message/my',
url: util.config.URL_PATH1 + '/v2/education/message/my',
callback: function (res) {
let json = res.data.map(function (_, i) {
return {
......
learnOnline/apiService/ScoreApi.js
浏览文件 @ 81328a89
......@@ -6,7 +6,7 @@ const util = require('../utils/util.js')
/* 获取我的学分信息 */
const getMyScore = (callback) => {
util.requestApi({
url: util.config.URL_PATH + '/v2/education/credits',
url: util.config.URL_PATH1 + '/v2/education/credits',
callback: function (res) {
let _data = res.data
let json = {
......
learnOnline/pages/index/bindAccount/bindAccount.js
浏览文件 @ 81328a89
......@@ -15,16 +15,16 @@ const BindAccount = {
const _that = this, _bind = _that.data.bindaccount
/* 调用接口 - 使用账号登录 */
wx.request({
url: util.config.URL_PATH + '/user/account-login',
data: { username: _bind.account, password: _bind.pwd }, method: 'POST', header: { skey: wx.getStorageSync('userSession').sessionKey, tenant: util.config.tenant },
url: util.config.URL_PATH2 + '/user_center/login',
data: { username: _bind.account, password: _bind.pwd, service: 'applet.ezijing.com' }, method: 'POST', header: { token: wx.getStorageSync('userSession').sessionKey, tenant: util.config.tenant },
success: function (res) {
if (res.statusCode && res.statusCode != 200) { wx.showToast({ title: res.data.message, icon: 'none' }); return; }
wx.hideToast()
/* 获取用户信息 */
wx.request({
url: util.config.URL_PATH + '/user/getinfo',
url: util.config.URL_PATH1 + '/user/check-access',
data: {}, method: 'GET', header: {
skey: wx.getStorageSync('userSession').sessionKey,
token: wx.getStorageSync('userSession').sessionKey,
tenant: util.config.tenant
},
success: res => {
......
learnOnline/pages/index/bindPhone/bindPhone.js
浏览文件 @ 81328a89
......@@ -25,8 +25,8 @@ const BindPhone = {
if (!_bind.phone || !/^1[3-9][0-9]{9}$/.test(_bind.phone)) { wx.showToast({ title: '请填入正确手机号', icon: 'none', duration: 1500 }); return; }
wx.showToast({ title: '验证码请求中', icon: 'none' })
wx.request({
url: util.config.URL_PATH + '/user/get-code',
data: { mobile: _bind.phone }, method: 'POST', header: { tenant: util.config.tenant },
url: util.config.URL_PATH2 + '/user_center/send_login_code',
data: { mobile: _bind.phone, service: 'applet.ezijing.com' }, method: 'POST', header: { tenant: util.config.tenant },
success: function (res) {
if (res.statusCode != 200) { wx.showToast({ title: res.data.message, icon: 'none' }); return ; }
wx.hideToast()
......@@ -48,17 +48,17 @@ const BindPhone = {
wx.showToast({ title: '验证中', icon: 'none' })
/* 调用接口 - 使用验证码登录 */
wx.request({
url: util.config.URL_PATH + '/user/code-login',
data: { mobile: _bind.phone, code: _bind.code }, method: 'POST', header: { skey: wx.getStorageSync('userSession').sessionKey, tenant: util.config.tenant },
url: util.config.URL_PATH2 + '/user_center/code_login',
data: { mobile: _bind.phone, code: _bind.code, service: 'applet.ezijing.com' }, method: 'POST', header: { token: wx.getStorageSync('userSession').sessionKey, tenant: util.config.tenant },
success: function (res) {
if (res.statusCode && res.statusCode != 200) { wx.showToast({ title: res.data.message, icon: 'none' }); return ; }
wx.hideToast()
clearInterval(_that.timer);
/* 获取用户信息 */
wx.request({
url: util.config.URL_PATH + '/user/getinfo',
url: util.config.URL_PATH1 + '/user/check-access',
data: {}, method: 'GET', header: {
skey: wx.getStorageSync('userSession').sessionKey,
token: wx.getStorageSync('userSession').sessionKey,
tenant: util.config.tenant
},
success: res => {
......
learnOnline/pages/index/index.js
浏览文件 @ 81328a89
......@@ -30,8 +30,8 @@ Page({
onReady: function () {
/* 判别 是否显示 账号登录 */
wx.request({
url: util.config.URL_PATH + '/switch/lock',
data: {}, method: 'GET', header: { tenant: util.config.tenant }, success: res => {
url: util.config.URL_PATH1 + '/switch/lock',
data: {}, method: 'GET', header: { tenant: util.config.tenant, apikey: 'pP5ECUqRDLDzuh4qRuJro0L1LPgjLP0N' }, success: res => {
this.setData({ 'isUseAccountLogin': res.data.switch })
wx.setStorageSync('isUseAccountLogin', res.data.switch)
}
......@@ -47,8 +47,8 @@ Page({
/* 判别是否登录或者登录过期 */
util.LoginAgainAndJumpPage((loginRes, res) => {
if (loginRes) {
/* 只要调用登录接口，就返回sessionKey, 如果没有绑定 直接 */
wx.setStorageSync('userSession', { sessionKey: loginRes.data.session_key })
/* 只要调用登录接口，就返回sessionKey, 如果没有绑定 直接 全部 不再使用skey 改为 token */
wx.setStorageSync('userSession', { sessionKey: loginRes.data.ticket })
wx.setStorageSync('userInfo', {})
if (loginRes.data && loginRes.data.error_code == 40030) {
/* 判别 是否绑定过 紫荆账号 */
......@@ -79,7 +79,7 @@ Page({
success: (res) => {
if (res.confirm) {
wx.setStorageSync('userInfo', { "avatarUrl": "https://wx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTJv5HunMDDhpdaTz7aVXniaeOUxyQxwa9clFnJCm7Y8eP8gbUkF7I9NHSXSDJ1KssdYw9vAKb0v8fQ/132", "nickName": "游客账号" });
wx.setStorageSync('userSession', { "sessionKey": "EOlbKKzWol0meLnDQOZb8g==" });
wx.setStorageSync('userSession', { "sessionKey": "" });
this.goOutSite();
}
}
......
learnOnline/pages/learnSystem/my/my.js
浏览文件 @ 81328a89
const util = require('../../../utils/util.js')
// pages/learnSystem/my/my.js
Page({
/* 页面的初始数据 */
......@@ -11,7 +12,13 @@ Page({
/* 我的学分 */
goMyScore: function () { wx.navigateTo({ url: '/pages/learnSystem/myScore/myScore' }) },
/* 退出系统 */
outSystem: function () { wx.setStorageSync('userInfo', {}); wx.setStorageSync('userSession', {}); wx.reLaunch({ url: '/pages/index/index' }) },
outSystem: function () { util.requestApi({
url: util.config.URL_PATH2 + '/user_center/logout',
method: 'POST',
data: {
token: wx.getStorageSync('userSesstion').sessionKey,
service: 'applet.ezijing.com'
}, callback: function (res) {}}); wx.setStorageSync('userInfo', {}); wx.setStorageSync('userSession', {}); wx.reLaunch({ url: '/pages/index/index' }) },
/* 输出信息 */
printMsg: function (detail) { console.log(detail.status) }
})
\ No newline at end of file
learnOnline/pages/videoPlayer/show.js
浏览文件 @ 81328a89
......@@ -368,7 +368,7 @@ Page({
/* 提交进度请求 */
if (this.realTimeProgress) {
let _rProgress = this.realTimeProgress
_rProgress.pt += (10000 / 1000) * 1.5
_rProgress.pt = parseInt(_rProgress.pt) + (10000 / 1000) * 1.5
_rProgress.cpt = tempTime
_rProgress.mpt = tempTime > _rProgress.mpt ? tempTime : _rProgress.mpt
ChapterApi.updateProgress(_rProgress)
......
learnOnline/utils/util.js
浏览文件 @ 81328a89
......@@ -7,6 +7,8 @@ const config = {
// URL_PATH: 'https://api2.ezijing.com', // 测试域名
// outSiteLink: 'https://kelley2.ezijing.com', // 测试外链
URL_PATH: 'https://api.ezijing.com/tenant', // 正式域名 - 由于项目变动域名
URL_PATH1: 'https://lms-api.ezijing.com', // 正式域名 - 由于项目变动域名
URL_PATH2: 'https://sso.ezijing.com', // 正式域名 - 由于项目变动域名
outSiteLink: 'https://e-learning.ezijing.com', // 正式外链
tenant: 'sofia'
}
......@@ -16,11 +18,10 @@ const requestApi = (obj) => {
url: obj.url,
data: obj.data || '', // 不必填
header: {
'skey': wx.getStorageSync('userSession').sessionKey,
'token': wx.getStorageSync('userSession').sessionKey,
'tenant': config.tenant,
'content-type': 'application/x-www-form-urlencoded',
// 测试用
// 'Cookie': '_idt=jjhz92fn0.le2a6c06c9g0.thhg7ekb1f8; _ga=GA1.2.1777311393.1531910388; Hm_lvt_64d86060eda3e464ab4928484860b4ea=1531998677; pt_37c2513b=uid=K0MVCaW1zOQbL9Hlh4nwcA&nid=0&vid=j38J/KRanp7TFqxsiK0Ryw&vn=14&pvn=3&sact=1533523932802&to_flag=0&pl=NbnhKybdedL6K-YTE0zzsQ*pt*1533523932802; _pk_id.8.50b6=5e9684d55d7b51d1.1534129436.5.1534223988.1534222943.; Hm_lvt_35891a16eff03ec8bb219e4a00dbaf7a=1534307203; looyu_id=3aa78c2b7a744584f9f6fef015c4157b66_10036753%3A6; Qs_lvt_217181=1534307202; pt_s_6d83a9d6=vt=1534308606705&cad=; Hm_lpvt_35891a16eff03ec8bb219e4a00dbaf7a=1534308607; Qs_pv_217181=4039008301502242300%2C2643992663734177300%2C23948192170497664%2C3823352575569261000; pt_6d83a9d6=uid=EXg24v5T9wUibq5/wWWZCg&nid=0&vid=4NDbaXQ0RlX8HEv7TTSzkA&vn=8&pvn=2&sact=1534308606705&to_flag=1&pl=Rcddj0FCL0MTlYRofJeCeA*pt*1534308606705; Hm_lvt_81efeffaf531027591c4d577ee4a5cb4=1533525823,1534473796; _SUP=00da585a6b1b53bd453d1b30cbf9812ff9ef0313e4f5756651f3218543452c27a%3A2%3A%7Bi%3A0%3Bs%3A4%3A%22_SUP%22%3Bi%3A1%3Bs%3A144%3A%22MFpTR3h1QmtTSlM1Z3JvLmVscG1heGUuMTBzYWMtZWRPWnFoeDdsMFlCTkFiTFNjZFl3UVVDZkVwa3N3UlgxZEFVQTlkTnFhRU54c3RLUGEtMTI1LVRHVDAuNDI3NDQ0ODQ4ODA1MzQ5MDU%3D%22%3B%7D; Hm_lpvt_81efeffaf531027591c4d577ee4a5cb4=1535072424; _pk_id.7.50b6=a73f1add4efca30d.1531815381.52.1535110040.1535110040.; _pk_ses.7.50b6=*'
'apikey': 'pP5ECUqRDLDzuh4qRuJro0L1LPgjLP0N'
},
method: obj.method || 'GET', // 不必填，默认 GET
dataType: 'json',
......@@ -32,7 +33,7 @@ const requestApi = (obj) => {
// wx.showToast({ title: JSON.stringify(res.data), icon: 'none' }) // 自己后台封装返回
// }
obj.callback(res)
} else if (res.statusCode === 403) {
} else if (res.statusCode === 403 || res.statusCode === 401) {
/* 未授权登录，跳转首页 */
wx.reLaunch({
url: '/pages/index/index'
......@@ -106,11 +107,28 @@ const miniGetInfo = (callback) => {
*/
const loginApi = (obj, callback) => {
wx.request({
url: config.URL_PATH + '/user/applets-login',
url: config.URL_PATH1 + '/user/check-unionid',
data: { code: obj.code, encrypted_data: obj.encryptedData, iv: obj.iv }, method: 'POST', header: {
tenant: config.tenant
tenant: config.tenant,
apikey: 'pP5ECUqRDLDzuh4qRuJro0L1LPgjLP0N'
},
success: res => { callback(res, obj); }
success: res => {
if (res.statusCode == 200) {
wx.request({
url: config.URL_PATH2 + '/user_center/wechat_login',
data: { wechat_unionid: res.data.union_id, service: 'applet.ezijing.com' }, method: 'POST', header: {
'tenant': config.tenant,
'content-type': 'application/x-www-form-urlencoded',
'apikey': 'pP5ECUqRDLDzuh4qRuJro0L1LPgjLP0N'
},
success: res => {
callback(res, obj);
}
})
} else {
callback(res, obj);
}
}
})
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论