diff --git a/app/store/svc/svc_index.go b/app/store/svc/svc_index.go index d48ead0..4fca86f 100644 --- a/app/store/svc/svc_index.go +++ b/app/store/svc/svc_index.go @@ -11,13 +11,9 @@ import ( func UserInfo(c *gin.Context) { store := svc.GetCampStore(c) - role := []string{"comm"} - if store.IsShowProject == 1 { - role = append(role, "project") - } + res := map[string]interface{}{ "phone": store.Phone, - "role": role, } e.OutSuc(c, res, nil) return diff --git a/app/store/svc/svc_login.go b/app/store/svc/svc_login.go index b6d71ae..981fe14 100644 --- a/app/store/svc/svc_login.go +++ b/app/store/svc/svc_login.go @@ -44,8 +44,16 @@ func Login(c *gin.Context) { } key := fmt.Sprintf("%s:camp_token:%s", c.GetString("mid"), user.Phone) cache.SetEx(key, token, 39528000) // 半年 - res := map[string]string{ + role := []string{"comm"} + if user.Pid > 0 { + user, _ = NewCampTaskStoreUserDb.GetCampTaskStoreUser(user.Pid) + } + if user.IsShowProject == 1 { + role = append(role, "project") + } + res := map[string]interface{}{ "token": token, + "role": role, } e.OutSuc(c, res, nil) return