调整

public/react/src/App.js

@@ -337,7 +337,7 @@ class App extends Component {
 		});
 
 		initAxiosInterceptors(this.props);
-		// this.getAppdata();
+	 this.getAppdata();
 		//
 		// axios.interceptors.response.use((response) => {
 		// 	// console.log("response"+response);

public/react/src/modules/login/EducoderLogin.js

@@ -110,8 +110,8 @@ class EducoderLogin extends Component {
     }
 
     componentDidMount() {
-     console.log("EducoderLogin");
+     // console.log("EducoderLogin");
-     console.log(this.props);
+     // console.log(this.props);
     }
 
     Setlogins=(i)=>{
@@ -140,8 +140,8 @@ class EducoderLogin extends Component {
 
     render() {
         let {showbool,loginstatus,logini} = this.state;
-        // console.log("EducoderLogingetHelmetapi");
+        console.log("EducoderLogingetHelmetapi");
-        // console.log(this.props);
+        console.log(this.props);
         // console.log(this.props.mygetHelmetapi);
         return (
             <div style={newContainer} className=" clearfix" >

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

@@ -68,6 +68,7 @@ class NewHeader extends Component {
       mydisplay:false,
 			headtypesonClickbool:false,
 			headtypess:"/",
+			mygetHelmetapi2:undefined,
     }
      console.log("176")
     // console.log(props);
@@ -76,10 +77,10 @@ class NewHeader extends Component {
   }
 	componentDidUpdate = (prevProps) => {
 		// console.log("componentDidMount2");
-		// console.log(this.props.mygetHelmetapi);
+		// console.log(this.state.mygetHelmetapi2);
-		// if(this.props.mygetHelmetapi===undefined){
+		if(this.state.mygetHelmetapi2===undefined){
-		// 	this.getAppdata();
+			this.getAppdata();
-		// }
+		}
 	}
   componentDidMount() {
   	console.log("componentDidMount1");
@@ -652,6 +653,70 @@ submittojoinclass=(value)=>{
 			headtypesonClickbool:bool,
 		})
 	}
+	getAppdata=()=>{
+		console.log("开始刷新数据了")
+		let url = "/setting.json";
+		axios.get(url).then((response) => {
+			// console.log("axios.get");
+			// console.log(response);
+
+			if(response){
+				if(response.data){
+					this.setState({
+						mygetHelmetapi2:response.data.setting
+					});
+					document.title = response.data.setting.name;
+					var link = document.createElement('link'),
+						oldLink = document.getElementById('dynamic-favicon');
+					link.id = 'dynamic-favicon';
+					link.rel = 'shortcut icon';
+					link.href = '/'+response.data.setting.tab_logo_url;
+					if (oldLink) {
+						document.head.removeChild(oldLink);
+					}
+					document.head.appendChild(link);
+				}else {
+					document.title = "EduCoder";
+					var link = document.createElement('link'),
+						oldLink = document.getElementById('dynamic-favicon');
+					link.id = 'dynamic-favicon';
+					link.rel = 'shortcut icon';
+					link.href = "/react/build/./favicon.ico";
+					if (oldLink) {
+						document.head.removeChild(oldLink);
+					}
+					document.head.appendChild(link);
+				}
+
+			}else{
+				document.title = "EduCoder";
+				var link = document.createElement('link'),
+					oldLink = document.getElementById('dynamic-favicon');
+				link.id = 'dynamic-favicon';
+				link.rel = 'shortcut icon';
+				link.href = "/react/build/./favicon.ico";
+				if (oldLink) {
+					document.head.removeChild(oldLink);
+				}
+				document.head.appendChild(link);
+			}
+
+		}).catch((error) => {
+			console.log("开始刷新数据了但报错了");
+			console.log(error);
+
+			document.title = "EduCoder";
+			var link = document.createElement('link'),
+				oldLink = document.getElementById('dynamic-favicon');
+			link.id = 'dynamic-favicon';
+			link.rel = 'shortcut icon';
+			link.href = "/react/build/./favicon.ico";
+			if (oldLink) {
+				document.head.removeChild(oldLink);
+			}
+			document.head.appendChild(link);
+		});
+	};
   render() {
     const isLogin = true;   // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
     const {match,} = this.props;
@@ -674,6 +739,7 @@ submittojoinclass=(value)=>{
 			showSearchOpentype,
 			headtypesonClickbool,
 			headtypess,
+			mygetHelmetapi2,
     }=this.state;
     /*
         用户名称  用户头像url
@@ -705,12 +771,12 @@ submittojoinclass=(value)=>{
 
     let headtypes='/';
 
-		// console.log("this.props.mygetHelmetapi");
+		// console.log("mygetHelmetapi2");
-		// console.log(this.props.mygetHelmetapi);
+		// console.log(mygetHelmetapi2);
-	  if(this.props.mygetHelmetapi){
+	  if(mygetHelmetapi2){
-	  	if(this.props.mygetHelmetapi.navbar){
+	  	if(mygetHelmetapi2.navbar){
-				if(this.props.mygetHelmetapi.navbar.length>0){
+				if(mygetHelmetapi2.navbar.length>0){
-					// console.log("this.props.mygetHelmetapi.navbar.length>0====-=-=--=-=-=-=");
+					// console.log("mygetHelmetapi2.navbar.length>0====-=-=--=-=-=-=");
 					//
 					// console.log(match.path);
 					if(match.path==='/'){
@@ -721,9 +787,9 @@ submittojoinclass=(value)=>{
 						}
 
 					}else {
-						for(var i=0;i<this.props.mygetHelmetapi.navbar.length;i++){
+						for(var i=0;i<mygetHelmetapi2.navbar.length;i++){
-							if(match.path===this.props.mygetHelmetapi.navbar[i].link){
+							if(match.path===mygetHelmetapi2.navbar[i].link){
-								headtypes=this.props.mygetHelmetapi.navbar[i].link;
+								headtypes=mygetHelmetapi2.navbar[i].link;
 								break;
 							}
 						}
@@ -788,9 +854,9 @@ submittojoinclass=(value)=>{
 		}
 
 	  // console.log("NewHeadergetHelmetapi432423423423");
-    // console.log(this.props.mygetHelmetapi);
+    // console.log(mygetHelmetapi2);
 		// console.log("NewHeadermygetHelmetapi123123123123");
-	  // console.log(this.props.mygetHelmetapi);
+	  // console.log(mygetHelmetapi2);
 	  // console.log(this.props);
     return (
 
@@ -809,10 +875,10 @@ submittojoinclass=(value)=>{
 				/>:""}
 				<a href={"/"} onClick={()=>this.headtypesonClick("/",false)} className={"fl mr30 ml25 mt10"}>
           {
-            this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.nav_logo_url===null||this.props.mygetHelmetapi.nav_logo_url===undefined?
+            mygetHelmetapi2===undefined||mygetHelmetapi2.nav_logo_url===null||mygetHelmetapi2.nav_logo_url===undefined?
               <img alt="高校智能化教学与实训平台" className="logoimg" style={{heigth:"40px"}} src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
               :
-              <img alt="高校智能化教学与实训平台" className="logoimg" style={{heigth:"40px"}} src={getImageUrl(this.props.mygetHelmetapi.nav_logo_url)}></img>
+              <img alt="高校智能化教学与实训平台" className="logoimg" style={{heigth:"40px"}} src={getImageUrl(mygetHelmetapi2.nav_logo_url)}></img>
           }
 				</a>
 
@@ -828,13 +894,13 @@ submittojoinclass=(value)=>{
 					}
 				</style>
 					{
-						this.props.mygetHelmetapi!==undefined&&this.props.mygetHelmetapi.navbar!==null&&this.props.mygetHelmetapi.navbar!==undefined&&this.props.mygetHelmetapi.navbar.length>0?
+						mygetHelmetapi2!==undefined&&mygetHelmetapi2.navbar!==null&&mygetHelmetapi2.navbar!==undefined&&mygetHelmetapi2.navbar.length>0?
 						<div className="head-nav pr" id={"head-navpre1"}>
 								<ul id="header-nav">
 									{/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
 									{/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/}
 									{
-										this.props.mygetHelmetapi.navbar && this.props.mygetHelmetapi.navbar.map((item,key)=>{
+										mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.map((item,key)=>{
 											// console.log("headtypes");
 											// console.log(headtypes);
 											return(
@@ -900,7 +966,7 @@ submittojoinclass=(value)=>{
 									</li>
 								</ul>
 							</div>
-						// 	:this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.navbar===null||this.props.mygetHelmetapi.navbar===undefined||this.props.mygetHelmetapi.navbar.length===0?
+						// 	:mygetHelmetapi2===undefined||mygetHelmetapi2.navbar===null||mygetHelmetapi2.navbar===undefined||mygetHelmetapi2.navbar.length===0?
 						// <div className="head-nav pr" id={"head-navpre2"}>
 						//
 						// 	<ul id="header-nav">