From de47c662636162f421241dd390242d9c965c3a08 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 4 Sep 2019 10:26:21 +0800
Subject: [PATCH 01/13] real

---
 public/react/src/modules/courses/busyWork/CommonWorkPost.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
index 312756ec4..ed96914de 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
@@ -646,7 +646,7 @@ render(){
           {/*<span className="color-grey-9 ml3 mr3">&gt;</span>*/}
         {/*</WordsBtn>*/}
         
-        <span>{`${current_user ? current_user.username : ''} ${ this.isEdit ? '编辑' : '提交'}作品` }</span>
+        <span>{`${current_user ? current_user.real_name : ''} ${ this.isEdit ? '编辑' : '提交'}作品` }</span>
       </p>
 
       <div style={{ width:'100%',height:'75px'}} >

From c80adad2030753c1400845aacdc17a0c00c449f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 4 Sep 2019 10:32:04 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E8=AF=BE=E5=A0=82=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AE=A1=E7=AE=97=E6=88=90=E7=BB=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/shixunHomework/Listofworksstudentone.js    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 64e2e6a99..a803ecdd2 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2499,6 +2499,8 @@ class Listofworksstudentone extends Component {
 		// console.log(data);
 		// console.log(datas);
 		// console.log(this.props.isAdmin());
+
+	 let course_is_end = this.props.current_user&&this.props.current_user.course_is_end;
 		return (
 			this.props.isAdmin() === true ?
 				(
@@ -2639,7 +2641,7 @@ class Listofworksstudentone extends Component {
 							<ul className="clearfix" style={{padding: '20px 15px 10px 20px'}}>
 								<li className="clearfix ">
 									<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-									<span>
+									{course_is_end===true?<span>
 									{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?
 										(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
 											计算成绩
@@ -2649,7 +2651,7 @@ class Listofworksstudentone extends Component {
 												计算成绩
 											</div>:"")
 									}
-						  	</span>
+						  	 </span>:""}
 
 									<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
 										<Search
@@ -2944,7 +2946,7 @@ class Listofworksstudentone extends Component {
 														<div className="fr">
 
 															<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-															{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
+															{	course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 													{computeTimetype===true?
 														(this.props.isNotMember()===false?
 															<div className={"computeTime font-13"} onClick={this.setComputeTime}>
@@ -3154,7 +3156,7 @@ class Listofworksstudentone extends Component {
 														<div className="fr">
 
 															<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-															{teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
+															{	course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 													{computeTimetype===true?
 														(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 															计算成绩

From d34f4a300276f1e3115fb12d2da5ecc5157f55d5 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Wed, 4 Sep 2019 10:52:21 +0800
Subject: [PATCH 03/13] js sdk api

---
 app/controllers/wechats/js_sdk_signatures_controller.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/wechats/js_sdk_signatures_controller.rb b/app/controllers/wechats/js_sdk_signatures_controller.rb
index e4ee0da27..6d7b3d87d 100644
--- a/app/controllers/wechats/js_sdk_signatures_controller.rb
+++ b/app/controllers/wechats/js_sdk_signatures_controller.rb
@@ -1,7 +1,10 @@
 class Wechats::JsSdkSignaturesController < ApplicationController
   def create
-    signature = Util::Wechat.js_sdk_signature(params[:url], params[:noncestr], params[:timestamp])
-    render_ok(signature: signature)
+    timestamp = (Time.now.to_f * 1000).to_i
+    noncestr = ('A'..'z').to_a.sample(8).join
+    signature = Util::Wechat.js_sdk_signature(params[:url], noncestr, timestamp)
+
+    render_ok(appid: Util::Wechat.appid, timestamp: timestamp, noncestr: noncestr, signature: signature)
   rescue Util::Wechat::Error => ex
     render_error(ex.message)
   end

From 308e582d8d851b2d1ebc1695a964628461a32e03 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 4 Sep 2019 13:39:29 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E5=8F=AA=E8=83=BD=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/tpm/TPMsettings/TPMsettings.js | 18 ++++++++++++------
 .../src/modules/tpm/newshixuns/Newshixuns.js   | 18 +++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index e277ad85f..f1184e7b7 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -15,7 +15,7 @@ import axios from 'axios';
 
 import './css/TPMsettings.css';
 
-import { getImageUrl, toPath, getUrl ,appendFileSizeToUploadFileAll} from 'educoder';
+import { getImageUrl, toPath, getUrl ,appendFileSizeToUploadFileAll, getUploadActionUrl} from 'educoder';
 
 let origin = getUrl();
 
@@ -1372,15 +1372,18 @@ export default class TPMsettings extends Component {
 		})
 
 	}
+
 	handleChange = (info) => {
+		let {fileList}=this.state;
+
 		if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
 			console.log("handleChange1");
-			let {fileList}=this.state;
-			if(fileList.length===0){
+			
+			// if(fileList.length===0){
 				let fileLists = info.fileList;
 				this.setState({ fileList:fileLists,
 					deleteisnot:false});
-			}
+			// }
 		}
 	}
 
@@ -1497,10 +1500,13 @@ export default class TPMsettings extends Component {
 			// https://github.com/ant-design/ant-design/issues/15505
 			// showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
 			// showUploadList: false,
-			action:  `${getUrl()}/api/attachments.json`,
+			action:  `${getUploadActionUrl()}`,
 			onChange: this.handleChange,
 			onRemove: this.onAttachmentRemove,
-			beforeUpload: (file) => {
+			beforeUpload: (file, fileList) => {
+				if (this.state.fileList.length >= 1) {
+                    return false
+                }
 				// console.log('beforeUpload', file.name);
 				const isLt150M = file.size / 1024 / 1024 < 50;
 				if (!isLt150M) {
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index cc178dbe0..d7b2b7d26 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -2,7 +2,7 @@ import React, {Component} from 'react';
 
 import {TPMIndexHOC} from '../TPMIndexHOC';
 
-import {SnackbarHOC,appendFileSizeToUploadFileAll} from 'educoder';
+import {SnackbarHOC,appendFileSizeToUploadFileAll, getUploadActionUrl} from 'educoder';
 
 import {Input, Select, Radio, Checkbox, Modal, Icon, DatePicker,Upload,Button,message,Form,notification,Tooltip} from 'antd';
 
@@ -757,19 +757,19 @@ class Newshixuns extends Component {
         })
     }
 
-
 	// 附件相关 START
     handleChange = (info) => {
+        let {fileList}=this.state;
+
         if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
-            let {fileList}=this.state;
             console.log("handleChange1");
-            if(fileList.length===0){
+            // if(fileList.length===0){
 					let fileLists = info.fileList;
 					this.setState({
 						// fileList:appendFileSizeToUploadFileAll(fileList),
 						fileList:fileLists,
 						deleteisnot:false});
-                }
+                // }
         }
 
     }
@@ -872,10 +872,14 @@ class Newshixuns extends Component {
             // https://github.com/ant-design/ant-design/issues/15505
             // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
             // showUploadList: false,
-            action:  `${getUrl()}/api/attachments.json`,
+            action:  `${getUploadActionUrl()}`,
             onChange: this.handleChange,
             onRemove: this.onAttachmentRemove,
-            beforeUpload: (file) => {
+            beforeUpload: (file, fileList) => {
+
+                if (this.state.fileList.length >= 1) {
+                    return false
+                }
                 // console.log('beforeUpload', file.name);
                 const isLt150M = file.size / 1024 / 1024 < 50;
                 if (!isLt150M) {

From c4756cde6711df13cbfafec211673886426bbaad Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 4 Sep 2019 14:03:52 +0800
Subject: [PATCH 05/13] https://www.trustie.net/issues/23867

---
 public/react/src/modules/comment/Comments.js       |  4 ++--
 .../src/modules/courses/boards/TopicDetail.js      |  8 +++++---
 public/react/src/modules/courses/boards/index.js   |  5 +++--
 .../modules/courses/coursesDetail/CoursesBanner.js | 14 +++++++-------
 .../src/modules/courses/members/studentsList.js    |  3 ++-
 public/react/src/modules/tpm/TPMIndexHOC.js        |  6 ++++++
 6 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/comment/Comments.js b/public/react/src/modules/comment/Comments.js
index ae246197c..836b520cc 100644
--- a/public/react/src/modules/comment/Comments.js
+++ b/public/react/src/modules/comment/Comments.js
@@ -383,12 +383,12 @@ class Comments extends Component {
 
 	                                {/* <span className="ml5 mr5 color-grey-8">|</span>*/}
 	                                
-										<a href={`javascript:void(0)`} className="color-grey-8"
+										{(this.props.showReply == undefined || this.props.showReply == true) && <a href={`javascript:void(0)`} className="color-grey-8"
 												onClick={() => this.initReply(item) } >
 											<Tooltip title={ "回复" }>
 												<i className="iconfont icon-huifu1 mr5"></i>
 											</Tooltip>
-										</a>
+										</a>}
 	                              	
 
 										{/* <span className="ml5 mr5 color-grey-8">|</span>*/}
diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js
index 542157bfb..8ecc85565 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.js
+++ b/public/react/src/modules/courses/boards/TopicDetail.js
@@ -527,6 +527,7 @@ class TopicDetail extends Component {
       // TODO 图片上传地址
       const courseId=this.props.match.params.coursesId;
       const boardId = this.props.match.params.boardId
+      const isCourseEnd = this.props.isCourseEnd()
 	    return (
         <div className="edu-back-white edu-class-container edu-position course-message topicDetail" id="yslforum_index_list"> {/* fl with100 */}
           <style>{`
@@ -678,8 +679,8 @@ class TopicDetail extends Component {
                         }
                     </div>
                     
-                      <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么" 
-                          height={160} showError={true} buttonText={'发表'} className={comments && comments.length && 'borderBottom'}></MemoDetailMDEditor>
+                      {!isCourseEnd && <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么" 
+                          height={160} showError={true} buttonText={'发表'} className={comments && comments.length && 'borderBottom'}></MemoDetailMDEditor>}
 
                   {/*  onClick={ this.createNewComment } 
                         enableReplyTo={true}
@@ -704,6 +705,7 @@ class TopicDetail extends Component {
                         loadMoreChildComments={this.loadMoreChildComments}
                         initReply={this.initReply}
                         showRewardButton={false}
+                        showReply={!isCourseEnd}
 
                         onlySuperAdminCouldHide={true}
                       ></Comments>
@@ -720,7 +722,7 @@ class TopicDetail extends Component {
                       { total_count > REPLY_PAGE_COUNT &&  
                         <Pagination showQuickJumper onChange={this.onPaginationChange} current={pageCount} total={total_count} pageSize={10}/>
                       }
-                      <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
+                      {!isCourseEnd && <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>}
                     </div> 
                     
     	        </div>
diff --git a/public/react/src/modules/courses/boards/index.js b/public/react/src/modules/courses/boards/index.js
index 572c8dd63..a4a3ed632 100644
--- a/public/react/src/modules/courses/boards/index.js
+++ b/public/react/src/modules/courses/boards/index.js
@@ -327,6 +327,7 @@ class Boards extends Component{
   }
   render(){
     const isAdmin = this.props.isAdmin()
+    const isCourseEnd = this.props.isCourseEnd()
     const isAdminOrStudent = this.props.isAdminOrStudent()
     let { boardName, searchValue, boards, messages, checkBoxValues,
        checkAllValue, pagination, sort_type, parent_id } = this.state;
@@ -350,9 +351,9 @@ class Boards extends Component{
           searchPlaceholder={ '请输入帖子名称进行搜索' }
           firstRowRight={
             <React.Fragment>
-              { isAdmin && !parent_id && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加目录</WordsBtn> }
+              { !isCourseEnd && isAdmin && !parent_id && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加目录</WordsBtn> }
               { isAdmin && !!parent_id && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>目录重命名</WordsBtn> }
-              { isAdminOrStudent && <WordsBtn style="blue" className="" onClick={()=>this.onToBoardsNew()}>我要发贴</WordsBtn> }
+              { !isCourseEnd && isAdminOrStudent && <WordsBtn style="blue" className="" onClick={()=>this.onToBoardsNew()}>我要发贴</WordsBtn> }
             </React.Fragment>
           }
           secondRowLeft={
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index 3cbd04fd1..d8927b8d7 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -426,7 +426,7 @@ class CoursesBanner extends Component {
 
     render() {
         let { Addcoursestypes, coursedata,excellent, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon,is_guide,AccountProfiletype} = this.state;
-
+        const isCourseEnd = this.props.isCourseEnd()
         return (
           <div>
             {
@@ -714,24 +714,24 @@ class CoursesBanner extends Component {
                                                    position: "relative"
                                                  }}
                       >
-                        <li className={"mt7 mr10im"}>
+                        {!isCourseEnd && <li className={"mt7 mr10im"}>
                           <a onClick={()=>this.addTeacher(true)}>
                             <span className="color-white fl font-16 bannerurli width100f">添加老师</span>
                           </a>
-                        </li>
+                        </li>}
 
-                        <li className={"mt7 mr10im"}>
+                        {!isCourseEnd && <li className={"mt7 mr10im"}>
                           <a onClick={()=>this.addTeacher(false)}>
                             <span className="color-white fl font-16 bannerurli width100f">添加助教</span>
                           </a>
 
-                        </li>
+                        </li>}
 
-                        <li className={"mt7 mr10im"}>
+                        {!isCourseEnd && <li className={"mt7 mr10im"}>
                           <a onClick={()=>this.addStudent()}>
                             <span className={"color-white fl font-16 bannerurli width100f"}>添加学生</span>
                           </a>
-                        </li>
+                        </li>}
                         {excellent===false?
                         <li className={"mt7 mr10im ml10"} style={{overflow:"hidden"}}>
                           <a>
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 08f4971ce..46e6ad77d 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -497,6 +497,7 @@ class studentsList extends Component{
   render(){
     const isAdmin = this.props.isAdmin()
     const isSuperAdmin = this.props.isSuperAdmin()
+    const isCourseEnd = this.props.isCourseEnd()
     let {
       page,
       
@@ -591,7 +592,7 @@ class studentsList extends Component{
                   ></CreateGroupByImportModal>
                   <WordsBtn style="blue" className="mr30" onClick={()=> this.refs['createGroupByImportModal'].setVisible(true)}>导入创建分班</WordsBtn>
                 </React.Fragment> }
-              { isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> }
+              { !isCourseEnd && isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>分班重命名</WordsBtn> }
               <style>{`
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 52eda5901..657a1ef6b 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -244,6 +244,10 @@ export function TPMIndexHOC(WrappedComponent) {
         return this.state.coursedata&&this.state.coursedata.course_identity >= 6
       }
 
+      isCourseEnd = () => {
+        return this.state.current_user ? this.state.current_user.course_is_end : false
+      }
+
       // setTrialapplication = ()=>{
       //     this.setState({
       //       isRenders:true
@@ -411,6 +415,8 @@ export function TPMIndexHOC(WrappedComponent) {
             isStudent: this.isStudent,
             isAdminOrStudent: this.isAdminOrStudent,
             isNotMember: this.isNotMember,
+            isCourseEnd: this.isCourseEnd,
+            
             isUserid:this.state.coursedata&&this.state.coursedata.userid,
             fetchUser: this.fetchUser,
 

From d0f4aec03d462e2f429f938cc6adfc480693cd30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 4 Sep 2019 14:08:22 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0?=
 =?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/graduation/tasks/GraduationTasksSubmitedit.js     | 2 +-
 .../courses/graduation/tasks/GraduationTasksSubmitnew.js      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index e029ba644..c527824c5 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -619,7 +619,7 @@ class GraduationTasksSubmitedit extends Component{
                 {/*<Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id} className="color-grey-6">{workslist&&workslist.task_name}</Link>*/}
                 {/*<span className="color-grey-9 ml3 mr3">&gt;</span>*/}
                 {/*</WordsBtn>*/}
-                <span>{this.props.user&&this.props.user.username} 修改作品</span>
+                <span>{this.props.current_user&&this.props.current_user.real_name} 修改作品</span>
               </p>
 
               <div style={{ width:'100%',height:'75px'}} >
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index 1f08b1b5c..e383d4843 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -552,7 +552,7 @@ render(){
     },
   };
 
-  // console.log(this.props)
+  console.log(this.props)
 
 
 
@@ -601,7 +601,7 @@ render(){
           {/*<Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id} className="color-grey-6">{workslist&&workslist.task_name}</Link>*/}
           {/*<span className="color-grey-9 ml3 mr3">&gt;</span>*/}
         {/*</WordsBtn>*/}
-        <span>{this.props.user&&this.props.user.username} 提交作品</span>
+        <span>{this.props.current_user&&this.props.current_user.real_name} 提交作品</span>
       </p>
 
       <div style={{ width:'100%',height:'75px'}} >

From e6a6635277b97661b41cc65465d2e8b5262ce9bc Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Wed, 4 Sep 2019 14:13:43 +0800
Subject: [PATCH 07/13] wechat js sdk api

---
 config/routes.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 5a1590afc..8085765b4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -776,6 +776,10 @@ Rails.application.routes.draw do
     end
 
     post 'callbacks/aliyun_vod', to: 'callbacks/aliyun_vods#create'
+
+    namespace :wechats do
+      resource :js_sdk_signature, only: [:create]
+    end
   end
 
   namespace :admins do
@@ -884,10 +888,6 @@ Rails.application.routes.draw do
     end
   end
 
-  namespace :wechats do
-    resource :js_sdk_signature, only: [:create]
-  end
-
   #git 认证回调
   match 'gitauth/*url', to: 'gits#auth', via: :all
 

From a6154097832c14dd9ed2e3a182c40151bf2711e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 4 Sep 2019 14:38:10 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/home/shixunsHome.js | 296 +++++++++----------
 1 file changed, 148 insertions(+), 148 deletions(-)

diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 690baf28b..0d11fb369 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -389,156 +389,156 @@ class ShixunsHome extends Component {
 
 
                             {/*导师排行榜*/}
-                            <div className="pt60 pb60 mb30 mentor-ranking">
-                                <div className="educontent">
-                                    <div className="edu-txt-center">
-                                        <p className="color-dark edu-txt-center font-24" style={{lineHeight: '30px'}}>导师排行榜</p>
-                                        <p className="color-grey-cd font-12">MENTOR RANKING</p>
-                                    </div>
-
-                                    <div className="ranking clearfix">
-                                        <ul className="grade color-dark">
-                                        {
-                                            homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{
-
-                                                if(key===1){
-                                                    return(
-                                                        <li className="mt35 pr" key={key}>
-                                                            <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
-                                                            <a href={"/users/"+item.login} className="color-dark">
-                                                                <img src={'/images/'+item.image_url} />
-                                                                <span className="task-hide rankName">{item.username}</span>
-                                                            </a>
-                                                        </li>
-                                                    )
-                                                }
-                                        })}
-                                            {
-                                                homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{
-                                                    if(key===0){
-                                                        return(
-                                                            <li className="pr" key={key}>
-                                                                <img src={getImageUrl("images/educoder/huangguan.png")}  className="huangguan" />
-                                                                <a href={"/users/"+item.login} className="color-dark">
-                                                                    <img src={'/images/'+item.image_url} />
-                                                                    <span className="task-hide rankName">{item.username}</span>
-                                                                </a>
-                                                            </li>
-                                                        )
-                                                    }
-                                                })}
-                                            {
-                                                homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{
-                                                    if(key===2){
-                                                        return(
-                                                            <li className="mt35 pr" key={key}>
-                                                                <img src={getImageUrl("images/educoder/huangguan-three.png")}  className="huangguan" />
-                                                                <a href={"/users/"+item.login} className="color-dark">
-                                                                    <img src={'/images/'+item.image_url} />
-                                                                    <span className="task-hide rankName">{item.username}</span>
-                                                                </a>
-                                                            </li>
-                                                        )
-                                                    }
-                                                })}
-                                        </ul>
-                                        <br />
-                                            <ul className="grade mt30">
-                                                {
-                                                    homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{
-                                                        if(key>2) {
-                                                            return (
-                                                                <li key={key}>
-                                                                    <a href={"/users/"+item.login} className="color-dark">
-                                                                        <img src={'/images/'+item.image_url}/>
-                                                                        <span className="task-hide rankName">{item.username}</span>
-                                                                    </a>
-                                                                </li>
-                                                            )
-                                                        }
-                                                    })}
-
-
-                                            </ul>
-                                    </div>
-
-
-                                </div>
-                            </div>
+                            {/*<div className="pt60 pb60 mb30 mentor-ranking">*/}
+                            {/*    <div className="educontent">*/}
+                            {/*        <div className="edu-txt-center">*/}
+                            {/*            <p className="color-dark edu-txt-center font-24" style={{lineHeight: '30px'}}>导师排行榜</p>*/}
+                            {/*            <p className="color-grey-cd font-12">MENTOR RANKING</p>*/}
+                            {/*        </div>*/}
+
+                            {/*        <div className="ranking clearfix">*/}
+                            {/*            <ul className="grade color-dark">*/}
+                            {/*            {*/}
+                            {/*                homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{*/}
+
+                            {/*                    if(key===1){*/}
+                            {/*                        return(*/}
+                            {/*                            <li className="mt35 pr" key={key}>*/}
+                            {/*                                <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />*/}
+                            {/*                                <a href={"/users/"+item.login} className="color-dark">*/}
+                            {/*                                    <img src={'/images/'+item.image_url} />*/}
+                            {/*                                    <span className="task-hide rankName">{item.username}</span>*/}
+                            {/*                                </a>*/}
+                            {/*                            </li>*/}
+                            {/*                        )*/}
+                            {/*                    }*/}
+                            {/*            })}*/}
+                            {/*                {*/}
+                            {/*                    homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{*/}
+                            {/*                        if(key===0){*/}
+                            {/*                            return(*/}
+                            {/*                                <li className="pr" key={key}>*/}
+                            {/*                                    <img src={getImageUrl("images/educoder/huangguan.png")}  className="huangguan" />*/}
+                            {/*                                    <a href={"/users/"+item.login} className="color-dark">*/}
+                            {/*                                        <img src={'/images/'+item.image_url} />*/}
+                            {/*                                        <span className="task-hide rankName">{item.username}</span>*/}
+                            {/*                                    </a>*/}
+                            {/*                                </li>*/}
+                            {/*                            )*/}
+                            {/*                        }*/}
+                            {/*                    })}*/}
+                            {/*                {*/}
+                            {/*                    homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{*/}
+                            {/*                        if(key===2){*/}
+                            {/*                            return(*/}
+                            {/*                                <li className="mt35 pr" key={key}>*/}
+                            {/*                                    <img src={getImageUrl("images/educoder/huangguan-three.png")}  className="huangguan" />*/}
+                            {/*                                    <a href={"/users/"+item.login} className="color-dark">*/}
+                            {/*                                        <img src={'/images/'+item.image_url} />*/}
+                            {/*                                        <span className="task-hide rankName">{item.username}</span>*/}
+                            {/*                                    </a>*/}
+                            {/*                                </li>*/}
+                            {/*                            )*/}
+                            {/*                        }*/}
+                            {/*                    })}*/}
+                            {/*            </ul>*/}
+                            {/*            <br />*/}
+                            {/*                <ul className="grade mt30">*/}
+                            {/*                    {*/}
+                            {/*                        homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{*/}
+                            {/*                            if(key>2) {*/}
+                            {/*                                return (*/}
+                            {/*                                    <li key={key}>*/}
+                            {/*                                        <a href={"/users/"+item.login} className="color-dark">*/}
+                            {/*                                            <img src={'/images/'+item.image_url}/>*/}
+                            {/*                                            <span className="task-hide rankName">{item.username}</span>*/}
+                            {/*                                        </a>*/}
+                            {/*                                    </li>*/}
+                            {/*                                )*/}
+                            {/*                            }*/}
+                            {/*                        })}*/}
+
+
+                            {/*                </ul>*/}
+                            {/*        </div>*/}
+
+
+                            {/*    </div>*/}
+                            {/*</div>*/}
 
                             {/*程序员排行榜*/}
-                            <div className="pt60 pb60 mb30 pro-ranking">
-                                <div className="educontent">
-                                    <div className="edu-txt-center">
-                                        <p className="color-dark edu-txt-center font-24" style={{lineHeight: '30px'}}>程序员排行榜</p>
-                                        <p className="color-grey-cd font-12">PROGRAMMER RANKING</p>
-                                    </div>
-                                    <div className="ranking clearfix">
-                                    <ul className="grade color-dark">
-                                        {
-                                            homedatalist===undefined?"":homedatalist.students.map((item,key)=>{
-                                                if(key===1){
-                                                    return(
-                                                        <li className="mt35 pr" key={key}>
-                                                            <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
-                                                            <a href={"/users/"+item.login} className="color-dark">
-                                                                <img src={'/images/'+item.image_url} />
-                                                                <span className="task-hide rankName">{item.username}</span>
-                                                            </a>
-                                                        </li>
-                                                    )
-                                                }
-                                            })}
-                                        {
-                                            homedatalist===undefined?"":homedatalist.students.map((item,key)=>{
-                                                if(key===0){
-                                                    return(
-                                                        <li className="pr" key={key}>
-                                                            <img src={getImageUrl("images/educoder/huangguan.png")}  className="huangguan" />
-                                                            <a href={"/users/"+item.login} className="color-dark">
-                                                                <img src={'/images/'+item.image_url} />
-                                                                <span className="task-hide rankName">{item.username}</span>
-                                                            </a>
-                                                        </li>
-                                                    )
-                                                }
-                                            })}
-                                        {
-                                            homedatalist===undefined?"":homedatalist.students.map((item,key)=>{
-                                                if(key===2){
-                                                    return(
-                                                        <li className="mt35 pr" key={key}>
-                                                            <img src={getImageUrl("images/educoder/huangguan-three.png")}  className="huangguan" />
-                                                            <a href={"/users/"+item.login} className="color-dark">
-                                                                <img src={'/images/'+item.image_url} />
-                                                                <span className="task-hide rankName">{item.username}</span>
-                                                            </a>
-                                                        </li>
-                                                    )
-                                                }
-                                            })}
-                                    </ul>
-                                    <br />
-                                    <ul className="grade mt30">
-                                        {
-                                            homedatalist===undefined?"":homedatalist.students.map((item,key)=>{
-                                                if(key>2) {
-                                                    return (
-                                                        <li key={key}>
-                                                            <a href={"/users/"+item.login} className="color-dark">
-                                                                <img src={'/images/'+item.image_url}/>
-                                                                <span className="task-hide rankName">{item.username}</span>
-                                                            </a>
-                                                        </li>
-                                                    )
-                                                }
-                                            })}
-
-
-                                    </ul>
-                                </div>
-                                </div>
-                            </div>
+                            {/*<div className="pt60 pb60 mb30 pro-ranking">*/}
+                            {/*    <div className="educontent">*/}
+                            {/*        <div className="edu-txt-center">*/}
+                            {/*            <p className="color-dark edu-txt-center font-24" style={{lineHeight: '30px'}}>程序员排行榜</p>*/}
+                            {/*            <p className="color-grey-cd font-12">PROGRAMMER RANKING</p>*/}
+                            {/*        </div>*/}
+                            {/*        <div className="ranking clearfix">*/}
+                            {/*        <ul className="grade color-dark">*/}
+                            {/*            {*/}
+                            {/*                homedatalist===undefined?"":homedatalist.students.map((item,key)=>{*/}
+                            {/*                    if(key===1){*/}
+                            {/*                        return(*/}
+                            {/*                            <li className="mt35 pr" key={key}>*/}
+                            {/*                                <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />*/}
+                            {/*                                <a href={"/users/"+item.login} className="color-dark">*/}
+                            {/*                                    <img src={'/images/'+item.image_url} />*/}
+                            {/*                                    <span className="task-hide rankName">{item.username}</span>*/}
+                            {/*                                </a>*/}
+                            {/*                            </li>*/}
+                            {/*                        )*/}
+                            {/*                    }*/}
+                            {/*                })}*/}
+                            {/*            {*/}
+                            {/*                homedatalist===undefined?"":homedatalist.students.map((item,key)=>{*/}
+                            {/*                    if(key===0){*/}
+                            {/*                        return(*/}
+                            {/*                            <li className="pr" key={key}>*/}
+                            {/*                                <img src={getImageUrl("images/educoder/huangguan.png")}  className="huangguan" />*/}
+                            {/*                                <a href={"/users/"+item.login} className="color-dark">*/}
+                            {/*                                    <img src={'/images/'+item.image_url} />*/}
+                            {/*                                    <span className="task-hide rankName">{item.username}</span>*/}
+                            {/*                                </a>*/}
+                            {/*                            </li>*/}
+                            {/*                        )*/}
+                            {/*                    }*/}
+                            {/*                })}*/}
+                            {/*            {*/}
+                            {/*                homedatalist===undefined?"":homedatalist.students.map((item,key)=>{*/}
+                            {/*                    if(key===2){*/}
+                            {/*                        return(*/}
+                            {/*                            <li className="mt35 pr" key={key}>*/}
+                            {/*                                <img src={getImageUrl("images/educoder/huangguan-three.png")}  className="huangguan" />*/}
+                            {/*                                <a href={"/users/"+item.login} className="color-dark">*/}
+                            {/*                                    <img src={'/images/'+item.image_url} />*/}
+                            {/*                                    <span className="task-hide rankName">{item.username}</span>*/}
+                            {/*                                </a>*/}
+                            {/*                            </li>*/}
+                            {/*                        )*/}
+                            {/*                    }*/}
+                            {/*                })}*/}
+                            {/*        </ul>*/}
+                            {/*        <br />*/}
+                            {/*        <ul className="grade mt30">*/}
+                            {/*            {*/}
+                            {/*                homedatalist===undefined?"":homedatalist.students.map((item,key)=>{*/}
+                            {/*                    if(key>2) {*/}
+                            {/*                        return (*/}
+                            {/*                            <li key={key}>*/}
+                            {/*                                <a href={"/users/"+item.login} className="color-dark">*/}
+                            {/*                                    <img src={'/images/'+item.image_url}/>*/}
+                            {/*                                    <span className="task-hide rankName">{item.username}</span>*/}
+                            {/*                                </a>*/}
+                            {/*                            </li>*/}
+                            {/*                        )*/}
+                            {/*                    }*/}
+                            {/*                })}*/}
+
+
+                            {/*        </ul>*/}
+                            {/*    </div>*/}
+                            {/*    </div>*/}
+                            {/*</div>*/}
                         </div>
 									</Spin>
             </div>

From 1d34f75cb8423b3b84e71924e354322cbe3ce2ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 4 Sep 2019 14:45:22 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/home/shixunsHome.js | 296 +++++++++----------
 1 file changed, 148 insertions(+), 148 deletions(-)

diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 0d11fb369..690baf28b 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -389,156 +389,156 @@ class ShixunsHome extends Component {
 
 
                             {/*导师排行榜*/}
-                            {/*<div className="pt60 pb60 mb30 mentor-ranking">*/}
-                            {/*    <div className="educontent">*/}
-                            {/*        <div className="edu-txt-center">*/}
-                            {/*            <p className="color-dark edu-txt-center font-24" style={{lineHeight: '30px'}}>导师排行榜</p>*/}
-                            {/*            <p className="color-grey-cd font-12">MENTOR RANKING</p>*/}
-                            {/*        </div>*/}
-
-                            {/*        <div className="ranking clearfix">*/}
-                            {/*            <ul className="grade color-dark">*/}
-                            {/*            {*/}
-                            {/*                homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{*/}
-
-                            {/*                    if(key===1){*/}
-                            {/*                        return(*/}
-                            {/*                            <li className="mt35 pr" key={key}>*/}
-                            {/*                                <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />*/}
-                            {/*                                <a href={"/users/"+item.login} className="color-dark">*/}
-                            {/*                                    <img src={'/images/'+item.image_url} />*/}
-                            {/*                                    <span className="task-hide rankName">{item.username}</span>*/}
-                            {/*                                </a>*/}
-                            {/*                            </li>*/}
-                            {/*                        )*/}
-                            {/*                    }*/}
-                            {/*            })}*/}
-                            {/*                {*/}
-                            {/*                    homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{*/}
-                            {/*                        if(key===0){*/}
-                            {/*                            return(*/}
-                            {/*                                <li className="pr" key={key}>*/}
-                            {/*                                    <img src={getImageUrl("images/educoder/huangguan.png")}  className="huangguan" />*/}
-                            {/*                                    <a href={"/users/"+item.login} className="color-dark">*/}
-                            {/*                                        <img src={'/images/'+item.image_url} />*/}
-                            {/*                                        <span className="task-hide rankName">{item.username}</span>*/}
-                            {/*                                    </a>*/}
-                            {/*                                </li>*/}
-                            {/*                            )*/}
-                            {/*                        }*/}
-                            {/*                    })}*/}
-                            {/*                {*/}
-                            {/*                    homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{*/}
-                            {/*                        if(key===2){*/}
-                            {/*                            return(*/}
-                            {/*                                <li className="mt35 pr" key={key}>*/}
-                            {/*                                    <img src={getImageUrl("images/educoder/huangguan-three.png")}  className="huangguan" />*/}
-                            {/*                                    <a href={"/users/"+item.login} className="color-dark">*/}
-                            {/*                                        <img src={'/images/'+item.image_url} />*/}
-                            {/*                                        <span className="task-hide rankName">{item.username}</span>*/}
-                            {/*                                    </a>*/}
-                            {/*                                </li>*/}
-                            {/*                            )*/}
-                            {/*                        }*/}
-                            {/*                    })}*/}
-                            {/*            </ul>*/}
-                            {/*            <br />*/}
-                            {/*                <ul className="grade mt30">*/}
-                            {/*                    {*/}
-                            {/*                        homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{*/}
-                            {/*                            if(key>2) {*/}
-                            {/*                                return (*/}
-                            {/*                                    <li key={key}>*/}
-                            {/*                                        <a href={"/users/"+item.login} className="color-dark">*/}
-                            {/*                                            <img src={'/images/'+item.image_url}/>*/}
-                            {/*                                            <span className="task-hide rankName">{item.username}</span>*/}
-                            {/*                                        </a>*/}
-                            {/*                                    </li>*/}
-                            {/*                                )*/}
-                            {/*                            }*/}
-                            {/*                        })}*/}
-
-
-                            {/*                </ul>*/}
-                            {/*        </div>*/}
-
-
-                            {/*    </div>*/}
-                            {/*</div>*/}
+                            <div className="pt60 pb60 mb30 mentor-ranking">
+                                <div className="educontent">
+                                    <div className="edu-txt-center">
+                                        <p className="color-dark edu-txt-center font-24" style={{lineHeight: '30px'}}>导师排行榜</p>
+                                        <p className="color-grey-cd font-12">MENTOR RANKING</p>
+                                    </div>
+
+                                    <div className="ranking clearfix">
+                                        <ul className="grade color-dark">
+                                        {
+                                            homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{
+
+                                                if(key===1){
+                                                    return(
+                                                        <li className="mt35 pr" key={key}>
+                                                            <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
+                                                            <a href={"/users/"+item.login} className="color-dark">
+                                                                <img src={'/images/'+item.image_url} />
+                                                                <span className="task-hide rankName">{item.username}</span>
+                                                            </a>
+                                                        </li>
+                                                    )
+                                                }
+                                        })}
+                                            {
+                                                homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{
+                                                    if(key===0){
+                                                        return(
+                                                            <li className="pr" key={key}>
+                                                                <img src={getImageUrl("images/educoder/huangguan.png")}  className="huangguan" />
+                                                                <a href={"/users/"+item.login} className="color-dark">
+                                                                    <img src={'/images/'+item.image_url} />
+                                                                    <span className="task-hide rankName">{item.username}</span>
+                                                                </a>
+                                                            </li>
+                                                        )
+                                                    }
+                                                })}
+                                            {
+                                                homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{
+                                                    if(key===2){
+                                                        return(
+                                                            <li className="mt35 pr" key={key}>
+                                                                <img src={getImageUrl("images/educoder/huangguan-three.png")}  className="huangguan" />
+                                                                <a href={"/users/"+item.login} className="color-dark">
+                                                                    <img src={'/images/'+item.image_url} />
+                                                                    <span className="task-hide rankName">{item.username}</span>
+                                                                </a>
+                                                            </li>
+                                                        )
+                                                    }
+                                                })}
+                                        </ul>
+                                        <br />
+                                            <ul className="grade mt30">
+                                                {
+                                                    homedatalist===undefined?"":homedatalist.teachers.map((item,key)=>{
+                                                        if(key>2) {
+                                                            return (
+                                                                <li key={key}>
+                                                                    <a href={"/users/"+item.login} className="color-dark">
+                                                                        <img src={'/images/'+item.image_url}/>
+                                                                        <span className="task-hide rankName">{item.username}</span>
+                                                                    </a>
+                                                                </li>
+                                                            )
+                                                        }
+                                                    })}
+
+
+                                            </ul>
+                                    </div>
+
+
+                                </div>
+                            </div>
 
                             {/*程序员排行榜*/}
-                            {/*<div className="pt60 pb60 mb30 pro-ranking">*/}
-                            {/*    <div className="educontent">*/}
-                            {/*        <div className="edu-txt-center">*/}
-                            {/*            <p className="color-dark edu-txt-center font-24" style={{lineHeight: '30px'}}>程序员排行榜</p>*/}
-                            {/*            <p className="color-grey-cd font-12">PROGRAMMER RANKING</p>*/}
-                            {/*        </div>*/}
-                            {/*        <div className="ranking clearfix">*/}
-                            {/*        <ul className="grade color-dark">*/}
-                            {/*            {*/}
-                            {/*                homedatalist===undefined?"":homedatalist.students.map((item,key)=>{*/}
-                            {/*                    if(key===1){*/}
-                            {/*                        return(*/}
-                            {/*                            <li className="mt35 pr" key={key}>*/}
-                            {/*                                <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />*/}
-                            {/*                                <a href={"/users/"+item.login} className="color-dark">*/}
-                            {/*                                    <img src={'/images/'+item.image_url} />*/}
-                            {/*                                    <span className="task-hide rankName">{item.username}</span>*/}
-                            {/*                                </a>*/}
-                            {/*                            </li>*/}
-                            {/*                        )*/}
-                            {/*                    }*/}
-                            {/*                })}*/}
-                            {/*            {*/}
-                            {/*                homedatalist===undefined?"":homedatalist.students.map((item,key)=>{*/}
-                            {/*                    if(key===0){*/}
-                            {/*                        return(*/}
-                            {/*                            <li className="pr" key={key}>*/}
-                            {/*                                <img src={getImageUrl("images/educoder/huangguan.png")}  className="huangguan" />*/}
-                            {/*                                <a href={"/users/"+item.login} className="color-dark">*/}
-                            {/*                                    <img src={'/images/'+item.image_url} />*/}
-                            {/*                                    <span className="task-hide rankName">{item.username}</span>*/}
-                            {/*                                </a>*/}
-                            {/*                            </li>*/}
-                            {/*                        )*/}
-                            {/*                    }*/}
-                            {/*                })}*/}
-                            {/*            {*/}
-                            {/*                homedatalist===undefined?"":homedatalist.students.map((item,key)=>{*/}
-                            {/*                    if(key===2){*/}
-                            {/*                        return(*/}
-                            {/*                            <li className="mt35 pr" key={key}>*/}
-                            {/*                                <img src={getImageUrl("images/educoder/huangguan-three.png")}  className="huangguan" />*/}
-                            {/*                                <a href={"/users/"+item.login} className="color-dark">*/}
-                            {/*                                    <img src={'/images/'+item.image_url} />*/}
-                            {/*                                    <span className="task-hide rankName">{item.username}</span>*/}
-                            {/*                                </a>*/}
-                            {/*                            </li>*/}
-                            {/*                        )*/}
-                            {/*                    }*/}
-                            {/*                })}*/}
-                            {/*        </ul>*/}
-                            {/*        <br />*/}
-                            {/*        <ul className="grade mt30">*/}
-                            {/*            {*/}
-                            {/*                homedatalist===undefined?"":homedatalist.students.map((item,key)=>{*/}
-                            {/*                    if(key>2) {*/}
-                            {/*                        return (*/}
-                            {/*                            <li key={key}>*/}
-                            {/*                                <a href={"/users/"+item.login} className="color-dark">*/}
-                            {/*                                    <img src={'/images/'+item.image_url}/>*/}
-                            {/*                                    <span className="task-hide rankName">{item.username}</span>*/}
-                            {/*                                </a>*/}
-                            {/*                            </li>*/}
-                            {/*                        )*/}
-                            {/*                    }*/}
-                            {/*                })}*/}
-
-
-                            {/*        </ul>*/}
-                            {/*    </div>*/}
-                            {/*    </div>*/}
-                            {/*</div>*/}
+                            <div className="pt60 pb60 mb30 pro-ranking">
+                                <div className="educontent">
+                                    <div className="edu-txt-center">
+                                        <p className="color-dark edu-txt-center font-24" style={{lineHeight: '30px'}}>程序员排行榜</p>
+                                        <p className="color-grey-cd font-12">PROGRAMMER RANKING</p>
+                                    </div>
+                                    <div className="ranking clearfix">
+                                    <ul className="grade color-dark">
+                                        {
+                                            homedatalist===undefined?"":homedatalist.students.map((item,key)=>{
+                                                if(key===1){
+                                                    return(
+                                                        <li className="mt35 pr" key={key}>
+                                                            <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
+                                                            <a href={"/users/"+item.login} className="color-dark">
+                                                                <img src={'/images/'+item.image_url} />
+                                                                <span className="task-hide rankName">{item.username}</span>
+                                                            </a>
+                                                        </li>
+                                                    )
+                                                }
+                                            })}
+                                        {
+                                            homedatalist===undefined?"":homedatalist.students.map((item,key)=>{
+                                                if(key===0){
+                                                    return(
+                                                        <li className="pr" key={key}>
+                                                            <img src={getImageUrl("images/educoder/huangguan.png")}  className="huangguan" />
+                                                            <a href={"/users/"+item.login} className="color-dark">
+                                                                <img src={'/images/'+item.image_url} />
+                                                                <span className="task-hide rankName">{item.username}</span>
+                                                            </a>
+                                                        </li>
+                                                    )
+                                                }
+                                            })}
+                                        {
+                                            homedatalist===undefined?"":homedatalist.students.map((item,key)=>{
+                                                if(key===2){
+                                                    return(
+                                                        <li className="mt35 pr" key={key}>
+                                                            <img src={getImageUrl("images/educoder/huangguan-three.png")}  className="huangguan" />
+                                                            <a href={"/users/"+item.login} className="color-dark">
+                                                                <img src={'/images/'+item.image_url} />
+                                                                <span className="task-hide rankName">{item.username}</span>
+                                                            </a>
+                                                        </li>
+                                                    )
+                                                }
+                                            })}
+                                    </ul>
+                                    <br />
+                                    <ul className="grade mt30">
+                                        {
+                                            homedatalist===undefined?"":homedatalist.students.map((item,key)=>{
+                                                if(key>2) {
+                                                    return (
+                                                        <li key={key}>
+                                                            <a href={"/users/"+item.login} className="color-dark">
+                                                                <img src={'/images/'+item.image_url}/>
+                                                                <span className="task-hide rankName">{item.username}</span>
+                                                            </a>
+                                                        </li>
+                                                    )
+                                                }
+                                            })}
+
+
+                                    </ul>
+                                </div>
+                                </div>
+                            </div>
                         </div>
 									</Spin>
             </div>

From b45fea069be4e017c1456c8bfad3212316dbc351 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 4 Sep 2019 15:13:57 +0800
Subject: [PATCH 10/13] isMobile

---
 public/react/src/common/Env.js      | 5 ++++-
 public/react/src/common/educoder.js | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/react/src/common/Env.js b/public/react/src/common/Env.js
index bdd4584f4..2d226ab22 100644
--- a/public/react/src/common/Env.js
+++ b/public/react/src/common/Env.js
@@ -1,3 +1,6 @@
 export function isDev() {
 	return window.location.port === "3007";
-}
\ No newline at end of file
+}
+
+const isMobile = (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase()));
+export const isMobile
\ No newline at end of file
diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js
index 1d7c66dbb..5b1d7ac28 100644
--- a/public/react/src/common/educoder.js
+++ b/public/react/src/common/educoder.js
@@ -20,8 +20,7 @@ export { markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, ap
         downloadFile, sortDirections } from 	'./TextUtil'
 export { handleDateString, getNextHalfHourOfMoment,formatDuring } from 	'./DateUtil'
 
-
-export { isDev as isDev } from 					'./Env'
+export { isDev as isDev, isMobile } from 					'./Env'
 
 export { toStore as toStore, fromStore as fromStore } from 	'./Store'
 

From 706028bc57230f51add0467125154afb941d7077 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 4 Sep 2019 15:16:13 +0800
Subject: [PATCH 11/13] isMobile

---
 public/react/src/common/Env.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/common/Env.js b/public/react/src/common/Env.js
index 2d226ab22..283e82c48 100644
--- a/public/react/src/common/Env.js
+++ b/public/react/src/common/Env.js
@@ -2,5 +2,5 @@ export function isDev() {
 	return window.location.port === "3007";
 }
 
-const isMobile = (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase()));
-export const isMobile
\ No newline at end of file
+// const isMobile 
+export const isMobile = (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase()));
\ No newline at end of file

From 6806e45fcc72792dcf7efe42b89f99c6e87cece5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 4 Sep 2019 15:19:11 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E5=B7=B2=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=AD=A6=E7=94=9F=E9=80=80=E5=87=BA=E8=AF=BE=E5=A0=82?=
 =?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/coursesDetail/CoursesBanner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index d8927b8d7..15f57f130 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -625,7 +625,7 @@ class CoursesBanner extends Component {
                         )
                         : ""}
 
-                      {this.props.isStudent()?<a className="fr user_default_btn user_blue_btn mr20 font-18"
+                      {this.props.isStudent()?this.props.current_user&&this.props.current_user.course_is_end===true?"":<a className="fr user_default_btn user_blue_btn mr20 font-18"
                                                  onClick={() => this.exitclass()}
                       > 退出课堂 </a>:""}
 

From 83986eed6da435549f03c21da4e6b04b13a207ff Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 4 Sep 2019 15:20:53 +0800
Subject: [PATCH 13/13] encode

---
 .../src/modules/courses/members/modal/AddStudentModal.js      | 2 +-
 public/react/src/modules/courses/members/teacherList.js       | 2 +-
 .../src/modules/paths/PathDetail/DetailCardsEditAndAdd.js     | 4 ++--
 public/react/src/modules/tpm/TPMBanner.js                     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/members/modal/AddStudentModal.js b/public/react/src/modules/courses/members/modal/AddStudentModal.js
index de95bc741..cf7583a51 100644
--- a/public/react/src/modules/courses/members/modal/AddStudentModal.js
+++ b/public/react/src/modules/courses/members/modal/AddStudentModal.js
@@ -29,7 +29,7 @@ class AddStudentModal extends Component{
     const { name, school_name } = this.state
     let url = `/courses/${courseId}/search_users.json?page=${page}&limit=${pageCount}&school_name=${school_name || ''}&name=${name || ''}`
     this.setState({ loading: true })
-    axios.get(url)
+    axios.get(encodeURI(url))
     .then((response) => {
       if (!response.data.users || response.data.users.length == 0) {
         this.setState({
diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js
index ee1f1dacb..70b1e3bd6 100644
--- a/public/react/src/modules/courses/members/teacherList.js
+++ b/public/react/src/modules/courses/members/teacherList.js
@@ -377,7 +377,7 @@ class studentsList extends Component{
     if(searchValue!=""){
       url+='&search='+searchValue;
     }
-    const result = await axios.get(url)
+    const result = await axios.get(encodeURI(url))
     // axios.get((url)).then((result)=>{
       if (result.data.teacher_list) {
         this.setState({ 
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
index d1bf6e1f0..f3c9d514b 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
@@ -160,7 +160,7 @@ class DetailCardsEditAndAdd extends Component{
       url+="&type="+id;
     }
 
-    axios.get(url).then((result)=>{
+    axios.get(encodeURI(url)).then((result)=>{
       if(result.status===200){
         this.setState({
           ChooseShixunList:result.data,
@@ -322,7 +322,7 @@ class DetailCardsEditAndAdd extends Component{
 				 if(type!=0){
 					 url+="&type="+type;
 				 }
-				 axios.get(url).then((result)=>{
+				 axios.get(encodeURI(url)).then((result)=>{
 					 if(result.status===200){
 						 let list =result.data.shixun_list;
 
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 0009e1f98..997786db2 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -205,7 +205,7 @@ class TPMBanner extends Component {
     SenttotheSearch=(value)=>{
         let id = this.props.match.params.shixunId;
         let url="/shixuns/" + id +"/search_user_courses.json?search="+value;
-        axios.get(url, {
+        axios.get(encodeURI(url), {
             params: {
                 page:1,
                 limit:10