From d0f913322414e8c439fbed50113300b9d3d8f24d Mon Sep 17 00:00:00 2001 From: "630892807@qq.com" <630892807@qq.com> Date: Sat, 20 Mar 2021 13:01:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=88=E6=8A=A4?= =?UTF-8?q?=E8=BF=9B=E7=A8=8B=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/server.go | 36 ++++++++++++++++++++++++------------ go.mod | 1 + go.sum | 2 ++ 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/cmd/server.go b/cmd/server.go index e210678..042b3bf 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -8,10 +8,9 @@ import ( "github.com/taoshihan1991/imaptool/middleware" "github.com/taoshihan1991/imaptool/router" "github.com/taoshihan1991/imaptool/tools" + "github.com/zh-five/xdaemon" "log" "os" - "os/exec" - "path/filepath" ) var ( @@ -33,17 +32,30 @@ func init() { } func run() { if daemon == true { - if os.Getppid() != 1 { - // 将命令行参数中执行文件路径转换成可用路径 - filePath, _ := filepath.Abs(os.Args[0]) - cmd := exec.Command(filePath, os.Args[1:]...) - // 将其他命令传入生成出的进程 - cmd.Stdin = os.Stdin // 给新进程设置文件描述符，可以重定向到文件中 - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - cmd.Start() // 开始执行新进程，不等待新进程退出 - os.Exit(0) + logFilePath := "" + if dir, err := os.Getwd(); err == nil { + logFilePath = dir + "/logs/" } + _, err := os.Stat(logFilePath) + if os.IsNotExist(err) { + if err := os.MkdirAll(logFilePath, 0777); err != nil { + log.Println(err.Error()) + } + } + d := xdaemon.NewDaemon(logFilePath + "go-fly.log") + d.MaxCount = 5 + d.Run() + //if os.Getppid() != 1 { + // // 将命令行参数中执行文件路径转换成可用路径 + // filePath, _ := filepath.Abs(os.Args[0]) + // cmd := exec.Command(filePath, os.Args[1:]...) + // // 将其他命令传入生成出的进程 + // cmd.Stdin = os.Stdin // 给新进程设置文件描述符，可以重定向到文件中 + // cmd.Stdout = os.Stdout + // cmd.Stderr = os.Stderr + // cmd.Start() // 开始执行新进程，不等待新进程退出 + // os.Exit(0) + //} } baseServer := "0.0.0.0:" + Port diff --git a/go.mod b/go.mod index c389d7f..28c4ffd 100644 --- a/go.mod +++ b/go.mod @@ -26,6 +26,7 @@ require ( github.com/spf13/cobra v0.0.5 github.com/swaggo/gin-swagger v1.2.0 github.com/swaggo/swag v1.5.1 + github.com/zh-five/xdaemon v0.1.1 golang.org/x/net v0.0.0-20200513185701-a91f0712d120 golang.org/x/text v0.3.2 ) diff --git a/go.sum b/go.sum index 9e228eb..79b0252 100644 --- a/go.sum +++ b/go.sum @@ -213,6 +213,8 @@ github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/zh-five/xdaemon v0.1.1 h1:W5VyJ+5ROjjcb9vNcF/SgWPwTzIRYIsW2yZBAomqMW8= +github.com/zh-five/xdaemon v0.1.1/go.mod h1:i3cluMVOPp/UcX2KDU2qzRv25f8u4y14tHzBPQhD8lI= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= From 038b53b9747dde502930c8f350baa6d4ab0c1b34 Mon Sep 17 00:00:00 2001 From: "630892807@qq.com" <630892807@qq.com> Date: Sat, 20 Mar 2021 13:05:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=88=E6=8A=A4?= =?UTF-8?q?=E8=BF=9B=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/server.go | 11 ----------- static/css/gofly-front.css | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/cmd/server.go b/cmd/server.go index 042b3bf..84f8eb0 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -45,17 +45,6 @@ func run() { d := xdaemon.NewDaemon(logFilePath + "go-fly.log") d.MaxCount = 5 d.Run() - //if os.Getppid() != 1 { - // // 将命令行参数中执行文件路径转换成可用路径 - // filePath, _ := filepath.Abs(os.Args[0]) - // cmd := exec.Command(filePath, os.Args[1:]...) - // // 将其他命令传入生成出的进程 - // cmd.Stdin = os.Stdin // 给新进程设置文件描述符，可以重定向到文件中 - // cmd.Stdout = os.Stdout - // cmd.Stderr = os.Stderr - // cmd.Start() // 开始执行新进程，不等待新进程退出 - // os.Exit(0) - //} } baseServer := "0.0.0.0:" + Port diff --git a/static/css/gofly-front.css b/static/css/gofly-front.css index 7a9b31b..f168054 100644 --- a/static/css/gofly-front.css +++ b/static/css/gofly-front.css @@ -219,6 +219,7 @@ max-height: 145px; } .launchButtonText .flyAvatar{ + display: block; margin-right: 0px; float: none; }