diff --git a/jero-web/.env.test b/jero-web/.env.test index 4932919..fdb475b 100644 --- a/jero-web/.env.test +++ b/jero-web/.env.test @@ -1,5 +1,5 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://boot.jero.com:8080/laws-sinotruk +VUE_APP_API_BASE_URL=http://boot.jero.com:8080/byd-structuredplugins-serve VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jero.com/onlinePreview VUE_APP_TAG_FLAG=1 diff --git a/jero-web/public/api_address_config.js b/jero-web/public/api_address_config.js index 3e6606f..23b0b61 100644 --- a/jero-web/public/api_address_config.js +++ b/jero-web/public/api_address_config.js @@ -2,8 +2,8 @@ * 防止打包部署时路径被写死 */ window._CONFIG = {} -window._CONFIG.domianURL = '/laws-sinotruk' // 路由转发 devServer -window._CONFIG.domianWebSocketURL = 'http://localhost:8184/laws-sinotruk' +window._CONFIG.domianURL = '/byd-structuredplugins-serve' // 路由转发 devServer +window._CONFIG.domianWebSocketURL = 'http://localhost:8184/byd-structuredplugins-serve' // 单点登录地址 window._CONFIG.staticDomainURL = window._CONFIG.domianURL + '/sys/common/download' window._CONFIG.pdfDomainURL = window._CONFIG.domianURL + '/sys/common/pdf/pdfPreviewIframe' @@ -15,7 +15,7 @@ window._CONFIG.onlyOfficeUrl = 'http://10.0.10.87:8083' // onlyOffice下载文件地址（暂时没用） window._CONFIG.onlyOfficeDownloadFileUrl = 'http://localhost:8184/sys/common/download' // onlyOffice文件获取地址 -window._CONFIG.documentUrl = 'http://10.0.10.87:8184/laws-sinotruk/onlyOffice/downLoadFile?path=' +window._CONFIG.documentUrl = 'http://10.0.10.87:8184/byd-structuredplugins-serve /onlyOffice/downLoadFile?path=' // 管理员角色code，英文逗号拼接 window._CONFIG.adminRoleCode = 'admin,BZGLY' // 水印配置 diff --git a/jero-web/public/ueditor/ueditor.all.js b/jero-web/public/ueditor/ueditor.all.js index 88ff65c..0e567b7 100644 --- a/jero-web/public/ueditor/ueditor.all.js +++ b/jero-web/public/ueditor/ueditor.all.js @@ -8084,7 +8084,7 @@ UE.Editor.defaultOptions = function(editor){ /* 发出ajax请求 */ me._serverConfigLoaded = false; - configUrl && UE.ajax.request('http://localhost:8184/laws-sinotruk/sys/split/file/getImage?fileName=7DS756NXKGimage5.png',{ + configUrl && UE.ajax.request('http://localhost:8184/byd-structuredplugins-serve /sys/split/file/getImage?fileName=7DS756NXKGimage5.png',{ 'method': 'GET', 'dataType': isJsonp ? 'jsonp':'', 'onsuccess':function(r){ diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue index 8b2d793..8069814 100644 --- a/jero-web/src/components/tools/HeaderNotice.vue +++ b/jero-web/src/components/tools/HeaderNotice.vue @@ -198,7 +198,7 @@ export default { initWebSocket: function () { // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https const userId = store.getters.userInfo.id - const url = window._CONFIG.domianWebSocketURL.replace('https://', 'wss://').replace('http://', 'ws://') + '/laws-sinotruk/websocket/' + userId + const url = window._CONFIG.domianWebSocketURL.replace('https://', 'wss://').replace('http://', 'ws://') + '/byd-structuredplugins-serve /websocket/' + userId // console.log(url); this.websock = new WebSocket(url) this.websock.onopen = this.websocketOnopen diff --git a/jero-web/src/utils/request.js b/jero-web/src/utils/request.js index 18d3cc5..b34dd74 100644 --- a/jero-web/src/utils/request.js +++ b/jero-web/src/utils/request.js @@ -8,15 +8,15 @@ import { Modal } from 'ant-design-vue' /** * 【指定 axios的 baseURL】 - * 如果手工指定 baseURL: '/laws-sinotruk' + * 如果手工指定 baseURL: '/byd-structuredplugins-serve ' * 则映射后端域名，通过 vue.config.js * @type {*|string} */ -const apiBaseUrl = window._CONFIG.domianURL || '/laws-sinotruk' +const apiBaseUrl = window._CONFIG.domianURL || '/byd-structuredplugins-serve ' // console.log("apiBaseUrl= ",apiBaseUrl) // 创建 axios 实例 const service = axios.create({ - // baseURL: '/laws-sinotruk', + // baseURL: '/byd-structuredplugins-serve ', baseURL: apiBaseUrl, // api base_url timeout: 30 * 60 * 1000 // 请求超时时间 }) diff --git a/jero-web/src/views/onlyoffice/index.vue b/jero-web/src/views/onlyoffice/index.vue index b6f52ed..a94e31e 100644 --- a/jero-web/src/views/onlyoffice/index.vue +++ b/jero-web/src/views/onlyoffice/index.vue @@ -24,21 +24,23 @@ export default { if (val.id) { const oldFileName = '比亚迪企业标准' const nowTime = new Date().getTime() - const standCode = 'x/xx xxxx-xxxx' + const serialNumber = 'x/xx xxxx-xxxx' const standName = '比亚迪企业标准' - const draftingDepartment = '起草部门' - const draftsman = '起草人' + const estDepart = '起草部门' + const drafts = '起草人' const assessor = '评审人员' const focalUnit = '归口单位' + const watermark = '比亚迪' + const replaceStand = '' // http://39.98.140.126:8999 // http://127.0.0.1:8080 window.open('http://39.98.140.126:8999' + '/editor?fileId=' + val.id + '&pid=' + val.pid + - '&taskIds=' + val.taskId + '&editType=' + val.editType + '&oldFileName=' + oldFileName + + '&taskIds=' + val.taskId + '&oldFileName=' + oldFileName + '&assessor=' + assessor + '&fileType=docx' + '&attId=' + val.id + '&fileUrl=' + val.downLoadUrl + '&key=' + val.id + nowTime + '&filePath=' + val.editFilePath + '&fileName=' + val.fileName + - '&userId=' + val.userId + '&userName=' + 'admin' + '&isEdit=123' + '&standCode=' + standCode + - '&standName=' + standName + '&draftingDepartment=' + draftingDepartment + '&draftsman=' + draftsman + - '&assessor=' + assessor + '&focalUnit=' + focalUnit) + '&userId=' + val.userId + '&userName=admin' + '&serialNumber=' + serialNumber + + '&standName=' + standName + '&replaceStand=' + replaceStand + '&drafts=' + drafts + + '&estDepart=' + estDepart + '&focalUnit=' + focalUnit + '&watermark=' + watermark) } }) } else { diff --git a/jero-web/vue.config.js b/jero-web/vue.config.js index 3da824f..3c3e9bc 100644 --- a/jero-web/vue.config.js +++ b/jero-web/vue.config.js @@ -82,16 +82,16 @@ module.exports = { ws: false, changeOrigin: true, pathRewrite: { - '/laws-sinotruk': '' //默认所有请求都加了jero-boot前缀，需要去掉 + '/byd-structuredplugins-serve ': '' //默认所有请求都加了jero-boot前缀，需要去掉 } }, */ - '/laws-sinotruk': { + '/byd-structuredplugins-serve': { host: '0.0.0.0', target: 'http://localhost:8184', ws: false, changeOrigin: true, pathRewrite: { - // '/laws-sinotruk': '' // 默认所有请求都加了jero-boot前缀，需要去掉 + // '/byd-structuredplugins-serve ': '' // 默认所有请求都加了jero-boot前缀，需要去掉 } } }