junru0303
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改创客空间微调及代理功能

This commit is contained in:
何童崇 2021-09-01 09:08:19 +08:00
parent 700ac5862e
commit 6e82862307
6 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@ -19205,13 +19205,15 @@
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
"dev": true
"dev": true,
"optional": true
},
"is-glob": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
"dev": true,
"optional": true,
"requires": {
"is-extglob": "^2.1.1"
}

BIN
public/favicon.back.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

BIN
public/favicon.ico Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

5
src/military/fetch.js
View File

@ -7,9 +7,12 @@ let actionUrl = '';
if (window.location.href.indexOf(':3007') > -1) {
actionUrl = 'http://117.50.100.12:8008';
// actionUrl='http://192.168.31.74:8081'; //万佳后台
} else if (window.location.href.indexOf('117.50.100.12') > -1 ||window.location.href.indexOf('forgeweb.osredm') > -1) {
} else if (window.location.href.indexOf('117.50.100.12') > -1 ) {
actionUrl = "http://117.50.100.12:8008"; //测试环境
axios.defaults.withCredentials = true;
} else if (window.location.href.indexOf('noticeweb.osredm') > -1) {
actionUrl = "https://taskapi.osredm.com"; //测试环境
axios.defaults.withCredentials = true;
} else if (window.location.href.indexOf('forge.osredm') > -1) {
actionUrl = "https://info.osredm.com"; //生产环境
axios.defaults.withCredentials = true;

2
src/military/notice/api.js
View File

@ -27,7 +27,7 @@ export async function getNoticeDetail(id) {
method: 'get',
params:{flag:1}
});
if (res.message === 'success') {
if (res.data) {
return res.data;
} else {
notification.open({

4
src/modules/tpm/NewHeader.js
View File

@ -580,7 +580,9 @@ class NewHeader extends Component {
return true
} else if (url.indexOf('projects') > -1 && match.path.indexOf('projects') > -1) {
return true
} else if (url.indexOf('notice') > -1 && match.path.indexOf('notice') > -1) {
} else if (url.indexOf('.com/notice') > -1 && match.path.indexOf('/notice') > -1) {
return true
} else if (url.indexOf('/task') > -1 && match.path.indexOf('/task') > -1) {
return true
} else if (url.indexOf('users') > -1 && match.path.indexOf('users') > -1) {
return true