feat(user): support user-group assignment in user management

This commit is contained in:
Sagit
2026-02-18 14:47:12 +00:00
parent 42701e6c01
commit d12c5bf2e1
10 changed files with 260 additions and 40 deletions
@@ -89,6 +89,7 @@ func (h *Handler) Register(mux *http.ServeMux) {
mux.HandleFunc("/api/v1/user/update", h.userUpdate)
mux.HandleFunc("/api/v1/user/delete", h.userDelete)
mux.HandleFunc("/api/v1/user/reset", h.userResetFlow)
mux.HandleFunc("/api/v1/user/groups", h.userGroups)
mux.HandleFunc("/api/v1/config/get", h.getConfigByName)
mux.HandleFunc("/api/v1/config/list", h.getConfigs)
mux.HandleFunc("/api/v1/config/update", h.updateConfigs)
+53 -1
View File
@@ -60,10 +60,21 @@ func (h *Handler) userCreate(w http.ResponseWriter, r *http.Request) {
roleID := 1
now := time.Now().UnixMilli()
if err := h.repo.CreateUser(username, security.MD5(pwd), roleID, expTime, flow, flowResetTime, num, status, now); err != nil {
userID, err := h.repo.CreateUser(username, security.MD5(pwd), roleID, expTime, flow, flowResetTime, num, status, now)
if err != nil {
response.WriteJSON(w, response.Err(-2, err.Error()))
return
}
groupIDs := asInt64Slice(req["groupIds"])
if len(groupIDs) > 0 {
if addErr := h.repo.AddUserToGroups(userID, groupIDs, now); addErr == nil {
for _, gid := range groupIDs {
_ = h.syncPermissionsByUserGroup(gid)
}
}
}
response.WriteJSON(w, response.OKEmpty())
}
@@ -133,9 +144,36 @@ func (h *Handler) userUpdate(w http.ResponseWriter, r *http.Request) {
}
h.repo.PropagateUserFlowToTunnels(id, flow, num, expTime, flowResetTime)
if groupIDsRaw, ok := req["groupIds"]; ok {
newGroupIDs := asInt64Slice(groupIDsRaw)
if affected, replaceErr := h.repo.ReplaceUserGroupsByUserID(id, newGroupIDs, now); replaceErr == nil {
for _, gid := range affected {
_ = h.syncPermissionsByUserGroup(gid)
}
}
}
response.WriteJSON(w, response.OKEmpty())
}
func (h *Handler) userGroups(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost {
response.WriteJSON(w, response.ErrDefault("请求失败"))
return
}
id := idFromBody(r, w)
if id <= 0 {
return
}
ids, err := h.repo.GetUserGroupIDsByUserID(id)
if err != nil {
response.WriteJSON(w, response.Err(-2, err.Error()))
return
}
response.WriteJSON(w, response.OK(ids))
}
func (h *Handler) userDelete(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost {
response.WriteJSON(w, response.ErrDefault("请求失败"))
@@ -3204,3 +3242,17 @@ func randomToken(n int) string {
}
return hex.EncodeToString(buf)
}
func asInt64Slice(v interface{}) []int64 {
arr := asAnySlice(v)
if len(arr) == 0 {
return nil
}
ids := make([]int64, 0, len(arr))
for _, x := range arr {
if id := asInt64(x, 0); id > 0 {
ids = append(ids, id)
}
}
return ids
}