diff --git a/agent/app/service/file.go b/agent/app/service/file.go index faf98baff..74bf5d399 100644 --- a/agent/app/service/file.go +++ b/agent/app/service/file.go @@ -4,7 +4,6 @@ import ( "bufio" "context" "fmt" - "github.com/1Panel-dev/1Panel/agent/app/dto" "io" "io/fs" "os" @@ -17,6 +16,8 @@ import ( "time" "unicode/utf8" + "github.com/1Panel-dev/1Panel/agent/app/dto" + "github.com/1Panel-dev/1Panel/agent/app/repo" "github.com/1Panel-dev/1Panel/agent/app/dto/request" @@ -492,7 +493,7 @@ func (f *FileService) ReadLogByLine(req request.FileReadByLineReq) (*response.Fi if req.TaskID != "" { opts = append(opts, taskRepo.WithByID(req.TaskID)) } else { - opts = append(opts, repo.WithByType(req.TaskType), taskRepo.WithOperate(req.TaskOperate), taskRepo.WithResourceID(req.ResourceID)) + opts = append(opts, repo.WithOrderRuleBy("created_at", "desc"), repo.WithByType(req.TaskType), taskRepo.WithOperate(req.TaskOperate), taskRepo.WithResourceID(req.ResourceID)) } taskModel, err := taskRepo.GetFirst(opts...) if err != nil { diff --git a/core/app/service/script_library.go b/core/app/service/script_library.go index 92491e0fa..546c82444 100644 --- a/core/app/service/script_library.go +++ b/core/app/service/script_library.go @@ -154,13 +154,13 @@ func LoadScriptInfo(id uint) (model.ScriptLibrary, error) { } func (u *ScriptService) Sync() error { - syncTask, err := task.NewTaskWithOps(i18n.GetMsgByKey("LocalApp"), task.TaskSync, task.TaskScopeScript, "", 0) + syncTask, err := task.NewTaskWithOps(i18n.GetMsgByKey("ScriptLibrary"), task.TaskSync, task.TaskScopeScript, "", 0) if err != nil { global.LOG.Errorf("create sync task failed %v", err) return err } - syncTask.AddSubTask(task.GetTaskName(i18n.GetMsgByKey("LocalApp"), task.TaskSync, task.TaskScopeScript), func(t *task.Task) (err error) { + syncTask.AddSubTask(task.GetTaskName(i18n.GetMsgByKey("ScriptLibrary"), task.TaskSync, task.TaskScopeScript), func(t *task.Task) (err error) { versionUrl := fmt.Sprintf("%s/scripts/version.txt", global.CONF.RemoteURL.ResourceURL) _, versionRes, err := req_helper.HandleRequest(versionUrl, http.MethodGet, constant.TimeOut20s) if err != nil { diff --git a/core/i18n/lang/en.yaml b/core/i18n/lang/en.yaml index ff4c4335d..abb4a8ecb 100644 --- a/core/i18n/lang/en.yaml +++ b/core/i18n/lang/en.yaml @@ -113,6 +113,8 @@ RestartAfterUpgrade: "Start service after upgrade" #add node TaskAddNode: "Add node" +LoadNodeArch: "Get node architecture info" +LoadNodeArchDetail: "Detected master node architecture: {{ .local }}, child node architecture: {{ .node }}" SyncAgentBaseInfo: "Sync basic node info" GenerateSSLInfo: "Generate node SSL info" ConnInfoNotMatch: "Connection info mismatch" diff --git a/core/i18n/lang/ja.yaml b/core/i18n/lang/ja.yaml index 2463c3d76..8ba169839 100644 --- a/core/i18n/lang/ja.yaml +++ b/core/i18n/lang/ja.yaml @@ -114,6 +114,8 @@ RestartAfterUpgrade: "アップグレード後にサービスを起動" #add node TaskAddNode: "ノードを追加" +LoadNodeArch: "ノードアーキテクチャ情報を取得" +LoadNodeArchDetail: "検出されたマスターノードアーキテクチャ: {{ .local }}, 子ノードアーキテクチャ: {{ .node }}" SyncAgentBaseInfo: "ノードの基本情報を同期" GenerateSSLInfo: "ノードのSSL情報を生成" ConnInfoNotMatch: "接続情報が一致しません" diff --git a/core/i18n/lang/ko.yaml b/core/i18n/lang/ko.yaml index e85682a68..cfbf9cb51 100644 --- a/core/i18n/lang/ko.yaml +++ b/core/i18n/lang/ko.yaml @@ -113,6 +113,8 @@ RestartAfterUpgrade: "업그레이드 후 서비스 시작" #add node TaskAddNode: "노드 추가" +LoadNodeArch: "노드 아키텍처 정보 가져오기" +LoadNodeArchDetail: "감지된 마스터 노드 아키텍처: {{ .local }}, 자식 노드 아키텍처: {{ .node }}" SyncAgentBaseInfo: "노드 기본 데이터 동기화" GenerateSSLInfo: "노드 SSL 정보 생성" ConnInfoNotMatch: "연결 정보가 일치하지 않음" diff --git a/core/i18n/lang/ms.yml b/core/i18n/lang/ms.yml index 699e0f03c..f12d7735d 100644 --- a/core/i18n/lang/ms.yml +++ b/core/i18n/lang/ms.yml @@ -113,6 +113,8 @@ RestartAfterUpgrade: "Mulakan perkhidmatan selepas naik taraf" #add node TaskAddNode: "Tambah nod" +LoadNodeArch: "Dapatkan maklumat seni bina nod" +LoadNodeArchDetail: "Mengesan seni bina nod induk: {{ .local }}, seni bina nod anak: {{ .node }}" SyncAgentBaseInfo: "Sinkronkan maklumat asas nod" GenerateSSLInfo: "Cipta maklumat SSL nod" ConnInfoNotMatch: "Maklumat sambungan tidak sepadan" diff --git a/core/i18n/lang/pt-BR.yaml b/core/i18n/lang/pt-BR.yaml index ddb13723f..dba84a3f8 100644 --- a/core/i18n/lang/pt-BR.yaml +++ b/core/i18n/lang/pt-BR.yaml @@ -113,6 +113,8 @@ RestartAfterUpgrade: "Iniciar serviço após a atualização" #add node TaskAddNode: "Adicionar nó" +LoadNodeArch: "Obter informações de arquitetura do nó" +LoadNodeArchDetail: "Arquitetura do nó mestre detectada: {{ .local }}, arquitetura do nó filho: {{ .node }}" SyncAgentBaseInfo: "Sincronizando dados básicos do nó" GenerateSSLInfo: "Gerando informações SSL do nó" ConnInfoNotMatch: "As informações de conexão não coincidem" diff --git a/core/i18n/lang/ru.yaml b/core/i18n/lang/ru.yaml index 0fbcfe861..f4e9d160d 100644 --- a/core/i18n/lang/ru.yaml +++ b/core/i18n/lang/ru.yaml @@ -113,6 +113,8 @@ RestartAfterUpgrade: "Запуск службы после обновления" #add node TaskAddNode: "Добавить узел" +LoadNodeArch: "Получить информацию об архитектуре узла" +LoadNodeArchDetail: "Обнаружена архитектура главного узла: {{ .local }}, архитектура дочернего узла: {{ .node }}" SyncAgentBaseInfo: "Синхронизировать базовую информацию узла" GenerateSSLInfo: "Сгенерировать SSL информацию узла" ConnInfoNotMatch: "Информация о соединении не совпадает" diff --git a/core/i18n/lang/zh-Hant.yaml b/core/i18n/lang/zh-Hant.yaml index 60ab8a71d..62c7b139e 100644 --- a/core/i18n/lang/zh-Hant.yaml +++ b/core/i18n/lang/zh-Hant.yaml @@ -113,6 +113,8 @@ RestartAfterUpgrade: "升級後啟動服務" #add node TaskAddNode: "添加節點" +LoadNodeArch: "獲取節點架構信息" +LoadNodeArchDetail: "檢測到主節點架構:{{ .local }},子節點架構:{{ .node }}" SyncAgentBaseInfo: "同步節點基礎數據" GenerateSSLInfo: "生成節點 SSL 信息" ConnInfoNotMatch: "連接信息不匹配" diff --git a/core/i18n/lang/zh.yaml b/core/i18n/lang/zh.yaml index c1c78a425..f56ec51dd 100644 --- a/core/i18n/lang/zh.yaml +++ b/core/i18n/lang/zh.yaml @@ -114,6 +114,8 @@ RestartAfterUpgrade: "升级后启动服务" #add node TaskAddNode: "添加节点" +LoadNodeArch: "获取节点架构信息" +LoadNodeArchDetail: "检测到主节点架构:{{ .local }},子节点架构:{{ .node }}" SyncAgentBaseInfo: "同步节点基础数据" GenerateSSLInfo: "生成节点 SSL 信息" ConnInfoNotMatch: "连接信息不匹配" diff --git a/core/utils/common/common.go b/core/utils/common/common.go index 54eb1cdd8..69c382156 100644 --- a/core/utils/common/common.go +++ b/core/utils/common/common.go @@ -121,6 +121,9 @@ func LoadArch() (string, error) { if err != nil { return "", fmt.Errorf("std: %s, err: %s", std, err.Error()) } + return LoadArchWithStdout(std) +} +func LoadArchWithStdout(std string) (string, error) { if strings.Contains(std, "x86_64") { return "amd64", nil }