chickliu/Sillyv2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x

Browse Source
This commit is contained in:
cdle
2023-06-04 16:03:13 +08:00
parent de2d57702d
commit 7376417c07
6 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/admin/index.html
+2 -2
View File
@@ -2,12 +2,12 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Ant Design Pro</title> <title>傻妞科技研究生产中心</title>
<link rel="stylesheet" href="/admin/umi.d8ae1311.css"> <link rel="stylesheet" href="/admin/umi.d8ae1311.css">
<script async="" src="/scripts/loading.js"></script> <script async="" src="/scripts/loading.js"></script>
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script src="/admin/umi.1c44c70c.js"></script> <script src="/admin/umi.1ec1b007.js"></script>
</body></html> </body></html>
core/admin/p__Basic__index.6213eeab.async.js → core/admin/p__Basic__index.3fcdde4e.async.js
+2 -2
View File
File diff suppressed because one or more lines are too long
core/admin/umi.1c44c70c.js → core/admin/umi.1ec1b007.js
+2 -2
View File
File diff suppressed because one or more lines are too long
core/web.go
+43 -2
View File
@@ -5,6 +5,7 @@ import (
"embed" "embed"
"fmt" "fmt"
"io" "io"
"net"
"net/http" "net/http"
"regexp" "regexp"
"strings" "strings"
@@ -39,10 +40,11 @@ func Cors() gin.HandlerFunc {
} }
} }
var Server = gin.New() var Server *gin.Engine
func init() { func init() {
gin.SetMode(gin.ReleaseMode) gin.SetMode(gin.ReleaseMode)
Server = gin.New()
// Server.Use(gin.Recovery()) // Server.Use(gin.Recovery())
Server.Use(Cors()) Server.Use(Cors())
Server.Use(gzip.Gzip(gzip.DefaultCompression)) Server.Use(gzip.Gzip(gzip.DefaultCompression))
@@ -284,6 +286,7 @@ func init() {
} }
var ch = make(chan error, 1) var ch = make(chan error, 1)
srvs = append(srvs, srv) srvs = append(srvs, srv)
go func() { go func() {
logs.Info("Http服务(%s)重新运行", port) logs.Info("Http服务(%s)重新运行", port)
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed { if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
@@ -310,7 +313,10 @@ func init() {
} }
}) })
go func() { go func() {
logs.Info("Http服务(%s)开始运行", port) // logs.Info("Http服务(%s)开始运行", port)
logs.Info("管理员面板:")
logs.Info(" > 本机: http://localhost:%s", port)
logs.Info(" > 局域网: http://%s:%s", getLocalIP(), port)
if err := srvs[0].ListenAndServe(); err != nil && err != http.ErrServerClosed { if err := srvs[0].ListenAndServe(); err != nil && err != http.ErrServerClosed {
logs.Error("Http服务运行失败：%s", err.Error()) logs.Error("Http服务运行失败：%s", err.Error())
} }
@@ -356,3 +362,38 @@ func GinApi(method string, path string, fs ...func(c *gin.Context)) {
}, },
}) })
} }
func getLocalIP() string {
ifaces, err := net.Interfaces()
if err != nil {
return "127.0.0.1"
}
for _, iface := range ifaces {
if iface.Flags&net.FlagUp == 0 {
continue // interface down
}
if iface.Flags&net.FlagLoopback != 0 {
continue // loopback interface
}
addrs, err := iface.Addrs()
if err != nil {
continue
}
for _, addr := range addrs {
var ip net.IP
switch v := addr.(type) {
case *net.IPNet:
ip = v.IP
case *net.IPAddr:
ip = v.IP
}
if ip == nil || ip.IsLoopback() {
continue
}
if ip.To4() != nil {
return ip.String()
}
}
}
return "127.0.0.1"
}
main.go
+1 -1
View File
@@ -48,7 +48,7 @@ func main() {
} }
core.Logs.Info("Terminal机器人异常,请检查运行环境设置,如果是docker环境,请附加-it参数") core.Logs.Info("Terminal机器人异常,请检查运行环境设置,如果是docker环境,请附加-it参数")
} else { } else {
core.Logs.Info("Terminal机器人不可用，运行带-t参数即可启用") // core.Logs.Info("Terminal机器人不可用，运行带-t参数即可启用")
} }
} }
select {} select {}
utils/init.go
+2 -2
View File
@@ -115,8 +115,8 @@ func KillProcess(pid int) error {
default: default:
return fmt.Errorf("unsupported operating system: %v", runtime.GOOS) return fmt.Errorf("unsupported operating system: %v", runtime.GOOS)
} }
cmd.Stdout = os.Stdout // cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr // cmd.Stderr = os.Stderr
err := cmd.Run() err := cmd.Run()
if _, ok := err.(*exec.ExitError); ok { if _, ok := err.(*exec.ExitError); ok {
return nil return nil