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

app/controllers/accounts_controller.rb

@@ -32,8 +32,11 @@ class AccountsController < ApplicationController
       end
       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)
-      return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
+      # todo 上线前请删除万能验证码"513231"
-      return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
+      if code != "513231"
+        return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
+        return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
+      end
 
       code = generate_identifier User, 8
       login = pre + code

app/controllers/application_controller.rb

@@ -325,6 +325,7 @@ class ApplicationController < ActionController::Base
 		unless file_content.present?
 			raise("获取文件代码异常")
 		end
+		logger.info("#######game_id:#{game_id}, file_content:#{file_content}")
 		game_code = GameCode.where(:game_id => game_id, :path => path).first
 		if game_code.nil?
 			GameCode.create!(:game_id => game_id, :new_code => file_content, :path => path)

app/controllers/myshixuns_controller.rb

@@ -90,7 +90,6 @@ class MyshixunsController < ApplicationController
   # params[:pics] = "a.png,b.png,c.png"
   def training_task_status
 
-    logger.info("##################training_task_status_start#{params[:jsonTestDetails]['buildID']}")
     ActiveRecord::Base.transaction do
       begin
         t1 = Time.now

public/react/src/AppConfig.js

@@ -2,7 +2,7 @@ import React from "react";
 
 import axios from 'axios';
 import { requestProxy } from "./indexEduplus2RequestProxy";
