Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

# Conflicts:
#	app/controllers/application_controller.rb
#	public/react/src/AppConfig.js

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js

@@ -78,12 +78,12 @@ class GraduationTasksSubmitedit extends Component{
   }
 
   setedit=()=>{
-    let coursesId=this.props.match.params.coursesId;
-    let workId=this.props.match.params.work_Id;
-    let {workslist}=this.state
-    let task_id=workslist&&workslist.task_id;
+    // let coursesId=this.props.match.params.coursesId;
+    // let workId=this.props.match.params.work_Id;
+    // let {workslist}=this.state
+    // let task_id=workslist&&workslist.task_id;
     // window.location.href="/courses/"+coursesId+"/graduation_tasks/"+task_id+"/"+workId+"/works/edit";
-		window.location.href="/courses/"+coursesId+"/graduation_tasks/"+workId+"/appraise";
+		this.goback()
   }
 
 
@@ -96,11 +96,13 @@ class GraduationTasksSubmitedit extends Component{
   }
 
   goback=()=>{
-    let courseId=this.props.match.params.coursesId;
-    let work_Id=this.props.match.params.work_Id;
 
-    // window.location.href="/courses/"+courseId+"/graduation/graduation_tasks/"+category_id;
-    window.location.href="/courses/"+courseId+"/graduation_tasks/"+work_Id+"/appraise";
+    let courseId=this.props.match.params.coursesId;
+		if(courseId===undefined){
+			this.props.history.push("/courses");
+		}else{
+			this.props.history.push(this.props.current_user.first_category_url);
+		}
 
   }
 
