From 9b0fd461885eccfff9db03643acf3474851e5e17 Mon Sep 17 00:00:00 2001
From: unknown <hetongchong@csxjy.com>
Date: Fri, 25 Feb 2022 14:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dissue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/home/FourthSection/index.jsx              | 2 +-
 src/military/components/adminRouter/index.jsx | 2 +-
 src/military/javaFetch.js                     | 4 ++--
 src/military/task/taskDetail/index.jsx        | 3 ++-
 src/military/task/taskManage/index.js         | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/home/FourthSection/index.jsx b/src/home/FourthSection/index.jsx
index 8e36ad9f0..2cc762cd7 100644
--- a/src/home/FourthSection/index.jsx
+++ b/src/home/FourthSection/index.jsx
@@ -33,7 +33,7 @@ function FourthSection({ fourth, history }) {
           <h2 className="homePage-blue-tit">开源项目</h2>
           <h4 className="homePage-subhead">开源项目版块集项目托管、版本管理等功能于一体，为开源协作和群智汇聚提供创作环境</h4>
           <Line />
-          <Button className="homepage-btn" type="primary" onClick={()=>{history.push('/projects')}}>查看项目 <i className="iconfont icon-gengduoicon"></i></Button>
+          <Button className="homepage-btn" type="primary" onClick={()=>{history.push('/explore/all')}}>查看项目 <i className="iconfont icon-gengduoicon"></i></Button>
         </div>
 
         <div className={fourth ? "code-box clearfix activeCode" : "code-box clearfix"} >
diff --git a/src/military/components/adminRouter/index.jsx b/src/military/components/adminRouter/index.jsx
index 5ec4397cc..7f652efd2 100644
--- a/src/military/components/adminRouter/index.jsx
+++ b/src/military/components/adminRouter/index.jsx
@@ -84,7 +84,7 @@ export default props => {
   const checkMenu = useMemo(() => {
     return <Menu selectedKeys={current} onClick={handleClick}>
       <Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/enterprise_authentication`}>企业认证</a></Menu.Item>
-      <Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/reviews/projects_list`}>开源项目</a></Menu.Item>
+      {/* <Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/reviews/projects_list`}>开源项目</a></Menu.Item> */}
       <Menu.Item key={"taskManage1"}><Link to="/task/taskManage/1">统筹任务发布审批</Link></Menu.Item>
       <Menu.Item key={"taskManage0"}><Link to="/task/taskManage/0">自主任务发布审批</Link></Menu.Item>
       <Menu.Item key={"paperManage"}><Link to="/task/paperManage">成果/评论审批</Link></Menu.Item>
diff --git a/src/military/javaFetch.js b/src/military/javaFetch.js
index 1a47425a4..5f75dd8b3 100644
--- a/src/military/javaFetch.js
+++ b/src/military/javaFetch.js
@@ -17,11 +17,11 @@ export default function javaFetch(actionUrl){
   // request拦截器
 service.interceptors.request.use(config => {
   if (cookie.load(TokenKey)) {
-    config.headers['Authorization'] = cookie.load(TokenKey); // 让每个请求携带自定义token 请根据实际情况自行修改
+    config.headers['Authorization'] = cookie.load(TokenKey) ||cookie.load('autologin_trustie'); // 让每个请求携带自定义token 请根据实际情况自行修改
   }
   if (window.location.port === "3007") {
     // 模拟token为登录用户
-    const osredmToken = sessionStorage.osredmToken;
+    const osredmToken = cookie.load(TokenKey) ||cookie.load('autologin_trustie')||sessionStorage.osredmToken;
     if (config.url.indexOf('?') === -1) {
       config.url = `${config.url}?token=${osredmToken}`;
     } else {
diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx
index 46fc29357..733df9cda 100644
--- a/src/military/task/taskDetail/index.jsx
+++ b/src/military/task/taskDetail/index.jsx
@@ -363,7 +363,8 @@ export default Form.create()(
     }
 
     function goUserProfiles() {
-      window.open(`/users/${current_user.login}/profiles`);
+      const main_web_site_url =localStorage.chromesetting&& JSON.parse(localStorage.chromesetting).main_web_site_url;
+      window.open(`${main_web_site_url}/users/${current_user.login}/profiles`);
     }
 
     function backPublicEnd(makePublicAt, makePublicDays) {
diff --git a/src/military/task/taskManage/index.js b/src/military/task/taskManage/index.js
index 60bcacea8..b3776641f 100644
--- a/src/military/task/taskManage/index.js
+++ b/src/military/task/taskManage/index.js
@@ -52,7 +52,7 @@ export default Form.create()(({ form, showNotification, match, history }) => {
       }
       setLoading(false);
     })
-  }, [reload, statusString, curPage, searchObj]);
+  }, [reload, statusString, curPage, searchObj ,publishMode]);
 
 
   const helper = useCallback(