From 2e5f34decc53679a491437491991fe35dfd16800 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 23 Aug 2019 15:37:50 +0800
Subject: [PATCH 01/19] =?UTF-8?q?addonafter=E6=9B=BF=E6=8D=A2=E4=B8=BAsuff?=
 =?UTF-8?q?ix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/boards/BoardsNew.js          | 2 +-
 public/react/src/modules/courses/busyWork/NewWork.js          | 2 +-
 public/react/src/modules/courses/exercise/ExerciseNew.js      | 2 +-
 .../modules/courses/graduation/tasks/GraduationTasksedit.js   | 2 +-
 .../modules/courses/graduation/tasks/GraduationTasksnew.js    | 2 +-
 .../src/modules/courses/graduation/topics/GraduateTopicNew.js | 2 +-
 public/react/src/modules/courses/poll/PollNew.js              | 4 ++--
 .../react/src/modules/user/usersInfo/video/EditVideoModal.js  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js
index d2b218f3d..b02f6a73f 100644
--- a/public/react/src/modules/courses/boards/BoardsNew.js
+++ b/public/react/src/modules/courses/boards/BoardsNew.js
@@ -350,7 +350,7 @@ class BoardsNew extends Component{
                     }],
                   })(
                     <Input placeholder={`请输入帖子标题，最大限制${MAX_TITLE_LENGTH}个字符 `}className="searchViewAfter" maxLength={MAX_TITLE_LENGTH}
-                      onInput={this.changeTitle} addonAfter={`${title_num}/${MAX_TITLE_LENGTH}`} />
+                      onInput={this.changeTitle} suffix={`${title_num}/${MAX_TITLE_LENGTH}`} />
                   )}
                 </Form.Item>
 
diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js
index 83e792d68..ca79e8ac5 100644
--- a/public/react/src/modules/courses/busyWork/NewWork.js
+++ b/public/react/src/modules/courses/busyWork/NewWork.js
@@ -399,7 +399,7 @@ class NewWork extends Component{
                     required: true, message: '请输入标题'
                   }],
                 })(
-                  <Input placeholder="请输入作业标题，最大限制60个字符" onInput={this.changeTitle} className="searchView searchViewAfter" style={{"width":"100%"}} maxLength={MAX_TITLE_LENGTH} addonAfter={`${String(title_num)}/${MAX_TITLE_LENGTH}`}/>
+                  <Input placeholder="请输入作业标题，最大限制60个字符" onInput={this.changeTitle} className="searchView searchViewAfter" style={{"width":"100%"}} maxLength={MAX_TITLE_LENGTH} suffix={`${String(title_num)}/${MAX_TITLE_LENGTH}`}/>
                 )}
               </Form.Item>
               <style>{`
diff --git a/public/react/src/modules/courses/exercise/ExerciseNew.js b/public/react/src/modules/courses/exercise/ExerciseNew.js
index 482a807cc..6e8444411 100644
--- a/public/react/src/modules/courses/exercise/ExerciseNew.js
+++ b/public/react/src/modules/courses/exercise/ExerciseNew.js
@@ -451,7 +451,7 @@ class ExerciceNew extends Component{
                     }],
                   })( */}
                     <Input placeholder={`请输入试卷标题，最大限制${TITLE_MAX_LENGTH}个字符`} maxLength={TITLE_MAX_LENGTH} className="input-100-40 mt5" value={exercise_name} 
-                        onChange={this.exercise_name_change} addonAfter={`${exercise_name ? exercise_name.length : 0}/${TITLE_MAX_LENGTH}`}
+                        onChange={this.exercise_name_change} suffix={`${exercise_name ? exercise_name.length : 0}/${TITLE_MAX_LENGTH}`}
                     />
                   {/* )} */}
                 </Form.Item>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 559144ecf..6f1b2db06 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -379,7 +379,7 @@ class GraduationTasksedit extends Component{
                   <Form.Item label="任务标题"  >
                     {getFieldDecorator('name', {
                       rules: [{ required: true, message: "请输入标题" }],
-                    })(<Input placeholder="请输入任务名称，最大限制60个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter" style={{"width":"100%"}} maxLength="60" addonAfter={String(title_num)}/>)}
+                    })(<Input placeholder="请输入任务名称，最大限制60个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter" style={{"width":"100%"}} maxLength="60" suffix={String(title_num)}/>)}
                   </Form.Item>
                   <input type="hidden"  id='nametypes' />
                 </div>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index 1d3c7578f..efe2bdd07 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -384,7 +384,7 @@ class GraduationTasksnew extends Component {
 											rules: [{required: true, message: "不能为空"}],
 										})(<Input placeholder="请输入任务名称，最大限制60个字符" value={title_value} onInput={this.changeTitle}
 															className="searchView searchViewAfter  h40" style={{"width": "100%"}} maxLength="60"
-															addonAfter={String(title_num)}/>)}
+															suffix={String(title_num)}/>)}
 									</Form.Item>
 									<input type="hidden" id='nametypes'  />
 								</div>
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
index 8c46bfa0e..94c238a5e 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
@@ -366,7 +366,7 @@ class GraduateTopicNew extends Component{
                       max: 60, message: '最大限制为60个字符',
                     }],
                   })(
-                    <Input placeholder="请输入帖子选题名称，最大限制60个字符" maxLength="60" onInput={this.changeTopicName} autoComplete="off" addonAfter={String(addonAfter)} className="searchViewAfter" />
+                    <Input placeholder="请输入帖子选题名称，最大限制60个字符" maxLength="60" onInput={this.changeTopicName} autoComplete="off" suffix={String(addonAfter)} className="searchViewAfter" />
                   )}
                 </Form.Item>
               </div>
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 9917187df..faa736ef2 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -2525,7 +2525,7 @@ class PollNew extends Component {
 										}
 
 									</div>
-									{/*addonAfter={String(addonAfter)}*/}
+									{/*suffix={String(addonAfter)}*/}
 									<Input placeholder="请输入问卷标题，最大限制60个字符" maxLength="60"
 												 style={{"margin-top": "15px", "text-align": "left"}}
 												 onInput={this.changeTopicName}
@@ -2556,7 +2556,7 @@ class PollNew extends Component {
 														readOnly={readOnlys}
 														onInput={this.changeTopicNametwo}
 														value={this.state.polls_descriptiontest}
-														autoComplete="off" addonAfter={"100"}></TextArea>
+														autoComplete="off" suffix={"100"}></TextArea>
 									{
 										this.state.Newedit === true || this.state.mysave === true ?
 											<div>
diff --git a/public/react/src/modules/user/usersInfo/video/EditVideoModal.js b/public/react/src/modules/user/usersInfo/video/EditVideoModal.js
index 4ed20d3cd..fc05cc932 100644
--- a/public/react/src/modules/user/usersInfo/video/EditVideoModal.js
+++ b/public/react/src/modules/user/usersInfo/video/EditVideoModal.js
@@ -77,7 +77,7 @@ function EditVideoModal (props) {
                     }],
                 })(
                     <Input placeholder="" className="titleInput" maxLength={MAX_LENGTH}
-                            addonAfter={String(_title ? `${String(_title.length)}/${MAX_LENGTH}` : 0)} />
+                            suffix={String(_title ? `${String(_title.length)}/${MAX_LENGTH}` : 0)} />
                 )}
             </Form.Item>
         </ModalWrapper>

From bbf419ef80018e1664a3d0688e6963e844b6bd91 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 23 Aug 2019 15:48:09 +0800
Subject: [PATCH 02/19] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb    | 2 +-
 app/controllers/application_controller.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index e62dcf6ed..d6b4068cb 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -33,7 +33,7 @@ class AccountsController < ApplicationController
       uid_logger("start register:  verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
       # check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
       # todo 上线前请删除万能验证码"513231"
-      unless code == "513231" && request.host == "47.96.87.25"
+      unless code == "513231" && request.domain == "pre-newweb.educoder.net"
         return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
         return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
       end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 233d94c8f..ac9d63346 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -245,7 +245,8 @@ class ApplicationController < ActionController::Base
 
 
 		# 测试版前端需求
-		if request.host == "47.96.87.25"
+		logger.info("#########domain:#{request.domain}")
+		if request.domain == "pre-newweb.educoder.net"
 			if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
 				User.current = User.find 81403
 			elsif params[:debug] == 'student'

From 5fdd157034f9a1e4011bf822aae1b19f4ac5db2f Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 23 Aug 2019 15:51:47 +0800
Subject: [PATCH 03/19] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E9=80=89=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../graduation/topics/GraduateTopicDetail.js      |  2 +-
 .../courses/graduation/topics/GraduateTopicNew.js | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
index b24277a2c..b518c44f3 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
@@ -114,7 +114,7 @@ class GraduateTopicDetail extends Component{
           <p className="clearfix mb20 lineh-25">
             <span className="color-grey-3 font-24 fl task-hide" style={{lineHeight:"25px",maxWidth:"900px"}}>{tableData && tableData.graduation_topic_name}</span>
             <span className="fl mt1" style={{height:"25px"}}><CoursesListType typelist={[`${tableData && tableData.status_name}`]} typesylename={""} /></span>
-            <WordsBtn className="fr font-16 mt1" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn>
+            <WordsBtn className="fr font-16 mt1" style="grey" to={`/courses/${tableData.course_id}/graduation_topics/${tableData.graduation_id}`}>返回</WordsBtn>
           </p>
           <div>
             <div className="clearfix edu-back-white bor-bottom-greyE" >
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
index 94c238a5e..3845721be 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
@@ -12,6 +12,8 @@ import "../../common/formCommon.css"
 import '../style.css'
 import '../../css/Courses.css'
 import { WordsBtn, City } from 'educoder'
+
+import {Link} from 'react-router-dom'
 // import City from './City'
 
 // import './board.css'
@@ -20,6 +22,7 @@ import { WordsBtn, City } from 'educoder'
 const confirm = Modal.confirm;
 const $ = window.$
 const { Option } = Select;
+const NAME_COUNT=60;
 // 新建毕设选题
 // https://lanhuapp.com/web/#/item/project/board/detail?pid=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&project_id=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&image_id=c6d9b36f-7701-4035-afdb-62404681108c
 class GraduateTopicNew extends Component{
@@ -38,7 +41,7 @@ class GraduateTopicNew extends Component{
       topic_source:[],
       topic_type:[],
       attachments:undefined,
-      addonAfter:60,
+      addonAfter:0,
       left_banner_id:undefined,
       course_name:undefined
     }
@@ -99,7 +102,7 @@ class GraduateTopicNew extends Component{
           topic_source:result.data.topic_source,
           topic_type:result.data.topic_type,
           attachments:result.data.attachments,
-          addonAfter:20-parseInt(result.data.selected_data.name.length)
+          addonAfter:parseInt(result.data.selected_data.name.length)
         })
         this.props.form.setFieldsValue({
           tea_id:result.data.selected_data.tea_id,
@@ -257,9 +260,9 @@ class GraduateTopicNew extends Component{
   // 附件相关 ------------ END
 
   changeTopicName=(e)=>{
-    let num= 60 - parseInt(e.target.value.length);
+    // let num= 60 - parseInt(e.target.value.length);
     this.setState({
-      addonAfter:num < 0 ? 0 : num
+      addonAfter:e.target.value.length
     })
   }
   render() {
@@ -331,7 +334,7 @@ class GraduateTopicNew extends Component{
             </p>
             <div className="clearfix mb20 lineh-25">
               <p className="fl color-black summaryname">{topicId==undefined?"新建":"编辑"}毕设选题</p>
-              <a onClick={()=>this.props.history.goBack()} className="color-grey-6 fr font-16">返回</a>
+              <Link to={`/courses/${coursesId}/graduation_topics/${left_banner_id}`} className="color-grey-6 fr font-16">返回</Link>
             </div>
 
             <Form {...formItemLayout} onSubmit={this.handleSubmit}>
@@ -366,7 +369,7 @@ class GraduateTopicNew extends Component{
                       max: 60, message: '最大限制为60个字符',
                     }],
                   })(
-                    <Input placeholder="请输入帖子选题名称，最大限制60个字符" maxLength="60" onInput={this.changeTopicName} autoComplete="off" suffix={String(addonAfter)} className="searchViewAfter" />
+                    <Input placeholder="请输入帖子选题名称，最大限制60个字符" maxLength="60" onInput={this.changeTopicName} autoComplete="off" suffix={`${String(addonAfter)}/${NAME_COUNT}`} className="searchViewAfter" />
                   )}
                 </Form.Item>
               </div>

From 2d76ddbad8389a12b834b891649d5810b704e0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 23 Aug 2019 15:52:42 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/shared/main.css                              | 3 +++
 public/react/src/modules/courses/gradinforms/Eduinforms.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/templates/shared/main.css b/app/templates/shared/main.css
index 81b80cdf8..c77818f16 100644
--- a/app/templates/shared/main.css
+++ b/app/templates/shared/main.css
@@ -779,4 +779,7 @@ html>body #ajax-indicator { position: fixed; }
     border-top-right-radius: 4px;
     border-bottom-right-radius: 4px;
     border-bottom-left-radius: 4px;
+}
+.yslminHeigth{
+    min-height: 400px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/courses/gradinforms/Eduinforms.js b/public/react/src/modules/courses/gradinforms/Eduinforms.js
index 777f04bc6..a50bc0369 100644
--- a/public/react/src/modules/courses/gradinforms/Eduinforms.js
+++ b/public/react/src/modules/courses/gradinforms/Eduinforms.js
@@ -149,7 +149,7 @@ class Eduinforms extends Component{
 														</div>
 														:
 														<div  className="edu-back-white ">
-														<div id="MakedownHTML"  className={"markdown-body fonttext yslmtopcg"}  style={{minHeight:"400px"}} dangerouslySetInnerHTML={{__html: markdownToHTML(description).replace(/▁/g, "▁▁▁")}}>
+														<div id="MakedownHTML"  className={"markdown-body fonttext yslmtopcg yslminHeigth"}  style={{minHeight:"400px"}} dangerouslySetInnerHTML={{__html: markdownToHTML(description).replace(/▁/g, "▁▁▁")}}>
 
 
 														</div>

From 599b94d579a76cc70e59b479c781c1d7fa1de292 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 23 Aug 2019 15:54:45 +0800
Subject: [PATCH 05/19] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb    | 2 +-
 app/controllers/application_controller.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index d6b4068cb..46b3964c2 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -33,7 +33,7 @@ class AccountsController < ApplicationController
       uid_logger("start register:  verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
       # check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
       # todo 上线前请删除万能验证码"513231"
-      unless code == "513231" && request.domain == "pre-newweb.educoder.net"
+      unless code == "513231" && request.subdomain == "pre-newweb"
         return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
         return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
       end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ac9d63346..4506d20e1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -245,8 +245,8 @@ class ApplicationController < ActionController::Base
 
 
 		# 测试版前端需求
-		logger.info("#########domain:#{request.domain}")
-		if request.domain == "pre-newweb.educoder.net"
+		logger.info("subdomain:#{subdomain}")
+		if request.subdomain == "pre-newweb"
 			if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
 				User.current = User.find 81403
 			elsif params[:debug] == 'student'

From 6073e6a7c3e12e98455e06fc5648769cb0063373 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 23 Aug 2019 15:55:54 +0800
Subject: [PATCH 06/19] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4506d20e1..177eb1a42 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -245,7 +245,7 @@ class ApplicationController < ActionController::Base
 
 
 		# 测试版前端需求
-		logger.info("subdomain:#{subdomain}")
+		logger.info("subdomain:#{request.subdomain}")
 		if request.subdomain == "pre-newweb"
 			if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
 				User.current = User.find 81403

From 5bb198e084acba5588268a5fc2875f935f95ae5f Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 23 Aug 2019 16:03:25 +0800
Subject: [PATCH 07/19] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/homework_commons_helper.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/helpers/homework_commons_helper.rb b/app/helpers/homework_commons_helper.rb
index c77ae5937..c49e58ca0 100644
--- a/app/helpers/homework_commons_helper.rb
+++ b/app/helpers/homework_commons_helper.rb
@@ -37,25 +37,25 @@ module HomeworkCommonsHelper
             when 3
               if ho_detail_manual.evaluation_end && ho_detail_manual.evaluation_end > Time.now
                 status << "匿评中"
-                time = how_much_time(ho_detail_manual.evaluation_end)
+                time = "提交剩余时间：" + how_much_time(ho_detail_manual.evaluation_end)
                 time_status = 3
               end
             when 4
               if ho_detail_manual.appeal_time && ho_detail_manual.appeal_time > Time.now
                 status << "申诉中"
-                time = how_much_time(ho_detail_manual.appeal_time)
+                time = "申诉剩余时间：" + how_much_time(ho_detail_manual.appeal_time)
                 time_status = 4
               end
             when 2, 5, 6
               status << "评阅中"
-              time = course.end_date.present? ? how_much_time(course.end_date.end_of_day) : ""
+              time = "评阅剩余时间：" + course.end_date.present? ? how_much_time(course.end_date.end_of_day) : ""
               time_status = 5
           end
 
           # 如果还在补交阶段则显示补交结束时间
           if homework_common.end_time && homework_common.end_time < Time.now && homework_common.allow_late &&
               homework_common.late_time && homework_common.late_time > Time.now
-            time = how_much_time(homework_common.late_time)
+            time = "补交剩余时间：" + how_much_time(homework_common.late_time)
             time_status = 2
           end
         else
@@ -74,12 +74,12 @@ module HomeworkCommonsHelper
               when 1
                 if homework_common.end_time && homework_common.end_time >= Time.now
                   status << "提交中"
-                  time = how_much_time(homework_common.end_time)
+                  time = "提交剩余时间：" + how_much_time(homework_common.end_time)
                   time_status = 1
                 elsif homework_common.end_time && homework_common.end_time < Time.now
                   time_status = 5
                   if homework_common.allow_late && (homework_common.late_time.nil? || homework_common.late_time >= Time.now)
-                    time = how_much_time(homework_common.late_time)
+                    time = "补交剩余时间：" + how_much_time(homework_common.late_time)
                     time_status = 2
                   end
                   status << "评阅中"
@@ -114,11 +114,11 @@ module HomeworkCommonsHelper
                 time_status = 0
               elsif max_end_time.present? && max_end_time > Time.now   #6.14 -hs  添加present?
                 status << "提交中"
-                time = how_much_time(max_end_time)
+                time = "提交剩余时间：" + how_much_time(max_end_time)
                 time_status = 1
               elsif homework_common.allow_late && (homework_common.late_time.nil? || homework_common.late_time >= Time.now)
                 status << "评阅中"
-                time = how_much_time(homework_common.late_time)
+                time = "补交剩余时间：" + how_much_time(homework_common.late_time)
                 time_status = 2
               else
                 status << "评阅中"

From a4023e99316a6f54baeb8cf8575963b82a54d46e Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 23 Aug 2019 16:05:45 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/homework_commons_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/homework_commons_helper.rb b/app/helpers/homework_commons_helper.rb
index c49e58ca0..fa563a72c 100644
--- a/app/helpers/homework_commons_helper.rb
+++ b/app/helpers/homework_commons_helper.rb
@@ -48,7 +48,7 @@ module HomeworkCommonsHelper
               end
             when 2, 5, 6
               status << "评阅中"
-              time = "评阅剩余时间：" + course.end_date.present? ? how_much_time(course.end_date.end_of_day) : ""
+              time = "评阅剩余时间：" + (course.end_date.present? ? how_much_time(course.end_date.end_of_day) : "")
               time_status = 5
           end
 

From a0a2e074f190f0779d6fde30e4552ee7edaf6734 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Fri, 23 Aug 2019 16:10:32 +0800
Subject: [PATCH 09/19] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/concerns/git_helper.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb
index 6a3765401..eeb4671a4 100644
--- a/app/controllers/concerns/git_helper.rb
+++ b/app/controllers/concerns/git_helper.rb
@@ -34,8 +34,7 @@ module GitHelper
 
     rescue Exception => e
       Rails.logger.error(e.message)
-      Rails.logger.error("#####__________文档内容获取异常")
-      # raise Educoder::TipException.new("文档内容获取异常")
+      raise Educoder::TipException.new("文档内容获取异常")
     end
   end
 

From 3df4dce3473f3e41d8f66d0aec24c867496a11b0 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 23 Aug 2019 16:18:32 +0800
Subject: [PATCH 10/19] pre-newweb.educoder.net

---
 public/react/src/AppConfig.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index dba12e81b..43f044f54 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -43,6 +43,7 @@ export function initAxiosInterceptors(props) {
         // proxy = "http://testbdweb.educoder.net"
         // proxy = "https://testeduplus2.educoder.net"
         proxy="http://47.96.87.25:48080"
+        proxy="pre-newweb.educoder.net"
         
         // wy
         // proxy="http://192.168.2.63:3001"

From 8537133072465c67fa6b9880f02adc5760c7362f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 23 Aug 2019 16:19:18 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                            | 6 +++---
 public/react/src/common/UrlTool.js                       | 8 ++++----
 public/react/src/context/TPIContextProvider.js           | 2 +-
 public/react/src/modules/courses/poll/PollNew.js         | 9 ++++++---
 .../react/src/modules/page/component/monaco/TPIMonaco.js | 2 +-
 public/react/src/modules/tpm/TPMIndexHOC.js              | 2 +-
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index dba12e81b..a3a51ddd7 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -42,9 +42,9 @@ export function initAxiosInterceptors(props) {
         // proxy = "http://testbdweb.trustie.net"
         // proxy = "http://testbdweb.educoder.net"
         // proxy = "https://testeduplus2.educoder.net"
-        proxy="http://47.96.87.25:48080"
-        
-        // wy
+        proxy="https://pre-newweb.educoder.net"
+
+    // wy
         // proxy="http://192.168.2.63:3001"
 
 
diff --git a/public/react/src/common/UrlTool.js b/public/react/src/common/UrlTool.js
index fc2100694..12505186a 100644
--- a/public/react/src/common/UrlTool.js
+++ b/public/react/src/common/UrlTool.js
@@ -1,10 +1,10 @@
 const isDev = window.location.port == 3007;
-export const TEST_HOST = "http://47.96.87.25:48080"
+export const TEST_HOST = "https://pre-newweb.educoder.net"
 export function getImageUrl(path) {
 	// https://www.educoder.net
 	// https://testbdweb.trustie.net
   // const local = 'http://localhost:3000'
-  const local = 'http://47.96.87.25:48080'
+  const local = 'https://pre-newweb.educoder.net'
 	if (isDev) {
 		return `${local}/${path}`
 	}
@@ -12,7 +12,7 @@ export function getImageUrl(path) {
 }
 
 export function setImagesUrl(path){
-	const local = 'http://47.96.87.25:48080'
+	const local = 'https://pre-newweb.educoder.net'
 	let firstStr=path.substr(0,1);
 	// console.log(firstStr);
 	if(firstStr=="/"){
@@ -31,7 +31,7 @@ export function getUrl(path, goTest) {
 	// testbdweb.educoder.net testbdweb.trustie.net
   // const local = goTest ? 'https://testeduplus2.educoder.net' : 'http://localhost:3000'
   // const local = 'https://testeduplus2.educoder.net'
-	const local = 'http://47.96.87.25:48080'
+	const local = 'https://pre-newweb.educoder.net'
 	if (isDev) {
 		return `${local}${path?path:''}`
 	}
diff --git a/public/react/src/context/TPIContextProvider.js b/public/react/src/context/TPIContextProvider.js
index 724f8bc11..998d58580 100644
--- a/public/react/src/context/TPIContextProvider.js
+++ b/public/react/src/context/TPIContextProvider.js
@@ -174,7 +174,7 @@ class TPIContextProvider extends Component {
         }
 		let testPath = ''
 		if (window.location.port == 3007) {
-			testPath = 'http://47.96.87.25:48080'
+			testPath = 'https://pre-newweb.educoder.net'
 		}
 		// var url = `${testPath}/api/v1/games/${ game.identifier }/cost_time`
 		var url = `${testPath}/api/tasks/${ game.identifier }/cost_time`
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index faa736ef2..07936cb82 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -78,10 +78,13 @@ class PollNew extends Component {
 
 	changeTopicName = (e) => {
 		console.log("调用了changeTopicName");
-		let num = 60 - parseInt(e.target.value.length);
+		let num = parseInt(e.target.value.length);
+		if(num>60){
+			 return;
+		}
 		this.setState({
 			addonAfter: num < 0 ? 0 : num
-		})
+		});
 		this.setState({
 			polls_nametest: e.target.value
 		})
@@ -252,7 +255,7 @@ class PollNew extends Component {
 				if(result.data){
 					if(result.data.poll){
 						if(result.data.poll.polls_name){
-							let num = 60 - parseInt(result.data.poll.polls_name.length);
+							let num =  parseInt(result.data.poll.polls_name.length);
 							this.setState({
 								addonAfter: num < 0 ? 0 : num
 							})
diff --git a/public/react/src/modules/page/component/monaco/TPIMonaco.js b/public/react/src/modules/page/component/monaco/TPIMonaco.js
index 26f020586..ee19e483d 100644
--- a/public/react/src/modules/page/component/monaco/TPIMonaco.js
+++ b/public/react/src/modules/page/component/monaco/TPIMonaco.js
@@ -46,7 +46,7 @@ function loadMonacoResouce(callback) {
         prefix = ''
     } else {
         // _url_origin = `https://testeduplus2.educoder.net/`;
-		   	_url_origin  = 'http://47.96.87.25:48080';
+		   	_url_origin  = 'https://pre-newweb.educoder.net';
     }
     const $ = window.$;
 
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 2d6bedf18..68abb52e1 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -23,7 +23,7 @@ const versionNum = '0001';
 // let _url_origin = getUrl()
 let _url_origin='';
 if(window.location.port === "3007"){
-	_url_origin="http://47.96.87.25:48080";
+	_url_origin="https://pre-newweb.educoder.net";
 }
 
 // let _url_origin=`https://www.educoder.net`;

From 883fc848055a5d29abf6812180c3f011ae0c8271 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 23 Aug 2019 16:31:41 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/homework_common.rb                                | 5 -----
 .../_homework_public_navigation.json.jbuilder                | 1 -
 2 files changed, 6 deletions(-)

diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 790a9b7ab..332aff045 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -80,11 +80,6 @@ class HomeworkCommon < ApplicationRecord
     end
   end
 
-  # 实训作业的主目录信息
-  def main_category_info
-    {category_id: course.shixun_course_modules.take.try(:id), category_name: course.shixun_course_modules.take.try(:module_name)}
-  end
-
   # 根据是否统一发布获取作业的作品列表
   def all_works
     student_works = self.unified_setting ? self.student_works :
diff --git a/app/views/homework_commons/_homework_public_navigation.json.jbuilder b/app/views/homework_commons/_homework_public_navigation.json.jbuilder
index b5067e3c7..243c6aecd 100644
--- a/app/views/homework_commons/_homework_public_navigation.json.jbuilder
+++ b/app/views/homework_commons/_homework_public_navigation.json.jbuilder
@@ -2,7 +2,6 @@ json.course_id course.id
 json.course_name course.name
 json.is_end course.is_end
 json.category homework.category_info
-json.main_category homework.main_category_info if homework.homework_type == "practice"
 member = course.course_members.find_by(user_id: user.id, is_active: 1)
 curr_status = homework_curr_status(homework, user.course_identity(course), course, member, member&.teacher_course_groups)
 json.homework_status curr_status[:status]

