Merge branch 'develop' into FOTON

# Conflicts:
#	src/sysConfig/index.js
This commit is contained in:
super_liu
2021-12-23 21:46:48 +08:00
2 changed files with 9 additions and 2 deletions
+4
View File
@@ -21,6 +21,9 @@ const webLoginType = 'idm'
// 配置onlyOffice 前端服务
const onlyOfficeUrl = 'http://10.100.5.116:8088'
// 配置 kkFileView 前端服务
const kkFileViewUrl = 'https://srms.foton.com.cn/preview/'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload'
@@ -59,6 +62,7 @@ module.exports = {
ssoLoginUrlDev: ssoLogin + devWebUrl,
ssoLoginUrl: ssoLogin,
onlyOfficeUrl: onlyOfficeUrl,
kkFileViewUrl: kkFileViewUrl,
devWebUrl: devWebUrl,
serverUrl: 'https://' + serverIP, // 服务器IP地址
interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,