From 09e793c283b02ef0f09bc999f4753d0da046e1f4 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 20 Jul 2019 20:40:52 +0800
Subject: [PATCH 1/4] is_md

---
 public/react/src/modules/courses/boards/TopicDetail.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js
index 6e645fc27..6309ac491 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.js
+++ b/public/react/src/modules/courses/boards/TopicDetail.js
@@ -648,7 +648,9 @@ class TopicDetail extends Component {
 
                     
                     <div className="padding30 memoContent new_li" style={{ paddingBottom: '10px'}}>
-                      <MarkdownToHtml content={memo.content}></MarkdownToHtml>
+                      {memo.is_md == true ? <MarkdownToHtml content={memo.content}></MarkdownToHtml> : 
+                        <div dangerouslySetInnerHTML={{ __html: memo.content }}></div>
+                      }
                     </div>
                     <div className="padding30 bor-bottom-greyE" style={{paddingTop: '2px'}}>
                         <div className="mt10 mb20">

From c7a704a3041dc14c15df2bdd4b7398450961e5d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 20 Jul 2019 20:41:40 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 528ec6b94..86359711f 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -32,7 +32,7 @@ export function initAxiosInterceptors(props) {
         // proxy = "http://testbdweb.trustie.net"
         // proxy = "http://testbdweb.educoder.net"
         // proxy = "https://testeduplus2.educoder.net"
-        proxy="http://47.96.87.25:48080"
+        proxy="http://newweb.educoder.net"
 
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；

From 3a0ab40b635c410a8682d325b2f750cf05f5da3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 20 Jul 2019 20:50:37 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                         | 2 +-
 public/react/src/modules/login/Trialapplicationysl.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 86359711f..528ec6b94 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -32,7 +32,7 @@ export function initAxiosInterceptors(props) {
         // proxy = "http://testbdweb.trustie.net"
         // proxy = "http://testbdweb.educoder.net"
         // proxy = "https://testeduplus2.educoder.net"
-        proxy="http://newweb.educoder.net"
+        proxy="http://47.96.87.25:48080"
 
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
diff --git a/public/react/src/modules/login/Trialapplicationysl.js b/public/react/src/modules/login/Trialapplicationysl.js
index 02e7dc81b..b65725cef 100644
--- a/public/react/src/modules/login/Trialapplicationysl.js
+++ b/public/react/src/modules/login/Trialapplicationysl.js
@@ -86,7 +86,7 @@ class Trialapplicationysl extends Component {
 		// console.log("53");
 		//
 		// console.log(this.props.isRenders);
-		this.getipthon();
+		// this.getipthon();
 		if (this.props.isRenders != undefined) {
 			this.setState({
 				isRenders: this.props.isRenders

From 2ea25ab7695a1b8a4f11be920b31a61c79842cf9 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 20 Jul 2019 20:51:37 +0800
Subject: [PATCH 4/4] auth

---
 public/react/src/common/UrlTool.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/react/src/common/UrlTool.js b/public/react/src/common/UrlTool.js
index c4ea468bf..3953f1f34 100644
--- a/public/react/src/common/UrlTool.js
+++ b/public/react/src/common/UrlTool.js
@@ -46,6 +46,9 @@ export function getUrl2(path, goTest) {
 export function getUploadActionUrl(path, goTest) {
 	return `${getUrl()}/api/attachments.json${isDev ? `?debug=${window._debugType || 'admin'}` : ''}`
 }
+export function getUploadActionUrlOfAuth(id) {
+	return `${getUrl()}/api/users/accounts/${id}/auth_attachments.json${isDev ? `?debug=${window._debugType || 'admin'}` : ''}`
+}
 
 export function test(path) {
 	return `${path}`;