admin/bl
1
0
Fork 0
Code Issues Pull Requests Projects 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"
"blazing/modules/base/service"
config "blazing/modules/config/service"
"github.com/gogf/gf/v2/frame/g"
)
@@ -82,15 +81,15 @@ func (c *BaseOpen) RefreshToken(ctx context.Context, req *RefreshTokenReq) (res
return
}
// 获取服务器当前ip和端口
type GetPortReq struct {
g.Meta `path:"/getport" method:"GET"`
}
// // 获取服务器当前ip和端口
// type GetPortReq struct {
// g.Meta `path:"/getport" method:"GET"`
// }
func (c *BaseOpen) GetPort(ctx context.Context, req *GetPortReq) (res *cool.BaseRes, err error) {
res = &cool.BaseRes{}
res.Data = config.NewServerService().GetPort()
// func (c *BaseOpen) GetPort(ctx context.Context, req *GetPortReq) (res *cool.BaseRes, err error) {
// res = &cool.BaseRes{}
// 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"
config "blazing/modules/config/service"
blazing "blazing/modules/player/service"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/frame/g"
)
@@ -68,13 +70,13 @@ func (c *BaseSysUserController) GetSession(ctx context.Context, req *SessionReq)
} else {
res.LoginAddr = cool.Config.File.Domain + ":" + cool.Config.LoginPort
}
res.Server = config.NewServerService().GetPort()
return
}
type SessionRes struct {
UserID int `json:"userid"`
Session string `json:"session"`
LoginAddr string `json:"loginaddr"`
//Server model.ServerList `json:"server"`
UserID int `json:"userid"`
Session string `json:"session"`
LoginAddr string `json:"loginaddr"`
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("/*", AutoI18n)
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 {
g.Server().BindMiddleware("/admin/*", BaseLog)
@@ -52,7 +50,7 @@ func init() {
tt := new(ServerHandler)
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"))
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, "开始执行完整自动化部署流程...")
// 1. 获取并校验下载链接
fileURL := config.NewServerService().GetFile()
filename := config.NewServerService().GetFile()
fileURL := "http://sun.72wo.cn/" + filename
fileURL = strings.TrimSpace(fileURL)
if fileURL == "" {
return fmt.Errorf("下载链接为空")
@@ -440,9 +441,8 @@ echo "#SCRIPT_EXECUTION_COMPLETE#"
}
// 6. 保存会话名称
config.NewServerService().SetServerScreen(s.ServerList.OnlineID, fixedScreenSession)
config.NewServerService().SetServerScreen(s.ServerList.OnlineID, filename)
s.sendTerminalOutput(s.session.WebSocket, "自动化部署完成")
return nil
}