From a51f0625a68ce81eb710231b6d431bcc5b435a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 22 Sep 2023 10:35:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E5=BB=BA=E7=AB=99=E7=9B=B8=E5=85=B3=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/SecuritySetting/Index.jsx | 4 ++--
 src/forge/Server/List.jsx           | 4 ++--
 src/forge/users/Material/Index.jsx  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index d88cd370..4a76ded8 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -158,10 +158,10 @@ function Index(props){
               <li className={active === 7 ?"active":""}><Link to={`/settings/mybot`}><i className="iconfont icon-kaifabot mr5 font-18"></i><span className="text-shodow-bold">我的Bot</span></Link></li>
               <li className={active === 8 ?"active":""}><Link to={`/settings/installbot`}><i className="iconfont icon-BOTpeizhi mr5 font-17"></i><span className="text-shodow-bold">Bot安装</span></Link></li>
             </ul>
-            <ul className="securityUl">
+            {/* <ul className="securityUl">
               <li>个人建站</li>
               <li className={active === 9 ?"active":""}><Link to={`/settings/mysite`}><i className="iconfont icon-liebiaoicon mr5 font-15"></i><span className="text-shodow-bold">我的站点</span></Link></li>
-            </ul>
+            </ul> */}
           </div>
           <LongWidth>
             <Gap>
diff --git a/src/forge/Server/List.jsx b/src/forge/Server/List.jsx
index 14677090..c83c00e4 100644
--- a/src/forge/Server/List.jsx
+++ b/src/forge/Server/List.jsx
@@ -64,7 +64,7 @@ function Main(props){
             <Link to={`/${owner}/${projectsId}/service/reposyncer`} className="btnhover">查看详情</Link>
           </span>
         </li> */}
-        {projectDetail && projectDetail.author.type === "User" && <li>
+        {/* {projectDetail && projectDetail.author.type === "User" && <li>
           <span className="servername">
             <img src={require('./img/logo.png')} alt=""/>
             <a onClick={openDetail}>个人建站服务</a>
@@ -73,7 +73,7 @@ function Main(props){
           <span className="serverbtn">
           <Link to={`/${owner}/${projectsId}/service/pages`} className="btnhover">查看详情</Link>
           </span>
-        </li>}
+        </li>} */}
       </ul>
     </div>
   )
diff --git a/src/forge/users/Material/Index.jsx b/src/forge/users/Material/Index.jsx
index c1503684..1cf63196 100644
--- a/src/forge/users/Material/Index.jsx
+++ b/src/forge/users/Material/Index.jsx
@@ -55,7 +55,7 @@ function Index(props){
           <Menu.Item key="3" className="font-16" onClick={()=>{props.history.push('/settings/phone')}}>手机号管理</Menu.Item>
           <Menu.Item key="0" className="font-16" onClick={()=>{props.history.push('/settings/emails')}}>邮箱管理</Menu.Item>
           <Menu.Item key="1" className="font-16" onClick={()=>{props.history.push('/settings/password')}}>密码管理</Menu.Item>
-          <Menu.Item key="4" className="font-16" onClick={()=>{props.history.push('/settings/verification')}}>实名认证</Menu.Item>
+          {/* <Menu.Item key="4" className="font-16" onClick={()=>{props.history.push('/settings/verification')}}>实名认证</Menu.Item> */}
           <Menu.Item key="2" className="font-16" onClick={()=>{props.history.push('/settings/cancel')}}>账号注销</Menu.Item>
         </Menu>}
       </div>

From 357435579a390f77070d737461f591e4b80b44d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 22 Sep 2023 11:13:11 +0800
Subject: [PATCH 2/3] issue

---
 src/forge/Component/RichEditor/index.jsx     |  2 +-
 src/forge/Information/Pages/main.jsx         |  2 +-
 src/forge/Information/Pages/newsCreate.jsx   | 20 +++++++++++--------
 src/forge/Information/Pages/newsDetail.jsx   |  4 +++-
 src/forge/Information/Pages/sourceCreate.jsx | 20 +++++++++----------
 src/forge/Information/Pages/sourceDetail.jsx | 10 +++++-----
 src/forge/Information/fetch.js               |  1 -
 src/forge/Information/index.scss             | 21 +++++++++++++++++++-
 8 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/src/forge/Component/RichEditor/index.jsx b/src/forge/Component/RichEditor/index.jsx
index 2a15b968..aa9da43f 100644
--- a/src/forge/Component/RichEditor/index.jsx
+++ b/src/forge/Component/RichEditor/index.jsx
@@ -23,7 +23,7 @@ function MyEditor(props) {
   const toolbarConfig = {};
 	// 隐藏 代办
 	toolbarConfig.excludeKeys = [
-    'todo'
+    'todo', "fullScreen"
 	]
 
   // 编辑器配置
diff --git a/src/forge/Information/Pages/main.jsx b/src/forge/Information/Pages/main.jsx
index 9fe9137f..a1027ccc 100644
--- a/src/forge/Information/Pages/main.jsx
+++ b/src/forge/Information/Pages/main.jsx
@@ -122,7 +122,7 @@ function Main(props){
         <div className="boxmain">
           <div className='titleButBox'>
             <p className="in_title">{tempConfig[temp].mainTitle}</p>
-            {role && role.role !== "None" && <div className='createButs'>
+            {role && role.role !== "None" && <div className='createButs mt10'>
               {role.role === "Member" && <Button type="primary" ghost className='mr20'>
                 <Link to={`/zone/${deptId}/news/self`}>我的文章</Link>
               </Button>}
diff --git a/src/forge/Information/Pages/newsCreate.jsx b/src/forge/Information/Pages/newsCreate.jsx
index 84483c79..b4e28384 100644
--- a/src/forge/Information/Pages/newsCreate.jsx
+++ b/src/forge/Information/Pages/newsCreate.jsx
@@ -90,22 +90,26 @@ function NewsCreate(props){
           const {data:{code, msg}} = res;
           setLoading(false);
           if(code === 200){
-            message.success("更新成功");
-            history.push(`/zone/${deptId}/news/self`);
+            message.success("提交成功");
+            history.push(`/zone/${deptId}/newdetail/${newsId}`);
           }else{
-            message.error(msg || '更新失败，请联系管理员！')
+            message.error(msg || '提交失败，请联系管理员！')
           }
+        }).catch(e=>{
+          setLoading(false);
         })
       }
       addNewsByDirId(fieldsValue.dirId, params).then(res=>{
-        const {data:{code, msg}} = res;
+        const {data:{code, msg, data}} = res;
         setLoading(false);
         if(code === 200){
-          message.success("新增成功");
-          history.push(`/zone/${deptId}/news/self`);
+          message.success("提交成功");
+          history.push(`/zone/${deptId}/newdetail/${data}`);
         }else{
-          message.error(msg || '新增失败，请联系管理员！')
+          message.error(msg || '提交失败，请联系管理员！')
         }
+      }).catch(e=>{
+        setLoading(false);
       })
     })
   }
