fix(tenant): 隔离经营租户与旧分销站点上下文
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
"hfb_sys/backend/internal/config"
|
||||
"hfb_sys/backend/internal/sitecode"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
"hfb_sys/backend/pkg/response"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"go.uber.org/zap"
|
||||
@@ -47,20 +48,30 @@ func TenantContext(resolver TenantResolver, appEnv string, logger *zap.Logger, d
|
||||
scope, err = resolver.ResolveHost(c.Request.Context(), c.Request.Host)
|
||||
}
|
||||
host := sitecode.ExtractHost(c.Request.Host)
|
||||
if scope == nil && err == nil && defaultTenantCode != "" && sitecode.FromRequest(c) != "" {
|
||||
legacySiteCode := sitecode.FromRequest(c)
|
||||
if scope == nil && err == nil &&
|
||||
!production &&
|
||||
legacySiteCode == "" &&
|
||||
sitecode.IsLocalHost(host) &&
|
||||
defaultTenantCode != "" {
|
||||
scope, err = resolver.ResolveCode(c.Request.Context(), defaultTenantCode)
|
||||
}
|
||||
if scope == nil && err == nil && !production && sitecode.IsLocalHost(host) && defaultTenantCode != "" {
|
||||
scope, err = resolver.ResolveCode(c.Request.Context(), defaultTenantCode)
|
||||
}
|
||||
if err != nil && logger != nil {
|
||||
logger.Warn("经营租户解析失败,按旧站点上下文继续",
|
||||
zap.String("host", host),
|
||||
zap.Error(err),
|
||||
)
|
||||
if err != nil {
|
||||
if logger != nil {
|
||||
logger.Error("经营租户解析失败,拒绝按旧站点上下文继续",
|
||||
zap.String("host", host),
|
||||
zap.Error(err),
|
||||
)
|
||||
}
|
||||
response.RecordError(c, err)
|
||||
response.ServiceUnavailable(c, "站点信息暂时不可用,请稍后重试")
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
if scope != nil {
|
||||
c.Request = c.Request.WithContext(tenancy.WithScope(c.Request.Context(), *scope))
|
||||
ctx := tenancy.WithScope(c.Request.Context(), *scope)
|
||||
ctx = sitecode.WithTenantScope(ctx)
|
||||
c.Request = c.Request.WithContext(ctx)
|
||||
c.Set(ContextTenantID, scope.TenantID)
|
||||
c.Set(ContextTenantCode, scope.TenantCode)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user