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

src/sysConfig/index.js

@@ -7,20 +7,22 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-// const devInterfacePORT = '9999'
-const devIp = '192.168.10.70'
-const devInterfacePORT = '4202'
 // const devIp = '62.234.136.153'
-// const devInterfacePORT = '8038'
+// 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 devWebUrl = 'http://62.234.136.153:8038/#/'
+const devWebUrl = 'https://srms.foton.com.cn/#/'
 // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
 const webLoginType = 'dev'
 
 // 配置onlyOffice 前端服务
-const onlyOfficeUrl = 'http://127.0.0.1:8080'
+const onlyOfficeUrl = 'http://10.100.5.116:8088'
+
+// 配置 kkFileView 前端服务
+const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
 
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -44,10 +46,10 @@ const processPort = '17210'
 
  *****************************************************************/
 // 生产环境配置
-const prodIp = '62.234.136.153'
-const prodInterfacePORT = '8033'
-// const prodIp = 'slrs.foton.com.cn'
-// const prodInterfacePORT = ''
+// const prodIp = '62.234.136.153'
+// const prodInterfacePORT = '8033'
+const prodIp = 'srms.foton.com.cn'
+const prodInterfacePORT = ''
 
 // 判断环境
 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp
@@ -60,6 +62,7 @@ module.exports = {
     ssoLoginUrlDev: ssoLogin + devWebUrl,
     ssoLoginUrl: ssoLogin,
     onlyOfficeUrl: onlyOfficeUrl,
+    kkFileViewUrl: kkFileViewUrl,
     devWebUrl: devWebUrl,
     serverUrl: 'http://' + serverIP, // 服务器IP地址
     interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,