-import { broadcastChannelOnmessage ,SetAppModel} from 'educoder';
+import { broadcastChannelOnmessage ,SetAppModel, isDev, queryString } from 'educoder';
 import {  notification } from 'antd';
 import './index.css'
 broadcastChannelOnmessage('refreshPage', () => {
@@ -18,8 +18,17 @@ function locationurl(list){
 }
 
 // TODO 开发期多个身份切换
-const debugType =window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+let debugType =""
-        window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
+if (isDev) {
+  	const _search = window.location.search;
+    let parsed = {};
+    if (_search) {
+      parsed = queryString.parse(_search);
+  	}
+    debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+        window.location.search.indexOf('debug=s') != -1 ? 'student' :
+        window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || ''
+}
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
 

public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js

@@ -20,7 +20,7 @@ import ShixunAnswer from './question/shixunAnswer'
 import update from 'immutability-helper'
 
 import axios from 'axios';
-
+import './new/common.css'
 const Textarea =Input.TextArea
 const tagArray = [
   'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 

public/react/src/modules/courses/exercise/Exercisestatisticalresult.js

@@ -222,6 +222,7 @@ class Exercisestatisticalresult extends Component {
 										)
 									}):
 							    <Exercisetablesmubu
+									tableNum={key}
 								    data={item.ques_details}
 								    type={item.ques_type}
 								    effictive_counts={item.effictive_counts}

public/react/src/modules/courses/exercise/Exercisetablesmubu.js

@@ -1,8 +1,14 @@
 import React, {Component} from "react";
-import {WordsBtn} from 'educoder';
+import {WordsBtn, MarkdownToHtml} from 'educoder';
 import {Table,Progress} from "antd";
 import {Link,Switch,Route,Redirect} from 'react-router-dom';
 
+const tagArray = [
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 
+    'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 
+    'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
+]
+
 class Exercisetablesmubus extends Component {
 
 	constructor(props) {
@@ -19,12 +25,17 @@ class Exercisetablesmubus extends Component {
 
 	render() {
 
-		let {data,type,effictive_counts,choicetype}=this.props;
+		let {data,type,effictive_counts,choicetype, tableNum}=this.props;
 		let datas=[];
 
 		data&&data.forEach((item,key)=>{
 			datas.push({
-				commit_percent:{num:item.choice_position,value:type===4||type===5?choicetype[item.choice_text-1]:item.choice_text,type:item.choice_right_boolean},
+				commit_percent:{
+						num:item.choice_position,
+						value:type===4||type===5?choicetype[item.choice_text-1]:item.choice_text,
+						type:item.choice_right_boolean,
+						_type: type
+						},
 				min_score:{value:item.choice_users_count,type:item.choice_right_boolean},
 				max_score:item.choice_percent,
 			})
@@ -40,13 +51,23 @@ class Exercisetablesmubus extends Component {
 			 title: '选项',
 			 dataIndex: 'commit_percent',
 			 key: 'commit_percent',
-			 render: (text, record) => (
+			 render: (text, record, index) => {
-				 <span style={{color:text.type===true? "#29BD8B":'#333333'}}>
+				const _content = <span style={{color:text.type===true? "#29BD8B":'#333333'}}>
-					{text.value!="有效填写量"&&text.value!="wrong"?text.value:false}
+					{text.value!="有效填写量"&&text.value!="wrong" && 
-				  {text.value==="wrong"?"填写了错误答案":false}
+						<MarkdownToHtml content={text.value} selector={(tableNum+1) + '' + (index+1)}></MarkdownToHtml>
-					{text.value==="有效填写量"?"有效填写量":false}
+						}
-        </span>
+				  	{text.value==="wrong" && "填写了错误答案" }
-			 ),
+					{text.value==="有效填写量" && "有效填写量" }
+					</span>
+				return (
+				
+				(text._type === 0 || text._type === 1) ? <div style={{ display: 'flex'}}>
+					{<span style={{ 'margin-right': '4px', 'margin-top': '-2px'}}>{tagArray[index]}.</span>}
+				 	{_content}
+				</div> : <React.Fragment>{_content}</React.Fragment>
+				)
+        
+			 },
 		 }, {
 			 title: '小计',
 			 dataIndex: 'min_score',

public/react/src/modules/courses/exercise/new/SingleDisplay.js

@@ -93,9 +93,9 @@ class SingleDisplay extends Component{
             <div className="options">
                 { question_choices.map((item, optionIndex) => {
                   let prefix = undefined
-                  if (!isPreviewPage) {
+                  // if (!isPreviewPage) {
                     prefix = `${tagArray[optionIndex]}.`
-                  }
+                  // }
                   if (question_type == 0) { // 单选
                     return (
                         <div className="mb10 clearfix" key={optionIndex}>

public/react/src/modules/courses/exercise/new/common.css

@@ -33,4 +33,8 @@
 
 .singleDisplay .options .markdown-body {
     max-width: 1116px;
+}
+.singleDisplay .ant-radio-wrapper span:last-child
+    , .singleDisplay .ant-checkbox-wrapper span:last-child {
+    padding-right: 0px;
 }

public/react/src/modules/courses/exercise/question/multiple.js

@@ -4,9 +4,9 @@ import {markdownToHTML} from 'educoder'
 
 import axios from 'axios'
 const tagArray = [
-  // 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
-  // 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+  'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
-  // 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
+  'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
 class Multiple extends Component{
   constructor(props){
@@ -41,14 +41,17 @@ class Multiple extends Component{
     let isStudent =this.props.isStudent();
     console.log(questionType);
     return(
-      <div className="pl30 pr30">
+      <div className="pl30 pr30 singleDisplay">
         <Checkbox.Group disabled={ user_exercise_status == 1 ? true : false } onChange={this.saveId} defaultValue={questionType.user_answer}>
           {
             questionType.question_choices && questionType.question_choices.map((item,key)=>{
+              let prefix = `${tagArray[key]}.`
+
               return(
                 <p className="clearfix mb15 df">
-                  <Checkbox className="fl lineh-20 " value={item.choice_id}></Checkbox>
+                  <Checkbox className="fl lineh-20 " value={item.choice_id}>{prefix}</Checkbox>
-                  <span class="fl lineh-20 mt1"></span><span style={{display:"inline-block"}} className="markdown-body mt1" dangerouslySetInnerHTML={{__html: markdownToHTML(item.choice_text)}}></span>
+                  {/* <span class="fl lineh-20 mt1"></span> */}
+                  <span style={{display:"inline-block"}} className="markdown-body " dangerouslySetInnerHTML={{__html: markdownToHTML(item.choice_text)}}></span>
                 </p>
               )
             })

public/react/src/modules/courses/exercise/question/single.js

@@ -4,9 +4,9 @@ import {Checkbox,Radio, Input} from "antd";
 import {markdownToHTML} from 'educoder'
 import axios from 'axios'
 const tagArray = [
-  // 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
-  // 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+  'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
-  // 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
+  'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
 class single extends Component{
   constructor(props){
@@ -36,14 +36,16 @@ class single extends Component{
     
     let isStudent =this.props.isStudent();
     return(
-      <div className="pl30 pr30">
+      <div className="pl30 pr30 singleDisplay">
         <Radio.Group disabled={ user_exercise_status == 1 ? true : false } defaultValue={questionType.user_answer[0]} onChange={this.changeItem}>
           {
             questionType.question_choices && questionType.question_choices.map((item,key)=>{
+              let prefix = `${tagArray[key]}.`
               return(
                 <p className={parseInt(questionType.question_type) == 0 ? "clearfix mb15 df" : "fl mr40"}>
-                  <Radio className="fl lineh-20" value={item.choice_id}></Radio>
+                  <Radio className="fl lineh-20" value={item.choice_id}>{prefix}</Radio>
-                  <span className="fl lineh-20 mr3 mt1"></span><span style={{display:"inline-block"}} className="markdown-body fl mt1" dangerouslySetInnerHTML={{__html: markdownToHTML(item.choice_text)}}></span>
+                  {/* <span className="fl lineh-20 mr3 "></span> */}
+                  <span style={{display:"inline-block", 'margin-top': '-1px'}} className="markdown-body fl " dangerouslySetInnerHTML={{__html: markdownToHTML(item.choice_text)}}></span>
                 </p>
               )
             })

public/react/src/modules/user/Interestpage.js

@@ -188,11 +188,11 @@ class InterestpageComponent extends Component {
 			if (response !== undefined) {
       // this.Jumptotheinterestpage();
 			// 	window.location.href = "/"
-				if(response.data.message!==undefined){
+				if(response.data.status===0){
 
-					return;
+					this.setMyEduCoderModals()
 				}
-				this.setMyEduCoderModals()
+
 			}
 
 

public/react/src/modules/user/InterestpageMax.js

@@ -166,6 +166,10 @@ class InterestpageMax extends Component {
 
 	//兴趣页面点击
 	Interestcompletionpage(){
+
+		this.setState({
+			setpagecomplet:true
+		})
 		if(this.state.gouxuans.length === 0){
 			this.openNotification("请选择您的职业");
 			return
@@ -189,12 +193,9 @@ class InterestpageMax extends Component {
 			if (response !== undefined) {
 				// this.Jumptotheinterestpage();
 				// 	window.location.href = "/"
-
+				if(response.data.status===0){
-				if(response.data.message!==undefined){
+					this.setMyEduCoderModals()
-
-					return;
 				}
-				this.setMyEduCoderModals()
 			}
 
 
@@ -285,7 +286,7 @@ class InterestpageMax extends Component {
 							)
 						})}
 					</div>
-					<Button className="yslbutton2" size={"large"} type="primary"onClick={()=>this.Interestcompletionpage()} style={{width:"255px",height: "35px",background: "#4CACFF",marginTop: "17px"} }>完成</Button>
+					<Button className="yslbutton2" size={"large"} type="primary"onClick={this.state.setpagecomplet===true?"":()=>this.Interestcompletionpage()} style={{width:"255px",height: "35px",background: "#4CACFF",marginTop: "17px"} }>完成</Button>
 				</div>
 
 			</div>