yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "pointChange"

Browse Source 
This reverts commit fb4dba161619c043b8acd4971eac5433eb6630ab.
This commit is contained in:
songzhibin97
2020-11-23 12:02:18 +08:00
parent 1ddd6dac4f
commit 8e87ae55a9
31 changed files with 114 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/service/exa_customer.go
+5 -5
View File
@@ -12,8 +12,8 @@ import (
//@param: e model.ExaCustomer
//@return: err error
func CreateExaCustomer(e *model.ExaCustomer) (err error) {
err = global.GVA_DB.Create(e).Error
func CreateExaCustomer(e model.ExaCustomer) (err error) {
err = global.GVA_DB.Create(&e).Error
return err
}
@@ -23,8 +23,8 @@ func CreateExaCustomer(e *model.ExaCustomer) (err error) {
//@param: e model.ExaCustomer
//@return: err error
func DeleteExaCustomer(e *model.ExaCustomer) (err error) {
err = global.GVA_DB.Delete(*e).Error
func DeleteExaCustomer(e model.ExaCustomer) (err error) {
err = global.GVA_DB.Delete(e).Error
return err
}
@@ -62,7 +62,7 @@ func GetCustomerInfoList(sysUserAuthorityID string, info request.PageInfo) (err
db := global.GVA_DB.Model(&model.ExaCustomer{})
var a model.SysAuthority
a.AuthorityId = sysUserAuthorityID
err, auth := GetAuthorityInfo(&a)
err, auth := GetAuthorityInfo(a)
var dataId []string
for _, v := range auth.DataAuthorityId {
dataId = append(dataId, v.AuthorityId)
server/service/exa_file_upload_download.go
+7 -7
View File
@@ -16,8 +16,8 @@ import (
//@param: file model.ExaFileUploadAndDownload
//@return: error
func Upload(file *model.ExaFileUploadAndDownload) error {
return global.GVA_DB.Create(file).Error
func Upload(file model.ExaFileUploadAndDownload) error {
return global.GVA_DB.Create(&file).Error
}
//@author: [piexlmax](https://github.com/piexlmax)
@@ -38,14 +38,14 @@ func FindFile(id uint) (error, model.ExaFileUploadAndDownload) {
//@param: file model.ExaFileUploadAndDownload
//@return: err error
func DeleteFile(file *model.ExaFileUploadAndDownload) (err error) {
func DeleteFile(file model.ExaFileUploadAndDownload) (err error) {
var fileFromDb model.ExaFileUploadAndDownload
err, fileFromDb = FindFile(file.ID)
oss := upload.NewOss()
if err = oss.DeleteFile(fileFromDb.Key); err != nil {
if err = oss.DeleteFile(fileFromDb.Key); err != nil{
return errors.New("文件删除失败")
}
err = global.GVA_DB.Where("id = ?", file.ID).Unscoped().Delete(*file).Error
err = global.GVA_DB.Where("id = ?", file.ID).Unscoped().Delete(file).Error
return err
}
@@ -55,7 +55,7 @@ func DeleteFile(file *model.ExaFileUploadAndDownload) (err error) {
//@param: info request.PageInfo
//@return: err error, list interface{}, total int64
func GetFileRecordInfoList(info *request.PageInfo) (err error, list interface{}, total int64) {
func GetFileRecordInfoList(info request.PageInfo) (err error, list interface{}, total int64) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB
@@ -85,7 +85,7 @@ func UploadFile(header *multipart.FileHeader, noSave string) (err error, file mo
Tag: s[len(s)-1],
Key: key,
}
return Upload(&f), f
return Upload(f), f
}
return
}
server/service/exa_simple_uploader.go
+2 -2
View File
@@ -17,8 +17,8 @@ import (
//@param: uploader model.ExaSimpleUploader
//@return: err error
func SaveChunk(uploader *model.ExaSimpleUploader) (err error) {
return global.GVA_DB.Create(*uploader).Error
func SaveChunk(uploader model.ExaSimpleUploader) (err error) {
return global.GVA_DB.Create(uploader).Error
}
//@author: [piexlmax](https://github.com/piexlmax)
server/service/jwt_black_list.go
+2 -2
View File
@@ -14,8 +14,8 @@ import (
//@param: jwtList model.JwtBlacklist
//@return: err error
func JsonInBlacklist(jwtList *model.JwtBlacklist) (err error) {
err = global.GVA_DB.Create(jwtList).Error
func JsonInBlacklist(jwtList model.JwtBlacklist) (err error) {
err = global.GVA_DB.Create(&jwtList).Error
return
}
server/service/sys_api.go
+7 -7
View File
@@ -14,11 +14,11 @@ import (
//@param: api model.SysApi
//@return: err error
func CreateApi(api *model.SysApi) (err error) {
func CreateApi(api model.SysApi) (err error) {
if !errors.Is(global.GVA_DB.Where("path = ? AND method = ?", api.Path, api.Method).First(&model.SysApi{}).Error, gorm.ErrRecordNotFound) {
return errors.New("存在相同api")
}
return global.GVA_DB.Create(api).Error
return global.GVA_DB.Create(&api).Error
}
//@author: [piexlmax](https://github.com/piexlmax)
@@ -27,8 +27,8 @@ func CreateApi(api *model.SysApi) (err error) {
//@param: api model.SysApi
//@return: err error
func DeleteApi(api *model.SysApi) (err error) {
err = global.GVA_DB.Delete(*api).Error
func DeleteApi(api model.SysApi) (err error) {
err = global.GVA_DB.Delete(api).Error
ClearCasbin(1, api.Path, api.Method)
return err
}
@@ -39,7 +39,7 @@ func DeleteApi(api *model.SysApi) (err error) {
//@param: api model.SysApi, info request.PageInfo, order string, desc bool
//@return: err error
func GetAPIInfoList(api *model.SysApi, info *request.PageInfo, order string, desc bool) (err error, list interface{}, total int64) {
func GetAPIInfoList(api model.SysApi, info request.PageInfo, order string, desc bool) (err error, list interface{}, total int64) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB.Model(&model.SysApi{})
@@ -109,7 +109,7 @@ func GetApiById(id float64) (err error, api model.SysApi) {
//@param: api model.SysApi
//@return: err error
func UpdateApi(api *model.SysApi) (err error) {
func UpdateApi(api model.SysApi) (err error) {
var oldA model.SysApi
err = global.GVA_DB.Where("id = ?", api.ID).First(&oldA).Error
if oldA.Path != api.Path || oldA.Method != api.Method {
@@ -124,7 +124,7 @@ func UpdateApi(api *model.SysApi) (err error) {
if err != nil {
return err
} else {
err = global.GVA_DB.Save(api).Error
err = global.GVA_DB.Save(&api).Error
}
}
return err
server/service/sys_authority.go
+6 -6
View File
@@ -16,7 +16,7 @@ import (
//@param: auth model.SysAuthority
//@return: err error, authority model.SysAuthority
func CreateAuthority(auth *model.SysAuthority) (err error, authority *model.SysAuthority) {
func CreateAuthority(auth model.SysAuthority) (err error, authority model.SysAuthority) {
var authorityBox model.SysAuthority
if !errors.Is(global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&authorityBox).Error, gorm.ErrRecordNotFound) {
return errors.New("存在相同角色id"), auth
@@ -31,7 +31,7 @@ func CreateAuthority(auth *model.SysAuthority) (err error, authority *model.SysA
//@param: copyInfo response.SysAuthorityCopyResponse
//@return: err error, authority model.SysAuthority
func CopyAuthority(copyInfo *response.SysAuthorityCopyResponse) (err error, authority model.SysAuthority) {
func CopyAuthority(copyInfo response.SysAuthorityCopyResponse) (err error, authority model.SysAuthority) {
var authorityBox model.SysAuthority
if !errors.Is(global.GVA_DB.Where("authority_id = ?", copyInfo.Authority.AuthorityId).First(&authorityBox).Error, gorm.ErrRecordNotFound) {
return errors.New("存在相同角色id"), authority
@@ -61,7 +61,7 @@ func CopyAuthority(copyInfo *response.SysAuthorityCopyResponse) (err error, auth
//@param: auth model.SysAuthority
//@return:err error, authority model.SysAuthority
func UpdateAuthority(auth *model.SysAuthority) (err error, authority *model.SysAuthority) {
func UpdateAuthority(auth model.SysAuthority) (err error, authority model.SysAuthority) {
err = global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&model.SysAuthority{}).Updates(&auth).Error
return err, auth
}
@@ -97,7 +97,7 @@ func DeleteAuthority(auth *model.SysAuthority) (err error) {
//@param: info request.PageInfo
//@return: err error, list interface{}, total int64
func GetAuthorityInfoList(info *request.PageInfo) (err error, list interface{}, total int64) {
func GetAuthorityInfoList(info request.PageInfo) (err error, list interface{}, total int64) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB
@@ -117,7 +117,7 @@ func GetAuthorityInfoList(info *request.PageInfo) (err error, list interface{},
//@param: auth model.SysAuthority
//@return: err error, sa model.SysAuthority
func GetAuthorityInfo(auth *model.SysAuthority) (err error, sa model.SysAuthority) {
func GetAuthorityInfo(auth model.SysAuthority) (err error, sa model.SysAuthority) {
err = global.GVA_DB.Preload("DataAuthorityId").Where("authority_id = ?", auth.AuthorityId).First(&sa).Error
return err, sa
}
@@ -128,7 +128,7 @@ func GetAuthorityInfo(auth *model.SysAuthority) (err error, sa model.SysAuthorit
//@param: auth model.SysAuthority
//@return:error
func SetDataAuthority(auth *model.SysAuthority) error {
func SetDataAuthority(auth model.SysAuthority) error {
var s model.SysAuthority
global.GVA_DB.Preload("DataAuthorityId").First(&s, "authority_id = ?", auth.AuthorityId)
err := global.GVA_DB.Model(&s).Association("DataAuthorityId").Replace(&auth.DataAuthorityId)
server/service/sys_auto_code.go
+4 -3
View File
@@ -28,7 +28,7 @@ type tplData struct {
//@param: model.AutoCodeStruct
//@return: error
func CreateTemp(autoCode *model.AutoCodeStruct) (err error) {
func CreateTemp(autoCode model.AutoCodeStruct) (err error) {
basePath := "resource/template"
// 获取 basePath 文件夹下所有tpl文件
tplFileList, err := GetAllTplFile(basePath, nil)
@@ -87,7 +87,7 @@ func CreateTemp(autoCode *model.AutoCodeStruct) (err error) {
if err != nil {
return err
}
if err = value.template.Execute(f, *autoCode); err != nil {
if err = value.template.Execute(f, autoCode); err != nil {
return err
}
_ = f.Close()
@@ -209,6 +209,7 @@ func addAutoMoveFile(data *tplData) {
}
}
//@author: [piexlmax](https://github.com/piexlmax)
//@author: [SliverHorn](https://github.com/SliverHorn)
//@function: CreateApi
@@ -268,4 +269,4 @@ func AutoCreateApi(a *model.AutoCodeStruct) (err error) {
return nil
})
return err
}
}
server/service/sys_base_menu.go
+1 -1
View File
@@ -36,7 +36,7 @@ func DeleteBaseMenu(id float64) (err error) {
//@param: menu model.SysBaseMenu
//@return:err error
func UpdateBaseMenu(menu *model.SysBaseMenu) (err error) {
func UpdateBaseMenu(menu model.SysBaseMenu) (err error) {
var oldMenu model.SysBaseMenu
upDateMap := make(map[string]interface{})
upDateMap["keep_alive"] = menu.KeepAlive
server/service/sys_dictionary.go
+5 -5
View File
@@ -14,11 +14,11 @@ import (
//@param: sysDictionary model.SysDictionary
//@return: err error
func CreateSysDictionary(sysDictionary *model.SysDictionary) (err error) {
func CreateSysDictionary(sysDictionary model.SysDictionary) (err error) {
if (!errors.Is(global.GVA_DB.First(&model.SysDictionary{}, "type = ?", sysDictionary.Type).Error, gorm.ErrRecordNotFound)) {
return errors.New("存在相同的type，不允许创建")
}
err = global.GVA_DB.Create(sysDictionary).Error
err = global.GVA_DB.Create(&sysDictionary).Error
return err
}
@@ -28,8 +28,8 @@ func CreateSysDictionary(sysDictionary *model.SysDictionary) (err error) {
//@param: sysDictionary model.SysDictionary
//@return: err error
func DeleteSysDictionary(sysDictionary *model.SysDictionary) (err error) {
err = global.GVA_DB.Delete(*sysDictionary).Delete(sysDictionary.SysDictionaryDetails).Error
func DeleteSysDictionary(sysDictionary model.SysDictionary) (err error) {
err = global.GVA_DB.Delete(sysDictionary).Delete(&sysDictionary.SysDictionaryDetails).Error
return err
}
@@ -78,7 +78,7 @@ func GetSysDictionary(Type string, Id uint) (err error, sysDictionary model.SysD
//@param: info request.SysDictionarySearch
//@return: err error, list interface{}, total int64
func GetSysDictionaryInfoList(info *request.SysDictionarySearch) (err error, list interface{}, total int64) {
func GetSysDictionaryInfoList(info request.SysDictionarySearch) (err error, list interface{}, total int64) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
// 创建db
server/service/sys_dictionary_detail.go
+5 -5
View File
@@ -12,8 +12,8 @@ import (
//@param: sysDictionaryDetail model.SysDictionaryDetail
//@return: err error
func CreateSysDictionaryDetail(sysDictionaryDetail *model.SysDictionaryDetail) (err error) {
err = global.GVA_DB.Create(sysDictionaryDetail).Error
func CreateSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (err error) {
err = global.GVA_DB.Create(&sysDictionaryDetail).Error
return err
}
@@ -23,8 +23,8 @@ func CreateSysDictionaryDetail(sysDictionaryDetail *model.SysDictionaryDetail) (
//@param: sysDictionaryDetail model.SysDictionaryDetail
//@return: err error
func DeleteSysDictionaryDetail(sysDictionaryDetail *model.SysDictionaryDetail) (err error) {
err = global.GVA_DB.Delete(*sysDictionaryDetail).Error
func DeleteSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (err error) {
err = global.GVA_DB.Delete(sysDictionaryDetail).Error
return err
}
@@ -56,7 +56,7 @@ func GetSysDictionaryDetail(id uint) (err error, sysDictionaryDetail model.SysDi
//@param: info request.SysDictionaryDetailSearch
//@return: err error
func GetSysDictionaryDetailInfoList(info *request.SysDictionaryDetailSearch) (err error, list interface{}, total int64) {
func GetSysDictionaryDetailInfoList(info request.SysDictionaryDetailSearch) (err error, list interface{}, total int64) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
// 创建db
server/service/sys_menu.go
+2 -2
View File
@@ -89,11 +89,11 @@ func getBaseChildrenList(menu *model.SysBaseMenu, treeMap map[string][]model.Sys
//@param: menu model.SysBaseMenu
//@return: err error
func AddBaseMenu(menu *model.SysBaseMenu) (err error) {
func AddBaseMenu(menu model.SysBaseMenu) (err error) {
if !errors.Is(global.GVA_DB.Where("name = ?", menu.Name).First(&model.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
err = errors.New("存在重复name，请修改name")
}
err = global.GVA_DB.Create(menu).Error
err = global.GVA_DB.Create(&menu).Error
return err
}
server/service/sys_operation_record.go
+6 -6
View File
@@ -12,8 +12,8 @@ import (
//@param: sysOperationRecord model.SysOperationRecord
//@return: err error
func CreateSysOperationRecord(sysOperationRecord *model.SysOperationRecord) (err error) {
err = global.GVA_DB.Create(sysOperationRecord).Error
func CreateSysOperationRecord(sysOperationRecord model.SysOperationRecord) (err error) {
err = global.GVA_DB.Create(&sysOperationRecord).Error
return err
}
@@ -24,7 +24,7 @@ func CreateSysOperationRecord(sysOperationRecord *model.SysOperationRecord) (err
//@param: ids request.IdsReq
//@return: err error
func DeleteSysOperationRecordByIds(ids *request.IdsReq) (err error) {
func DeleteSysOperationRecordByIds(ids request.IdsReq) (err error) {
err = global.GVA_DB.Delete(&[]model.SysOperationRecord{}, "id in (?)", ids.Ids).Error
return err
}
@@ -35,8 +35,8 @@ func DeleteSysOperationRecordByIds(ids *request.IdsReq) (err error) {
//@param: sysOperationRecord model.SysOperationRecord
//@return: err error
func DeleteSysOperationRecord(sysOperationRecord *model.SysOperationRecord) (err error) {
err = global.GVA_DB.Delete(*sysOperationRecord).Error
func DeleteSysOperationRecord(sysOperationRecord model.SysOperationRecord) (err error) {
err = global.GVA_DB.Delete(sysOperationRecord).Error
return err
}
@@ -58,7 +58,7 @@ func GetSysOperationRecord(id uint) (err error, sysOperationRecord model.SysOper
//@param: info request.SysOperationRecordSearch
//@return: err error, list interface{}, total int64
func GetSysOperationRecordInfoList(info *request.SysOperationRecordSearch) (err error, list interface{}, total int64) {
func GetSysOperationRecordInfoList(info request.SysOperationRecordSearch) (err error, list interface{}, total int64) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
// 创建db
server/service/sys_system.go
+5 -4
View File
@@ -24,7 +24,7 @@ func GetSystemConfig() (err error, conf config.Server) {
//@param: system model.System
//@return: err error
func SetSystemConfig(system *model.System) (err error) {
func SetSystemConfig(system model.System) (err error) {
cs := utils.StructToMap(system.Config)
for k, v := range cs {
global.GVA_VP.Set(k, v)
@@ -41,18 +41,19 @@ func SetSystemConfig(system *model.System) (err error) {
func GetServerInfo() (server *utils.Server, err error) {
var s utils.Server
s.Os = utils.InitOS()
if s.Cpu, err = utils.InitCPU(); err != nil {
if s.Cpu, err = utils.InitCPU(); err != nil{
global.GVA_LOG.Error("func utils.InitCPU() Failed!", zap.String("err", err.Error()))
return &s, err
}
if s.Rrm, err = utils.InitRAM(); err != nil {
if s.Rrm, err = utils.InitRAM(); err != nil{
global.GVA_LOG.Error("func utils.InitRAM() Failed!", zap.String("err", err.Error()))
return &s, err
}
if s.Disk, err = utils.InitDisk(); err != nil {
if s.Disk, err = utils.InitDisk(); err != nil{
global.GVA_LOG.Error("func utils.InitDisk() Failed!", zap.String("err", err.Error()))
return &s, err
}
return &s, nil
}
server/service/sys_user.go
+7 -6
View File
@@ -10,13 +10,14 @@ import (
"gorm.io/gorm"
)
//@author: [piexlmax](https://github.com/piexlmax)
//@function: Register
//@description: 用户注册
//@param: u model.SysUser
//@return: err error, userInter model.SysUser
func Register(u *model.SysUser) (err error, userInter *model.SysUser) {
func Register(u model.SysUser) (err error, userInter model.SysUser) {
var user model.SysUser
if !errors.Is(global.GVA_DB.Where("username = ?", u.Username).First(&user).Error, gorm.ErrRecordNotFound) { // 判断用户名是否注册
return errors.New("用户名已注册"), userInter
@@ -24,7 +25,7 @@ func Register(u *model.SysUser) (err error, userInter *model.SysUser) {
// 否则 附加uuid 密码md5简单加密 注册
u.Password = utils.MD5V([]byte(u.Password))
u.UUID = uuid.NewV4()
err = global.GVA_DB.Create(u).Error
err = global.GVA_DB.Create(&u).Error
return err, u
}
@@ -60,7 +61,7 @@ func ChangePassword(u *model.SysUser, newPassword string) (err error, userInter
//@param: info request.PageInfo
//@return: err error, list interface{}, total int64
func GetUserInfoList(info *request.PageInfo) (err error, list interface{}, total int64) {
func GetUserInfoList(info request.PageInfo) (err error, list interface{}, total int64) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB.Model(&model.SysUser{})
@@ -99,7 +100,7 @@ func DeleteUser(id float64) (err error) {
//@param: reqUser model.SysUser
//@return: err error, user model.SysUser
func SetUserInfo(reqUser *model.SysUser) (err error, user *model.SysUser) {
func SetUserInfo(reqUser model.SysUser) (err error, user model.SysUser) {
err = global.GVA_DB.Updates(&reqUser).Error
return err, reqUser
}
@@ -124,8 +125,8 @@ func FindUserById(id int) (err error, user *model.SysUser) {
func FindUserByUuid(uuid string) (err error, user *model.SysUser) {
var u model.SysUser
if err = global.GVA_DB.Where("`uuid` = ?", uuid).First(&u).Error; err != nil {
if err = global.GVA_DB.Where("`uuid` = ?", uuid).First(&u).Error; err != nil{
return errors.New("用户不存在"), &u
}
return nil, &u
}
}
server/service/sys_workflow.go
+2 -2
View File
@@ -11,7 +11,7 @@ import (
//@param: wk model.SysWorkflow
//@return: error
func Create(wk *model.SysWorkflow) error {
err := global.GVA_DB.Create(wk).Error
func Create(wk model.SysWorkflow) error {
err := global.GVA_DB.Create(&wk).Error
return err
}