Merge branch 'chat' into dev

Update common.go
fix: 完成用户进入聊天室直接回复
2025-06-15 20:05:42 +08:00 · 2025-06-15 20:05:26 +08:00 · 2025-06-15 19:58:02 +08:00 · 2025-06-15 18:36:14 +08:00
1 changed files with 4 additions and 1 deletions
--- a/pkg/common/jwt/common.go
+++ b/pkg/common/jwt/common.go
@ -24,7 +24,10 @@ import (
 func ParseToChatUser(c *gin.Context) (chatUserInfo *accountFiee.ChatUserData, code e.ErrorCodeType) {
 	domain := c.GetHeader("Domain")
 	if domain == "" {
-		domain = config.AppConfig.System.Domain
+		domain = c.GetHeader("domain")
+		if domain == "" {
+			domain = config.AppConfig.System.Domain
+		}
 	}
 	fmt.Println("domain2:", domain)
 	var err error
Author	SHA1	Message	Date
jjxu	5131c182a5	Merge branch 'chat' into dev	2025-06-15 20:05:42 +08:00
jjxu	6f16137b43	Update common.go	2025-06-15 20:05:26 +08:00
jjxu	905d2077d3	fix: 完成用户进入聊天室直接回复	2025-06-15 19:58:02 +08:00
jjxu	bf21a5b906	Update conf.ini	2025-06-15 18:36:14 +08:00