Merge commit 'deabd777' into dev

# Conflicts:
#	client/util/logger.js
#	client/util/socket.js

client/config/config.js

@@ -2,7 +2,7 @@ import { getQuery } from '../util/common';
 
 
 const requestInfo = {
 const requestInfo = {
     domainPort : '7788',
     domainPort : '7788',
-    domainIp : '192.168.10.',
+    domainIp : process.env.NODE_ENV !== 'production' ? '192.168.10.' : '192.168.8.',
     exactDomainIp: getQuery('isDev') ? '127.0.0.1' : ''
     exactDomainIp: getQuery('isDev') ? '127.0.0.1' : ''
 }
 }
 
 

client/env/development.js

@@ -2,6 +2,6 @@
  * Created by ruibing on 16/11/2.
  * Created by ruibing on 16/11/2.
  */
  */
 module.exports = {
 module.exports = {
-    domain: 'https://test.mjitech.com/web/',
+    domain: 'https://www.mjitech.com/web/',
     uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble'
     uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble'
 }
 }
\ No newline at end of file

client/env/production.js

@@ -2,6 +2,6 @@
  * Created by ruibing on 16/11/2.
  * Created by ruibing on 16/11/2.
  */
  */
 module.exports = {
 module.exports = {
-    domain: 'https://test.mjitech.com/web/',
+    domain: 'https://www.mjitech.com/web/',
     uploadImg : "https://preprod.mjitech.com/static/uploadTrouble"
     uploadImg : "https://preprod.mjitech.com/static/uploadTrouble"
 }
 }
\ No newline at end of file

client/env/test.js

@@ -2,6 +2,6 @@
  * Created by ruibing on 16/11/2.
  * Created by ruibing on 16/11/2.
  */
  */
 module.exports = {
 module.exports = {
-    domain: 'https://preprod.mjitech.com/web/',
+    domain: 'https://www.mjitech.com/web/',
     uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble'
     uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble'
 }
 }
\ No newline at end of file

client/util/logger.js

 import fetch from 'isomorphic-fetch';
 import fetch from 'isomorphic-fetch';
 
 
-let domain = "http://192.168.10.63:7780";
+let domain = "";
 
 
 const domainPort = CONFIG.config.domainPort;
 const domainPort = CONFIG.config.domainPort;
 const myHeaders = new Headers({
 const myHeaders = new Headers({

webpack.config.js

@@ -65,7 +65,6 @@ let baseConfig = {
 function getEnv(){
 function getEnv(){
     const args = require('minimist')(process.argv.slice(2));
     const args = require('minimist')(process.argv.slice(2));
     let env;
     let env;
-    console.log("===================== args ",args);
     if(args._.length > 0 && args._.indexOf('start') !== -1){
     if(args._.length > 0 && args._.indexOf('start') !== -1){
         env = 'test';
         env = 'test';
     }else if(args.env){
     }else if(args.env){
@@ -77,7 +76,6 @@ function getEnv(){
 }
 }
 let env = getEnv();
 let env = getEnv();
 
 
-console.log("===================== env ",env);
 
 
 function getVersion(){
 function getVersion(){
     const args = require('minimist')(process.argv.slice(2));
     const args = require('minimist')(process.argv.slice(2));
@@ -90,8 +88,6 @@ function getVersion(){
 
 
 let curversion = getVersion();
 let curversion = getVersion();
 
 
-console.log("===================== version ",curversion,typeof curversion);
-
 let envConfig = {
 let envConfig = {
     'build':{
     'build':{
         output:{
         output:{