Merge remote-tracking branch 'origin/master' into enterprise

learnOnline/apiService/ChapterApi.js

@@ -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_PATH1 + '/v2/education/courses/' + cur_semester_id + '/' + cur_course_id,
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/education/video-streaming',
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/education/video/' + sid + '/' + vid + '/device',
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/analytics/upload-video',
+    url: util.config.URL_PATH + '/v2/analytics/upload-video',
     data: {
       d: obj.did,
       i: obj.did,

learnOnline/apiService/CourseApi.js

@@ -6,7 +6,7 @@ const util = require('../utils/util.js')
 /* 获取学期分类信息 */
 const getlearnFindList = (callback) => {
   util.requestApi({
-    url: util.config.URL_PATH1 + '/v2/education/semesters',
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/education/courses' + (isMy ? '/my' : '' ),
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/education/courses/' + sid + '/' + id,
+    url: util.config.URL_PATH + '/v2/education/courses/' + sid + '/' + id,
     callback: function (res) {
       let cur = res.data, _cur = cur.curriculum
       /* 课程类型 */
@@ -130,7 +130,7 @@ const getCourseDetail = (id, sid, callback) => {
 /* 获取课程考核信息 */
 const getCourseAssess = (cid, sid, callback) => {
   util.requestApi({
-    url: util.config.URL_PATH1 + '/v2/analytics/courses/' + sid + '/' + cid + '/evaluation',
+    url: util.config.URL_PATH + '/v2/analytics/courses/' + sid + '/' + cid + '/evaluation',
     callback: function (res) {
       let cur = res.data
       let video = [];
@@ -184,7 +184,7 @@ const getCourseAssess = (cid, sid, callback) => {
 /* 获取试题信息 */
 const getExamDetail = (eid, sid, callback) => {
   util.requestApi({
-    url: util.config.URL_PATH1 + '/v2/education/homeworks/' + sid + '/' + eid,
+    url: util.config.URL_PATH + '/v2/education/homeworks/' + sid + '/' + eid,
     callback: function (res) {
       callback(res)
     }
@@ -193,7 +193,7 @@ const getExamDetail = (eid, sid, callback) => {
 /* 提交考试信息 */
 const submitExamDetail = (param, callback) => {
   util.requestApi({
-    url: util.config.URL_PATH1 + '/v2/education/homeworks',
+    url: util.config.URL_PATH + '/v2/education/homeworks',
     method: 'POST',
     data: param,
     callback: function (res) {
@@ -204,7 +204,7 @@ const submitExamDetail = (param, callback) => {
 /* 选课 */
 const selectCourse = (cid, sid, callback) => {
   util.requestApi({
-    url: util.config.URL_PATH1 + '/v2/education/courses/major',
+    url: util.config.URL_PATH + '/v2/education/courses/major',
     data: { course_id: cid, semester_id: sid },
     method: 'POST',
     callback: function (res) {
@@ -215,7 +215,7 @@ const selectCourse = (cid, sid, callback) => {
 /* 退课 */
 const outSelectCourse = (cid, sid, callback) => {
   util.requestApi({
-    url: util.config.URL_PATH1 + '/v2/education/courses/drop',
+    url: util.config.URL_PATH + '/v2/education/courses/drop',
     data: { course_id: cid, semester_id: sid },
     method: 'POST',
     callback: function (res) {

learnOnline/apiService/DiscussApi.js

@@ -10,7 +10,7 @@ const util = require('../utils/util.js')
  */
 const getDiscussList = (path, dataJson, callback) => {
   util.requestApi({
-    url: util.config.URL_PATH1 + '/v2/qa/questions' + path,
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/qa/questions/course/' + sid + '/' + cid,
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/qa/questions/' + qid,
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/qa/questions/' + qid,
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/qa/questions',
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/qa/answers',
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/qa/answers/' + aid,
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/qa/comments',
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/qa/comments/' + cid,
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/qa/tags',
+    url: util.config.URL_PATH + '/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_PATH1 + '/v2/qa/tags/' + tagid,
+    url: util.config.URL_PATH + '/v2/qa/tags/' + tagid,
     method: 'DELETE',
     callback: function (res) {
       let _data = res.data

learnOnline/apiService/MsgApi.js

@@ -6,7 +6,7 @@ const util = require('../utils/util.js')
 /* 获取我的学分信息 */
 const getMyMsg = (callback) => {
   util.requestApi({
-    url: util.config.URL_PATH1 + '/v2/education/message/my',
+    url: util.config.URL_PATH + '/v2/education/message/my',
     callback: function (res) {
       let json = res.data.map(function (_, i) {
         return {

learnOnline/apiService/ScoreApi.js

@@ -6,7 +6,7 @@ const util = require('../utils/util.js')
 /* 获取我的学分信息 */
 const getMyScore = (callback) => {
   util.requestApi({
-    url: util.config.URL_PATH1 + '/v2/education/credits',
+    url: util.config.URL_PATH + '/v2/education/credits',
     callback: function (res) {
       let _data = res.data
       let json = {

learnOnline/utils/util.js

@@ -6,8 +6,7 @@ const config = {
   // outSiteLink: 'https://applets.ezijing.com', // 本地测试外链
   // URL_PATH: 'https://api2.ezijing.com', // 测试域名
   // outSiteLink: 'https://kelley2.ezijing.com', // 测试外链
-  URL_PATH: 'https://api.ezijing.com/ep', // 正式域名 - 不变 域名
-  URL_PATH1: 'https://api.ezijing.com/ep', // 正式域名 - 由于项目变动域名
+  URL_PATH: 'https://api.ezijing.com/ep', // 正式域名 - 由于项目变动域名
   outSiteLink: 'https://e-learning.ezijing.com', // 正式外链
   tenant: 'classes'
 }
@@ -102,7 +101,7 @@ const miniGetInfo = (callback) => {
  */
 const loginApi = (obj, callback) => {
   wx.request({
-    url: config.URL_PATH1 + '/user/applets-login', 
+    url: config.URL_PATH + '/user/applets-login', 
     data: { code: obj.code, encrypted_data: obj.encryptedData, iv: obj.iv }, method: 'POST', header: {
       tenant: config.tenant
     },