Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/sysConfig/index.js

src/sysConfig/index.js

@@ -6,25 +6,21 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-// const devIp = '192.168.10.6'
+// const devIp = '192.168.1.42'
+// const devInterfacePORT = '9999'
+const devIp = '39.98.140.126'
+const devInterfacePORT = '4201'
 // 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='
-
-const ssoLogout = 'http://sso.foton.com.cn/logout?service='
 // 配置 前端服务
-const devWebUrl = 'https://srms.foton.com.cn/#/'
+const devWebUrl = 'http://62.234.136.153:8038/#/'
 // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
-const webLoginType = 'idm'
+const webLoginType = 'dev'
 
 // 配置onlyOffice 前端服务
-const onlyOfficeUrl = 'http://10.100.5.116:8088'
+const onlyOfficeUrl = 'http://127.0.0.1:8080'
-
-// 配置 kkFileView 前端服务
-const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
 
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -48,10 +44,10 @@ const processPort = '17210'
 
  *****************************************************************/
 // 生产环境配置
-// const prodIp = '62.234.136.153'
+const prodIp = '39.98.140.126'
-// const prodInterfacePORT = '8033'
+const prodInterfacePORT = '4201'
-const prodIp = 'srms.foton.com.cn'
+// const prodIp = 'slrs.foton.com.cn'
-const prodInterfacePORT = ''
+// const prodInterfacePORT = ''
 
 // 判断环境
 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp
@@ -59,16 +55,14 @@ const interfacePORT = process.env.NODE_ENV === 'production' ? prodInterfacePORT
 const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT
 
 module.exports = {
-    baseUrl: 'https://' + serverIP + ':' + interfacePORT,
+    baseUrl: 'http://' + serverIP + ':' + interfacePORT,
     webLoginType: webLoginType,
     ssoLoginUrlDev: ssoLogin + devWebUrl,
-    ssoLogoutUrlDev: ssoLogout + devWebUrl,
     ssoLoginUrl: ssoLogin,
     onlyOfficeUrl: onlyOfficeUrl,
-    kkFileViewUrl: kkFileViewUrl,
     devWebUrl: devWebUrl,
-    serverUrl: 'https://' + serverIP, // 服务器IP地址
+    serverUrl: 'http://' + serverIP, // 服务器IP地址
-    interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
+    interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
     cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址,
     simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址
     multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址