diff --git a/src/forge/Settings/Index.js b/src/forge/Settings/Index.js index ae9579117..78c4636df 100644 --- a/src/forge/Settings/Index.js +++ b/src/forge/Settings/Index.js @@ -113,7 +113,7 @@ class Index extends Component {

{ - projectDetail && projectDetail.permission && (projectDetail.permission === "Owner" || projectDetail.permission === "Admin") ? + false && projectDetail && projectDetail.permission && (projectDetail.permission === "Owner" || projectDetail.permission === "Admin") ?
  • -1 ? "active" : ""} > diff --git a/src/forge/javaFetch.js b/src/forge/javaFetch.js deleted file mode 100644 index 02840a15b..000000000 --- a/src/forge/javaFetch.js +++ /dev/null @@ -1,97 +0,0 @@ -import { notification ,message} from 'antd'; -import axios from 'axios'; -import cookie from 'react-cookies'; -import Login from './Wiki/components/Login'; - -export const TokenKey = 'autologin_trustie'; - -export default function javaFetch(actionUrl){ - if (window.location.href.indexOf('localhost') < 0) { - axios.defaults.withCredentials = true; - } - - // 创建axios实例 - const service = axios.create({ - baseURL: actionUrl, - timeout: 1800000, // 请求超时时间 - }); - - // request拦截器 - service.interceptors.request.use(config => { - if (cookie.load(TokenKey)) { - console.log(cookie.load(TokenKey)); - config.headers['Authorization'] = cookie.load(TokenKey); // 让每个请求携带自定义token 请根据实际情况自行修改 - } - if (window.location.port === "3007") { - // 模拟token为登录用户 - const token = sessionStorage.token; - if (config.url.indexOf('?') === -1) { - config.url = `${config.url}?token=${token}`; - } else { - config.url = `${config.url}&token=${token}`; - } - } - return config; - }, error => { - console.log(error); // for debug - // Promise.reject(error); - }); - // respone拦截器 - service.interceptors.response.use( - response => { - const res = response||{}; - if (res.status === 400) { - message.error(res.data.message || '操作失败'); - return Promise.reject('error'); - } - if (res.status === 401) { - message.error(res.data.message || '登录信息已过期'); - return Promise.reject('error'); - } - if (res.status === 403) { - message.error(res.data.message || '无权限!'); - return Promise.reject('error'); - } - if (res.status === 40001) { - notification.open({ - message: "提示", - description: '账户或密码错误!', - }); - return Promise.reject('error'); - } - if (response.status !== 200 && res.status !== 200) { - notification.open({ - message: "提示", - description: res.message, - }); - } else { - return response.data; - } - }, - error => { - console.log(error); - let res = error.response||{}; - if (res.status === 400) { - message.error(res.data.message || '操作失败'); - return Promise.reject('error'); - } - if (res.status === 401) { - message.error(res.data.message || '登录信息已过期'); - Login(); - return Promise.reject('error'); - } - if (res.status === 403) { - message.error(res.data.message || '无权限!'); - return Promise.reject('error'); - } - notification.open({ - message: "提示", - description: error.message, - }); - return Promise.reject(error); - } - ); - - - return service; -} \ No newline at end of file diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index 50970b9ff..226b1ada1 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -127,7 +127,7 @@ class NewHeader extends Component { } onLogout = () => { const url = `/accounts/logout.json` - this.delCookie("autologin_trustie") + this.delCookie("autologin_forge_military") axios.get(url, { }).then((response) => { if (response.data.status === 1) { @@ -744,7 +744,7 @@ class NewHeader extends Component { } {this.props.user && this.props.user.login && -
    +
    diff --git a/src/modules/tpm/NewHeader_backup.js b/src/modules/tpm/NewHeader_backup.js index 0081969bd..2c66cd617 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_trustie"); + this.delCookie("autologin_forge_military"); axios.get(url, {}).then((response) => { if (response.data.status === 1) { this.setState({