Skip to content

S
saas-weichat
Commit 995d29c1 by liangkaiping
Options

Merge branch 'dev' into 'master' 

Dev

See merge request liangkaiping/saas-weichat!1
parents 213a7ed5 8d216270
Showing with 49 additions and 54 deletions
libs/reactCli.js
This source diff could not be displayed because it is too large. You can view the blob instead.
libs/report.js
This source diff could not be displayed because it is too large. You can view the blob instead.
libs/report.manifest.json
This source diff could not be displayed because it is too large. You can view the blob instead.
libs/ui.js
This source diff could not be displayed because it is too large. You can view the blob instead.
libs/ui.manifest.json
This source diff could not be displayed because it is too large. You can view the blob instead.
src/common/polyvVideo/polyvVideo.jsx
...@@ -194,10 +194,11 @@ class PolyvVideo extends Component { ...@@ -194,10 +194,11 @@ class PolyvVideo extends Component {
loading_bg_img: poster || '/lib/black-bg.png', loading_bg_img: poster || '/lib/black-bg.png',
df: 2, df: 2,
showHd: 'off', showHd: 'off',
forceH5: true,
autoplay: autoplay, autoplay: autoplay,
ban_ui: 'off', ban_ui: 'off',
vid: videoId, vid: videoId,
speed: companyCode == "fudan" ? true : false, speed: companyCode == "fulan" ? true : false,
playsafe: polyvToken, playsafe: polyvToken,
history_video_duration: 1000, history_video_duration: 1000,
watchStartTime: videoStartTime ? videoStartTime : 0, watchStartTime: videoStartTime ? videoStartTime : 0,
......
src/services/baseUrl.js
// const NODE_ENV_API = process.env.NODE_ENV_API; // const NODE_ENV_API = process.env.NODE_ENV_API;
const original = process.env.NODE_ENV_API ? process.env.NODE_ENV_API : JSON.parse(process.env.npm_config_argv)["original"]; const original = process.env.NODE_ENV_API
let NODE_ENV_API = 'dev'; ? process.env.NODE_ENV_API
if(process.env.NODE_ENV_API){ : JSON.parse(process.env.npm_config_argv)["original"];
let NODE_ENV_API = "dev";
if (process.env.NODE_ENV_API) {
NODE_ENV_API = original; NODE_ENV_API = original;
}else{ } else {
NODE_ENV_API = original[original.length - 1].split('--')[1] ? original[original.length - 1].split('--')[1] : 'dev'; NODE_ENV_API = original[original.length - 1].split("--")[1]
? original[original.length - 1].split("--")[1]
: "dev";
} }
const config = { const config = {
prod: { prod: {
BASE_URL: "http://dev.mg.kmelearning.com", BASE_URL: "https://wx.fairyclass.cn",
}, },
deve: { deve: {
BASE_URL: "http://dev.mg.kmelearning.com", BASE_URL: "https://wx.fairyclass.cn",
}, },
sit: { sit: {
BASE_URL: "https://test.wechat.kmelearning.com", BASE_URL: "https://wx.fairyclass.cn",
}, },
uat: { uat: {
BASE_URL: "https://uat.mg.kmelearning.com", BASE_URL: "https://wx.fairyclass.cn",
}, },
other: { other: {
BASE_URL: "", BASE_URL: "",
......
src/util/urlconfig.js
const WEBSTUDENT = '/web-student/'; const WEBSTUDENT = "/web-student/";
// 只有交银康林企业用 // 只有交银康林企业用
let urlPrefix = localStorage.getItem("host_config"); let urlPrefix = localStorage.getItem("host_config");
// //
//认证授权服务 //认证授权服务
const SYSTEM = "/system/"; const SYSTEM = "/system/";
const SEARCH = "/esearch/"; const SEARCH = "/esearch/";
const CHATPRACTICE = "/chat-practice/" const CHATPRACTICE = "/chat-practice/";
const host = location.host; const host = location.host;
var baseUrl = ''; var baseUrl = "";
let urlHeader = location.host.split(".")[0]; let urlHeader = location.host.split(".")[0];
if (host.indexOf("localhost") != -1 || host.indexOf("192.168.") != -1 || host.indexOf("1") != -1 || host.indexOf("172.") != -1) { if (
host.indexOf("localhost") != -1 ||
host.indexOf("192.168.") != -1 ||
host.indexOf("1") != -1 ||
host.indexOf("172.") != -1
) {
//本地浏览器使用localhost时 //本地浏览器使用localhost时
// baseUrl = 'http://dev.wechat.kmelearning.com'; // baseUrl = 'http://dev.wechat.kmelearning.com';
baseUrl = 'https://test.wechat.kmelearning.com'; baseUrl = "https://wx.fairyclass.cn";
// baseUrl = 'https://uat.wechat.kmelearning.com'; // baseUrl = 'https://uat.wechat.kmelearning.com';
...@@ -37,32 +37,27 @@ if (host.indexOf("localhost") != -1 || host.indexOf("192.168.") != -1 || host.in ...@@ -37,32 +37,27 @@ if (host.indexOf("localhost") != -1 || host.indexOf("192.168.") != -1 || host.in
// baseUrl = 'http://localhost:8003'; // baseUrl = 'http://localhost:8003';
// baseUrl = 'https://wechat.kmelearning.com'; // baseUrl = 'https://wechat.kmelearning.com';
} else if (
host.indexOf("192.168.1.131") != -1 ||
} else if (host.indexOf("192.168.1.131") != -1 || host.indexOf("192.168.2.23") != -1) { host.indexOf("192.168.2.23") != -1
) {
//这个基本不用 //这个基本不用
// baseUrl = 'http://test.wechat.kmelearning.com'; // baseUrl = 'http://test.wechat.kmelearning.com';
// baseUrl = 'http://dev.wechat.kmelearning.com'; // baseUrl = 'http://dev.wechat.kmelearning.com';
baseUrl = 'https://uat.wechat.kmelearning.com'; baseUrl = "https://wx.fairyclass.cn";
} else if (urlHeader.indexOf("wechats") != -1) { } else if (urlHeader.indexOf("wechats") != -1) {
//本地域名访问 //本地域名访问
// baseUrl = 'https://uat.wechat.kmelearning.com'; // baseUrl = 'https://uat.wechat.kmelearning.com';
baseUrl = 'http://test.wechat.kmelearning.com'; baseUrl = "https://wx.fairyclass.cn";
} else { } else {
//再改又是三杯奶茶! //再改又是三杯奶茶!
baseUrl = ''; baseUrl = "";
} }
// 只有交银康林企业用 // 只有交银康林企业用
if (urlPrefix) { if (urlPrefix) {
baseUrl += "/" + urlPrefix; baseUrl += "/" + urlPrefix;
} }
const url = { const url = {
// 测试环境域名 // 测试环境域名
baseUrl: baseUrl, baseUrl: baseUrl,
...@@ -118,7 +113,6 @@ const url = { ...@@ -118,7 +113,6 @@ const url = {
// banner // banner
banner: `${baseUrl}${WEBSTUDENT}api/banner/home/image/list`, banner: `${baseUrl}${WEBSTUDENT}api/banner/home/image/list`,
//火热报名中 //火热报名中
hotEnrolling: `${baseUrl}${WEBSTUDENT}api/trainingProject/hot/page/list`, hotEnrolling: `${baseUrl}${WEBSTUDENT}api/trainingProject/hot/page/list`,
//项目列表 //项目列表
...@@ -219,7 +213,6 @@ const url = { ...@@ -219,7 +213,6 @@ const url = {
//新闻与公告列表 //新闻与公告列表
newsMessageList: `${baseUrl}${WEBSTUDENT}api/info/page/pcList`, newsMessageList: `${baseUrl}${WEBSTUDENT}api/info/page/pcList`,
//我的分享 //我的分享
myShareUrl: `${baseUrl}${WEBSTUDENT}api/marketing/course/share/list`, myShareUrl: `${baseUrl}${WEBSTUDENT}api/marketing/course/share/list`,
//我分享的课程被浏览数 //我分享的课程被浏览数
...@@ -247,7 +240,8 @@ const url = { ...@@ -247,7 +240,8 @@ const url = {
https://open.weixin.qq.com/connect/oauth2/authorize?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=SCOPE&state=STATE#wechat_redirect https://open.weixin.qq.com/connect/oauth2/authorize?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=SCOPE&state=STATE#wechat_redirect
*/ */
//微信对接 //微信对接
weChartLogin: 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf30db9148141fdbb&redirect_uri=cs-wechat-ent.vmceshi.com&response_type=code&scope=snsapi_base&agentid=1000005&state=wexinauth#wechat_redirect', weChartLogin:
"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf30db9148141fdbb&redirect_uri=cs-wechat-ent.vmceshi.com&response_type=code&scope=snsapi_base&agentid=1000005&state=wexinauth#wechat_redirect",
//直播 list //直播 list
STRAIGHT_PLAY: `${baseUrl}${WEBSTUDENT}api/live/list`, STRAIGHT_PLAY: `${baseUrl}${WEBSTUDENT}api/live/list`,
//直播回放 //直播回放
...@@ -443,28 +437,24 @@ const url = { ...@@ -443,28 +437,24 @@ const url = {
postView: `${baseUrl}${WEBSTUDENT}/student/posts//postsReadRecords/insertReadRecord`, postView: `${baseUrl}${WEBSTUDENT}/student/posts//postsReadRecords/insertReadRecord`,
//签到定位 //签到定位
signingCheckCode: `${baseUrl}${WEBSTUDENT}api/sign/checkCode`,//签到详情 signingCheckCode: `${baseUrl}${WEBSTUDENT}api/sign/checkCode`, //签到详情
signingInsert: `${baseUrl}${WEBSTUDENT}api/sign/insert`,//签到 signingInsert: `${baseUrl}${WEBSTUDENT}api/sign/insert`, //签到
getLanguageData: `${baseUrl}${WEBSTUDENT}public/api/siteLanguage/language/get`, //获取国际化数据
getlanguageClass: `${baseUrl}${WEBSTUDENT}public/api/siteLanguage/page`, //获取语言类
getLanguageData: `${baseUrl}${WEBSTUDENT}public/api/siteLanguage/language/get`,//获取国际化数据
getlanguageClass: `${baseUrl}${WEBSTUDENT}public/api/siteLanguage/page`,//获取语言类
siteLanguagePublicPage: `${baseUrl}${WEBSTUDENT}manage/siteLanguage/public/page`, siteLanguagePublicPage: `${baseUrl}${WEBSTUDENT}manage/siteLanguage/public/page`,
siteLanguageSave: `${baseUrl}${WEBSTUDENT}/student/siteLanguage/record/international/selectLanguage/save`,//保存用户选择的语种 siteLanguageSave: `${baseUrl}${WEBSTUDENT}/student/siteLanguage/record/international/selectLanguage/save`, //保存用户选择的语种
siteLanguageGet: `${baseUrl}${WEBSTUDENT}/student/siteLanguage/record/international/selectLanguage/get`,//回显用户选择的语种 siteLanguageGet: `${baseUrl}${WEBSTUDENT}/student/siteLanguage/record/international/selectLanguage/get`, //回显用户选择的语种
//智能陪练 //智能陪练
practiceStateList: `${baseUrl}${CHATPRACTICE}student/practice/by/state/list`,//根据状态获取陪练列表 practiceStateList: `${baseUrl}${CHATPRACTICE}student/practice/by/state/list`, //根据状态获取陪练列表
practiceMsgIdList: `${baseUrl}${CHATPRACTICE}student/practice/msg/by/id/list`,//获取配练时间及次数信息 practiceMsgIdList: `${baseUrl}${CHATPRACTICE}student/practice/msg/by/id/list`, //获取配练时间及次数信息
practiceLogList: `${baseUrl}${CHATPRACTICE}student/practice/log/list`,//历史记录列表 practiceLogList: `${baseUrl}${CHATPRACTICE}student/practice/log/list`, //历史记录列表
practiceJoinedCount: `${baseUrl}${CHATPRACTICE}student/practice/joined/count`,//获取训练模式不同等级的参加次数 practiceJoinedCount: `${baseUrl}${CHATPRACTICE}student/practice/joined/count`, //获取训练模式不同等级的参加次数
practiceLogGet: `${baseUrl}${CHATPRACTICE}student/practice/log/get`,//陪练分析--雷达图数据 practiceLogGet: `${baseUrl}${CHATPRACTICE}student/practice/log/get`, //陪练分析--雷达图数据
practiceAnalysisGet: `${baseUrl}${CHATPRACTICE}student/practice/log/analysis/get`,//答案解析--得分分析 practiceAnalysisGet: `${baseUrl}${CHATPRACTICE}student/practice/log/analysis/get`, //答案解析--得分分析
practiceStartSave: `${baseUrl}${CHATPRACTICE}student/chat/start/practice/save`,//陪练开始,新增一条陪练记录 practiceStartSave: `${baseUrl}${CHATPRACTICE}student/chat/start/practice/save`, //陪练开始,新增一条陪练记录
practiceChatEnd: `${baseUrl}${CHATPRACTICE}student/chat/end/save`,//陪练，获取结果评分 practiceChatEnd: `${baseUrl}${CHATPRACTICE}student/chat/end/save`, //陪练，获取结果评分
practiceTabIndex: `${baseUrl}${CHATPRACTICE}student/practice/list/tab/index/get`,//陪练列表，默认显示哪个tab(未开始,进行中,已结束) practiceTabIndex: `${baseUrl}${CHATPRACTICE}student/practice/list/tab/index/get`, //陪练列表，默认显示哪个tab(未开始,进行中,已结束)
}; };
export default url; export default url;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment