Merge branch 'test' into 'develop'

# Conflicts:
#   src/sysConfig/index.js

src/sysConfig/index.js

@@ -6,9 +6,11 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-const devIp = '192.168.10.52'
-// const devIp = '62.234.136.153'
-const devInterfacePORT = '9999'
+// const devIp = '192.168.10.248'
+const devIp = '62.234.136.153'
+const devInterfacePORT = '8033'
+// const devIp = '10.19.11.243'
+// const devInterfacePORT = '4304'
 // 配置 idm 认证
 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
 // 配置 前端服务
@@ -37,8 +39,10 @@ const processPort = '17210'
 
  *****************************************************************/
 // 生产环境配置
-const prodIp = '10.100.5.117'
-const prodInterfacePORT = '4202'
+const prodIp = '62.234.136.153'
+const prodInterfacePORT = '8033'
+// const prodIp = 'slrs.foton.com.cn'
+// const prodInterfacePORT = ''
 
 // 判断环境
 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp