Merge pull request #83 from wenjianzhang/v1.0.0-fixbug
Ignore error validation
This commit is contained in:
14 files changed
+61
-29
No files matched your search
@@ -73,8 +73,7 @@
|
||||
settings:
|
||||
application:
|
||||
# 项目启动环境
|
||||
mode: dev # dev开发环境 test测试环境 prod线上环境;当 mode:demo 时,GET以外的请求操作提示
|
||||
demomsg: "谢谢您的参与,但为了大家更好的体验,所以本次提交就算了吧!"
|
||||
mode: dev # dev开发环境 test测试环境 prod线上环境;
|
||||
host: 0.0.0.0 # 主机ip 或者域名,默认0.0.0.0
|
||||
# 服务名称
|
||||
name: go-admin
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
package blog
|
||||
+4
-2
@@ -80,8 +80,10 @@ func (e *SysConfig) GetPage(pageSize int, pageIndex int) ([]SysConfig, int, erro
|
||||
// 数据权限控制
|
||||
dataPermission := new(DataPermission)
|
||||
dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
|
||||
table = dataPermission.GetDataScope("sys_config", table)
|
||||
|
||||
table, err := dataPermission.GetDataScope("sys_config", table)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
var count int
|
||||
|
||||
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
|
||||
|
||||
+11
-5
@@ -1,6 +1,7 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"github.com/jinzhu/gorm"
|
||||
"go-admin/tools"
|
||||
)
|
||||
@@ -12,14 +13,19 @@ type DataPermission struct {
|
||||
RoleId int
|
||||
}
|
||||
|
||||
func (e *DataPermission) GetDataScope(tbname string, table *gorm.DB) *gorm.DB {
|
||||
func (e *DataPermission) GetDataScope(tbname string, table *gorm.DB) (*gorm.DB, error) {
|
||||
SysUser := new(SysUser)
|
||||
SysRole := new(SysRole)
|
||||
SysUser.UserId = e.UserId
|
||||
user, _ := SysUser.Get()
|
||||
user, err := SysUser.Get()
|
||||
if err != nil {
|
||||
return nil, errors.New("获取用户数据出错 msg:" + err.Error())
|
||||
}
|
||||
SysRole.RoleId = user.RoleId
|
||||
role, _ := SysRole.Get()
|
||||
|
||||
role, err := SysRole.Get()
|
||||
if err != nil {
|
||||
return nil, errors.New("获取用户数据出错 msg:" + err.Error())
|
||||
}
|
||||
if role.DataScope == "2" {
|
||||
table = table.Where(tbname+".create_by in (select sys_user.user_id from sys_role_dept left join sys_user on sys_user.dept_id=sys_role_dept.dept_id where sys_role_dept.role_id = ?)", user.RoleId)
|
||||
}
|
||||
@@ -33,5 +39,5 @@ func (e *DataPermission) GetDataScope(tbname string, table *gorm.DB) *gorm.DB {
|
||||
table = table.Where(tbname+".create_by = ?", e.UserId)
|
||||
}
|
||||
|
||||
return table
|
||||
return table, nil
|
||||
}
|
||||
+5
-1
@@ -117,7 +117,11 @@ func (e *Dept) GetPage(bl bool) ([]Dept, error) {
|
||||
// 数据权限控制
|
||||
dataPermission := new(DataPermission)
|
||||
dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
|
||||
table = dataPermission.GetDataScope("sys_dept", table)
|
||||
tableper, err := dataPermission.GetDataScope("sys_dept", table)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
table = tableper
|
||||
}
|
||||
|
||||
if err := table.Order("sort").Find(&doc).Error; err != nil {
|
||||
|
||||
+4
-2
@@ -107,8 +107,10 @@ func (e *DictData) GetPage(pageSize int, pageIndex int) ([]DictData, int, error)
|
||||
// 数据权限控制
|
||||
dataPermission := new(DataPermission)
|
||||
dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
|
||||
table = dataPermission.GetDataScope("sys_dict_data", table)
|
||||
|
||||
table, err := dataPermission.GetDataScope("sys_dict_data", table)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
var count int
|
||||
|
||||
if err := table.Order("dict_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
|
||||
|
||||
+4
-2
@@ -95,8 +95,10 @@ func (e *DictType) GetPage(pageSize int, pageIndex int) ([]DictType, int, error)
|
||||
// 数据权限控制
|
||||
dataPermission := new(DataPermission)
|
||||
dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
|
||||
table = dataPermission.GetDataScope("sys_dict_type", table)
|
||||
|
||||
table, err := dataPermission.GetDataScope("sys_dict_type", table)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
var count int
|
||||
|
||||
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
|
||||
|
||||
+4
-2
@@ -261,8 +261,10 @@ func (e *Menu) GetPage() (Menus []Menu, err error) {
|
||||
// 数据权限控制
|
||||
dataPermission := new(DataPermission)
|
||||
dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
|
||||
table = dataPermission.GetDataScope("sys_menu", table)
|
||||
|
||||
table, err = dataPermission.GetDataScope("sys_menu", table)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = table.Order("sort").Find(&Menus).Error; err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
+4
-2
@@ -97,8 +97,10 @@ func (e *Post) GetPage(pageSize int, pageIndex int) ([]Post, int, error) {
|
||||
// 数据权限控制
|
||||
dataPermission := new(DataPermission)
|
||||
dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
|
||||
table = dataPermission.GetDataScope("sys_post", table)
|
||||
|
||||
table, err := dataPermission.GetDataScope("sys_post", table)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
var count int
|
||||
|
||||
if err := table.Order("sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
|
||||
|
||||
+4
-2
@@ -52,8 +52,10 @@ func (e *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int, error) {
|
||||
// 数据权限控制
|
||||
dataPermission := new(DataPermission)
|
||||
dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
|
||||
table = dataPermission.GetDataScope("sys_role", table)
|
||||
|
||||
table,err := dataPermission.GetDataScope("sys_role", table)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
var count int
|
||||
|
||||
if err := table.Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
|
||||
|
||||
+8
-3
@@ -146,8 +146,10 @@ func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, erro
|
||||
// 数据权限控制
|
||||
dataPermission := new(DataPermission)
|
||||
dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
|
||||
table = dataPermission.GetDataScope("sys_user", table)
|
||||
|
||||
table,err := dataPermission.GetDataScope("sys_user", table)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
var count int
|
||||
|
||||
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
|
||||
@@ -224,7 +226,10 @@ func (e *SysUser) BatchDelete(id []int) (Result bool, err error) {
|
||||
}
|
||||
|
||||
func (e *SysUser) SetPwd(pwd SysUserPwd) (Result bool, err error) {
|
||||
user, _ := e.Get()
|
||||
user, err := e.Get()
|
||||
if err != nil {
|
||||
tools.HasError(err, "获取用户数据失败(代码202)", 500)
|
||||
}
|
||||
_, err = tools.CompareHashAndPassword(user.Password, pwd.OldPassword)
|
||||
if err != nil {
|
||||
if strings.Contains(err.Error(), "hashedPassword is not the hash of the given password") {
|
||||
|
||||
@@ -69,8 +69,10 @@ func (e *{{.ClassName}}) GetPage(pageSize int, pageIndex int) ([]{{.ClassName}},
|
||||
// 数据权限控制(如果不需要数据权限请将此处去掉)
|
||||
dataPermission := new(DataPermission)
|
||||
dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
|
||||
table = dataPermission.GetDataScope(e.TableName(), table)
|
||||
|
||||
table,err := dataPermission.GetDataScope(e.TableName(), table)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
var count int
|
||||
|
||||
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
|
||||
|
||||
+4
-1
@@ -14,7 +14,10 @@ func TestGoModelTemplate(t *testing.T) {
|
||||
}
|
||||
table := tools.SysTables{}
|
||||
table.TableName = "sys_tables"
|
||||
tab, _ := table.Get()
|
||||
tab, err := table.Get()
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
file, err := os.Create("models/"+table.PackageName+".go")
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
|
||||
@@ -64,8 +64,10 @@ func (e *{{.ClassName}}) GetPage(pageSize int, pageIndex int) ([]{{.ClassName}},
|
||||
// 数据权限控制
|
||||
dataPermission := new(DataPermission)
|
||||
dataPermission.UserId, _ = utils.StringToInt(e.DataScope)
|
||||
table = dataPermission.GetDataScope("{{.TableName}}", table)
|
||||
|
||||
table,err := dataPermission.GetDataScope("{{.TableName}}", table)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
var count int32
|
||||
table = table.Offset((pageIndex - 1) * pageSize).Limit(pageSize)
|
||||
if err := table.Find(&doc).Error; err != nil {
|
||||
|
||||
Reference in new issue
Block a user