Merge branch 'work-js-sdk' into v2

# Conflicts: # credential/default_access_token.go
silenceper · Jan 14, 2025 · 3f10bdb · 3f10bdb
2 parents 87e4bdb + dea8c4b
commit 3f10bdb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/credential/default_access_token.go b/credential/default_access_token.go
@@ -229,6 +229,7 @@ func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessTok
 
 	// 构建缓存key
 	var accessTokenCacheKey string
+
 	if ak.AgentID != "" {
 		// 如果设置了AgentID，使用新的key格式
 		accessTokenCacheKey = fmt.Sprintf("%s_access_token_%s_%s", ak.cacheKeyPrefix, ak.CorpID, ak.AgentID)

diff --git a/work/jsapi/jsapi.go b/work/jsapi/jsapi.go
@@ -1,8 +1,7 @@
 package jsapi
 
 import (
-	"strconv"
-
+	"fmt"
 	"github.com/silenceper/wechat/v2/credential"
 	"github.com/silenceper/wechat/v2/util"
 	"github.com/silenceper/wechat/v2/work/context"
@@ -49,7 +48,8 @@ func (js *Js) GetConfig(uri string) (config *Config, err error) {
 	}
 	config.NonceStr = util.RandomStr(16)
 	config.Timestamp = util.GetCurrTS()
-	config.Signature = util.Signature(ticketStr, config.NonceStr, strconv.FormatInt(config.Timestamp, 10), uri)
+	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, config.NonceStr, config.Timestamp, uri)
+	config.Signature = util.Signature(str)
 	return
 }
 
@@ -68,6 +68,7 @@ func (js *Js) GetAgentConfig(uri string) (config *Config, err error) {
 	}
 	config.NonceStr = util.RandomStr(16)
 	config.Timestamp = util.GetCurrTS()
-	config.Signature = util.Signature(ticketStr, config.NonceStr, strconv.FormatInt(config.Timestamp, 10), uri)
+	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, config.NonceStr, config.Timestamp, uri)
+	config.Signature = util.Signature(str)
 	return
 }