From 6c214ba4ce45f5af0c0f5fa5fee56be406ce1e6d Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 23 Aug 2019 16:32:25 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E8=AF=95=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/exercise/ExerciseNew.js    | 2 +-
 .../modules/courses/exercise/Testpapersettinghomepage.js    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/ExerciseNew.js b/public/react/src/modules/courses/exercise/ExerciseNew.js
index 6e8444411..9b1b095c0 100644
--- a/public/react/src/modules/courses/exercise/ExerciseNew.js
+++ b/public/react/src/modules/courses/exercise/ExerciseNew.js
@@ -450,7 +450,7 @@ class ExerciceNew extends Component{
                       max: 20, message: '最大限制为20个字符',
                     }],
                   })( */}
-                    <Input placeholder={`请输入试卷标题，最大限制${TITLE_MAX_LENGTH}个字符`} maxLength={TITLE_MAX_LENGTH} className="input-100-40 mt5" value={exercise_name} 
+                    <Input placeholder={`请输入试卷标题，最大限制${TITLE_MAX_LENGTH}个字符`} maxLength={TITLE_MAX_LENGTH} className="mt5" value={exercise_name} 
                         onChange={this.exercise_name_change} suffix={`${exercise_name ? exercise_name.length : 0}/${TITLE_MAX_LENGTH}`}
                     />
                   {/* )} */}
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 6bda01cba..b958faa5c 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -299,9 +299,9 @@ class Testpapersettinghomepage extends Component{
 
                     <div className="educontent mb20" style={{width:"1200px"}}>
                         <p className="clearfix mb20 mt10">
-                            <a className=" btn colorgrey fl hovercolorblue "  onClick={this.goback} >{this.props.coursedata.name}</a>
+                            <Link className=" btn colorgrey fl hovercolorblue "  to = {`/courses/${this.props.match.params.coursesId}`} >{this.props.coursedata.name}</Link>
                             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-                            <Link className=" btn colorgrey fl hovercolorblue "   to={`/courses/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`} >试卷</Link>
+                            <Link className=" btn colorgrey fl hovercolorblue " to={`/courses/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`} >试卷</Link>
                             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                             <WordsBtn className="fl">试卷详情</WordsBtn>
                         </p>
@@ -322,7 +322,7 @@ class Testpapersettinghomepage extends Component{
                         <CoursesListType
                             typelist={[`${polls_status[Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status]}`]}
                         />
-                        <a className="color-grey-6 fr font-16  summaryname  mr30" onClick={this.goback}>返回</a>
+                        <Link className="color-grey-6 fr font-16  summaryname  mr30" to={`/courses/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`}>返回</Link>
                         <p className="color-grey-6 fr font-16"> </p>
 
                     </div>

From 3c64fc3066c19e905e373a01344787c4d0dbd900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 23 Aug 2019 16:33:54 +0800
Subject: [PATCH 14/19] Merge branch 'dev_aliyun' of
 https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

# Conflicts:
#	public/react/src/AppConfig.js
---
 public/react/src/modules/courses/poll/PollNew.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 07936cb82..48bc69c79 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -39,7 +39,7 @@ class PollNew extends Component {
 			visible: false,
 			poll_questions: [],
 			user_permission: "",
-			addonAfter: 60,
+			addonAfter: 0,
 			addonAftertwo: 100,
 			mysingles: 0,
 			mydoubles: 0,

From af9059c952bfb2454253183cc967be86324ff2d6 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 23 Aug 2019 16:48:15 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/homework_common.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 332aff045..ac11a54b7 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -68,14 +68,14 @@ class HomeworkCommon < ApplicationRecord
   def category_info
     case self.homework_type
     when 'normal'
-      {category_id: course.common_course_modules.first.try(:id), category_name: course.common_course_modules.first.try(:module_name)}
+      {category_id: course.common_course_modules.first.try(:id), category_name: course.common_course_modules.first.try(:module_name), main: 1}
     when 'group'
-      {category_id: course.group_course_modules.first.try(:id), category_name: course.group_course_modules.first.try(:module_name)}
+      {category_id: course.group_course_modules.first.try(:id), category_name: course.group_course_modules.first.try(:module_name), main: 1}
     when 'practice'
       if self.course_second_category.present?
-        {category_id: self.course_second_category.try(:id), category_name: self.course_second_category.try(:name)}
+        {category_id: self.course_second_category.try(:id), category_name: self.course_second_category.try(:name), main: 0}
       else
-        {category_id: course.shixun_course_modules.take.try(:id), category_name: course.shixun_course_modules.take.try(:module_name)}
+        {category_id: course.shixun_course_modules.take.try(:id), category_name: course.shixun_course_modules.take.try(:module_name), main: 1}
       end
     end
   end

From 349d55c43317dbdc4864ceb96fa3311a0aaed321 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Fri, 23 Aug 2019 17:12:13 +0800
Subject: [PATCH 16/19] rechange 1936 scores

---
 ...cores.rb => 20190823090957_rechange_exercise_1936_scores.rb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename db/migrate/{20190823023738_change_exericse_1936_scores.rb => 20190823090957_rechange_exercise_1936_scores.rb} (93%)

diff --git a/db/migrate/20190823023738_change_exericse_1936_scores.rb b/db/migrate/20190823090957_rechange_exercise_1936_scores.rb
similarity index 93%
rename from db/migrate/20190823023738_change_exericse_1936_scores.rb
rename to db/migrate/20190823090957_rechange_exercise_1936_scores.rb
index ea3f66182..f089714ee 100644
--- a/db/migrate/20190823023738_change_exericse_1936_scores.rb
+++ b/db/migrate/20190823090957_rechange_exercise_1936_scores.rb
@@ -1,4 +1,4 @@
-class ChangeExericse1936Scores < ActiveRecord::Migration[5.2]
+class RechangeExercise1936Scores < ActiveRecord::Migration[5.2]
   include ExercisesHelper
   def change
     #1936的试卷成绩有问题。

From a490f728f9ebaf0cf80d013fe404687d2f2ecf2a Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Fri, 23 Aug 2019 17:25:05 +0800
Subject: [PATCH 17/19] test repo_name change

---
 app/views/exercises/_shixun_details.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/exercises/_shixun_details.json.jbuilder b/app/views/exercises/_shixun_details.json.jbuilder
index bd559d37d..7a6c858ee 100644
--- a/app/views/exercises/_shixun_details.json.jbuilder
+++ b/app/views/exercises/_shixun_details.json.jbuilder
@@ -32,7 +32,7 @@ json.shixun_detail do
       if game.try(:lastest_code).blank?
         cha_path = challenge_path(shixun_challenge.challenge&.path)
         begin
-          latest_code = git_fle_content(game.myshixun.repo_path,cha_path)
+          latest_code = git_fle_content(game.myshixun.repo_path+"11",cha_path)
         rescue
           latest_code = ""
         end

From 172c9dab0617988d5e71086f4ed1afc5215dcc90 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Fri, 23 Aug 2019 17:30:26 +0800
Subject: [PATCH 18/19] fixubg

---
 app/controllers/concerns/git_helper.rb            | 1 +
 app/views/exercises/_shixun_details.json.jbuilder | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb
index eeb4671a4..b154d32a5 100644
--- a/app/controllers/concerns/git_helper.rb
+++ b/app/controllers/concerns/git_helper.rb
@@ -9,6 +9,7 @@ module GitHelper
   # 版本库文件内容，带转码
   def git_fle_content(repo_path, path)
     begin
+      raise Educoder::TipException.new("文档内容获取异常")
       Rails.logger.info("git file content: repo_path is #{repo_path}, path is #{path}")
 
       content = GitService.file_content(repo_path: repo_path, path: path)
diff --git a/app/views/exercises/_shixun_details.json.jbuilder b/app/views/exercises/_shixun_details.json.jbuilder
index 7a6c858ee..bd559d37d 100644
--- a/app/views/exercises/_shixun_details.json.jbuilder
+++ b/app/views/exercises/_shixun_details.json.jbuilder
@@ -32,7 +32,7 @@ json.shixun_detail do
       if game.try(:lastest_code).blank?
         cha_path = challenge_path(shixun_challenge.challenge&.path)
         begin
-          latest_code = git_fle_content(game.myshixun.repo_path+"11",cha_path)
+          latest_code = git_fle_content(game.myshixun.repo_path,cha_path)
         rescue
           latest_code = ""
         end

From 16e8782613364da6bf8c503629a8a762f5051a80 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Fri, 23 Aug 2019 17:33:40 +0800
Subject: [PATCH 19/19] return

---
 app/controllers/concerns/git_helper.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb
index b154d32a5..eeb4671a4 100644
--- a/app/controllers/concerns/git_helper.rb
+++ b/app/controllers/concerns/git_helper.rb
@@ -9,7 +9,6 @@ module GitHelper
   # 版本库文件内容，带转码
   def git_fle_content(repo_path, path)
     begin
-      raise Educoder::TipException.new("文档内容获取异常")
       Rails.logger.info("git file content: repo_path is #{repo_path}, path is #{path}")
 
       content = GitService.file_content(repo_path: repo_path, path: path)