From c9e7da7df3cef2884c00678a8efa4fe763d41bff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com> Date: Thu, 25 Nov 2021 11:40:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E7=94=A8=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/AppConfig.js | 4 ++-- src/military/task/components/itemAgreementManage/index.jsx | 2 +- src/military/task/components/itemListMyTask/index.jsx | 2 +- src/military/task/components/itemListPaper/index.jsx | 2 +- src/military/task/components/itemProofManage/index.jsx | 2 +- src/military/task/components/itemPublicityComplain/index.jsx | 2 +- src/military/task/components/proofModal/index.jsx | 2 +- src/military/task/paperComplain/index.js | 2 +- src/military/task/taskDetail/index.jsx | 2 +- src/military/task/taskEdit/index.jsx | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/AppConfig.js b/src/AppConfig.js index 55873f00d..1b78e7a91 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -56,8 +56,8 @@ export function initAxiosInterceptors(props) { // TODO 避免重复的请求 https://github.com/axios/axios#cancellation var proxy = "http://localhost:3000"; - // proxy = "https://forge.osredm.com"; - proxy = "http://117.50.100.12:49999"; + proxy = "https://forge.osredm.com"; + // proxy = "http://117.50.100.12:49999"; const requestMap = {}; window.setfalseInRequestMap = function (keyName) { diff --git a/src/military/task/components/itemAgreementManage/index.jsx b/src/military/task/components/itemAgreementManage/index.jsx index 787948c1a..a6497f212 100644 --- a/src/military/task/components/itemAgreementManage/index.jsx +++ b/src/military/task/components/itemAgreementManage/index.jsx @@ -5,7 +5,7 @@ import Nodata from 'forge/Nodata'; import Loading from "src/Loading"; import { timeAgo, getImageUrl } from 'educoder'; import { adminCheckAgreement } from '../../api'; -import { httpUrl } from 'military/fetch'; +import { httpUrl } from '../../fetch'; import './index.scss'; const { TextArea } = Input; diff --git a/src/military/task/components/itemListMyTask/index.jsx b/src/military/task/components/itemListMyTask/index.jsx index ea70bfa2b..33fa35e77 100644 --- a/src/military/task/components/itemListMyTask/index.jsx +++ b/src/military/task/components/itemListMyTask/index.jsx @@ -7,7 +7,7 @@ import Upload from 'military/components/Upload'; import ProofModal from '../proofModal'; import { publishModeArr, taskStatusAllArr, myPaperStatusArr } from '../../static'; import { signMethod, uploadAgreeRequire, downAgreement } from "../../api"; -import { httpUrl } from 'military/fetch'; +import { httpUrl } from '../../fetch'; import '../../index.scss'; import './index.scss'; diff --git a/src/military/task/components/itemListPaper/index.jsx b/src/military/task/components/itemListPaper/index.jsx index 1e7dd06e8..70c1f9496 100644 --- a/src/military/task/components/itemListPaper/index.jsx +++ b/src/military/task/components/itemListPaper/index.jsx @@ -9,7 +9,7 @@ import AgreementModal from '../agreementModal'; import ComplainModal from '../complainModal'; import { reportPaper, thumbUpPaper, commentAdd, confirmReceipt } from '../../api'; import { paperCheckStatusArr } from '../../static'; -import { httpUrl } from '../../../fetch'; +import { httpUrl } from '../../fetch'; import winpng from '../../image/winner.png'; import './index.scss'; diff --git a/src/military/task/components/itemProofManage/index.jsx b/src/military/task/components/itemProofManage/index.jsx index bf5025e09..36c8860f6 100644 --- a/src/military/task/components/itemProofManage/index.jsx +++ b/src/military/task/components/itemProofManage/index.jsx @@ -5,7 +5,7 @@ import Nodata from 'forge/Nodata'; import Loading from "src/Loading"; import { timeAgo, getImageUrl } from 'educoder'; import { checkProof } from '../../api'; -import { httpUrl } from 'military/fetch'; +import { httpUrl } from '../../fetch'; import './index.scss'; const { TextArea } = Input; diff --git a/src/military/task/components/itemPublicityComplain/index.jsx b/src/military/task/components/itemPublicityComplain/index.jsx index e7f8bf2fc..4f3289751 100644 --- a/src/military/task/components/itemPublicityComplain/index.jsx +++ b/src/military/task/components/itemPublicityComplain/index.jsx @@ -5,7 +5,7 @@ import Nodata from 'forge/Nodata'; import Loading from "src/Loading"; import { timeAgo, getImageUrl } from 'educoder'; import { checkPublicity } from '../../api'; -import { httpUrl } from 'military/fetch'; +import { httpUrl } from '../../fetch'; import './index.scss'; const { TextArea } = Input; diff --git a/src/military/task/components/proofModal/index.jsx b/src/military/task/components/proofModal/index.jsx index 5ac16efff..15c741f4c 100644 --- a/src/military/task/components/proofModal/index.jsx +++ b/src/military/task/components/proofModal/index.jsx @@ -2,7 +2,7 @@ import React, { useEffect, useState, useCallback, useMemo } from 'react'; import { Modal, Table, Form, Input, Button, Pagination } from 'antd'; import Upload from 'military/components/Upload'; import { readyCheckPapers, proofAdd } from "../../api"; -import { httpUrl } from 'military/fetch'; +import { httpUrl } from '../../fetch'; import '../../index.scss'; import './index.scss'; diff --git a/src/military/task/paperComplain/index.js b/src/military/task/paperComplain/index.js index 302a8f77b..a8564856a 100644 --- a/src/military/task/paperComplain/index.js +++ b/src/military/task/paperComplain/index.js @@ -5,7 +5,7 @@ import { Link } from "react-router-dom"; import StatusNav from '../../components/statusNav'; import { complainPaperList, checkComplain } from '../api'; import { paperComplainStatusArr } from '../static'; -import { httpUrl } from 'military/fetch'; +import { httpUrl } from '../fetch'; import '../index.scss'; diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx index 81296eee3..c67a4e961 100644 --- a/src/military/task/taskDetail/index.jsx +++ b/src/military/task/taskDetail/index.jsx @@ -10,7 +10,7 @@ import ItemListPaper from '../components/itemListPaper'; import ProofModal from '../components/proofModal'; import { getTaskDetail, getTaskCategory, getTaskPaper, makePublic, addPaper, getAgreement, agreement, checkAgreement, checkHavePaper } from '../api'; import { taskModeIdArr, applyStatusArr, applyStatusAllArr, agreementContent, paperCheckTextArr } from '../static'; -import { httpUrl } from '../../fetch'; +import { httpUrl } from '../fetch'; import './index.scss'; const { TextArea } = Input; diff --git a/src/military/task/taskEdit/index.jsx b/src/military/task/taskEdit/index.jsx index e21b17add..b3f1dbff5 100644 --- a/src/military/task/taskEdit/index.jsx +++ b/src/military/task/taskEdit/index.jsx @@ -5,7 +5,7 @@ import moment from 'moment'; import ReactWEditor from 'wangeditor-for-react'; import { Link } from "react-router-dom"; import Upload from '../../components/Upload'; -import { httpUrl } from '../../fetch'; +import { httpUrl } from '../fetch'; import { getTaskDetail, addTask, updateTask, getTaskCategory, getCompanyInfo } from '../api'; import { formItemLayout, formModalLayout } from '../static'; import { editorConfig } from '../../components/config';