Skip to content

G
gin-vue-admin

祺技世界 / gin-vue-admin
与 Fork 源项目一致

Fork自 FLIPPED-AURORA / gin-vue-admin

通知 6
Star 0
Fork 0
G
gin-vue-admin

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 e108521f 编写于 作者: Sliver_Horn's avatar Sliver_Horn
浏览文件
操作

更新测试文档及初始数据的错误,修复in条件查询, gormv2取消()的占位符,更新模板文件的()占位符

上级 4907706b
隐藏空白更改
内联 并排
Showing with 99 addition and 53 deletion
server/GORMV2接口测试文档.md
浏览文件 @ e108521f
| 路由path | 路由描述 | 测试情况 | 备注 |
| ------------------------------------------------- | ----------------------- | :------: | ---------- |
| /base/login | 用户登录 | √ | SliverHorn |
| /base/register | 用户注册 | | |
| /base/register | 用户注册 | √ | SliverHorn |
| /api/createApi | 创建api | √ | SliverHorn |
| /api/getApiList | 获取api详细信息 | √ | SliverHorn |
| /api/deleteApi | 删除Api | √ | SliverHorn |
......@@ -12,57 +12,109 @@
| /authority/deleteAuthority | 删除角色 | √ | SliverHorn |
| /authority/getAuthorityList | 获取角色列表 | √ | SliverHorn |
| /menu/getMenu | 获取菜单树 | √ | SliverHorn |
| /menu/getMenuList | 分页获取基础menu列表 | | |
| /menu/getMenuList | 分页获取基础menu列表 | √ | SliverHorn |
| /menu/addBaseMenu | 新增菜单 | | |
| /menu/getBaseMenuTree | 获取用户动态路由 | | |
| /menu/addMenuAuthority | 增加menu和角色关联关系 | | |
| /menu/getMenuAuthority | 获取指定角色menu | | |
| /menu/getBaseMenuTree | 获取用户动态路由 | √ | SliverHorn |
| /menu/addMenuAuthority | 增加menu和角色关联关系 | √ | SliverHorn |
| /menu/getMenuAuthority | 获取指定角色menu | √ | SliverHorn |
| /menu/deleteBaseMenu | 删除菜单 | | |
| /menu/updateBaseMenu | 更新菜单 | | |
| /menu/getBaseMenuById | 根据id获取菜单 | | |
| /menu/getBaseMenuById | 根据id获取菜单 | √ | SliverHorn |
| /user/changePassword | 修改密码 | | |
| /user/uploadHeaderImg | 上传头像 | | |
| /user/uploadHeaderImg | 上传头像 | √ | SliverHorn |
| /user/getInfoList | 分页获取用户列表 | | |
| /user/getUserList | 获取用户列表 | | |
| /user/setUserAuthority | 修改用户角色 | | |
| /fileUploadAndDownload/upload | 文件上传示例 | | |
| /fileUploadAndDownload/getFileList | 获取上传文件列表 | | |
| /casbin/updateCasbin | 更改角色api权限 | | |
| /casbin/getPolicyPathByAuthorityId | 获取权限列表 | | |
| /fileUploadAndDownload/deleteFile | 删除文件 | | |
| /user/getUserList | 获取用户列表 | √ | SliverHorn |
| /user/setUserAuthority | 修改用户角色 | √ | SliverHorn |
| /fileUploadAndDownload/upload | 文件上传示例 | √ | SliverHorn |
| /fileUploadAndDownload/getFileList | 获取上传文件列表 | √ | SliverHorn |
| /casbin/updateCasbin | 更改角色api权限 | √ | SliverHorn |
| /casbin/getPolicyPathByAuthorityId | 获取权限列表 | √ | SliverHorn |
| /fileUploadAndDownload/deleteFile | 删除文件 | √ | SliverHorn |
| /jwt/jsonInBlacklist | jwt加入黑名单 | | |
| /authority/setDataAuthority | 设置角色资源权限 | | |
| /authority/setDataAuthority | 设置角色资源权限 | √ | SliverHorn |
| /system/getSystemConfig | 获取配置文件内容 | | |
| /system/setSystemConfig | 设置配置文件内容 | | |
| /customer/customer | 创建客户 | | |
| /customer/customer | 创建客户 | √ | SliverHorn |
| /customer/customer | 更新客户 | | |
| /customer/customer | 删除客户 | | |
| /customer/customer | 删除客户 | √ | SliverHorn |
| /customer/customer | 获取单一客户 | | |
| /customer/customerList | 获取客户列表 | | |
| /customer/customerList | 获取客户列表 | √ | SliverHorn |
| /casbin/casbinTest/:pathParam | RESTFUL模式测试 | | |
| /autoCode/createTemp | 自动化代码 | | |
| /authority/updateAuthority | 更新角色信息 | | |
| /authority/copyAuthority | 拷贝角色 | | |
| /user/deleteUser | 删除用户 | | |
| /sysDictionaryDetail/createSysDictionaryDetail | 新增字典内容 | | |
| /sysDictionaryDetail/deleteSysDictionaryDetail | 新增字典内容 | | |
| /sysDictionaryDetail/updateSysDictionaryDetail | 新增字典内容 | | |
| /sysDictionaryDetail/findSysDictionaryDetail | 根据ID获取字典内容 | | |
| /sysDictionaryDetail/getSysDictionaryDetailList | 获取字典内容列表 | | |
| /sysDictionary/createSysDictionary | 新增字典 | | |
| /sysDictionary/deleteSysDictionary | 删除字典 | | |
| /sysDictionary/updateSysDictionary | 更新字典 | | |
| /sysDictionary/findSysDictionary | 根据ID获取字典 | | |
| /sysDictionary/getSysDictionaryList | 获取字典列表 | | |
| /sysOperationRecord/createSysOperationRecord | 新增操作记录 | | |
| /sysOperationRecord/deleteSysOperationRecord | 删除操作记录 | | |
| /authority/updateAuthority | 更新角色信息 | √ | SliverHorn |
| /authority/copyAuthority | 拷贝角色 | √ | SliverHorn |
| /user/deleteUser | 删除用户 | √ | SliverHorn |
| /sysDictionaryDetail/createSysDictionaryDetail | 新增字典内容 | √ | SliverHorn |
| /sysDictionaryDetail/deleteSysDictionaryDetail | 删除字典内容 | √ | SliverHorn |
| /sysDictionaryDetail/updateSysDictionaryDetail | 更新字典内容 | √ | SliverHorn |
| /sysDictionaryDetail/findSysDictionaryDetail | 根据ID获取字典内容 | √ | SliverHorn |
| /sysDictionaryDetail/getSysDictionaryDetailList | 获取字典内容列表 | √ | SliverHorn |
| /sysDictionary/createSysDictionary | 新增字典 | √ | SliverHorn |
| /sysDictionary/deleteSysDictionary | 删除字典 | √ | SliverHorn |
| /sysDictionary/updateSysDictionary | 更新字典 | √ | SliverHorn |
| /sysDictionary/findSysDictionary | 根据ID获取字典 | √ | SliverHorn |
| /sysDictionary/getSysDictionaryList | 获取字典列表 | √ | SliverHorn |
| /sysOperationRecord/createSysOperationRecord | 新增操作记录 | √ | SliverHorn |
| /sysOperationRecord/deleteSysOperationRecord | 删除操作记录 | √ | SliverHorn |
| /sysOperationRecord/updateSysOperationRecord | 更新操作记录 | | |
| /sysOperationRecord/findSysOperationRecord | 根据ID获取操作记录 | | |
| /sysOperationRecord/getSysOperationRecordList | 获取操作记录列表 | | |
| /autoCode/getTables | 获取数据库表 | √ | |
| /autoCode/getDB | 获取所有数据库 | √ | |
| /autoCode/getColume | 获取所选table的所有字段 | √ | |
| /sysOperationRecord/findSysOperationRecord | 根据ID获取操作记录 | √ | SliverHorn |
| /sysOperationRecord/getSysOperationRecordList | 获取操作记录列表 | √ | SliverHorn |
| /autoCode/getTables | 获取数据库表 | √ | SliverHorn |
| /autoCode/getDB | 获取所有数据库 | √ | SliverHorn |
| /autoCode/getColume | 获取所选table的所有字段 | √ | SliverHorn |
| /sysOperationRecord/deleteSysOperationRecordByIds | 批量删除操作历史 | | |
| /simpleUploader/upload | 插件版分片上传 | | |
| /simpleUploader/checkFileMd5 | 文件完整度验证 | | |
| /simpleUploader/mergeFileMd5 | 上传完成合并文件 | | |
### Gorm V2 Vs Gorm V1
- in查询,v2不需要括号了
```go
// V2文档
// IN
db.Where("name IN ?", []string{"jinzhu", "jinzhu 2"}).Find(&users)
// SELECT * FROM users WHERE name in ('jinzhu','jinzhu 2');
// V1文档
// IN
db.Where("name IN (?)", []string{"jinzhu", "jinzhu 2"}).Find(&users)
//// SELECT * FROM users WHERE name in ('jinzhu','jinzhu 2');
```
- v2将RecordNotFound链式调用,取而代之是errors.Is(error, gorm.ErrRecordNotFound)
```go
// V2版本代码(https://github.com/flipped-aurora/gin-vue-admin/blob/gva_gormv2_dev/server/service/sys_user.go)
func Register(u model.SysUser) (err error, userInter model.SysUser) {
var user model.SysUser
// 判断用户名是否注册
notRegister := errors.Is(global.GVA_DB.Where("username = ?", u.Username).First(&user).Error, gorm.ErrRecordNotFound)
// notRegister为false表明读取到了 不能注册
if !notRegister {
return errors.New("用户名已注册"), userInter
} else {
// 否则 附加uuid 密码md5简单加密 注册
u.Password = utils.MD5V([]byte(u.Password))
u.UUID = uuid.NewV4()
err = global.GVA_DB.Create(&u).Error
}
return err, u
}
// V1版本Register(https://github.com/flipped-aurora/gin-vue-admin/blob/master/server/service/sys_user.go)
func Register(u model.SysUser) (err error, userInter model.SysUser) {
var user model.SysUser
// 判断用户名是否注册
notRegister := global.GVA_DB.Where("username = ?", u.Username).First(&user).RecordNotFound()
// notRegister为false表明读取到了 不能注册
if !notRegister {
return errors.New("用户名已注册"), userInter
} else {
// 否则 附加uuid 密码md5简单加密 注册
u.Password = utils.MD5V([]byte(u.Password))
u.UUID = uuid.NewV4()
err = global.GVA_DB.Create(&u).Error
}
return err, u
}
```
server/model/exa_customer.go
浏览文件 @ e108521f
......@@ -16,6 +16,6 @@ type ExaCustomer struct {
func ExaCustomerData() []ExaCustomer {
return []ExaCustomer{
{Model: gorm.Model{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, CustomerName: "测试客户", CustomerPhoneData: "1761111111", SysUserID: 10, SysUserAuthorityID: "888"},
{Model: gorm.Model{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, CustomerName: "测试客户", CustomerPhoneData: "1761111111", SysUserID: 1, SysUserAuthorityID: "888"},
}
}
server/resource/template/te/service.go.tpl
浏览文件 @ e108521f
......@@ -35,7 +35,7 @@ func Delete{{.StructName}}({{.Abbreviation}} model.{{.StructName}}) (err error)
// @return error
func Delete{{.StructName}}ByIds(ids request.IdsReq) (err error) {
err = global.GVA_DB.Delete(&[]model.{{.StructName}}{},"id in (?)",ids.Ids).Error
err = global.GVA_DB.Delete(&[]model.{{.StructName}}{},"id in ?",ids.Ids).Error
return err
}
......
server/service/exa_customer.go
浏览文件 @ e108521f
......@@ -70,11 +70,11 @@ func GetCustomerInfoList(sysUserAuthorityID string, info request.PageInfo) (err
dataId = append(dataId, v.AuthorityId)
}
var CustomerList []model.ExaCustomer
err = db.Where("sys_user_authority_id in (?)", dataId).Count(&total).Error
err = db.Where("sys_user_authority_id in ?", dataId).Count(&total).Error
if err != nil {
return err, CustomerList, total
} else {
err = db.Limit(limit).Offset(offset).Preload("SysUser").Where("sys_user_authority_id in (?)", dataId).Find(&CustomerList).Error
err = db.Limit(limit).Offset(offset).Preload("SysUser").Where("sys_user_authority_id in ?", dataId).Find(&CustomerList).Error
}
return err, CustomerList, total
}
server/service/initialize.go
浏览文件 @ e108521f
......@@ -12,8 +12,8 @@ type SysAuthorityMenus struct {
}
type SysDataAuthorityId struct {
SysAuthorityAuthorityId string
SysBaseMenuId string
SysAuthorityAuthorityId string
DataAuthorityIdAuthorityId string
}
func InitSysApi() (err error) {
......@@ -44,8 +44,8 @@ func InitExaCustomer() (err error) {
}
func InitCasbinModel() (err error) {
if !global.GVA_DB.Migrator().HasTable("casbin_rule"){
if err := global.GVA_DB.Migrator().CreateTable(&gormadapter.CasbinRule{}); err != nil{
if !global.GVA_DB.Migrator().HasTable("casbin_rule") {
if err := global.GVA_DB.Migrator().CreateTable(&gormadapter.CasbinRule{}); err != nil {
return err
}
}
......@@ -162,16 +162,10 @@ func InitSysDataAuthorityId() (err error) {
{"888", "888"},
{"888", "8881"},
{"888", "9528"},
{"888222", "888"},
{"888222", "8881"},
{"888222", "9528"},
{"8883", "888"},
{"8883", "8881"},
{"8883", "9528"},
{"9528", "8881"},
{"9528", "9528"},
}
if tx.Table("sys_authority_menus").Create(&insert).Error != nil { // 遇到错误时回滚事务
if tx.Table("sys_data_authority_ids").Create(&insert).Error != nil { // 遇到错误时回滚事务
tx.Rollback()
}
return tx.Commit().Error
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或