Skip to content

fix: 修复 default_group 配置不生效的问题 #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lanrenwo wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: 修复 default_group 配置不生效的问题 #382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion server/handler/link_auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,29 @@ func LinkAuth(w http.ResponseWriter, r *http.Request) {

if cr.Type == "init" {
w.WriteHeader(http.StatusOK)
data := RequestData{Group: cr.GroupSelect, Groups: dbdata.GetGroupNamesNormal()}

// 获取所有可用组
groups := dbdata.GetGroupNamesNormal()

// 确定默认选择的组
selectedGroup := cr.GroupSelect
if selectedGroup == "" && base.Cfg.DefaultGroup != "" {
// 验证配置的默认组是否存在于可用组列表中
groupExists := false
for _, g := range groups {
if g == base.Cfg.DefaultGroup {
selectedGroup = base.Cfg.DefaultGroup
groupExists = true
break
}
}

if !groupExists {
base.Warn(fmt.Sprintf("Configuration warning: default_group '%s' does not exist or is disabled", base.Cfg.DefaultGroup))
}
}

data := RequestData{Group: selectedGroup, Groups: groups}
tplRequest(tpl_request, w, data)
return
}
Expand Down
Loading