1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-12-18 21:38:57 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fixed issue where original Compose file content was cleared during comparison (#10880)

Browse source
This commit is contained in:
CityFun 2025-11-07 14:46:30 +08:00 • committed by GitHub
parent 9d84120181
commit 7fa39687b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
agent/app/service/cronjob_helper.go
View file

@ -243,7 +243,7 @@ func (u *CronjobService) handleCleanLog(cronjob model.Cronjob, taskItem *task.Ta
} }
appInstall, _ := getAppInstallByKey(constant.AppOpenresty) appInstall, _ := getAppInstallByKey(constant.AppOpenresty)
if appInstall.ID > 0 { if appInstall.ID > 0 {
curStr := i18n.GetWithName("CleanLogByName", "Openresty") curStr := i18n.GetWithName("CleanLogByName", "OpenResty")
t.LogStart(curStr) t.LogStart(curStr)
accessLogPath := path.Join(appInstall.GetPath(), "log", "access.log") accessLogPath := path.Join(appInstall.GetPath(), "log", "access.log")
if err := os.Truncate(accessLogPath, 0); err != nil { if err := os.Truncate(accessLogPath, 0); err != nil {

4
frontend/src/views/app-store/installed/detail/index.vue
View file

@ -208,7 +208,9 @@ const composeDiffRef = ref();
const rawCompose = ref(''); const rawCompose = ref('');
const getNewCompose = (compose: string) => { const getNewCompose = (compose: string) => {
paramModel.dockerCompose = compose; if (compose != '') {
paramModel.dockerCompose = compose;
}
}; };
const openDiff = () => { const openDiff = () => {