diff --git a/internal/web/actions/default/users/otpQrcode.go b/internal/web/actions/default/users/otpQrcode.go index f4c9c18b..25e41bf0 100644 --- a/internal/web/actions/default/users/otpQrcode.go +++ b/internal/web/actions/default/users/otpQrcode.go @@ -2,7 +2,6 @@ package users import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/utils/otputils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -58,15 +57,11 @@ func (this *OtpQrcodeAction) RunGet(params struct { return } - uiConfig, err := configloaders.LoadUserUIConfig() + productName, err := this.findProductName() if err != nil { this.ErrorPage(err) return } - var productName = uiConfig.ProductName - if len(productName) == 0 { - productName = "GoEdge用户" - } var url = gotp.NewDefaultTOTP(secret).ProvisioningUri(user.Username, productName) data, err := qrcode.Encode(otputils.FixIssuer(url), qrcode.Medium, 256) if err != nil { diff --git a/internal/web/actions/default/users/otpQrcode_ext.go b/internal/web/actions/default/users/otpQrcode_ext.go new file mode 100644 index 00000000..edc350a5 --- /dev/null +++ b/internal/web/actions/default/users/otpQrcode_ext.go @@ -0,0 +1,18 @@ +// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn . +//go:build !plus + +package users + +import "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + +func (this *OtpQrcodeAction) findProductName() (string, error) { + uiConfig, err := configloaders.LoadAdminUIConfig() + if err != nil { + return "", err + } + var productName = uiConfig.ProductName + if len(productName) == 0 { + productName = "GoEdge用户" + } + return productName, nil +}