From 8d6383592c44cc6196c8f4343f3e6775da7cfec5 Mon Sep 17 00:00:00 2001 From: Newnius Date: Thu, 1 Aug 2019 09:54:38 +0800 Subject: [PATCH] bugfix --- src/group.go | 4 +++- src/main.go | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/group.go b/src/group.go index f0109ad..9b7d7ed 100644 --- a/src/group.go +++ b/src/group.go @@ -16,6 +16,7 @@ func InstanceOfGroupManager() *GroupManager { if groupManagerInstance == nil { groupManagerInstance = &GroupManager{groups: map[string]Group{}} + groupManagerInstance.groups["default"] = Group{Name: "default", Weight: 10, Reserved: false} } return groupManagerInstance } @@ -53,7 +54,8 @@ func (gm *GroupManager) Remove(group Group) MsgGroupCreate { func (gm *GroupManager) List() MsgGroupList { defer gm.mu.Unlock() gm.mu.Lock() - var result []Group + // cannot change to `var`, since it would be json_encoded to null + result := []Group{} for _, v := range gm.groups { result = append(result, v) } diff --git a/src/main.go b/src/main.go index ffc2374..ae91869 100644 --- a/src/main.go +++ b/src/main.go @@ -113,7 +113,7 @@ func serverAPI(w http.ResponseWriter, r *http.Request) { log.Debug("group_update") var group Group msg := MsgGroupCreate{Code: 0} - err := json.Unmarshal([]byte(string(r.PostFormValue("job"))), &group) + err := json.Unmarshal([]byte(string(r.PostFormValue("group"))), &group) if err != nil { msg.Code = 1 msg.Error = err.Error() @@ -129,7 +129,7 @@ func serverAPI(w http.ResponseWriter, r *http.Request) { log.Debug("group_remove") var group Group msg := MsgGroupCreate{Code: 0} - err := json.Unmarshal([]byte(string(r.PostFormValue("job"))), &group) + err := json.Unmarshal([]byte(string(r.PostFormValue("group"))), &group) if err != nil { msg.Code = 1 msg.Error = err.Error()