From 0b4c83d64008f15aa24bd94251d4ed2e312188fe Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Thu, 23 Apr 2020 14:53:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderRootDirectory.js | 21 ++++++++++++---------
 src/forge/quillForEditor/index.js    |  5 +++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index d08729c3..781462a2 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -263,15 +263,18 @@ class CoderRootDirectory extends Component{
       http_url:branchLastCommit && branchLastCommit.http_url,
       isSpin: true
     })
-    const { pathname } = this.props.location;
-    if(pathname && pathname.indexOf("/filesurl/")>-1){
-      let url =pathname.split("filesurl/")[1];
-      this.setState({
-        filePath:url
-      })
-      this.getFileDetail(url,branchLastCommit && branchLastCommit.name);
-    }else{
-      this.getProjectRoot( branchLastCommit && branchLastCommit.name );
+    if(branchLastCommit){
+      const { pathname } = this.props.location;
+      if(pathname && pathname.indexOf("/filesurl/")>-1){
+        let url =pathname.split("filesurl/")[1];
+        this.setState({
+          filePath:url
+        })
+        this.getFileDetail(url, branchLastCommit.name);
+      }else{
+        this.getProjectRoot( branchLastCommit.name );
+      }
+      // this.props.history.location.search.replace( branchLastCommit.name );
     }
   }
   render(){
diff --git a/src/forge/quillForEditor/index.js b/src/forge/quillForEditor/index.js
index 49708260..b7adc7c3 100644
--- a/src/forge/quillForEditor/index.js
+++ b/src/forge/quillForEditor/index.js
@@ -19,7 +19,8 @@ import deepEqual from './deepEqual.js'
 import { fetchUploadImage } from '../../services/ojService.js';
 import ImageBlot from './ImageBlot';
 import FillBlot from './FillBlot';
-import LinkBlot from './link-blot'
+import LinkBlot from './link-blot';
+import { getImageUrl } from 'educoder';
 var Size = Quill.import('attributors/style/size');
 Size.whitelist = ['14px', '16px', '18px', '20px', false];
 var fonts = ['Microsoft-YaHei', 'SimSun', 'SimHei', 'KaiTi', 'FangSong'];
@@ -174,7 +175,7 @@ function QuillForEditor({
         const result = await fetchUploadImage(formData);
         // 获取上传图片的url
         if (result.data && result.data.id) {
-          fileUrl = (`https://testforgeplus.trustie.net/api/attachments/${result.data.id}`);
+          fileUrl = (getImageUrl(`api/attachments/${result.data.id}`));
         }
         // 根据id获取文件路径
         const { width, height } = imgAttrs;