@@ -568,7 +570,7 @@ class GraduationTasksSubmitedit extends Component{
               <p className="clearfix mt10">
                 {/*<WordsBtn style="grey" className="fl">  <Link to={"/courses/"+courseId+"/graduation"} className="color-grey-6">{workslist&&workslist.course_name}</Link></WordsBtn>*/}
                 {/*<span className="color-grey-9 fl ml3 mr3">&gt;</span>*/}
-                <WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id}  className="color-grey-6">毕设任务</Link></WordsBtn>
+                <WordsBtn style="grey" className="fl"> <a onClick={this.goback} className="color-grey-6">毕设任务</a></WordsBtn>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                 <WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+work_Id+"/list"} className="color-grey-6">任务详情</Link></WordsBtn>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
@@ -825,7 +827,7 @@ class GraduationTasksSubmitedit extends Component{
                 <Form.Item>
                   <div className="clearfix mt30 mb30">
                     <Button type="primary" htmlType="submit" onClick={()=>this.handleSubmit()} className="defalutSubmitbtn fl mr20">提交</Button>
-                    <a onClick={this.gocannel} className="defalutCancelbtn fl">取消</a>
+                    <a onClick={this.goback} className="defalutCancelbtn fl">取消</a>
                   </div>
                 </Form.Item>
               {/*</Form>*/}

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js

@@ -100,9 +100,12 @@ class GraduationTasksSubmitnew extends Component{
 
   goback=()=>{
     let courseId=this.props.match.params.coursesId;
-    let category_id=this.props.match.params.category_id;
+		if(courseId===undefined){
+			this.props.history.push("/courses");
+		}else{
+			this.props.history.push(this.props.current_user.first_category_url);
+		}
 
-    window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id;
   }
 
 
@@ -438,7 +441,7 @@ class GraduationTasksSubmitnew extends Component{
               spinnings:false
             })
             if(response!==undefined){
-              this.setedit(response.data.work_id)
+              this.goback()
             }
             // if(response.status===200) {
             //   GraduationTasksnewtype=false;
@@ -567,7 +570,7 @@ render(){
       <p className="clearfix mt10">
         {/*<WordsBtn style="grey" className="fl">  <Link to={"/courses/"+courseId+"/graduation_tasks"} className="color-grey-6">{workslist&&workslist.course_name}</Link></WordsBtn>*/}
         {/*<span className="color-grey-9 fl ml3 mr3">&gt;</span>*/}
-        <WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id}  className="color-grey-6">毕设任务</Link></WordsBtn>
+        <WordsBtn style="grey" className="fl"> <a onClick={this.goback} className="color-grey-6">毕设任务</a></WordsBtn>
         <span className="color-grey-9 fl ml3 mr3">&gt;</span>
         <WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/list"} className="color-grey-6">任务详情</Link></WordsBtn>
         <span className="color-grey-9 fl ml3 mr3">&gt;</span>
@@ -802,7 +805,7 @@ render(){
         <Form.Item>
           <div className="clearfix mt30 mb30">
             <Button type="primary" htmlType="submit"  onClick={()=>this.handleSubmit()} className="defalutSubmitbtn fl mr20">提交</Button>
-            <a onClick={this.gocannel} className="defalutCancelbtn fl">取消</a>
+            <a onClick={this.goback} className="defalutCancelbtn fl">取消</a>
           </div>
         </Form.Item>
       {/*</Form>*/}

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js

@@ -70,7 +70,13 @@ class GraduationTasksappraise extends Component{
     // let category_id=this.props.match.params.category_id;
 		//
     // window.location.href="/courses/"+courseId+"/graduation_tasks/"+datalist.graduation_id;
-		window.history.go(-1)
+		let courseId=this.props.match.params.coursesId;
+		if(courseId===undefined){
+			this.props.history.push("/courses");
+		}else{
+			this.props.history.push(this.props.current_user.first_category_url);
+		}
+
   }
 
   Cancelvisible=()=>{

public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js

@@ -81,10 +81,13 @@ class GraduationTasksedit extends Component{
 
 
   goback=()=>{
-    // let courseId=this.props.match.params.coursesId;
-    // window.location.href="/courses/"+courseId+"/graduation_tasks/"+this.state.data.graduation_id;
-		// goback = () => {
-			window.history.go(-1)
+
+		let courseId = this.props.match.params.coursesId;
+		if(courseId===undefined){
+			this.props.history.push("/courses");
+		}else{
+			this.props.history.push(this.props.current_user.first_category_url);
+		}
 
   }
 
@@ -233,8 +236,8 @@ class GraduationTasksedit extends Component{
               // console.log(response)
               // GraduationTasksedittype=false;
               // window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions";
-              // this.goback()
-              this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting");
+							this.goback()
+              //this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting");
             }
           }).catch((error) => {
             console.log(error)
@@ -333,7 +336,7 @@ class GraduationTasksedit extends Component{
             <div className={"educontent mb20"}>
 
               <p className="clearfix mt10">
-                <WordsBtn style="grey" className="fl">  <Link to={"/courses/"+courseId+"/students"} className="color-grey-6">{this.props.current_user&&this.props.current_user.course_name}</Link></WordsBtn>
+                <WordsBtn style="grey" className="fl">  <a onClick={this.goback} className="color-grey-6">{this.props.current_user&&this.props.current_user.course_name}</a></WordsBtn>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                 <WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id} className="color-grey-6">毕设任务</Link></WordsBtn>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>

public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js

@@ -91,7 +91,7 @@ class GraduationTasksnew extends Component {
 							// GraduationTasksnewtype = false;
 							// this.goback();
 						if(response!==undefined){
-							this.props.history.push("/courses/" + this.props.match.params.coursesId + "/graduation_tasks/" + this.props.match.params.category_id + "/" + response.data.task_id + "/setting");
+							this.goback()
 						}
 						// }
 					}).catch((error) => {
@@ -108,9 +108,11 @@ class GraduationTasksnew extends Component {
 
 	goback = () => {
 		let courseId = this.props.match.params.coursesId;
-		let category_id = this.props.match.params.category_id;
-
-		window.location.href = "/courses/" + courseId + "/graduation_tasks/" + category_id;
+		if(courseId===undefined){
+			this.props.history.push("/courses");
+		}else{
+			this.props.history.push(this.props.current_user.first_category_url);
+		}
 	}
 
 
@@ -307,8 +309,7 @@ class GraduationTasksnew extends Component {
 						<div className={"educontent mb20"}>
 
 							<p className="clearfix mt10">
-								<WordsBtn style="grey" className="fl"> <Link to={"/courses/" + courseId + "/students"}
-																														 className="color-grey-6">{this.props.current_user && this.props.current_user.course_name}</Link></WordsBtn>
+								<WordsBtn style="grey" className="fl"> <a  onClick={this.goback} className="color-grey-6">{this.props.current_user && this.props.current_user.course_name}</a></WordsBtn>
 								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 								<WordsBtn style="grey" className="fl"> <Link
 									to={"/courses/" + courseId + "/graduation_tasks/" + category_id} className="color-grey-6">毕设任务</Link></WordsBtn>

public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js

@@ -761,9 +761,11 @@ class GraduationTaskssettingapp extends Component{
 
   goback=()=>{
     let courseId=this.props.match.params.coursesId;
-    let category_id=this.props.match.params.category_id;
-
-    window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id;
+		if(courseId===undefined){
+			this.props.history.push("/courses");
+		}else{
+			this.props.history.push(this.props.current_user.first_category_url);
+		}
   }
 
   isgoback=()=>{
@@ -1046,7 +1048,7 @@ class GraduationTaskssettingapp extends Component{
             <div className={"educontent mb20"}>
 
               <p className="clearfix mt10">
-                <Link to={"/courses/"+courseId+"/students"} className="color-grey-9 fl">{coursename}</Link>
+                <a onClick={this.goback} className="color-grey-9 fl">{coursename}</a>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                 <Link to={"/courses/"+courseId+"/graduation_tasks/"+settingdata.graduation_id} className="color-grey-9 fl">毕设任务</Link>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js

@@ -57,11 +57,15 @@ class GraduationTaskssettinglist extends Component{
 		let{teacher_comment,task_status,course_group,cross_comment,order,b_order,search}=this.state;
 		this.seacthdata(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,this.state.page);
 	}
+
 	goback=()=>{
 		// window.history.back(-1)
 		let courseId=this.props.match.params.coursesId;
-		let category_id=this.props.match.params.category_id;
-		window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id;
+		if(courseId===undefined){
+			this.props.history.push("/courses");
+		}else{
+			this.props.history.push(this.props.current_user.first_category_url);
+		}
 
 	}
 
@@ -1058,7 +1062,7 @@ class GraduationTaskssettinglist extends Component{
 								<div className={"educontent mb20"}>
 
 									<p className="clearfix mt10">
-										<Link className="color-grey-9 fl" to={"/courses/"+courseId+"/students"}>{taskslistdata.course_name}</Link>
+										<a className="color-grey-9 fl" onClick={this.goback}>{taskslistdata.course_name}</a>
 										<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 										<Link className="color-grey-9 fl" to={"/courses/"+courseId+"/graduation_tasks/"+taskslistdata.graduation_id}>{taskslistdata.graduation_name}</Link>
 										<span className="color-grey-9 fl ml3 mr3">&gt;</span>

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js

@@ -55,7 +55,12 @@ class GraduationTasksquestions extends Component{
     // let courseId=this.props.match.params.coursesId;
     // let category_id=this.props.match.params.category_id;
     // window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id;
-		window.history.go(-1)
+		let courseId = this.props.match.params.coursesId;
+		if(courseId===undefined){
+			this.props.history.push("/courses");
+		}else{
+			this.props.history.push(this.props.current_user.first_category_url);
+		}
   }
 
   end=()=>{
@@ -300,7 +305,7 @@ class GraduationTasksquestions extends Component{
             <div className={"educontent mb20"}>
 
               <p className="clearfix mt10">
-                <Link to={"/courses/"+courseId+"/students"}  className="color-grey-9 fl">{questionslist.course_name}</Link>
+                <a onClick={this.goback} className="color-grey-9 fl">{questionslist.course_name}</a>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                 <Link to={"/courses/"+courseId+"/graduation_tasks/"+questionslist.graduation_id} className="color-grey-9 fl">{questionslist.graduation_name}</Link>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>

public/react/src/modules/courses/new/CoursesNew.js

@@ -28,6 +28,7 @@ function disabledDateTime() {
     };
 }
 
+
 class CoursesNew extends Component {
 
     constructor(props) {
@@ -191,17 +192,7 @@ class CoursesNew extends Component {
                     ).then((response) => {
                             // debugger
                         if (response.data.status === 0) {
-                            // this.setState({
-                            //     Modalstype: true,
-                            //     Modalstopval: response.data.message,
-                            //     ModalSave: this.cancelmodel,
-                            //     Loadtype: true,
-                            //     checkBoxValues: [],
-                            //     checkAllValue: false,
-                            //     // Realnamecertification : authentication,
-                            //     // professional_certification: values.Professionalcertification
-                            // })
-                            window.location.href = "/courses/" + coursesId+"/students";
+													this.goback
                         }
                     }).catch((error) => {
                         console.log(error)
@@ -262,7 +253,7 @@ class CoursesNew extends Component {
        if(this.props.match.params.coursesId===undefined){
 				 this.props.history.push("/courses");
 			 }else{
-				 this.props.history.push(`/courses/${this.props.match.params.coursesId}`);
+				 this.props.history.push(this.props.current_user.first_category_url);
 			 }
         // window.history.go(-1)
     }
@@ -390,7 +381,7 @@ class CoursesNew extends Component {
         const optionschool  = this.state.searchlistscholl&&this.state.searchlistscholl.map(z => <Option key={z} value={z}>{z}</Option>);
         // console.log(this.props.current_user.user_school)
 				// form合并了
-		    console.log(options)
+
         return (
             <React.Fragment>
 

public/react/src/modules/home/shixunsHome.js

@@ -93,7 +93,7 @@ class ShixunsHome extends Component {
         const CustomNextArrow = props => {
             return (
                 <div {...props}  id="bannerright" style={arrowStyler}>
-                    <img id="bannerrightimg" style={noneStyler} src={"images/educoder/banner-right.png"} />
+                    <img id="bannerrightimg" style={noneStyler} src={"/images/educoder/banner-right.png"} />
                 </div>
             );
         };
@@ -101,7 +101,7 @@ class ShixunsHome extends Component {
         const CustomPrevArrow = props => {
             return (
                 <div {...props}  id="bannerleft" style={arrowStylel}>
-                    <img id="bannerleftimg" style={noneStyler} src={"images/educoder/banner-left.png"} />
+                    <img id="bannerleftimg" style={noneStyler} src={"/images/educoder/banner-left.png"} />
                 </div>
             );
         };
@@ -374,7 +374,7 @@ class ShixunsHome extends Component {
                                                         <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} />
+                                                                <img src={'/images/'+item.image_url} />
                                                                 <span className="task-hide rankName">{item.username}</span>
                                                             </a>
                                                         </li>
@@ -388,7 +388,7 @@ class ShixunsHome extends Component {
                                                             <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} />
+                                                                    <img src={'/images/'+item.image_url} />
                                                                     <span className="task-hide rankName">{item.username}</span>
                                                                 </a>
                                                             </li>
@@ -402,7 +402,7 @@ class ShixunsHome extends Component {
                                                             <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} />
+                                                                    <img src={'/images/'+item.image_url} />
                                                                     <span className="task-hide rankName">{item.username}</span>
                                                                 </a>
                                                             </li>
@@ -418,7 +418,7 @@ class ShixunsHome extends Component {
                                                             return (
                                                                 <li key={key}>
                                                                     <a href={"/users/"+item.login} className="color-dark">
-                                                                        <img src={'images/'+item.image_url}/>
+                                                                        <img src={'/images/'+item.image_url}/>
                                                                         <span className="task-hide rankName">{item.username}</span>
                                                                     </a>
                                                                 </li>
@@ -450,7 +450,7 @@ class ShixunsHome extends Component {
                                                         <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} />
+                                                                <img src={'/images/'+item.image_url} />
                                                                 <span className="task-hide rankName">{item.username}</span>
                                                             </a>
                                                         </li>
@@ -464,7 +464,7 @@ class ShixunsHome extends Component {
                                                         <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} />
+                                                                <img src={'/images/'+item.image_url} />
                                                                 <span className="task-hide rankName">{item.username}</span>
                                                             </a>
                                                         </li>
@@ -478,7 +478,7 @@ class ShixunsHome extends Component {
                                                         <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} />
+                                                                <img src={'/images/'+item.image_url} />
                                                                 <span className="task-hide rankName">{item.username}</span>
                                                             </a>
                                                         </li>
@@ -494,7 +494,7 @@ class ShixunsHome extends Component {
                                                     return (
                                                         <li key={key}>
                                                             <a href={"/users/"+item.login} className="color-dark">
-                                                                <img src={'images/'+item.image_url}/>
+                                                                <img src={'/images/'+item.image_url}/>
                                                                 <span className="task-hide rankName">{item.username}</span>
                                                             </a>
                                                         </li>

public/react/src/modules/paths/ShixunPathCard.js

@@ -38,7 +38,7 @@ class ShixunPathCard extends Component{
                       </div>
                       <Link to={"/paths/"+item.id} className="square-img" >
 												{/*target="_blank"*/}
-                        <img alt="13?1543211263" src={item.image_url} style={{"display":"block"}}/>
+                        <img alt="13?1543211263" src={"/"+item.image_url} style={{"display":"block"}}/>
                       </Link>
                       <div className="square-main">
                         <p className="task-hide">