diff --git a/.gitignore b/.gitignore index c94e2fa4b..0ff6f7cfa 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ yarn-error.log yarn.lock package-lock.json *bak +pom.xml.versionsBackup .vscode # visual studio code diff --git a/modules/server/src/main/java/io/jpom/model/log/MonitorNotifyLog.java b/modules/server/src/main/java/io/jpom/model/log/MonitorNotifyLog.java index e46453ea5..08e86035f 100644 --- a/modules/server/src/main/java/io/jpom/model/log/MonitorNotifyLog.java +++ b/modules/server/src/main/java/io/jpom/model/log/MonitorNotifyLog.java @@ -190,4 +190,9 @@ public class MonitorNotifyLog extends BaseWorkspaceModel { public void setStatus(boolean status) { this.status = status; } + + @Override + public void setModifyUser(String modifyUser) { + + } } diff --git a/script/replaceVersion.sh b/script/replaceVersion.sh index 2799cd90d..212d940cf 100644 --- a/script/replaceVersion.sh +++ b/script/replaceVersion.sh @@ -28,11 +28,15 @@ fi cd ../ && mvn versions:set -DnewVersion=$1 # 替换 jpom.io 主页版本号 -sed -i "s/${old_version}/${new_version}/g" $pwd/../docs/js/version.js +sed -i.bak "s/${old_version}/${new_version}/g" $pwd/../docs/js/version.js # 替换远程更新包的版本号 -sed -i "s/${old_version}/${new_version}/g" $pwd/../docs/version.json +sed -i.bak "s/${old_version}/${new_version}/g" $pwd/../docs/versions.json # 替换 docker 中的版本 -sed -i "s/${old_version}/${new_version}/g" $pwd/../.env +sed -i.bak "s/${old_version}/${new_version}/g" $pwd/../.env + +# 替换 Dockerfile 中的版本 +sed -i.bak "s/${old_version}/${new_version}/g" $pwd/../modules/server/Dockerfile +sed -i.bak "s/${old_version}/${new_version}/g" $pwd/../modules/agent/Dockerfile # 保留新版本号 echo "$new_version" > $pwd/../docs/version.txt