public/gfast
1
0
Fork 0
mirror of https://github.com/tiger1103/gfast.git synced 2026-09-21 18:20:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

升级gf与gtoken到最新版本，更新gf生成的model为最新版本

Browse Source
This commit is contained in:
yxh
2020-09-18 11:53:04 +08:00
parent 4fbecae513
commit 092db0cb2b
50 changed files with 1301 additions and 1055 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/service/admin/cms_service/news.go
+1 -1
View File
@@ -14,7 +14,7 @@ import (
)
//添加文章操作
func AddNews(req *cms_news.ReqAddParams, cateIds []int, userId int) (insId int64, err error) {
func AddNews(req *cms_news.ReqAddParams, cateIds []int, userId uint64) (insId int64, err error) {
cateIds, err = getPubCateIds(cateIds)
if err != nil {
return
app/service/admin/dept_service/dept.go
+1 -1
View File
@@ -29,7 +29,7 @@ func EditDept(data *sys_dept.EditParams) error {
return sys_dept.EditDept(data)
}
func GetDeptById(id int64) (*sys_dept.Dept, error) {
func GetDeptById(id uint64) (*sys_dept.Dept, error) {
return sys_dept.GetDeptById(id)
}
app/service/admin/dict_service/dict_data.go
+2 -2
View File
@@ -5,12 +5,12 @@ import (
)
//添加字典数据操作
func AddSaveData(req *sys_dict_data.AddDataReq, userId int) (int64, error) {
func AddSaveData(req *sys_dict_data.AddDataReq, userId uint64) (int64, error) {
return sys_dict_data.AddSaveData(req, userId)
}
//修改字典数据操作
func EditSaveData(req *sys_dict_data.EditDataReq, userId int) (int64, error) {
func EditSaveData(req *sys_dict_data.EditDataReq, userId uint64) (int64, error) {
return sys_dict_data.EditSaveData(req, userId)
}
app/service/admin/dict_service/dict_type.go
+2 -2
View File
@@ -19,12 +19,12 @@ func CheckDictTypeUnique(dictType *sys_dict_type.EditReq) bool {
}
//添加数据
func AddSave(req *sys_dict_type.AddReq, userId int) (int64, error) {
func AddSave(req *sys_dict_type.AddReq, userId uint64) (int64, error) {
return sys_dict_type.AddSave(req, userId)
}
//修改保存字典类型
func EditSave(req *sys_dict_type.EditReq, userId int) (int64, error) {
func EditSave(req *sys_dict_type.EditReq, userId uint64) (int64, error) {
return sys_dict_type.EditSave(req, userId)
}
app/service/admin/monitor_service/job.go
+2 -2
View File
@@ -17,12 +17,12 @@ func init() {
}
//添加计划任务
func AddJob(req *sys_job.ReqAdd, userId int) (id int64, err error) {
func AddJob(req *sys_job.ReqAdd, userId uint64) (id int64, err error) {
return sys_job.Add(req, userId)
}
//修改计划任务
func EditJob(req *sys_job.ReqEdit, userId int) (rows int64, err error) {
func EditJob(req *sys_job.ReqEdit, userId uint64) (rows int64, err error) {
return sys_job.Edit(req, userId)
}
app/service/admin/params_service/params.go
+2 -2
View File
@@ -7,12 +7,12 @@ import (
)
//保存参数
func AddSave(req *sys_config.AddReq, userId int) (id int64, err error) {
func AddSave(req *sys_config.AddReq, userId uint64) (id int64, err error) {
return sys_config.AddSave(req, userId)
}
//修改保存
func EditSave(req *sys_config.EditReq, userId int) (int64, error) {
func EditSave(req *sys_config.EditReq, userId uint64) (int64, error) {
return sys_config.EditSave(req, userId)
}
app/service/admin/user_service/user.go
+8 -8
View File
@@ -104,12 +104,12 @@ func GetCurrentUserInfo(r *ghttp.Request) (map[string]interface{}, error) {
}
func GetPostsByUserId(id int) ([]*sys_post.Entity, error) {
func GetPostsByUserId(id uint64) ([]*sys_post.Entity, error) {
return user_post.GetPostsByUserId(id)
}
//获取登陆用户ID
func GetLoginID(r *ghttp.Request) (userId int) {
func GetLoginID(r *ghttp.Request) (userId uint64) {
userInfo := GetLoginAdminInfo(r)
if userInfo != nil {
userId = userInfo.Id
@@ -156,7 +156,7 @@ func GetAdminList(req *user.SearchReq) (total, page int, userList []*user.Entity
}
//获取管理员的角色信息
func GetAdminRole(userId int, allRoleList []*role.Entity) (roles []*role.Entity, err error) {
func GetAdminRole(userId uint64, allRoleList []*role.Entity) (roles []*role.Entity, err error) {
roleIds, err := GetAdminRoleIds(userId)
if err != nil {
return
@@ -173,7 +173,7 @@ func GetAdminRole(userId int, allRoleList []*role.Entity) (roles []*role.Entity,
}
//获取管理员对应的角色ids
func GetAdminRoleIds(userId int) (roleIds []int, err error) {
func GetAdminRoleIds(userId uint64) (roleIds []uint, err error) {
enforcer, e := casbin_adapter_service.GetEnforcer()
if e != nil {
err = e
@@ -182,16 +182,16 @@ func GetAdminRoleIds(userId int) (roleIds []int, err error) {
//查询关联角色规则
groupPolicy := enforcer.GetFilteredGroupingPolicy(0, fmt.Sprintf("u_%d", userId))
if len(groupPolicy) > 0 {
roleIds = make([]int, len(groupPolicy))
roleIds = make([]uint, len(groupPolicy))
//得到角色id的切片
for k, v := range groupPolicy {
roleIds[k] = gconv.Int(gstr.SubStr(v[1], 2))
roleIds[k] = gconv.Uint(gstr.SubStr(v[1], 2))
}
}
return
}
func GetAdminPosts(userId int) (postIds []int64, err error) {
func GetAdminPosts(userId uint64) (postIds []int64, err error) {
return user_post.GetAdminPosts(userId)
}
@@ -213,7 +213,7 @@ func GetAllMenus() (menus g.List, err error) {
}
//获取管理员所属角色菜单
func GetAdminMenusByRoleIds(roleIds []int) (menus g.List, err error) {
func GetAdminMenusByRoleIds(roleIds []uint) (menus g.List, err error) {
//获取角色对应的菜单id
enforcer, e := casbin_adapter_service.GetEnforcer()
if e != nil {