feat：优化信息

app/common/init.go

@@ -3,7 +3,6 @@ package common
 import (
 	"ArmedPolice/app/common/model"
 	"ArmedPolice/config"
-	"ArmedPolice/lib"
 	"ArmedPolice/serve/orm"
 	"ArmedPolice/utils"
 )
@@ -96,7 +95,7 @@ func initModel() {
 
 			out := make([]*model.SysConfig, 0)
 
-			lib.LoadConfig("./json/sys_config.json", &values, func(i interface{}) {
+			utils.LoadConfig("./json/sys_config.json", &values, func(i interface{}) {
 				for _, v := range values {
 					out = append(out, &model.SysConfig{
 						Model:        model.Model{ID: v.ID},
@@ -115,7 +114,7 @@ func initModel() {
 
 			out := make([]*model.SysMenu, 0)
 
-			lib.LoadConfig("./json/sys_menu.json", &values, func(i interface{}) {
+			utils.LoadConfig("./json/sys_menu.json", &values, func(i interface{}) {
 				for _, v := range values {
 					out = append(out, &model.SysMenu{
 						Model: model.Model{ID: v.ID},
@@ -145,7 +144,7 @@ func initModel() {
 			out := make([]*model.SysRole, 0)
 			values := make([]*structForSysRole, 0)
 
-			lib.LoadConfig("./json/sys_role.json", &values, func(i interface{}) {
+			utils.LoadConfig("./json/sys_role.json", &values, func(i interface{}) {
 				for _, v := range values {
 					out = append(out, &model.SysRole{
 						Model:        model.Model{ID: v.ID},
@@ -177,7 +176,7 @@ func initModel() {
 
 			values := make([]*structForWorkSchedule, 0)
 
-			lib.LoadConfig("./json/work_schedule.json", &values, func(i interface{}) {
+			utils.LoadConfig("./json/work_schedule.json", &values, func(i interface{}) {
 				for _, v := range values {
 					out = append(out, &model.WorkSchedule{
 						Model:         model.Model{ID: v.ID},

app/controller/user/menu.go

@@ -1,19 +1,29 @@
 package user
 
 import (
-	"ArmedPolice/app/controller/menu"
+	model2 "ArmedPolice/app/common/model"
+	"ArmedPolice/app/controller/basic"
 	"ArmedPolice/app/model"
 	"ArmedPolice/app/service"
-	"ArmedPolice/utils"
-	"fmt"
 )
 
 type Menu struct{ *service.Session }
 
 type MenuHandle func(session *service.Session) *Menu
 
+type MenuInfo struct {
+	basic.CommonIDString
+	*model2.SysMenuBasic
+	ParentID string `json:"parent_id"`
+	// 与前端约定
+	Meta struct {
+		Title string `json:"title"`
+	} `json:"meta"`
+	Path string `json:"path"`
+}
+
 // Menu 用户菜单信息
-func (c *Menu) Menu() ([]*menu.InstanceIdentityInfo, error) {
+func (c *Menu) Menu() ([]*MenuInfo, error) {
 	mSysMenu := model.NewSysMenu()
 
 	out := make([]*model.SysMenuScene, 0)
@@ -28,9 +38,25 @@ func (c *Menu) Menu() ([]*menu.InstanceIdentityInfo, error) {
 	if out, err = mSysMenu.UserMenu(c.UID); err != nil {
 		return nil, err
 	}
-	fmt.Println(utils.AnyToJSON(out))
 RETURN:
-	return menu.TreeIdentity(mSysMenu.SysMenu, out, 0), nil
+	list := make([]*MenuInfo, 0)
+
+	for _, v := range out {
+		mSysMenu.SetID(v.ID)
+		data := &MenuInfo{
+			CommonIDString: basic.CommonIDString{ID: mSysMenu.GetEncodeID()},
+			SysMenuBasic:   v.SysMenuBasic,
+			ParentID:       (&model2.Model{ID: v.ParentID}).GetEncodeID(),
+			Meta: struct {
+				Title string `json:"title"`
+			}{Title: v.Name},
+		}
+		data.Name = v.Link
+		data.Path = v.Link
+		list = append(list, data)
+	}
+	return list, nil
+	//return menu.TreeIdentity(mSysMenu.SysMenu, out, 0), nil
 }
 
 func NewMenu() MenuHandle {

app/init.go

@@ -4,7 +4,6 @@ import (
 	"ArmedPolice/app/event"
 	"ArmedPolice/app/service"
 	"ArmedPolice/config"
-	"ArmedPolice/lib"
 	"ArmedPolice/utils"
 )
 
@@ -14,7 +13,7 @@ func Init() {
 		service.NewHub().Run()
 	})
 	// 载入数据配置
-	lib.LoadConfig("./json/area.json", &config.SettingAreaInfo)
+	utils.LoadConfig("./json/area.json", &config.SettingAreaInfo)
 	// RedisHash存储/移除监听
 	service.Subscribe(config.EventForRedisHashProduce, event.NewRedisHashProduce())
 	service.Subscribe(config.EventForRedisHashDestroy, event.NewRedisHashDestroy())

app/service/session.go

@@ -20,7 +20,7 @@ func (this *Session) MarshalBinary() ([]byte, error) {
 }
 
 func (this *Session) UnmarshalBinary(data []byte) error {
-	return utils.FromJSONBytes(data, this)
+	return json.Unmarshal(data, this)
 }
 
 func (this *Session) UIDToString() string {