diff --git a/backend/app/service/image.go b/backend/app/service/image.go index ef3235a7e..3e67c842d 100644 --- a/backend/app/service/image.go +++ b/backend/app/service/image.go @@ -110,8 +110,8 @@ func (u *ImageService) ImageBuild(req dto.ImageBuild) (string, error) { } } - path := fmt.Sprintf("%s/Dockerfile", dir) - file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666) + pathItem := fmt.Sprintf("%s/Dockerfile", dir) + file, err := os.OpenFile(pathItem, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666) if err != nil { return "", err } @@ -134,8 +134,8 @@ func (u *ImageService) ImageBuild(req dto.ImageBuild) (string, error) { } logName := fmt.Sprintf("%s/build.log", req.Dockerfile) - path := logName - file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666) + pathItem := logName + file, err := os.OpenFile(pathItem, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666) if err != nil { return "", err } @@ -165,8 +165,10 @@ func (u *ImageService) ImagePull(req dto.ImagePull) (string, error) { return "", err } } - path := fmt.Sprintf("%s/image_pull_%s_%s.log", dockerLogDir, strings.ReplaceAll(req.ImageName, ":", "_"), time.Now().Format("20060102150405")) - file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666) + imageItemName := strings.ReplaceAll(req.ImageName, ":", "_") + imageItemName = strings.ReplaceAll(imageItemName, "/", "@") + pathItem := fmt.Sprintf("%s/image_pull_%s_%s.log", dockerLogDir, imageItemName, time.Now().Format("20060102150405")) + file, err := os.OpenFile(pathItem, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666) if err != nil { return "", err } @@ -182,7 +184,7 @@ func (u *ImageService) ImagePull(req dto.ImagePull) (string, error) { global.LOG.Debugf("pull image %s successful!", req.ImageName) _, _ = io.Copy(file, out) }() - return path, nil + return pathItem, nil } repo, err := imageRepoRepo.Get(commonRepo.WithByID(req.RepoID)) if err != nil { @@ -213,7 +215,7 @@ func (u *ImageService) ImagePull(req dto.ImagePull) (string, error) { global.LOG.Debugf("pull image %s successful!", req.ImageName) _, _ = io.Copy(file, out) }() - return path, nil + return pathItem, nil } func (u *ImageService) ImageLoad(req dto.ImageLoad) error { @@ -294,14 +296,15 @@ func (u *ImageService) ImagePush(req dto.ImagePush) (string, error) { return "", err } } - if _, err := os.Stat(dockerLogDir); err != nil && os.IsNotExist(err) { if err = os.MkdirAll(dockerLogDir, os.ModePerm); err != nil { return "", err } } - path := fmt.Sprintf("%s/image_push_%s_%s.log", dockerLogDir, strings.ReplaceAll(req.Name, ":", "_"), time.Now().Format("20060102150405")) - file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666) + imageItemName := strings.ReplaceAll(req.Name, ":", "_") + imageItemName = strings.ReplaceAll(imageItemName, "/", "@") + pathItem := fmt.Sprintf("%s/image_push_%s_%s.log", dockerLogDir, imageItemName, time.Now().Format("20060102150405")) + file, err := os.OpenFile(pathItem, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666) if err != nil { return "", err } @@ -317,7 +320,7 @@ func (u *ImageService) ImagePush(req dto.ImagePush) (string, error) { _, _ = io.Copy(file, out) }() - return path, nil + return pathItem, nil } func (u *ImageService) ImageRemove(req dto.BatchDelete) error { diff --git a/frontend/src/views/app-store/detail/params/index.vue b/frontend/src/views/app-store/detail/params/index.vue index 6f6096482..aa2f485f2 100644 --- a/frontend/src/views/app-store/detail/params/index.vue +++ b/frontend/src/views/app-store/detail/params/index.vue @@ -13,6 +13,7 @@ v-if="p.type == 'password'" :type="p.type" show-password + clearable @change="updateParam" > - + @@ -19,7 +19,7 @@ diff --git a/frontend/src/views/container/container/create/index.vue b/frontend/src/views/container/container/create/index.vue index 22f0da15a..9f8ea0eaa 100644 --- a/frontend/src/views/container/container/create/index.vue +++ b/frontend/src/views/container/container/create/index.vue @@ -7,7 +7,7 @@ - + diff --git a/frontend/src/views/container/image/build/index.vue b/frontend/src/views/container/image/build/index.vue index d60e80526..d197bafa5 100644 --- a/frontend/src/views/container/image/build/index.vue +++ b/frontend/src/views/container/image/build/index.vue @@ -13,7 +13,7 @@ - + diff --git a/frontend/src/views/container/image/index.vue b/frontend/src/views/container/image/index.vue index 061a7674f..b6b75ffec 100644 --- a/frontend/src/views/container/image/index.vue +++ b/frontend/src/views/container/image/index.vue @@ -9,7 +9,7 @@ {{ $t('container.startIn') }} - + - - + diff --git a/frontend/src/views/container/image/pull/index.vue b/frontend/src/views/container/image/pull/index.vue index 160e5471b..f645d969c 100644 --- a/frontend/src/views/container/image/pull/index.vue +++ b/frontend/src/views/container/image/pull/index.vue @@ -26,7 +26,7 @@ - + diff --git a/frontend/src/views/container/image/push/index.vue b/frontend/src/views/container/image/push/index.vue index 511c190c1..f366d9bdc 100644 --- a/frontend/src/views/container/image/push/index.vue +++ b/frontend/src/views/container/image/push/index.vue @@ -23,7 +23,7 @@ - + diff --git a/frontend/src/views/container/image/save/index.vue b/frontend/src/views/container/image/save/index.vue index b4c7df365..29d16abee 100644 --- a/frontend/src/views/container/image/save/index.vue +++ b/frontend/src/views/container/image/save/index.vue @@ -18,7 +18,7 @@ - + diff --git a/frontend/src/views/container/network/create/index.vue b/frontend/src/views/container/network/create/index.vue index ee325f6fc..8ea704e63 100644 --- a/frontend/src/views/container/network/create/index.vue +++ b/frontend/src/views/container/network/create/index.vue @@ -7,7 +7,7 @@ - + @@ -26,13 +26,13 @@ /> - + - + - + @@ -20,15 +20,20 @@ - + - + diff --git a/frontend/src/views/container/setting/index.vue b/frontend/src/views/container/setting/index.vue index 7260fc39b..b1870b075 100644 --- a/frontend/src/views/container/setting/index.vue +++ b/frontend/src/views/container/setting/index.vue @@ -29,7 +29,7 @@ - + diff --git a/frontend/src/views/container/template/operator/index.vue b/frontend/src/views/container/template/operator/index.vue index 5aec5d057..3587d5f69 100644 --- a/frontend/src/views/container/template/operator/index.vue +++ b/frontend/src/views/container/template/operator/index.vue @@ -7,7 +7,7 @@ - + diff --git a/frontend/src/views/container/volume/create/index.vue b/frontend/src/views/container/volume/create/index.vue index a9f7a14ad..d4fb0c295 100644 --- a/frontend/src/views/container/volume/create/index.vue +++ b/frontend/src/views/container/volume/create/index.vue @@ -7,7 +7,7 @@ - + diff --git a/frontend/src/views/cronjob/index.vue b/frontend/src/views/cronjob/index.vue index 202d6551b..a0c3a8ff2 100644 --- a/frontend/src/views/cronjob/index.vue +++ b/frontend/src/views/cronjob/index.vue @@ -139,9 +139,9 @@ const onOpenDialog = async ( rowData: Partial = { specType: 'perMonth', week: 1, - day: 1, - hour: 2, - minute: 3, + day: 3, + hour: 1, + minute: 30, keepLocal: true, retainCopies: 7, }, diff --git a/frontend/src/views/cronjob/operate/index.vue b/frontend/src/views/cronjob/operate/index.vue index 94eee5ab1..6bbc617a1 100644 --- a/frontend/src/views/cronjob/operate/index.vue +++ b/frontend/src/views/cronjob/operate/index.vue @@ -7,21 +7,17 @@ - + - + - + @@ -65,11 +61,7 @@ - + @@ -87,12 +79,7 @@ :label="$t('cronjob.sourceDir')" prop="sourceDir" > - + @@ -124,8 +111,8 @@ - - + + { if (!formEl) return; diff --git a/frontend/src/views/database/mysql/create/index.vue b/frontend/src/views/database/mysql/create/index.vue index f150b0696..e453a79e9 100644 --- a/frontend/src/views/database/mysql/create/index.vue +++ b/frontend/src/views/database/mysql/create/index.vue @@ -7,7 +7,7 @@ - +