diff --git a/agent/app/repo/cronjob.go b/agent/app/repo/cronjob.go index 3f3db6648..c55081a08 100644 --- a/agent/app/repo/cronjob.go +++ b/agent/app/repo/cronjob.go @@ -147,7 +147,7 @@ func (u *CronjobRepo) StartRecords(cronjobID uint, targetPath, cronjobType strin var record model.JobRecords record.StartTime = time.Now() record.CronjobID = cronjobID - if cronjobType != "directory" && cronjobType != "log" { + if cronjobType != "directory" && cronjobType != "log" && cronjobType != "cutWebsiteLog" { record.TaskID = uuid.New().String() } record.Status = constant.StatusWaiting diff --git a/agent/app/service/app.go b/agent/app/service/app.go index a781ab4d6..74e465522 100644 --- a/agent/app/service/app.go +++ b/agent/app/service/app.go @@ -981,15 +981,13 @@ func (a AppService) SyncAppListFromRemote(taskID string) (err error) { t.LogStart(i18n.GetMsgByKey("SyncAppDetail")) for _, l := range list.Apps { app := appsMap[l.AppProperty.Key] - _, iconRes, err := req_helper.HandleRequest(l.Icon, http.MethodGet, constant.TimeOut20s) - if err != nil { - return err - } iconStr := "" - if !strings.Contains(string(iconRes), "") { - iconStr = base64.StdEncoding.EncodeToString(iconRes) + _, iconRes, err := req_helper.HandleRequest(l.Icon, http.MethodGet, constant.TimeOut20s) + if err == nil { + if !strings.Contains(string(iconRes), "") { + iconStr = base64.StdEncoding.EncodeToString(iconRes) + } } - app.Icon = iconStr app.TagsKey = l.AppProperty.Tags if l.AppProperty.Recommend > 0 { @@ -1171,7 +1169,6 @@ func (a AppService) SyncAppListFromRemote(taskID string) (err error) { _ = settingService.Update("AppStoreSyncStatus", constant.StatusSyncSuccess) _ = settingService.Update("AppStoreLastModified", strconv.Itoa(list.LastModified)) - t.Log(i18n.GetMsgByKey("AppStoreSyncSuccess")) return nil }, nil) diff --git a/agent/app/task/task.go b/agent/app/task/task.go index ba4b1836b..34fa0ad5e 100644 --- a/agent/app/task/task.go +++ b/agent/app/task/task.go @@ -224,9 +224,6 @@ func (t *Task) Execute() error { } if t.Task.Status == constant.StatusExecuting { t.Task.Status = constant.StatusSuccess - t.Log(i18n.GetWithName("TaskSuccess", t.Name)) - } else { - t.Log(i18n.GetWithName("TaskFailed", t.Name)) } t.Log("[TASK-END]") t.Task.EndAt = time.Now() diff --git a/frontend/src/components/log/container/index.vue b/frontend/src/components/log/container/index.vue index 94df87125..eeb86977c 100644 --- a/frontend/src/components/log/container/index.vue +++ b/frontend/src/components/log/container/index.vue @@ -252,7 +252,7 @@ onMounted(() => { } .log-container { - height: calc(100vh - 320px); + height: calc(100vh - 350px); overflow-y: auto; overflow-x: auto; position: relative; diff --git a/frontend/src/components/table-setting/index.vue b/frontend/src/components/table-setting/index.vue index c1e226cca..bb888d639 100644 --- a/frontend/src/components/table-setting/index.vue +++ b/frontend/src/components/table-setting/index.vue @@ -26,6 +26,7 @@ const refreshRate = ref(0); const emit = defineEmits(['search']); const props = defineProps({ title: String, + rate: Number, }); let timer: NodeJS.Timer | null = null; @@ -57,10 +58,15 @@ onUnmounted(() => { }); onMounted(() => { - if (props.title) { + if (props.title && localStorage.getItem(props.title) != null) { let rate = Number(localStorage.getItem(props.title)); refreshRate.value = rate ? Number(rate) : 0; changeRefresh(); + return; + } + if (props.rate) { + refreshRate.value = props.rate; + changeRefresh(); } }); diff --git a/frontend/src/components/task-list/index.vue b/frontend/src/components/task-list/index.vue index c008ed130..4888143e2 100644 --- a/frontend/src/components/task-list/index.vue +++ b/frontend/src/components/task-list/index.vue @@ -11,7 +11,7 @@ - +