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

public/react/src/modules/page/MainContentContainer.js

@@ -671,11 +671,11 @@ class MainContentContainer extends Component {
 	// 之前的task_commit方法
 	gameBuild(fileUpdateResponse, first) {
 		const { st, challenge, output_sets, onRunCodeTestFinish, resetTestSetsExpandedArray, showSnackbar, time_limit, game } = this.props
-		const { resubmit, content_modified } = fileUpdateResponse.data;
+		const { resubmit, content_modified, sec_key } = fileUpdateResponse.data;
 		const timeOut = time_limit;
     	// http://localhost:3000/myshixuns/so5w6iap97/stages/zl6kx8f7vfpo/game_build?first=1&resubmit=GDBEX741_1993
     	// const game_build_url = `${locationPath}/game_build?first=${first}&resubmit=${resubmit}&content_modified=${content_modified}`
-    	const game_build_url = `/tasks/${game.identifier}/game_build.json?first=${first}&resubmit=${resubmit}&content_modified=${content_modified}`
+    	const game_build_url = `/tasks/${game.identifier}/game_build.json?first=${first}&resubmit=${resubmit}&content_modified=${content_modified}&sec_key=${sec_key}`
 
     	// var timeOut = parseInt(<%= @myshixun.main_mirror.try(:time_limit) %>); // 超时参数
 
@@ -702,7 +702,7 @@ class MainContentContainer extends Component {
 
 	    		var gameStatusIntervalId = setInterval(()=>{
 	    			// let game_status_url = `${locationPath}/game_status?port=${port}&resubmit=${resubmit||""}&time_out=${timeOutFlag}`
-	    			let game_status_url = `/tasks/${game.identifier}/game_status.json?port=${port}&resubmit=${resubmit||""}&time_out=${timeOutFlag}`
+	    			let game_status_url = `/tasks/${game.identifier}/game_status.json?port=${port}&resubmit=${resubmit||""}&time_out=${timeOutFlag}&sec_key=${sec_key}`
 
 		    		axios.get(game_status_url, {
 		    			// withCredentials: true,

public/react/src/modules/user/account/AccountNav.js

@@ -16,7 +16,7 @@ class AccountNav extends Component {
       let { basicInfo } = this.props
       console.log(this.props);
       const path = window.location.pathname
-      const isBasic = path.indexOf('basic') != -1 || path == "/account"
+      const isBasic = path.indexOf('profile') != -1 || path == "/account"
       const isCertification = path.indexOf('certification') != -1
       const isSecure = path.indexOf('secure') != -1
       return (