@@ -153,7 +157,7 @@ function NewsCreate(props){
               type === "richEditor" ? <RichEditor uploadUrl={`${httpUrl}/file/common/upload`} videoUploadUrl={`${httpUrl}/file/common/upload?type=cms`} setValue={(value)=>{setFieldsValue({"content": value})}}/> : <MdEditor
                 placeholder={"请输入详细介绍"}
                 height={500}
-                mdID={"order-new-description"}
+                className='editNewsMd'
                 initValue={value}
                 onChange={(value)=>{setFieldsValue({"content": value})}}
                 imageExpand={false}
diff --git a/src/forge/Information/Pages/newsDetail.jsx b/src/forge/Information/Pages/newsDetail.jsx
index 025f1659..3947f4cb 100644
--- a/src/forge/Information/Pages/newsDetail.jsx
+++ b/src/forge/Information/Pages/newsDetail.jsx
@@ -1,5 +1,5 @@
 import React,{ useState , useEffect } from 'react';
-import { Breadcrumb , Divider, Spin } from 'antd';
+import { Badge, Breadcrumb , Divider, Spin } from 'antd';
 import liulan from '../img/liulan.png';
 import RenderHtml from '../../../components/render-html';
 import { Base64 } from 'js-base64';
@@ -108,6 +108,8 @@ function NewsDetail(props){
                     { cmsDir && <li><a href={ detail.publishUserUrl } ><img src={ detail.publishUserImage } alt="" className="headimg" /> { detail.publishUserNickname }</a></li> }
                     { cmsDir && <li>{ detail.isFirstPublish ? '创建于' : '更新于' }{detail.publishTime}</li> }
                     { detail.visits && <li><img src={liulan} alt="" className="mr5" />{detail.visits}</li> }
+                    { detail.auditStatus === '2' && <li><Badge color={temp === "zone" ? "#466aff" : "#089f7f"} text="待审核" className='pass'/></li>}
+                    { detail.auditStatus === '0' && <li><Badge color="#eb1212" text="未通过" className='failed'/></li>}
                   </ul>
                 </div>
                 { !IsPC() && <Divider dashed={true}	/> }
diff --git a/src/forge/Information/Pages/sourceCreate.jsx b/src/forge/Information/Pages/sourceCreate.jsx
index 526df0e1..14c63033 100644
--- a/src/forge/Information/Pages/sourceCreate.jsx
+++ b/src/forge/Information/Pages/sourceCreate.jsx
@@ -68,7 +68,7 @@ function SourceCreate(props){
     }).catch(error=>{})
   }
 
