From 594e9ecea64593fff98c64f1b34f3dacc3d7d8e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 22 Dec 2023 13:38:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5wiki=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AppConfig.js                               |  2 +-
 src/forge/Wiki/components/uploadWiki/index.jsx | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index 13d010628..c246ad013 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -32,7 +32,7 @@ export function initAxiosInterceptors(props) {
   // 判断网络是否连接
   initOnlineOfflineListener();
 
-  var proxy = "https://testforgeplus.trustie.net";
+  var proxy = "http://172.20.32.202:4000";
 
   //响应前的设置
   axios.interceptors.request.use(
diff --git a/src/forge/Wiki/components/uploadWiki/index.jsx b/src/forge/Wiki/components/uploadWiki/index.jsx
index 3e5a33f99..4113752dd 100644
--- a/src/forge/Wiki/components/uploadWiki/index.jsx
+++ b/src/forge/Wiki/components/uploadWiki/index.jsx
@@ -21,10 +21,10 @@ export default function UploadWiki(props) {
     },
     beforeUpload: beforeUpload,
     onChange(info) {
+      // 截取文件名称
+      const fileName = info.file.name.substring(0,info.file.name.lastIndexOf("."))
       if (info.file.status === 'done') {
         if (info.file.response.message === '201') {
-          // 截取文件名称
-          const fileName = info.file.name.substring(0,info.file.name.lastIndexOf("."))
           // 修改sidebar文件
           if(!fileArrInit.length){
             // 仓库没有wiki文件
@@ -42,11 +42,14 @@ export default function UploadWiki(props) {
           message.success(`${fileName} 上传成功`);
           history.push(`/${owner}/${projectsId}/wiki/${encodeURI(fileName)}/0`);
           setReload(Math.random());
-        } else {
-          message.error(info.file.response.message || '文件上传失败');
         }
       } else if (info.file.status === 'error') {
-        message.error((info.file.response && info.file.response.message) || `${info.file.name} 上传失败`);
+        const {message: responseMes} = info.file.response;
+        if(responseMes.indexOf('wiki page already exists') !== -1){
+          message.error("已存在相同文件名的文件")
+        }else{
+          message.error(responseMes || `${fileName} 上传失败`);
+        }
       }
     },
   };