```
feat(config): 添加服务器screen参数字段 添加OldScreen字段用于存储服务器的screen会话名称 --- fix(fight): 修复攻击值结构体格式 格式化AttackValue结构体字段对齐,并添加Offensive字段用于存储攻击力 --- feat(fight): 计算并存储技能攻击力 在技能计算过程中添加攻击力计算并存储到AttackValue结构体中 --- fix(base): 修正JWT密钥配置 将JWT密钥从
This commit is contained in:
@@ -1,13 +1,16 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"blazing/cool"
|
||||
"blazing/modules/base/config"
|
||||
"blazing/modules/config/service"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/net/ghttp"
|
||||
"github.com/gogf/gf/v2/util/gconv"
|
||||
"github.com/golang-jwt/jwt/v4"
|
||||
"github.com/lxzan/gws"
|
||||
)
|
||||
|
||||
@@ -42,61 +45,33 @@ func init() {
|
||||
if config.Config.Middleware.Log.Enable {
|
||||
g.Server().BindMiddleware("/admin/*", BaseLog)
|
||||
}
|
||||
g.Server().BindHandler("/ws/*", func(r *ghttp.Request) {
|
||||
urls := r.URL.Query().Get("port")
|
||||
fmt.Println(urls)
|
||||
tt := new(Handler)
|
||||
|
||||
tt.port = gconv.Int(urls)
|
||||
upgrader := gws.NewUpgrader(tt, &gws.ServerOption{
|
||||
//CompressEnabled: true,
|
||||
|
||||
// 在querystring里面传入用户名
|
||||
// 把Sec-WebSocket-Key作为连接的key
|
||||
|
||||
// 刷新页面的时候, 会触发上一个连接的OnClose/OnError事件, 这时候需要对比key并删除map里存储的连接
|
||||
Authorize: func(rt *http.Request, session gws.SessionStorage) bool {
|
||||
//r.s\\\
|
||||
// r.Get("t")
|
||||
//admin := cool.GetAdmin(r.Context())
|
||||
// var name = r.URL.Query().Get("name")
|
||||
// if name == "" {
|
||||
// return false
|
||||
// }
|
||||
// t, _ := service.NewBaseSysUserService().Person(admin.UserID)
|
||||
|
||||
//Loger.Debug(context.TODO(), t.Mimi)
|
||||
// session.Store("name", t.Mimi)
|
||||
//session.Store("key", r.Header.Get("Sec-WebSocket-Key"))
|
||||
return true
|
||||
},
|
||||
})
|
||||
|
||||
socket, err := upgrader.Upgrade(r.Response.Writer, r.Request)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return
|
||||
}
|
||||
// ants.Submit(func() {
|
||||
// socket.ReadLoop()
|
||||
// })
|
||||
// ants.Submit(func() { socket.ReadLoop() })
|
||||
go socket.ReadLoop()
|
||||
|
||||
})
|
||||
g.Server().BindHandler("/server/*", func(r *ghttp.Request) {
|
||||
|
||||
tt := new(ServerHandler)
|
||||
id := gconv.Uint32(r.URL.Query().Get("id"))
|
||||
tt.ServerList = service.NewServerService().GetServerByID(id)
|
||||
tt.isinstall = gconv.Uint32(r.URL.Query().Get("isinstall"))
|
||||
|
||||
upgrader := gws.NewUpgrader(tt, &gws.ServerOption{
|
||||
|
||||
Authorize: func(rt *http.Request, session gws.SessionStorage) bool {
|
||||
//r.s\\\
|
||||
// r.Get("t")
|
||||
// admin := cool.GetAdmin(rt.Context())
|
||||
// if admin.UserId != 10001 {
|
||||
// return false
|
||||
// }
|
||||
|
||||
tokenString := r.URL.Query().Get("Authorization")
|
||||
token, err := jwt.ParseWithClaims(tokenString, &cool.Claims{}, func(token *jwt.Token) (interface{}, error) {
|
||||
|
||||
return []byte(config.Config.Jwt.Secret), nil
|
||||
})
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
if !token.Valid {
|
||||
return false
|
||||
}
|
||||
admin := token.Claims.(*cool.Claims)
|
||||
if admin.UserId != 10001 {
|
||||
return false
|
||||
}
|
||||
|
||||
// var name = r.URL.Query().Get("name")
|
||||
// if name == "" {
|
||||
|
||||
Reference in New Issue
Block a user