1
This commit is contained in:
@@ -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{
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user