FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test_20230215' into 'dev_20230216'

Browse Source 
# Conflicts:
#   src/sysConfig/index.js
This commit is contained in:
高嵩
2023-03-03 13:42:18 +08:00
parent 9b494c1ccf caf1f7e357
commit d735875698
15 changed files with 10248 additions and 9431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sysConfig/index.js
+11 -12
View File
@@ -1,18 +1,17 @@
/**
* @description: 通用配置
* @author: chenxiaoxi
* @date: 2018-09-04 17:47:46
*/
/*** @description: 通用配置
* @author: chenxiaoxi
* @date: 2018-09-04 17:47:46
*/
// 服务器地址
// const devIp = '39.98.140.126'
// const devInterfacePORT = '4202'
// const devIp = '192.168.1.42'
// const devInterfacePORT = '9999'
// const devIp = '10.10.10.46'
// const devInterfacePORT = '4202'
// const devIp = '10.0.3.10'
const devIp = 'localhost'
const devInterfacePORT = '10086'
const devIp = '10.10.10.46'
const devInterfacePORT = '4202'
// // const devIp = '10.0.3.10'
// const devIp = 'localhost'
// const devInterfacePORT = '10086'
// const devIp = '62.234.136.153'
// const devInterfacePORT = '8033'
// 配置 idm 认证
@@ -23,8 +22,8 @@ const devWebUrl = 'http://62.234.136.153:8038/#/'
const webLoginType = 'dev'
// 配置onlyOffice 前端服务
const onlyOfficeUrl = 'http://127.0.0.1:8080'
// const onlyOfficeUrl = 'http://10.10.10.46:8103'
// const onlyOfficeUrl = 'http://127.0.0.1:8080'
const onlyOfficeUrl = 'http://10.10.10.46:8889'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'