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

Merge branch 'dev_military_osredm' of http://106.75.45.236:3000/tongChong/forgeplus-react into expert_review

This commit is contained in:
unknown 2022-01-13 16:56:23 +08:00
parent 16b89ea2f3 46942d8b59
commit fdd442c377
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/users/Infos.js
View File

@ -137,7 +137,9 @@ class Infos extends Component {
render() {
const { current_user, main_web_site_url } = this.props;
let settings = JSON.parse(localStorage.chromesetting);
let main_web_site_url = settings.main_web_site_url;
const { current_user } = this.props;
const { username } = this.props.match.params;
const { user, isSpin, project_type, route_type } = this.state;
@ -167,7 +169,7 @@ class Infos extends Component {
<Button
block
className="text-button-grey"
href={`${main_web_site_url || "https://osredm.com/"}users/${user.login}/profiles`}
href={`${main_web_site_url || "https://osredm.com"}/users/${user.login}/profiles`}
>
{" "}
<i className="iconfont icon-shezhi4 font-15 mr5"></i>

2
src/military/expert/fetch.js
View File

@ -3,7 +3,7 @@ import javaFetch from '../javaFetch';
let settings=JSON.parse(localStorage.chromesetting);
let actionUrl = settings.api_urls && settings.api_urls.expert ? settings.api_urls.expert :'http://117.50.100.12:8067';
let actionUrl = settings.api_urls && settings.api_urls.expert ? settings.api_urls.expert :'http://117.50.100.12:8066';
// http://10.47.38.39:8088
// http://117.50.100.12:8067/
const service = javaFetch(actionUrl);

4
src/military/notice/fetch.js
View File

@ -2,8 +2,8 @@
import javaFetch from '../javaFetch';
let settings=JSON.parse(localStorage.chromesetting);
let actionUrl = settings.api_urls? settings.api_urls.notice :'https://info.osredm.com';
let settings = JSON.parse(localStorage.chromesetting);
let actionUrl = settings && settings.api_urls ? settings.api_urls.notice : 'https://info.osredm.com';
const service = javaFetch(actionUrl);
export const httpUrl = actionUrl;

2
src/military/task/fetch.js
View File

@ -4,7 +4,7 @@ import javaFetch from '../javaFetch';
let settings=JSON.parse(localStorage.chromesetting);
// let actionUrl = settings.api_urls? settings.api_urls.task :'https://task.osredm.com';
let actionUrl = 'http://117.50.100.12:8067'
let actionUrl = 'http://117.50.100.12:8066'
const service = javaFetch(actionUrl);
export const httpUrl = actionUrl;