From 0822fdb866615b44495d0b6fd2b7112afdf7099c Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 22 Nov 2022 10:04:32 +0800 Subject: [PATCH] xiugai --- src/common/onlineEdit/index.js | 2 +- src/sysConfig/index.js | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/common/onlineEdit/index.js b/src/common/onlineEdit/index.js index b8866bd2c..19fd86a0f 100644 --- a/src/common/onlineEdit/index.js +++ b/src/common/onlineEdit/index.js @@ -20,7 +20,7 @@ export default (id,nodeName,userId,userName) => { editFileInfo.pId = editFileInfo.pid } const nowTime = new Date().getTime() - window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName) + window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id +'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName) } }).catch(e => { }) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 6f1f1a7b9..9de6764d7 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -8,10 +8,10 @@ // const devInterfacePORT = '10005' // const devIp = '192.168.1.42' // const devInterfacePORT = '9999' -// const devIp = '39.98.140.126' -// const devInterfacePORT = '4202' -const devIp = '10.0.3.10' -const devInterfacePORT = '10086' +const devIp = '10.10.10.46' +const devInterfacePORT = '4202' +// const devIp = '10.0.3.10' +// const devInterfacePORT = '10086' // const devIp = '62.234.136.153' // const devInterfacePORT = '8033' // 配置 idm 认证 @@ -22,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:8103' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' @@ -47,8 +47,10 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -const prodIp = '39.98.140.126' -const prodInterfacePORT = '4201' +// const prodIp = '39.98.140.126' +// const prodInterfacePORT = '4201' +const prodIp = '10.10.10.46' +const prodInterfacePORT = '4202' // const prodIp = 'slrs.foton.com.cn' // const prodInterfacePORT = ''