admin/bl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
1
2026-01-23 20:34:52 +00:00
parent 9199768c37
commit 5682ff2d42
5 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/base/controller/admin/base_open.go
View File

@@ -7,7 +7,6 @@ import (
v1 "blazing/modules/base/api/v1" v1 "blazing/modules/base/api/v1"
"blazing/modules/base/service" "blazing/modules/base/service"
config "blazing/modules/config/service"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
) )
@@ -82,15 +81,15 @@ func (c *BaseOpen) RefreshToken(ctx context.Context, req *RefreshTokenReq) (res
return return
} }
// 获取服务器当前ip和端口 // // 获取服务器当前ip和端口
type GetPortReq struct { // type GetPortReq struct {
g.Meta `path:"/getport" method:"GET"` // g.Meta `path:"/getport" method:"GET"`
} // }
func (c *BaseOpen) GetPort(ctx context.Context, req *GetPortReq) (res *cool.BaseRes, err error) { // func (c *BaseOpen) GetPort(ctx context.Context, req *GetPortReq) (res *cool.BaseRes, err error) {
res = &cool.BaseRes{} // res = &cool.BaseRes{}
res.Data = config.NewServerService().GetPort() // res.Data = config.NewServerService().GetPort()
return // return
} // }

12
modules/base/controller/admin/base_sys_user.go
View File

@@ -7,8 +7,10 @@ import (
"blazing/modules/base/service" "blazing/modules/base/service"
config "blazing/modules/config/service"
blazing "blazing/modules/player/service" blazing "blazing/modules/player/service"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
) )
@@ -68,13 +70,13 @@ func (c *BaseSysUserController) GetSession(ctx context.Context, req *SessionReq)
} else { } else {
res.LoginAddr = cool.Config.File.Domain + ":" + cool.Config.LoginPort res.LoginAddr = cool.Config.File.Domain + ":" + cool.Config.LoginPort
} }
res.Server = config.NewServerService().GetPort()
return return
} }
type SessionRes struct { type SessionRes struct {
UserID int `json:"userid"` UserID int `json:"userid"`
Session string `json:"session"` Session string `json:"session"`
LoginAddr string `json:"loginaddr"` LoginAddr string `json:"loginaddr"`
//Server model.ServerList `json:"server"` Server gdb.List `json:"server"`
} }

6
modules/base/middleware/middleware.go
View File

@@ -40,9 +40,7 @@ func init() {
g.Server().BindMiddleware("/admin/*", BaseAuthorityMiddleware) g.Server().BindMiddleware("/admin/*", BaseAuthorityMiddleware)
// g.Server().BindMiddleware("/*", AutoI18n) // g.Server().BindMiddleware("/*", AutoI18n)
g.Server().BindMiddleware("/*", MiddlewareCORS) g.Server().BindMiddleware("/*", MiddlewareCORS)
// g.Server().BindMiddleware("/getip", func(r *ghttp.Request) {
// r.Response.Write(cool.Config.File.Domain + ":" + gconv.String(cool.Config.LoginPort))
// })
} }
if config.Config.Middleware.Log.Enable { if config.Config.Middleware.Log.Enable {
g.Server().BindMiddleware("/admin/*", BaseLog) g.Server().BindMiddleware("/admin/*", BaseLog)
@@ -52,7 +50,7 @@ func init() {
tt := new(ServerHandler) tt := new(ServerHandler)
id := gconv.Uint16(r.URL.Query().Get("id")) id := gconv.Uint16(r.URL.Query().Get("id"))
tt.ServerList = service.NewServerService().GetServerID(id) tt.ServerList = service.NewServerService().StartUPdate(id)
tt.isinstall = gconv.Uint32(r.URL.Query().Get("isinstall")) tt.isinstall = gconv.Uint32(r.URL.Query().Get("isinstall"))
upgrader := gws.NewUpgrader(tt, &gws.ServerOption{ upgrader := gws.NewUpgrader(tt, &gws.ServerOption{

6
modules/base/middleware/server.go
View File

@@ -152,7 +152,8 @@ func (s *ServerHandler) executeFullDeployment() error {
s.sendTerminalOutput(s.session.WebSocket, "开始执行完整自动化部署流程...") s.sendTerminalOutput(s.session.WebSocket, "开始执行完整自动化部署流程...")
// 1. 获取并校验下载链接 // 1. 获取并校验下载链接
fileURL := config.NewServerService().GetFile() filename := config.NewServerService().GetFile()
fileURL := "http://sun.72wo.cn/" + filename
fileURL = strings.TrimSpace(fileURL) fileURL = strings.TrimSpace(fileURL)
if fileURL == "" { if fileURL == "" {
return fmt.Errorf("下载链接为空") return fmt.Errorf("下载链接为空")
@@ -440,9 +441,8 @@ echo "#SCRIPT_EXECUTION_COMPLETE#"
} }
// 6. 保存会话名称 // 6. 保存会话名称
config.NewServerService().SetServerScreen(s.ServerList.OnlineID, fixedScreenSession) config.NewServerService().SetServerScreen(s.ServerList.OnlineID, filename)
s.sendTerminalOutput(s.session.WebSocket, "自动化部署完成")
return nil return nil
} }

20
modules/config/service/server.go
View File

@@ -85,7 +85,20 @@ func (s *ServerService) GetServer() []model.ServerList {
return item return item
} }
func (s *ServerService) StartUPdate(OnlineID uint16) model.ServerList {
m := cool.DBM(s.Model).Where("online_id", OnlineID)
var tttt model.ServerList
m.Scan(&tttt)
tttt.IsOpen = 0
m.Save(tttt)
// s.CleanCache()
return tttt
}
func (s *ServerService) SetServerID(OnlineID uint16, Port uint16) error { func (s *ServerService) SetServerID(OnlineID uint16, Port uint16) error {
m := cool.DBM(s.Model).Where("online_id", OnlineID) m := cool.DBM(s.Model).Where("online_id", OnlineID)
@@ -94,6 +107,7 @@ func (s *ServerService) SetServerID(OnlineID uint16, Port uint16) error {
m.Scan(&tttt) m.Scan(&tttt)
tttt.Port = Port tttt.Port = Port
tttt.OnlineID = OnlineID tttt.OnlineID = OnlineID
tttt.IsOpen = 1
m.Save(tttt) m.Save(tttt)
// s.CleanCache() // s.CleanCache()
@@ -108,9 +122,7 @@ func (s *ServerService) GetServerID(OnlineID uint16) model.ServerList {
} }
// func (s *ServerService) CleanCache() { // 保存版本号
// g.DB().GetCore().ClearCache(context.TODO(), s.Model.TableName())
// }
func (s *ServerService) SetServerScreen(id uint16, name string) { func (s *ServerService) SetServerScreen(id uint16, name string) {
dbm(s.Model).Where("online_id", id).Data("old_screen", name).Update() dbm(s.Model).Where("online_id", id).Data("old_screen", name).Update()
@@ -149,7 +161,7 @@ func (s *ServerService) GetFile() string {
return files[i].Time > files[j].Time return files[i].Time > files[j].Time
}) })
return "http://sun.72wo.cn/" + files[0].Name return files[0].Name
} }