|
|
@@ -83,7 +83,7 @@ type RelayInfo struct {
|
|
|
TokenKey string
|
|
|
TokenGroup string
|
|
|
UserId int
|
|
|
- UsingGroup string // 使用的分组
|
|
|
+ UsingGroup string // 使用的分组,当auto跨分组重试时,会变动
|
|
|
UserGroup string // 用户所在分组
|
|
|
TokenUnlimited bool
|
|
|
StartTime time.Time
|
|
|
@@ -374,6 +374,12 @@ func genBaseRelayInfo(c *gin.Context, request dto.Request) *RelayInfo {
|
|
|
//channelId := common.GetContextKeyInt(c, constant.ContextKeyChannelId)
|
|
|
//paramOverride := common.GetContextKeyStringMap(c, constant.ContextKeyChannelParamOverride)
|
|
|
|
|
|
+ tokenGroup := common.GetContextKeyString(c, constant.ContextKeyTokenGroup)
|
|
|
+ // 当令牌分组为空时,表示使用用户分组
|
|
|
+ if tokenGroup == "" {
|
|
|
+ tokenGroup = common.GetContextKeyString(c, constant.ContextKeyUserGroup)
|
|
|
+ }
|
|
|
+
|
|
|
startTime := common.GetContextKeyTime(c, constant.ContextKeyRequestStartTime)
|
|
|
if startTime.IsZero() {
|
|
|
startTime = time.Now()
|
|
|
@@ -401,7 +407,7 @@ func genBaseRelayInfo(c *gin.Context, request dto.Request) *RelayInfo {
|
|
|
TokenId: common.GetContextKeyInt(c, constant.ContextKeyTokenId),
|
|
|
TokenKey: common.GetContextKeyString(c, constant.ContextKeyTokenKey),
|
|
|
TokenUnlimited: common.GetContextKeyBool(c, constant.ContextKeyTokenUnlimited),
|
|
|
- TokenGroup: common.GetContextKeyString(c, constant.ContextKeyTokenGroup),
|
|
|
+ TokenGroup: tokenGroup,
|
|
|
|
|
|
isFirstResponse: true,
|
|
|
RelayMode: relayconstant.Path2RelayMode(c.Request.URL.Path),
|