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

# Conflicts:
#	public/react/src/modules/message/js/MessagSub.js

public/react/src/modules/message/js/Messagerouting.js

@@ -43,7 +43,8 @@ class Messagerouting extends Component{
 		// // courstype=courstype[3];
 		// // console.log("45");
 		// console.log(courstype);
-
+		// console.log("Messagerouting46");
+		// console.log(this.props.current_user);
 
 	}
 
@@ -54,7 +55,9 @@ class Messagerouting extends Component{
 		// console.log(this.props);
 		// console.log("33333333333");
 		 if(prevProps.current_user !== this.props.current_user){
-		 	this.Messageprivatemessageunreadmessage(this.props.current_user.user_id);
+		 	this.Messageprivatemessageunreadmessage(this.props.current_user.login);
+			 // console.log("Messagerouting59");
+			 // console.log(this.props.current_user);
 		 }
 	}
 	//消息未读
@@ -79,13 +82,13 @@ class Messagerouting extends Component{
    this.setState({
 		 routing:value,
 	 });
-   this.Messageprivatemessageunreadmessage(this.props.current_user.user_id);
+   this.Messageprivatemessageunreadmessage(this.props.current_user.login);
 	 if(value===1){
-		 this.props.history.replace(`/message/${this.props.current_user.user_id}/user_tidings`);
+		 this.props.history.replace(`/message/${this.props.current_user.login}/user_tidings`);
 		 this.homeworkendss1(child);
 	 }
 	 if(value===2){
-		 this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`);
+		 this.props.history.replace(`/message/${this.props.current_user.login}/private_messages`);
 		 this.homeworkendss2(child);
 	 }
 
@@ -114,10 +117,10 @@ class Messagerouting extends Component{
 				routing:i,
 			});
 			if(i===1){
-				this.props.history.replace(`/message/${this.props.current_user.user_id}/user_tidings`);
+				this.props.history.replace(`/message/${this.props.current_user.login}/user_tidings`);
 			}
 			if(i===2){
-				this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`);
+				this.props.history.replace(`/message/${this.props.current_user.login}/private_messages`);
 			}
 
 		}else {
@@ -125,7 +128,7 @@ class Messagerouting extends Component{
 				routing:i,
 			});
 			console.log("22222222222");
-			this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail?target_ids=${id}`);
+			this.props.history.replace(`/message/${this.props.current_user.login}/message_detail?target_ids=${id}`);
 		}
 
 	};