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

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

@@ -357,7 +357,9 @@ class MainContentContainer extends Component {
 					this.fetchRepositoryCode(props, null, null, true)
 				} else{
 					this.setState({ isEditablePath, currentPath: path });
-					this.oldRepositoryCode = fetchRepositoryCodeResponse.data.content || '';
+					this.oldRepositoryCode = ((fetchRepositoryCodeResponse.data.content === true || !fetchRepositoryCodeResponse.data.content)
+						 ? '' : fetchRepositoryCodeResponse.data.content);
+
 					this.updateRepositoryCode(this.oldRepositoryCode, updateCodeMirror)
 				}
 

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

@@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) {
   // $('head').append($('<link rel="stylesheet" type="text/css" />')
   //     .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?1`));
+      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?6`));
 
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1`));
+      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?6`));
 
   // index.html有加载
 	$('head').append($('<link rel="stylesheet" type="text/css" />')
-		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1`));
+		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?6`));
 
 
   // $('head').append($('<link rel="stylesheet" type="text/css" />')