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

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -1156,7 +1156,6 @@ class Listofworksstudentone extends Component {
 		this.setState({
 			data: datalist,
 			datas: datalists,
-			// teacherlist: teacherlist,
 			teacherlists: teacherlists,
 			loadingstate: false,
 			styletable: styletable,

public/react/src/modules/page/main/Webssh.js

@@ -5,9 +5,10 @@ export function loadSshScript(callback) {
     let prefix = 'react/build'
     if (window.location.port == 3007) {
         prefix = ''
+			_url_origin  = 'https://newweb.educoder.net/';
     } else {
         // _url_origin = `https://testeduplus2.educoder.net/`;
-			  _url_origin  = '';
+			  _url_origin  = '/';
     }
     const $ = window.$;
     // 未加载过

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -18,8 +18,11 @@ import Trialapplication from "../login/Trialapplication";
 const $ = window.$;
 const versionNum = '0001';
 // let _url_origin = getUrl()
-console.log(this.props)
 let _url_origin='';
+if(window.location.port === "3007"){
+	_url_origin="https://newweb.educoder.net";
+}
+
 // let _url_origin=`https://www.educoder.net`;
 
 if (!window['indexHOCLoaded']) {