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

修复gf 1.14.4兼容性

Browse Source
This commit is contained in:
tiger1103
2020-11-19 23:20:52 +08:00
parent b183fd2a07
commit 689007958e
24 changed files with 40 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/model/admin/auth_rule/auth_rule.go
+1 -1
View File
@@ -124,7 +124,7 @@ func Edit(req *MenuReq, id int) (err error, rows int64) {
entity.IsFrame = req.IsFrame
entity.Pid = req.Pid
entity.Weigh = req.Weigh
res, e := entity.Update()
res, e := Model.Save(entity)
err = e
if err != nil {
return
app/model/admin/cms_category/cms_category.go
+1 -1
View File
@@ -154,7 +154,7 @@ func EditSave(req *ReqEdit) (id int64, err error) {
if len(moreFields) != 0 {
entity.More = gconv.String(moreFields)
}
res, err := entity.Update()
res, err := Model.Save(entity)
if err != nil {
g.Log().Error(err)
err = gerror.New("修改保存失败")
app/model/admin/model_fields/model_fields.go
+1 -1
View File
@@ -187,7 +187,7 @@ func EditSave(req *EditReq) error {
entity.UpdateTime = gconv.Uint64(gtime.Timestamp())
entity.FieldWidth = req.FieldWidth
entity.FieldAlign = req.FieldAlign
_, err = entity.Update()
_, err = Model.Save(entity)
if err != nil {
g.Log().Error(err)
return gerror.New("修改失败")
app/model/admin/model_info/model_info.go
+2 -2
View File
@@ -155,7 +155,7 @@ func EditSave(req *EditReq) error {
entity.ModelEngine = req.ModelEngine
entity.UpdateBy = gconv.Uint64(req.UpdateBy)
entity.UpdateTime = gconv.Uint64(gtime.Timestamp())
_, err = entity.Update()
_, err = Model.Save(entity)
if err != nil {
g.Log().Error(err)
return gerror.New("修改失败")
@@ -242,7 +242,7 @@ func SetStatus(req *StatusSetReq) error {
return gerror.New("获取模型信息失败")
}
entity.ModelStatus = gconv.Uint(req.ModelStatus)
_, err = entity.Update()
_, err = Model.Save(entity)
if err != nil {
g.Log().Error(err)
return gerror.New("设置状态失败")
app/model/admin/plug_ad/plug_ad.go
+1 -1
View File
@@ -102,7 +102,7 @@ func EditSave(editReq *EditReq) error {
entity.AdContent = editReq.AdContent
entity.AdSort = editReq.AdSort
entity.AdOpen = editReq.AdOpen
_, err = entity.Update()
_, err = Model.Save(entity)
if err != nil {
g.Log().Error(err)
return gerror.New("修改广告失败")
app/model/admin/plug_adtype/plug_adtype.go
+1 -1
View File
@@ -96,7 +96,7 @@ func EditSave(editReq *EditReq) error {
// 修改实体
entity.AdtypeName = editReq.AdtypeName
entity.AdtypeSort = editReq.AdtypeSort
_, err = entity.Update()
_, err = Model.Save(entity)
if err != nil {
g.Log().Error(err)
return gerror.New("修改广告位失败")
app/model/admin/plug_link/plug_link.go
+1 -1
View File
@@ -109,7 +109,7 @@ func EditSave(editReq *EditReq) error {
entity.LinkUsername = editReq.LinkUsername
entity.LinkEmail = editReq.LinkEmail
entity.LinkRemark = editReq.LinkRemark
_, err = entity.Update()
_, err = Model.Save(entity)
if err != nil {
g.Log().Error(err)
return gerror.New("修改栏目失败")
app/model/admin/plug_linktype/plug_linktype.go
+1 -1
View File
@@ -101,7 +101,7 @@ func EditSave(req *EditReq) error {
// 修改实体
entity.LinktypeName = req.LinktypeName
entity.LinktypeOrder = uint(req.LinktypeOrder)
_, err = entity.Update()
_, err = Model.Save(entity)
if err != nil {
g.Log().Error(err)
return gerror.New("修改栏目失败")
app/model/admin/role/role.go
+1 -1
View File
@@ -169,7 +169,7 @@ func StatusSetRole(req *StatusSetReq) error {
return gerror.New("获取角色信息失败")
}
entity.Status = req.Status
_, err = entity.Update()
_, err = Model.Save(entity)
if err != nil {
g.Log().Error(err)
return gerror.New("设置状态失败")
app/model/admin/sys_config/sys_config.go
+1 -1
View File
@@ -74,7 +74,7 @@ func EditSave(req *EditReq, userId uint64) (int64, error) {
entity.Remark = req.Remark
entity.UpdateTime = gconv.Uint64(gtime.Timestamp())
entity.UpdateBy = gconv.Uint(userId)
result, err := entity.Update()
result, err := Model.Save(entity)
if err != nil {
g.Log().Error(err)
return 0, gerror.New("修改失败")
app/model/admin/sys_dict_data/sys_dict_data.go
+1 -1
View File
@@ -96,7 +96,7 @@ func EditSaveData(req *EditDataReq, userId uint64) (int64, error) {
entity.Remark = req.Remark
entity.UpdateTime = gconv.Uint64(gtime.Timestamp())
entity.UpdateBy = userId
result, err := entity.Update()
result, err := Model.Save(entity)
if err != nil {
g.Log().Error(err)
return 0, gerror.New("修改失败")
app/model/admin/sys_dict_type/sys_dict_type.go
+2 -2
View File
@@ -87,7 +87,7 @@ func EditSave(req *EditReq, userId uint64) (int64, error) {
entity.Remark = req.Remark
entity.UpdateBy = gconv.Uint(userId)
entity.UpdateTime = gconv.Uint64(gtime.Timestamp())
res, err := entity.Update()
res, err := Model.Save(entity)
if err != nil {
g.Log().Error(err)
return 0, gerror.New("更新失败")
@@ -239,7 +239,7 @@ func DeleteDictByIds(ids []int) error {
//删除字典下的数据
for _, v := range discs {
sys_dict_data.Model.Delete("dict_type=?", v.DictType)
v.Delete()
Model.Delete(v.DictId)
}
return nil
}
app/model/admin/sys_job/sys_job.go
+3 -3
View File
@@ -105,7 +105,7 @@ func Edit(req *ReqEdit, userId uint64) (rows int64, err error) {
entity.Status = req.Status
entity.UpdateTime = gconv.Uint64(gtime.Timestamp())
entity.UpdateBy = gconv.Uint64(userId)
res, err := entity.Update()
res, err := Model.Save(entity)
if err != nil {
g.Log().Error(err)
err = gerror.New("修改任务失败")
@@ -194,7 +194,7 @@ func JobStart(job *Entity) error {
gcron.Start(job.InvokeTarget)
if job.MisfirePolicy == 1 {
job.Status = 0
job.Update()
Model.Save(job)
}
return nil
}
@@ -211,6 +211,6 @@ func JobStop(job *Entity) error {
gcron.Remove(job.InvokeTarget)
}
job.Status = 1
job.Update()
Model.Save(job)
return nil
}
app/model/admin/sys_oper_log/sys_oper_log.go
+1 -1
View File
@@ -69,7 +69,7 @@ func Add(user *user.Entity, menu *auth_rule.Entity, url *url.URL,
operLog.OperParam = string(b)
}
}
operLog.Save()
Model.Save(operLog)
}
//操作日志列表
app/model/admin/sys_post/sys_post.go
+2 -2
View File
@@ -118,7 +118,7 @@ func Add(addParams *AddParams) (result sql.Result, err error) {
CreateTime: gtime.Now(),
}
return entity.Save()
return Model.Save(entity)
}
@@ -136,7 +136,7 @@ func Edit(editParams *EditParams) (result sql.Result, err error) {
if entity.CreateTime == nil {
entity.CreateTime = entity.UpdateTime
}
return entity.Update()
return Model.Save(entity)
}
func GetOneById(id int64) (*Entity, error) {
app/model/admin/user/user.go
+4 -4
View File
@@ -87,7 +87,7 @@ func Add(req *AddUserReq) (InsertId int64, err error) {
entity.UserPassword = req.Password
entity.Remark = req.Remark
entity.IsAdmin = req.IsAdmin
res, err := entity.Save()
res, err := Model.Save(entity)
if err != nil {
return
}
@@ -117,7 +117,7 @@ func Edit(req *EditUserReq) (err error) {
entity.UserNickname = req.NickName
entity.Remark = req.Remark
entity.IsAdmin = req.IsAdmin
_, err = entity.Update()
_, err = Model.Save(entity)
if err != nil {
g.Log().Error(err)
err = gerror.New("修改用户信息失败")
@@ -172,7 +172,7 @@ func ChangeUserStatus(req *StatusReq) error {
return gerror.New("用户不存在")
}
user.UserStatus = req.UserStatus
_, err = user.Update()
_, err = Model.Save(user)
if err != nil {
g.Log().Error(err)
return gerror.New("修改用户状态失败")
@@ -188,7 +188,7 @@ func ResetUserPwd(req *ResetPwdReq) error {
return gerror.New("用户不存在")
}
user.UserPassword = req.Password
_, err = user.Update()
_, err = Model.Save(user)
if err != nil {
g.Log().Error(err)
return gerror.New("修改用户密码失败")
app/model/admin/web_set/web_set.go
+1 -1
View File
@@ -18,7 +18,7 @@ func UpdateSave(req *UpdateReq) error {
WebContent: gconv.String(req.WebContent),
}
_, err := entity.Replace()
_, err := Model.Save(entity)
if err != nil {
g.Log().Error(err)
return gerror.New("更新站点信息失败")