Commit 103d7495 by ouyanghui

update port

parent b5d1691b
import fetch from 'isomorphic-fetch' import fetch from 'isomorphic-fetch'
import actionType from '../actiontype/getIp' import actionType from '../actiontype/getIp'
let domain = 'http://192.168.10.100:7788'; let domain = 'http://192.168.10.100:8088';
let domainIp = '192.168.10.'; let domainIp = '192.168.10.';
...@@ -39,7 +39,7 @@ const testIp = ()=>{ ...@@ -39,7 +39,7 @@ const testIp = ()=>{
const getIp = ()=>{ const getIp = ()=>{
return (dispatch =>{ return (dispatch =>{
for(let i = initIndex; i < (totalIndex + initIndex) ; i++){ for(let i = initIndex; i < (totalIndex + initIndex) ; i++){
let url = 'http://' + domainIp + i + ':7788/testIp'; let url = 'http://' + domainIp + i + ':8088/testIp';
fetch( url ,{ fetch( url ,{
// credentials : 'include', // credentials : 'include',
method : 'POST', method : 'POST',
...@@ -48,7 +48,7 @@ const getIp = ()=>{ ...@@ -48,7 +48,7 @@ const getIp = ()=>{
}).then(checkStatus) }).then(checkStatus)
.then(parseJson) .then(parseJson)
.then((data) => { .then((data) => {
dispatch(saveIp(domainIp + i + ':7788')) dispatch(saveIp(domainIp + i + ':8088'))
}) })
.catch((err) =>{ .catch((err) =>{
failTotal++; failTotal++;
......
import { getQuery } from '../util/common'; import { getQuery } from '../util/common';
const requestInfo = { const requestInfo = {
domainPort : getQuery('monitorPort') || '7788', domainPort : getQuery('monitorPort') || '8088',
domainIp : process.env.PAD_ENV !== 'production' ? '192.168.10.' : '192.168.8.', domainIp : process.env.PAD_ENV !== 'production' ? '192.168.10.' : '192.168.8.',
exactDomainIp: getQuery('localMonitorIP') ? '127.0.0.1' : (localStorage.getItem('monitorIP') || '') exactDomainIp: getQuery('localMonitorIP') ? '127.0.0.1' : (localStorage.getItem('monitorIP') || '')
}; };
......
...@@ -1098,7 +1098,7 @@ class PageContainer extends React.Component { ...@@ -1098,7 +1098,7 @@ class PageContainer extends React.Component {
let {state} = this.props; let {state} = this.props;
let headerInfo = state.commonInfo; let headerInfo = state.commonInfo;
let ip = headerInfo ? headerInfo.ip : ''; let ip = headerInfo ? headerInfo.ip : '';
let mp3Url = ip ? `http://${ip}:7788/defaultMedia/back.mp3` : ''; let mp3Url = ip ? `http://${ip}:8088/defaultMedia/back.mp3` : '';
return ( return (
<div className={"pageContainer "} onTouchStart={()=>this.handleTouch()}> <div className={"pageContainer "} onTouchStart={()=>this.handleTouch()}>
{ {
......
...@@ -10,7 +10,7 @@ import refresh_disabled from '../image/refresh_disabled.png'; ...@@ -10,7 +10,7 @@ import refresh_disabled from '../image/refresh_disabled.png';
import overPassIcon from '../image/overPassIcon.png' import overPassIcon from '../image/overPassIcon.png'
import homePage from '../image/homepage.png' import homePage from '../image/homepage.png'
const localHost = 'http://localhost:7788'; const localHost = 'http://localhost:8088';
const devHost = 'http://test.mjitech.com'; const devHost = 'http://test.mjitech.com';
const masterHost = 'http://www.mjitech.com'; const masterHost = 'http://www.mjitech.com';
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"scripts": { "scripts": {
"pretest": "npm run clean", "pretest": "npm run clean",
"test": "cross-env NODE_ENV=production PAD_ENV=test webpack --env=test --version=2.0.4 --progress --color", "test": "cross-env NODE_ENV=production PAD_ENV=test webpack --env=test --version=2.0.4 --progress --color",
"clean": "rm -rf static/*", "clean": "",
"start": "cross-env NODE_ENV=development PAD_ENV=development webpack-dev-server --version=2.0.4 --env=dev -d --history-api-fallback --hot --inline --progress --colors --port 6999 --host 0.0.0.0", "start": "cross-env NODE_ENV=development PAD_ENV=development webpack-dev-server --version=2.0.4 --env=dev -d --history-api-fallback --hot --inline --progress --colors --port 6999 --host 0.0.0.0",
"prebuild": "npm run clean", "prebuild": "npm run clean",
"build": "cross-env NODE_ENV=production PAD_ENV=production webpack --env=build --version=2.0.4 --progress --color", "build": "cross-env NODE_ENV=production PAD_ENV=production webpack --env=build --version=2.0.4 --progress --color",
...@@ -52,5 +52,6 @@ ...@@ -52,5 +52,6 @@
"react-dom": "^16.4.1", "react-dom": "^16.4.1",
"react-redux": "^5.0.7", "react-redux": "^5.0.7",
"redux": "^4.0.0" "redux": "^4.0.0"
} },
"homepage": "./"
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment