From 68a848e0b75ef08bc4f1f456bd7d802f0bc90915 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 20 Aug 2019 12:07:05 +0800
Subject: [PATCH 2/4] ali cdn test
---
public/react/scripts/build.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/react/scripts/build.js b/public/react/scripts/build.js
index 8f2e93942..c18479299 100644
--- a/public/react/scripts/build.js
+++ b/public/react/scripts/build.js
@@ -193,10 +193,10 @@ function generateNewIndexJsp() {
}
const newVersion = '1.1.1'
let cdnHost = 'https://shixun.educoder.net'
- cdnHost = 'http://cdn.educoder.net'
- cdnHost = ''
+ cdnHost = 'https://ali-cdn.educoder.net'
+ // cdnHost = ''
var result = data.replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`)
- .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
+ // .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
.replace('/css/css_min_all.css', `${cdnHost}/react/build/css/css_min_all.css?v=${newVersion}`)
.replace('/css/iconfont.css', `${cdnHost}/react/build/css/iconfont.css?v=${newVersion}`)
From 8c05ef7f207e7fd78d2e4ef56622e25c439cb58c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 20 Aug 2019 12:35:17 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../courses/coursesPublic/SelectSetting.js | 168 +++++++++---------
.../courses/coursesPublic/sendResource.js | 150 ++++++++--------
2 files changed, 159 insertions(+), 159 deletions(-)
diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
index f27d810fe..557cec972 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
@@ -632,89 +632,89 @@ class Selectsetting extends Component{
{this.state.newfileListtypes===true?
请先上传资源
:""}
-
-
-
-
-
- 勾选后所有用户可见,否则仅课堂成员可见
-
-
- {/*{this.props.has_course_groups&&this.props.has_course_groups===true?:""}*/}
- {/*{this.state.course_groupss&&this.state.course_groupss.length>0?
*/}
- {/*统一设置(选中则所有分班使用相同的发布设置,否则各个单独设置)*/}
- {/*:""}*/}
-
-
-
-
- {/*this.props.has_course_groups&&this.props.has_course_groups===true?:""*/}
-
- {unified_setting===false?
- this.state.course_groups&&this.state.course_groups.map((item,key)=>{
- return(
-
-
-
-
-
-
- this.onChangeTimepublishs(e,index,key)}
- // onChange={ this.onChangeTimepublish }
- disabledTime={disabledDateTime}
- disabledDate={disabledDate}
- />
-
- {key!=0?this.deletegrouppublish(key)}>:""}
- {key===course_groups.length-1?:""}
-
- )
- }):""}
-
-
-
+ {/*
*/}
+ {/**/}
+
+ {/*
*/}
+ {/**/}
+ {/*勾选后所有用户可见,否则仅课堂成员可见*/}
+ {/**/}
+ {/*
*/}
+ {/*/!*{this.props.has_course_groups&&this.props.has_course_groups===true?:""}*!/*/}
+ {/*/!*{this.state.course_groupss&&this.state.course_groupss.length>0?
*!/*/}
+ {/*/!*统一设置(选中则所有分班使用相同的发布设置,否则各个单独设置)*!/*/}
+ {/*/!*:""}*!/*/}
+
+ {/**/}
+
+
+ {/*/!*this.props.has_course_groups&&this.props.has_course_groups===true?:""*!/*/}
+ {/*
*/}
+ {/*{unified_setting===false?*/}
+ {/*this.state.course_groups&&this.state.course_groups.map((item,key)=>{*/}
+ {/*return(*/}
+ {/*
*/}
+
+
+ {/**/}
+
+
+ {/*this.onChangeTimepublishs(e,index,key)}*/}
+ {/*// onChange={ this.onChangeTimepublish }*/}
+ {/*disabledTime={disabledDateTime}*/}
+ {/*disabledDate={disabledDate}*/}
+ {/*/>*/}
+
+ {/*{key!=0?this.deletegrouppublish(key)}>:""}*/}
+ {/*{key===course_groups.length-1?:""}*/}
+ {/*
*/}
+ {/*)*/}
+ {/*}):""}*/}
+ {/*
*/}
+
+ {/**/}
{unified_setting===true?
-
+
请先上传资源
:""}
-
-
-
-
- 勾选后所有用户可见,否则仅课堂成员可见
-
-
- {/*{this.state.course_groups_count&&this.state.course_groups_count>0?
*/}
- {/*统一设置(选中则所有分班使用相同的发布设置,否则各个单独设置)*/}
- {/*:""}*/}
-
-
- {is_unified_setting===false?
- course_group_publish_times.map((item,key)=>{
- return(
-
-
-
-
- this.onChangeTimepublish(e,index,key,2)}
- // onChange={ this.onChangeTimepublish }
- disabledTime={disabledDateTime}
- disabledDate={disabledDate}
- />
- {key!=0?this.deletegrouppublish(key)}>:""}
- {key===course_group_publish_times.length-1&&key:""}
-
- )
- })
-
- :""}
-
-
-
-
- {is_unified_setting===true?
+ {/*
*/}
+ {/**/}
+
+ {/*
*/}
+ {/*勾选后所有用户可见,否则仅课堂成员可见*/}
+ {/**/}
+
+ {/*/!*{this.state.course_groups_count&&this.state.course_groups_count>0?
*!/*/}
+ {/*/!*统一设置(选中则所有分班使用相同的发布设置,否则各个单独设置)*!/*/}
+ {/*/!*:""}*!/*/}
+ {/**/}
+ {/*
*/}
+ {/*{is_unified_setting===false?*/}
+ {/*course_group_publish_times.map((item,key)=>{*/}
+ {/*return(*/}
+ {/*
*/}
+
+ {/**/}
+
+ {/*this.onChangeTimepublish(e,index,key,2)}*/}
+ {/*// onChange={ this.onChangeTimepublish }*/}
+ {/*disabledTime={disabledDateTime}*/}
+ {/*disabledDate={disabledDate}*/}
+ {/*/>*/}
+ {/*{key!=0?this.deletegrouppublish(key)}>:""}*/}
+ {/*{key===course_group_publish_times.length-1&&key:""}*/}
+ {/*
*/}
+ {/*)*/}
+ {/*})*/}
+
+ {/*:""}*/}
+ {/*
*/}
+
+ {/**/}
+
+ {is_unified_setting===true?
Date: Tue, 20 Aug 2019 12:38:21 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/courses/coursesPublic/sendResource.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/courses/coursesPublic/sendResource.js b/public/react/src/modules/courses/coursesPublic/sendResource.js
index 08f23572d..20f22b119 100644
--- a/public/react/src/modules/courses/coursesPublic/sendResource.js
+++ b/public/react/src/modules/courses/coursesPublic/sendResource.js
@@ -543,7 +543,7 @@ class Sendresource extends Component{
{/*
*/}
- {is_unified_setting===true?
+ {is_unified_setting===true?