test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-02 03:48:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'beta'

Browse Source 
# Conflicts:
#	modules/agent-transport/agent-transport-common/pom.xml
#	modules/agent-transport/agent-transport-http/pom.xml
#	modules/agent-transport/pom.xml
#	modules/agent/pom.xml
#	modules/common/pom.xml
#	modules/common/src/main/resources/banner.txt
#	modules/server/pom.xml
#	modules/storage-module/pom.xml
#	modules/storage-module/storage-module-common/pom.xml
#	modules/storage-module/storage-module-h2/pom.xml
#	modules/storage-module/storage-module-mysql/pom.xml
#	modules/sub-plugin/docker-cli/pom.xml
#	modules/sub-plugin/email/pom.xml
#	modules/sub-plugin/encrypt/pom.xml
#	modules/sub-plugin/git-clone/pom.xml
#	modules/sub-plugin/pom.xml
#	modules/sub-plugin/ssh-jsch/pom.xml
#	modules/sub-plugin/svn-clone/pom.xml
#	modules/sub-plugin/webhook/pom.xml
#	modules/updater/pom.xml
#	pom.xml
This commit is contained in:
bwcx_jzy 2023-08-25 08:09:38 +08:00
commit 2117c0a5c4
No known key found for this signature in database
GPG Key ID: E187D6E9DDDE8C53
6 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG-BETA.md
View File

@ -1,6 +1,14 @@
# 🚀 版本日志
### 2.10.42.5-beta
### 2.10.42.6-beta (2023-08-23)
### 🐞 解决BUG、优化功能
1. 【server】修复 未配置集群地址时无法切换工作空间（感谢@ccx2480）
------
### 2.10.42.5-beta (2023-08-23)
### 🐣 新增功能

2
env-beta.env
View File

@ -1,3 +1,3 @@
JPOM_VERSION=2.10.42.4
JPOM_VERSION=2.10.42.6
# Server Token 生产部署请更换
SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97

2
modules/server/DockerfileBeta
View File

@ -29,7 +29,7 @@ LABEL maintainer="bwcx-jzy <bwcx_jzy@163.com>"
LABEL documentation="https://jpom.top"
ENV JPOM_HOME /usr/local/jpom-server
ENV JPOM_PKG_VERSION 2.10.42.4
ENV JPOM_PKG_VERSION 2.10.42.6
ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz
ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1

2
modules/server/DockerfileBetaJdk17
View File

@ -29,7 +29,7 @@ LABEL maintainer="bwcx-jzy <bwcx_jzy@163.com>"
LABEL documentation="https://jpom.top"
ENV JPOM_HOME /usr/local/jpom-server
ENV JPOM_PKG_VERSION 2.10.42.4
ENV JPOM_PKG_VERSION 2.10.42.6
ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz
ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1

2
script/tag.beta.txt
View File

@ -1 +1 @@
2.10.42.4
2.10.42.6

14
web-vue/src/pages/layout/user-header.vue
View File

@ -773,7 +773,7 @@ export default {
const cluster = this.myClusterList.find((item2) => {
return item2.id === item.clusterInfoId;
});
if (cluster && location.href.indexOf(cluster.url) !== 0) {
if (cluster && cluster.url && location.href.indexOf(cluster.url) !== 0) {
let url = `${cluster.url}/#/${this.$route.fullPath}`.replace(/[\\/]+[\\/]/g, "/").replace(":/", "://");
url = url.replace(`wid=${this.selectWorkspace.id}`, `wid=${item.id}`);
// console.log(location.href.indexOf(cluster.url), url);
@ -791,9 +791,15 @@ export default {
},
// 集群切换
handleClusterChange(item) {
const url = `${item.url}/#/${this.$route.fullPath}`.replace(/[\\/]+[\\/]/g, "/").replace(":/", "://");
// console.log(url);
location.href = url;
if (item.url) {
const url = `${item.url}/#/${this.$route.fullPath}`.replace(/[\\/]+[\\/]/g, "/").replace(":/", "://");
// console.log(url);
location.href = url;
} else {
this.$notification.error({
message: "还未配置集群地址,不能切换集群",
});
}
},
tabChange(key) {
if (key === 1) {