-  // 新建文章
+  // 新建/编辑资源
   function submit(e){
     e.preventDefault();
     validateFields((err, fieldsValue)=>{
@@ -89,21 +89,21 @@ function SourceCreate(props){
         updateMyResource(params).then((res)=>{
           const {data:{code, msg}} = res;
           if(code === 200){
-            message.success("编辑成功");
-            history.push(`/zone/${deptId}/source/self`);
+            message.success("提交成功");
+            history.push(`/zone/${deptId}/source/${sourceid}`);
           }else{
-            message.error(msg || '编辑失败，请联系管理员！')
+            message.error(msg || '提交失败，请联系管理员！')
           }
         })
         return;
       }
       addResource(params).then((res)=>{
-        const {data:{code, msg}} = res;
+        const {data:{code, msg, data}} = res;
         if(code === 200){
-          message.success("新增成功");
-          history.push(`/zone/${deptId}/source/self`);
+          message.success("提交成功");
+          history.push(`/zone/${deptId}/source/${data.id}`);
         }else{
-          message.error(msg || '新增失败，请联系管理员！')
+          message.error(msg || '提交失败，请联系管理员！')
         }
       })
     })
@@ -203,8 +203,8 @@ function SourceCreate(props){
             {getFieldDecorator("fileList", {
               rules:[{ required:true,message:"请上传资源附件！" }]
             })(
-              <Upload action={getZoneUrl(`/api/file/common/upload?type=resource`)} showUploadList={false} beforeUpload={beforeUpload} onChange={onChange} withCredentials={true}>
-                <Button>
+              <Upload action={getZoneUrl(`/api/file/common/upload?type=resource`)} showUploadList={false} beforeUpload={beforeUpload} onChange={onChange} withCredentials={true} headers={{Authorization: "3e33a5b0a35824f93666b1084488f0bd5f010025"}}>
+                <Button className='hoverThemeColorBut'>
                   <Icon type="upload" />单击上传
                 </Button>
               </Upload>
diff --git a/src/forge/Information/Pages/sourceDetail.jsx b/src/forge/Information/Pages/sourceDetail.jsx
index cd50906f..eae707ff 100644
--- a/src/forge/Information/Pages/sourceDetail.jsx
+++ b/src/forge/Information/Pages/sourceDetail.jsx
@@ -1,11 +1,8 @@
 import React , { useEffect , useState } from 'react';
-import { Breadcrumb } from 'antd';
+import { Badge, Breadcrumb } from 'antd';
 import SourceFile from '../img/sourceFile.png';
-import RenderHtml from '../../../components/render-html';
 import { getSourceDetail } from '../api';
 import { Link } from 'react-router-dom';
-import axios from 'axios';
-import { Base64 } from 'js-base64';
 import { httpUrl } from '../fetch';
 import { AlignCenter, FlexAJ } from '../../Component/layout';
 import SourceIcon from '../img/sourceIcon.png';
@@ -16,6 +13,7 @@ function SourceDetail(props){
   const { deptId , sourceid } = props.match.params;
   const [ detail , setDetail ] = useState(undefined);
   const zonedetail = props.data;
+  const {temp} = props;
 
   useEffect(()=>{
     if(sourceid){
@@ -69,7 +67,9 @@ function SourceDetail(props){
             </FlexAJ>
             {detail.createUser && detail.createUser.avatar && <Link to={`/${detail.createUser.userName}`}><img alt='' src={detail.createUser.avatar} className='publicUserAvatar mr10'/></Link>}
             {detail.createUser && <Link className='mr20' to={`/${detail.createUser.userName}`}>{detail.createUser.nickName}</Link>}
-            <span>发布于{detail.updateTime || detail.createTime}</span>
+            <span className='mr20'>发布于{detail.updateTime || detail.createTime}</span>
+            {detail.auditStatus === '0' && <Badge color={temp === "zone" ? "#466aff" : "#089f7f"} text="待审核" className='pass'/> }
+            {detail.auditStatus === '2' && <Badge color="#eb1212" text="未通过" className='failed'/> }
           </div>
           <div className='pb20'>{detail.summary}</div>
           {
diff --git a/src/forge/Information/fetch.js b/src/forge/Information/fetch.js
index ddb0df2b..29cc15d2 100644
--- a/src/forge/Information/fetch.js
+++ b/src/forge/Information/fetch.js
@@ -7,7 +7,6 @@ function beforeFetch(actionUrl){
   }
 
   const service = axios.create({
-    headers:{Authorization:"0cd46d63363af9205eb7ccecff574309ce069a97"},
     baseURL: actionUrl,
     timeout: 1800000, // 请求超时时间
   });
diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss
index ef5c0f61..78db4134 100644
--- a/src/forge/Information/index.scss
+++ b/src/forge/Information/index.scss
@@ -28,6 +28,12 @@
     background-color: var(--primary-color);
   }
 }
+.hoverThemeColorBut{
+  &:hover, &:active, &:focus{
+    border-color: var(--light-color);
+    color: var(--light-color);
+  }
+}
 
 .information_main{
   background-color:#f3f5f8;
@@ -1547,7 +1553,7 @@
     button{
       border-color: var(--primary-color);
       color: var(--primary-color);
-      &:hover{
+      &:hover, &:active, &:focus{
         border-color: var(--light-color);
         color: var(--light-color);
       }
@@ -1562,6 +1568,12 @@
     padding: 30px 35px 50px;
   }
 }
+.editNewsMd .editormd-dialog-header{
+  padding: 5px 20px;
+}
+.editNewsMd .number-input{
+  width: 60px !important;
+}
 // 新增资源
 .sourceCreateBox{
   .sourceFilesBox{
@@ -1580,6 +1592,13 @@
   color: var(--primary-color)!important;
 }
 
+.failed .ant-badge-status-text{
+  color: #eb1212;
+}
+.pass .ant-badge-status-text{
+  color: var(--primary-color);
+}
+
 // --------------新建专区
 .applyBox{
   background-color: #fff;

From 0b0dcb9eda25e647cfe4255f4277aed604eef7b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 22 Sep 2023 11:40:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Information/Pages/newsDetail.jsx | 2 +-
 src/forge/Information/index.scss           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/forge/Information/Pages/newsDetail.jsx b/src/forge/Information/Pages/newsDetail.jsx
index 3947f4cb..e625080b 100644
--- a/src/forge/Information/Pages/newsDetail.jsx
+++ b/src/forge/Information/Pages/newsDetail.jsx
@@ -107,7 +107,7 @@ function NewsDetail(props){
                   <ul className="i_ul_value">
                     { cmsDir && <li><a href={ detail.publishUserUrl } ><img src={ detail.publishUserImage } alt="" className="headimg" /> { detail.publishUserNickname }</a></li> }
                     { cmsDir && <li>{ detail.isFirstPublish ? '创建于' : '更新于' }{detail.publishTime}</li> }
-                    { detail.visits && <li><img src={liulan} alt="" className="mr5" />{detail.visits}</li> }
+                    { !!detail.visits && <li><img src={liulan} alt="" className="mr5" />{detail.visits}</li> }
                     { detail.auditStatus === '2' && <li><Badge color={temp === "zone" ? "#466aff" : "#089f7f"} text="待审核" className='pass'/></li>}
                     { detail.auditStatus === '0' && <li><Badge color="#eb1212" text="未通过" className='failed'/></li>}
                   </ul>
diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss
index 3c259b20..6ba07f0f 100644
--- a/src/forge/Information/index.scss
+++ b/src/forge/Information/index.scss
@@ -574,7 +574,7 @@
             align-items: center;
             height: 20px;
             overflow: visible;
-            color: #466aff;
+            color: var(--primary-color);
           }
           .headimg {
             width: 26px;