From 7f44d0e115f7e626b4722012f1caf883a5d4a797 Mon Sep 17 00:00:00 2001
From: unknown <xiesi@csxjy.com>
Date: Fri, 25 Feb 2022 15:28:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E7=BB=91=E5=AE=9Acookie=E5=90=8D=E7=A7=B0=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=88=9B=E5=AE=A2=E8=AF=A6=E6=83=85=E4=B8=AD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E4=B8=BB=E4=BD=93=E4=BF=A1=E6=81=AF=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=B08001=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/expert/expertList/index.jsx | 2 +-
 src/military/javaFetch.js                | 2 +-
 src/military/task/taskDetail/index.jsx   | 5 +++--
 src/modules/tpm/NewHeader.js             | 2 +-
 src/modules/tpm/NewHeader_backup.js      | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx
index 69baf73a..895adcc5 100644
--- a/src/military/expert/expertList/index.jsx
+++ b/src/military/expert/expertList/index.jsx
@@ -310,7 +310,7 @@ function RegisterList({ showNotification }) {
     showUploadList: true,
     withCredentials: true,
     headers: {
-      Authorization: cookie.load('autologin_forge_military') || sessionStorage.osredmToken,
+      Authorization: cookie.load('autologin_trustie') || sessionStorage.osredmToken,
     },
   };
 
diff --git a/src/military/javaFetch.js b/src/military/javaFetch.js
index 1a47425a..5137a043 100644
--- a/src/military/javaFetch.js
+++ b/src/military/javaFetch.js
@@ -2,7 +2,7 @@ import { notification} from 'antd';
 import axios from 'axios';
 import cookie from 'react-cookies';
 
-export const TokenKey = 'autologin_forge_military';
+export const TokenKey = 'autologin_trustie';
 export default function javaFetch(actionUrl){
   if (window.location.href.indexOf('localhost') < 0) {
     axios.defaults.withCredentials = true;
diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx
index 46fc2935..2a33540a 100644
--- a/src/military/task/taskDetail/index.jsx
+++ b/src/military/task/taskDetail/index.jsx
@@ -28,7 +28,8 @@ for (const item of applyStatusAllArr) {
 
 
 export default Form.create()(
-  forwardRef(({ match, current_user, form, history, showNotification }, ref) => {
+  forwardRef((props, ref) => {
+    const { match, current_user, form, history, showNotification, mygetHelmetapi } = props;
     const id = match.params.taskId;
     const { getFieldDecorator, validateFields, setFieldsValue } = form;
 
@@ -363,7 +364,7 @@ export default Form.create()(
     }
 
     function goUserProfiles() {
-      window.open(`/users/${current_user.login}/profiles`);
+      window.open(mygetHelmetapi && mygetHelmetapi.main_web_site_url+`/users/${current_user.login}/profiles`);
     }
 
     function backPublicEnd(makePublicAt, makePublicDays) {
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index b635dfb5..13115740 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -128,7 +128,7 @@ class NewHeader extends Component {
   }
   onLogout = () => {
     const url = `/accounts/logout.json`
-    this.delCookie("autologin_forge_military")
+    this.delCookie("autologin_trustie")
     axios.get(url, {
     }).then((response) => {
       if (response.data.status === 1) {
diff --git a/src/modules/tpm/NewHeader_backup.js b/src/modules/tpm/NewHeader_backup.js
index 0473ce27..ebbd9e70 100644
--- a/src/modules/tpm/NewHeader_backup.js
+++ b/src/modules/tpm/NewHeader_backup.js
@@ -119,7 +119,7 @@ class NewHeader extends Component {
   };
   onLogout = () => {
     const url = `/accounts/logout.json`;
-    this.delCookie("autologin_forge_military");
+    this.delCookie("autologin_trustie");
     axios.get(url, {}).then((response) => {
       if (response.data.status === 1) {
         this.setState({