ToolTech/tool-tech-front
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release-v1.0 #1

Merged
panchichun merged 57 commits from release-v1.0 into main 2024-09-13 17:04:18 +08:00
Conversation 0 Commits 57 Files Changed 101 +40 -7
6 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 014341b671 - Show all commits

4
.env.development
View File

@ -7,11 +7,11 @@ ENV = 'development'
VUE_APP_CONTEXT_PATH = '/tool-tech'
# 工具与技术交流管理系统/开发环境
VUE_APP_BASE_API = 'http://localhost:8080/tool-tech-admin'
VUE_APP_BASE_API = '/tool-tech-admin'
VUE_APP_WS_URL = 'ws://localhost:8080/tool-tech-admin/websocket'
# 文档在线预览服务
VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://localhost:8012/tool-tech-file-view'
VUE_APP_TOOL_TECH_FILE_VIEW_API = '/tool-tech-file-view'
# 流程管理服务地址
VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'

6
.env.staging
View File

@ -9,11 +9,11 @@ ENV = 'staging'
VUE_APP_CONTEXT_PATH = '/tool-tech'
# 工具与技术交流管理系统/测试环境
VUE_APP_BASE_API = 'https://www.rzdata.net/tool-tech-admin'
VUE_APP_WS_URL = 'wss://www.rzdata.net/tool-tech-admin/websocket'
VUE_APP_BASE_API = '/tool-tech-admin'
VUE_APP_WS_URL = '/tool-tech-admin/websocket'
# 文档在线预览服务
VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://192.168.1.2:8012/tool-tech-file-view'
VUE_APP_TOOL_TECH_FILE_VIEW_API = '/tool-tech-file-view'
# 流程管理服务地址
VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'

24
default.conf
View File

@ -15,6 +15,30 @@ server {
}
}
location ^~/tool-tech-admin/ {
proxy_pass http://124.223.108.21:8080/tool-tech-admin/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_ssl_verify off;
}
location ^~/tool-tech-file-view/ {
proxy_pass http://124.223.108.21:8012/tool-tech-file-view/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_ssl_verify off;
}
location ^~/ebpm-process-manage/ {
proxy_pass http://124.223.108.21:9080/ebpm-process-manage/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_ssl_verify off;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;

1
src/components/FileUpload/optimizeUpload.vue
View File

@ -324,7 +324,6 @@ export default {
fileNewName: res.data.newFileName,
suffixType: res.data.suffixType
}
console.info("data===========", data)
self.$emit("handleSuccess", data)
},
/** 清空文件 **/

5
src/views/document/index.vue
View File

@ -453,7 +453,10 @@ export default {
},
handlePreview(row){
this.viewDialogOpen = true;
this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
let protocol = window.location.protocol
let hostname = window.location.hostname;
let getDocUrl = protocol + '//' + hostname + ':8080' + process.env.VUE_APP_BASE_API
this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(getDocUrl + row.docUrl));
this.viewDialogTitle = '文档在线预览'
},
// 多选框选中数据

7
vue.config.js
View File

@ -41,6 +41,13 @@ module.exports = {
['^' + process.env.VUE_APP_BASE_API]: ''
}
},
[process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API]: {
target: `http://localhost:8012/tool-tech-file-view`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API]: ''
}
},
[process.env.VUE_APP_WORKFLOW_MANAGE_URL]: {
target: `http://124.223.108.21:9080/ebpm-process-manage`,
changeOrigin: true,