更新gf版本为v1.14.0 添加按钮权限 友情链接完善 cms模板选择

app/controller/admin/cms_menu.go

@@ -77,9 +77,12 @@ func (c *CmsMenu) Add(r *ghttp.Request) {
 	if err != nil {
 		response.FailJson(true, r, err.Error())
 	}
-
+	//获取分类栏目模板
+	ListTemp, contentTemp := cms_service.GetCmsTemplate()
 	res := g.Map{
-		"parentList": menus,
+		"parentList":  menus,
+		"listTemp":    ListTemp,
+		"contentTemp": contentTemp,
 	}
 	response.SusJson(true, r, "添加栏目", res)
 }
@@ -119,10 +122,13 @@ func (c *CmsMenu) Edit(r *ghttp.Request) {
 	if err != nil {
 		response.FailJson(true, r, err.Error())
 	}
-
+	//获取分类栏目模板
+	ListTemp, contentTemp := cms_service.GetCmsTemplate()
 	res := g.Map{
-		"menuInfo":   menuInfo,
-		"parentList": menus,
+		"menuInfo":    menuInfo,
+		"parentList":  menus,
+		"listTemp":    ListTemp,
+		"contentTemp": contentTemp,
 	}
 	response.SusJson(true, r, "修改栏目", res)
 }

app/controller/admin/index.go

@@ -27,6 +27,7 @@ func (c *Index) GetInfo(r *ghttp.Request) {
 	}
 	userInfo := gconv.Map(userEntity)
 	rolesList := make([]string, 0, 10)
+	var permissions []string
 	if userInfo != nil {
 		userId := userEntity.Id
 		delete(userInfo, "user_password")
@@ -44,6 +45,19 @@ func (c *Index) GetInfo(r *ghttp.Request) {
 					roleIds[k] = v.Id
 				}
 				userInfo["roles"] = roles
+				isSuperAdmin := false
+				//获取无需验证权限的用户id
+				for _, v := range service.NotCheckAuthAdminIds {
+					if gconv.Uint64(v) == userId {
+						isSuperAdmin = true
+						break
+					}
+				}
+				if isSuperAdmin {
+					permissions = []string{"*/*/*"}
+				} else {
+					permissions, err = user_service.GetPermissions(roleIds)
+				}
 				rolesList = name
 			} else {
 				g.Log().Error(err)
@@ -56,7 +70,7 @@ func (c *Index) GetInfo(r *ghttp.Request) {
 	result := g.Map{
 		"user":        userInfo,
 		"roles":       rolesList,
-		"permissions": nil,
+		"permissions": permissions,
 	}
 
 	response.SusJson(true, r, "ok", result)

app/controller/admin/plug_link.go

@@ -23,7 +23,7 @@ func (c *PlugLink) Add(r *ghttp.Request) {
 			response.FailJson(true, r, err.(*gvalid.Error).FirstString())
 		}
 		// 调用service中的添加函数添加链接
-		err = plug_link.AddSave(req)
+		err = plug_link_service.AddSavePlugLink(req)
 		if err != nil {
 			response.FailJson(true, r, err.Error())
 		}