Merge branch 'master' into dev

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))
+	if isAdmin(ctx) {
-	processNameList := repository.PermissionRepository.GetProcessNameByPermission(getUserName(ctx), constants.OPERATION_LOG)
+		rOk(ctx, "Query successful!", service.LogServiceImpl.Search(req, req.FilterName...))
-	if len(filterName) != 0 {
-		for _, v := range processNameList {
-			for _, m := range req.FilterName {
-				if v == m {
-					filterName = append(filterName, m)
-					break
-				}
-			}
-		}
 	} 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, !isAdmin(ctx) && len(filterName) == 0, "No information found!")
+		errCheck(ctx, len(filterName) == 0, "No information found!")
 		rOk(ctx, "Query successful!", service.LogServiceImpl.Search(req, filterName...))
+	}
 }
 
 func (a *logApi) GetRunningLog(ctx *gin.Context) {

internal/app/model/es.go

@@ -91,7 +91,7 @@ type ProcessLog struct {
 	Id    int    `json:"id,omitempty" gorm:"primaryKey;autoIncrement;column:id" `
 	Log   string `json:"log" gorm:"column:log" type:"text"`
 	Time  int64  `json:"time" gorm:"column:time" type:"long"`
-	Name  string `json:"name" gorm:"column:name" type:"keyword"`
+	Name  string `json:"name" gorm:"column:name" type:"text"`
 	Using string `json:"using" gorm:"column:using" type:"keyword"`
 }
 

internal/app/route/route.go

@@ -1,7 +1,6 @@
 package route
 
 import (
-	"embed"
 	"io/fs"
 	"net/http"
 
@@ -10,6 +9,7 @@ import (
 	"github.com/lzh-1625/go_process_manager/internal/app/constants"
 	"github.com/lzh-1625/go_process_manager/internal/app/middle"
 	"github.com/lzh-1625/go_process_manager/log"
+	"github.com/lzh-1625/go_process_manager/resources"
 	"github.com/lzh-1625/go_process_manager/utils"
 
 	"github.com/gin-contrib/pprof"
@@ -29,20 +29,17 @@ func Route() {
 	log.Logger.Fatalw("服务器启动失败", "err", err)
 }
 
-//go:embed templates
-var f embed.FS
-
 func staticInit(r *gin.Engine) {
 	r.NoRoute(func(c *gin.Context) {
-		b, _ := f.ReadFile("templates/index.html")
+		b, _ := resources.Templates.ReadFile("templates/index.html")
 		c.Data(http.StatusOK, "text/html; charset=utf-8", b)
 	})
-	r.StaticFS("/js", http.FS(utils.UnwarpIgnore(fs.Sub(f, "templates/js"))))
+	r.StaticFS("/js", http.FS(utils.UnwarpIgnore(fs.Sub(resources.Templates, "templates/js"))))
-	r.StaticFS("/css", http.FS(utils.UnwarpIgnore(fs.Sub(f, "templates/css"))))
+	r.StaticFS("/css", http.FS(utils.UnwarpIgnore(fs.Sub(resources.Templates, "templates/css"))))
-	r.StaticFS("/media", http.FS(utils.UnwarpIgnore(fs.Sub(f, "templates/media"))))
+	r.StaticFS("/media", http.FS(utils.UnwarpIgnore(fs.Sub(resources.Templates, "templates/media"))))
-	r.StaticFS("/fonts", http.FS(utils.UnwarpIgnore(fs.Sub(f, "templates/fonts"))))
+	r.StaticFS("/fonts", http.FS(utils.UnwarpIgnore(fs.Sub(resources.Templates, "templates/fonts"))))
 	r.GET("/favicon.ico", func(ctx *gin.Context) {
-		ctx.Data(200, "image/x-icon", utils.UnwarpIgnore(f.ReadFile("templates/favicon.ico")))
+		ctx.Data(200, "image/x-icon", utils.UnwarpIgnore(resources.Templates.ReadFile("templates/favicon.ico")))
 	})
 }
 

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
 }

resources/resources.go

@@ -0,0 +1,6 @@
+package resources
+
+import "embed"
+
+//go:embed templates
+var Templates embed.FS

resources/templates/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>login</title><script defer="defer" src="/js/chunk-vendors.5b52f07b.js"></script><script defer="defer" src="/js/app.35a813b1.js"></script><link href="/css/chunk-vendors.965b2fe9.css" rel="stylesheet"><link href="/css/app.254f733a.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but login doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>login</title><script defer="defer" src="/js/chunk-vendors.c371f7f2.js"></script><script defer="defer" src="/js/app.5b64d7f6.js"></script><link href="/css/chunk-vendors.965b2fe9.css" rel="stylesheet"><link href="/css/app.254f733a.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but login doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>