luoyangwei 1 жил өмнө
parent
commit
c2128c4307

+ 3 - 0
server/client.go

@@ -387,6 +387,9 @@ func (c *Client) loadOfflineMessage() {
 		return
 	}()
 
+	// 五秒后自动推送
+	time.Sleep(5 * time.Second)
+
 	rid := uuid.NewString()
 	unreadMsg, err := c.repos.MessageRepository.FindUnread(c.ctx, c.UserId)
 	if err != nil {

+ 3 - 3
server/server.go

@@ -248,12 +248,12 @@ func jwtParse(headers Headers) (*UserClaims, bool, error) {
 	}
 	accessToken = strings.Trim(accessToken, " ")
 
-	token, err := jwt.ParseWithClaims(accessToken, UserClaims{}, func(t *jwt.Token) (interface{}, error) {
+	token, err := jwt.ParseWithClaims(accessToken, &UserClaims{}, func(t *jwt.Token) (interface{}, error) {
 		return []byte(viper.GetString("auth.secret")), nil
 	})
-	userClaims, ok := token.Claims.(UserClaims)
+	userClaims, ok := token.Claims.(*UserClaims)
 	if ok {
-		return &userClaims, true, nil
+		return userClaims, true, nil
 	} else {
 		return nil, false, eris.Wrap(err, "token parse error")
 	}

+ 4 - 3
server/server_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
-	"sikey.com/websocket/config"
+	"github.com/spf13/viper"
 	"sikey.com/websocket/utils/keys"
 )
 
@@ -63,10 +63,11 @@ func websocketConnect() {
 }
 
 func TestServer_JWT(t *testing.T) {
-	config.MustLoadConfig("../config/websocket.toml")
+	// config.MustLoadConfig("../etc/websocket.release.yaml")
+	viper.SetDefault("auth.secret", "a4176e95ad5d4d05b012b81dd5833b40")
 	var headers = make(Headers)
 	headers[keys.LocalizationHeader] = ""
-	headers[keys.AccessTokenHeader] = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyYXciOiIiLCJ1aWQiOiJkNmZhYTBhZi1iODYzLTQ4YmItYjY1OC1kOTYxYTkzODE1ODUifQ.dJS_qsGhmRHDAA7B1B_Dy1ECKSZ3jWOoZSd71fFq8vA"
+	headers[keys.AccessTokenHeader] = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJmOTU1NGE3OS03N2JiLTRkNTItYmYxMy01MDMyZTg2OTlmNDgiLCJpc19jaGlsZCI6dHJ1ZSwiZmFjdG9yIjoiMzEyNjg3NTMtODU1ZC00NzBmLWFmYzEtZmZhZjk0ZDJmMjJkIn0.HhCi-HpFSVy8UTL7LNUZyrZB25XiDtpu-Nl9-mM2rs0"
 	headers[keys.SimpleHeader] = ""
 	s, ok, err := jwtParse(headers)
 	if !ok {