From a05700ed5dbf7b6f42cfaf84b3b29d2465797e2b Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 18 Jan 2022 10:18:21 +0800
Subject: [PATCH] update

---
 src/AppConfig.js                |  2 +-
 src/common/UrlTool.js           |  5 +----
 src/forge/Component/SiderBar.js | 12 ++++++------
 src/forge/Head/Header.js        |  4 ++--
 src/forge/comments/comments.js  |  9 ++++-----
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index de303a5e..4b60b298 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -32,7 +32,7 @@ export function initAxiosInterceptors(props) {
   // 判断网络是否连接
   initOnlineOfflineListener();
 
-  var proxy = "https://forge.osredm.com";
+  var proxy = "http://192.168.1.40:3000";
   //响应前的设置
   axios.interceptors.request.use(
     config => {
diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js
index 86dc8506..5969b03f 100644
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@@ -8,10 +8,7 @@ const isDev = window.location.port == 3007;
 const isdev2= window.location.hostname ==='www.educoder.net'
 export const TEST_HOST = "http://39.105.176.215:49999"
 export function getImageUrl(path) {
-	// https://www.educoder.net
-	// https://testbdweb.trustie.net
-  // const local = 'http://localhost:3000'
-	const local = 'http://39.105.176.215:49999';
+	const local = 'http://192.168.1.40:3000';
 
 	if (isDev) {
 		return `${local}/${path}`
diff --git a/src/forge/Component/SiderBar.js b/src/forge/Component/SiderBar.js
index 09941701..a5c4836d 100644
--- a/src/forge/Component/SiderBar.js
+++ b/src/forge/Component/SiderBar.js
@@ -33,12 +33,12 @@ function SiderBar() {
   },[])
 
   function getFAQ(){
-    // const url = `/faqs.json`;
-    // axios.get(url).then(result=>{
-    //   if(result && result.data){
-    //     setData(result.data);
-    //   }
-    // }).catch(error=>{})
+    const url = `/faqs.json`;
+    axios.get(url).then(result=>{
+      if(result && result.data){
+        setData(result.data);
+      }
+    }).catch(error=>{})
   }
 
   //获取当前登录账号信息->用于建议反馈
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index dd0710ec..cbc1e1b6 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -295,14 +295,14 @@ class NewHeader extends Component {
               {...this.props}
               {...this.state}
             /> : ""}
-            <div style={{width:"78px"}}>
+            {/* <div style={{width:"78px"}}>
               {
                 publicNav &&
                 <a href={'https://www.ccf.org.cn/'} className={"fl"}>
                   <img src={MainLogo} alt="ccf" />
                 </a>
               }
-            </div>
+            </div> */}
             {
               settings && settings.nav_logo_url ?
               <a href={settings && settings.new_course.default_url} className={"fl mr50"}>
diff --git a/src/forge/comments/comments.js b/src/forge/comments/comments.js
index fb19e1da..52c3e079 100644
--- a/src/forge/comments/comments.js
+++ b/src/forge/comments/comments.js
@@ -325,7 +325,6 @@ class comments extends Component {
     } = this.state;
     const { current_user, only_show_content } = this.props;
     const { projectsId ,owner } = this.props.match.params;
-
     const new_comment = (is_reply, item_id) => {
       return (
         <div className="grid-item-top pb10">
@@ -501,9 +500,9 @@ class comments extends Component {
                   <img
                     className="radius"
                     src={
-                      current_user && current_user.image_url
+                      current_user && (current_user.image_url && current_user.image_url !== 'null')
                         ? getImageUrl(`/${current_user.image_url}`)
-                        : "images/avatars/User/b"
+                        : "/images/avatars/User/b"
                     }
                     alt=""
                     width="30"
@@ -558,9 +557,9 @@ class comments extends Component {
                         <img
                           className="radius"
                           src={
-                            current_user && current_user.image_url
+                            (current_user && current_user.image_url && current_user.image_url!== 'null')
                               ? getImageUrl(`/${current_user.image_url}`)
-                              : "images/avatars/User/b"
+                              : "/images/avatars/User/b"
                           }
                           alt=""
                           width="30"