From 5b8d3e6c37cf45a7885dacaf286f9e83d976f977 Mon Sep 17 00:00:00 2001 From: liuzhihang1 <1625167628@qq.com> Date: Fri, 7 Feb 2025 06:19:04 +0000 Subject: [PATCH 1/6] ignore pty input log --- internal/app/service/process_pty.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/app/service/process_pty.go b/internal/app/service/process_pty.go index a764b6c..40d25f3 100644 --- a/internal/app/service/process_pty.go +++ b/internal/app/service/process_pty.go @@ -78,13 +78,11 @@ func (p *ProcessPty) SetTerminalSize(cols, rows int) { } func (p *ProcessPty) WriteBytes(input []byte) (err error) { - p.logReportHandler(config.CF.ProcessInputPrefix + string(input)) _, err = p.pty.Write(input) return } func (p *ProcessPty) Write(input string) (err error) { - p.logReportHandler(config.CF.ProcessInputPrefix + input) _, err = p.pty.Write([]byte(input)) return } From 85b3f68919e04b466374e8e84cf590d762095fbf Mon Sep 17 00:00:00 2001 From: liuzhihang1 <1625167628@qq.com> Date: Fri, 7 Feb 2025 09:32:14 +0000 Subject: [PATCH 2/6] supoort process choice --- internal/app/api/log.go | 27 +++++++++---------- internal/app/route/templates/index.html | 2 +- .../app/route/templates/js/about.59baee17.js | 1 + .../app/route/templates/js/about.99a27370.js | 1 - .../app/route/templates/js/app.35a813b1.js | 1 - .../app/route/templates/js/app.6d305a90.js | 1 + 6 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 internal/app/route/templates/js/about.59baee17.js delete mode 100644 internal/app/route/templates/js/about.99a27370.js delete mode 100644 internal/app/route/templates/js/app.35a813b1.js create mode 100644 internal/app/route/templates/js/app.6d305a90.js diff --git a/internal/app/api/log.go b/internal/app/api/log.go index 29bd88b..056b223 100644 --- a/internal/app/api/log.go +++ b/internal/app/api/log.go @@ -1,6 +1,8 @@ package api import ( + "slices" + "github.com/lzh-1625/go_process_manager/internal/app/constants" "github.com/lzh-1625/go_process_manager/internal/app/model" "github.com/lzh-1625/go_process_manager/internal/app/repository" @@ -14,22 +16,19 @@ type logApi struct{} var LogApi = new(logApi) func (a *logApi) GetLog(ctx *gin.Context, req model.GetLogReq) { - filterName := make([]string, 0, len(req.FilterName)) - processNameList := repository.PermissionRepository.GetProcessNameByPermission(getUserName(ctx), constants.OPERATION_LOG) - if len(filterName) != 0 { - for _, v := range processNameList { - for _, m := range req.FilterName { - if v == m { - filterName = append(filterName, m) - break - } - } - } + if isAdmin(ctx) { + rOk(ctx, "Query successful!", service.LogServiceImpl.Search(req, req.FilterName...)) } else { - filterName = append(filterName, processNameList...) + processNameList := repository.PermissionRepository.GetProcessNameByPermission(getUserName(ctx), constants.OPERATION_LOG) + filterName := slices.DeleteFunc(req.FilterName, func(s string) bool { + return !slices.Contains(processNameList, s) + }) + if len(filterName) == 0 { + filterName = processNameList + } + errCheck(ctx, len(filterName) == 0, "No information found!") + rOk(ctx, "Query successful!", service.LogServiceImpl.Search(req, filterName...)) } - errCheck(ctx, !isAdmin(ctx) && len(filterName) == 0, "No information found!") - rOk(ctx, "Query successful!", service.LogServiceImpl.Search(req, filterName...)) } func (a *logApi) GetRunningLog(ctx *gin.Context) { diff --git a/internal/app/route/templates/index.html b/internal/app/route/templates/index.html index 69caf36..840c8fa 100644 --- a/internal/app/route/templates/index.html +++ b/internal/app/route/templates/index.html @@ -1 +1 @@ -