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

# Conflicts:
#	public/react/src/modules/message/js/MessagChat.js
#	public/react/src/modules/message/js/Messagerouting.js

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

@@ -656,7 +656,7 @@ class MessagChat extends Component{
 												 </p>
 
 
-												     <p className="color-grey-6 lineh-20 justify  break_word task-hide-2" style={{wordBreak:"break-word"}}	id="MakedownHTML" dangerouslySetInnerHTML={{__html:item.content}}>
+												     <p className="color-grey-6 lineh-20 justify  break_word task-hide-2 markdown-body" style={{wordBreak:"break-word"}}	id="MakedownHTML" dangerouslySetInnerHTML={{__html:item.content}}>
 														 </p>
 											 </div>
 

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

@@ -532,7 +532,7 @@ class MessagSub extends Component{
 													 	`
 													 }
 												 </style>
-												 <p className="color-grey-6 break_word_firefox yslspansk" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html:item.content}}></p>
+												 <p className="color-grey-6 break_word_firefox yslspansk markdown-body" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html:item.content}}></p>
 											 </div>
 
 											 <span className={item.new_tiding===true?"new-point fr mr40 mt22":""}></span>

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

@@ -179,7 +179,7 @@ class MessagePrivate extends Component{
 													<span className="color-grey-c mr20">[{item.message_count}{"条"}]</span>
 													<span className="color-grey-c">{moment(item.send_time).fromNow()}</span>
 												</p>
-												<span className="color-grey-6 break_word_firefox " 		dangerouslySetInnerHTML={{__html:item.content}}></span>
+												<span className="color-grey-6 break_word_firefox  markdown-body" 		dangerouslySetInnerHTML={{__html:item.content}}></span>
 
 											</div>
 											{item.unread === true ?<span className="new-point fr mt22"></span>:""}