修改action和模版,使用log打印日志,修复job删除问题,已经所有删除问题

This commit is contained in:
linwenxiang committed 2020-09-22 22:04:29 +08:00
1 parent f3e0e4dbc6
commit 8460b3f385
17 files changed
+234 -229

No files matched your search

+2 -2
View File
@@ -22,7 +22,7 @@ type SysJob struct {
// RemoveJobForService 调用service实现
func (e *SysJob) RemoveJobForService(c *gin.Context) {
msgID := apis.GenerateMsgIDFromContext(c)
msgID := tools.GenerateMsgIDFromContext(c)
db, err := e.GetOrm(c)
if err != nil {
log.Errorf("msgID[%s] error:%#v", msgID, err)
@@ -49,7 +49,7 @@ func (e *SysJob) RemoveJobForService(c *gin.Context) {
// StartJobForService 启动job service实现
func (e *SysJob) StartJobForService(c *gin.Context) {
msgID := apis.GenerateMsgIDFromContext(c)
msgID := tools.GenerateMsgIDFromContext(c)
db, err := e.GetOrm(c)
if err != nil {
log.Errorf("msgID[%s] error:%#v", msgID, err)
+4 -4
View File
@@ -3,16 +3,16 @@ package middleware
import (
"database/sql"
"errors"
"go-admin/common/config"
"go-admin/common/global"
"go-admin/tools"
"gorm.io/gorm/schema"
"gorm.io/driver/mysql"
"gorm.io/driver/postgres"
"gorm.io/gorm"
"gorm.io/gorm/schema"
"go-admin/common/config"
"go-admin/common/global"
"go-admin/common/middleware"
"go-admin/tools"
)
var WithContextDb = middleware.WithContextDb
+9 -12
View File
@@ -5,7 +5,8 @@ import (
"go-admin/app/admin/models"
"go-admin/common/dto"
models2 "go-admin/common/models"
"go-admin/common/log"
common "go-admin/common/models"
)
type SysJobSearch struct {
@@ -23,7 +24,11 @@ func (m *SysJobSearch) GetNeedSearch() interface{} {
}
func (m *SysJobSearch) Bind(ctx *gin.Context) error {
return ctx.Bind(m)
err := ctx.Bind(m)
if err != nil {
log.Errorf("MsgID[%s] Bind error: %#v", err)
}
return err
}
func (m *SysJobSearch) Generate() dto.Index {
@@ -31,14 +36,6 @@ func (m *SysJobSearch) Generate() dto.Index {
return &o
}
func (m *SysJobSearch) GetPageIndex() int {
return m.PageIndex
}
func (m *SysJobSearch) GetPageSize() int {
return m.PageSize
}
type SysJobControl struct {
JobId int `json:"jobId"`
JobName string `json:"jobName" validate:"required"` // 名称
@@ -62,7 +59,7 @@ func (s *SysJobControl) Generate() dto.Control {
return &cp
}
func (s *SysJobControl) GenerateM() (models2.ActiveRecord, error) {
func (s *SysJobControl) GenerateM() (common.ActiveRecord, error) {
return &models.SysJob{
JobId: s.JobId,
JobName: s.JobName,
@@ -91,6 +88,6 @@ func (s *SysJobById) Generate() dto.Control {
return &cp
}
func (s *SysJobById) GenerateM() (models2.ActiveRecord, error) {
func (s *SysJobById) GenerateM() (common.ActiveRecord, error) {
return &models.SysJob{}, nil
}
+28 -22
View File
@@ -1,43 +1,49 @@
package actions
import (
"errors"
"github.com/gin-gonic/gin"
dto2 "go-admin/common/dto"
"go-admin/common/models"
"gorm.io/gorm"
"net/http"
"github.com/gin-gonic/gin"
"go-admin/common/apis"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
)
// CreateAction 通用新增动作
func CreateAction(control dto2.Control) gin.HandlerFunc {
func CreateAction(control dto.Control) gin.HandlerFunc {
return func(c *gin.Context) {
req := control.Generate()
var err error
idb, exist := c.Get("db")
if !exist {
err = errors.New("db connect not exist")
tools.HasError(err, "", 500)
db, err := apis.GetOrm(c)
if err != nil {
log.Error(err)
return
}
switch idb.(type) {
case *gorm.DB:
msgID := tools.GenerateMsgIDFromContext(c)
//新增操作
db := idb.(*gorm.DB)
req := control.Generate()
err = req.Bind(c)
tools.HasError(err, "参数验证失败", 422)
if err != nil {
app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object models.ActiveRecord
object, err = req.GenerateM()
tools.HasError(err, "模型生成失败", 422)
if err != nil {
app.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetCreateBy(tools.GetUserIdUint(c))
err = db.WithContext(c).Create(object).Error
tools.HasError(err, "创建失败", 500)
if err != nil {
log.Errorf("MsgID[%s] Create error: %#v", msgID, err)
app.Error(c, http.StatusInternalServerError, err, "创建失败")
return
}
app.OK(c, object.GetId(), "创建成功")
c.Next()
default:
err = errors.New("db connect not exist")
tools.HasError(err, "", 500)
}
}
}
+29 -23
View File
@@ -1,36 +1,42 @@
package actions
import (
"errors"
dto2 "go-admin/common/dto"
"go-admin/common/models"
"go-admin/tools/app"
"net/http"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
"go-admin/common/apis"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
)
// DeleteAction 通用删除动作
func DeleteAction(control dto2.Control) gin.HandlerFunc {
func DeleteAction(control dto.Control) gin.HandlerFunc {
return func(c *gin.Context) {
var err error
idb, exist := c.Get("db")
if !exist {
err = errors.New("db connect not exist")
tools.HasError(err, "", 500)
db, err := apis.GetOrm(c)
if err != nil {
log.Error(err)
return
}
switch idb.(type) {
case *gorm.DB:
msgID := tools.GenerateMsgIDFromContext(c)
//删除操作
db := idb.(*gorm.DB)
req := control.Generate()
err = req.Bind(c)
tools.HasError(err, "参数验证失败", 422)
if err != nil {
log.Errorf("MsgID[%s] Bind error: %#v", msgID, err)
app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object models.ActiveRecord
object, err = req.GenerateM()
tools.HasError(err, "模型生成失败", 500)
if err != nil {
app.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetUpdateBy(tools.GetUserIdUint(c))
@@ -40,16 +46,16 @@ func DeleteAction(control dto2.Control) gin.HandlerFunc {
db = db.WithContext(c).Scopes(
Permission(object.TableName(), p),
).Where(req.GetId()).Delete(object)
tools.HasError(db.Error, "删除失败", 500)
if db.Error != nil {
log.Errorf("MsgID[%s] Delete error: %#v", msgID, err)
app.Error(c, http.StatusInternalServerError, err, "删除失败")
return
}
if db.RowsAffected == 0 {
err = errors.New("无权删除该数据")
tools.HasError(err, "", 403)
app.Error(c, http.StatusForbidden, nil, "无权删除该数据")
return
}
app.OK(c, object.GetId(), "删除成功")
c.Next()
default:
err = errors.New("db connect not exist")
tools.HasError(err, "", 500)
}
}
}
+24 -21
View File
@@ -2,55 +2,58 @@ package actions
import (
"errors"
dto2 "go-admin/common/dto"
"go-admin/common/models"
"net/http"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
"go-admin/common/apis"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
)
// IndexAction 通用查询动作
func IndexAction(m models.ActiveRecord, d dto2.Index, f func() interface{}) gin.HandlerFunc {
func IndexAction(m models.ActiveRecord, d dto.Index, f func() interface{}) gin.HandlerFunc {
return func(c *gin.Context) {
db, err := apis.GetOrm(c)
if err != nil {
log.Error(err)
return
}
msgID := tools.GenerateMsgIDFromContext(c)
list := f()
object := m.Generate()
req := d.Generate()
var err error
idb, exist := c.Get("db")
if !exist {
err = errors.New("db connect not exist")
tools.HasError(err, "", 500)
}
var count int64
switch idb.(type) {
case *gorm.DB:
//查询列表
db := idb.(*gorm.DB)
err = req.Bind(c)
tools.HasError(err, "参数验证失败", 422)
if err != nil {
app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
//数据权限检查
p := getPermissionFromContext(c)
err = db.WithContext(c).Model(object).
Scopes(
dto2.MakeCondition(req.GetNeedSearch()),
dto2.Paginate(req.GetPageSize(), req.GetPageIndex()),
dto.MakeCondition(req.GetNeedSearch()),
dto.Paginate(req.GetPageSize(), req.GetPageIndex()),
Permission(object.TableName(), p),
).
Find(list).Limit(-1).Offset(-1).
Count(&count).Error
if !errors.Is(err, gorm.ErrRecordNotFound) {
tools.HasError(err, "查询失败", 500)
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
log.Errorf("MsgID[%s] Index error: %#v", msgID, err)
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
app.PageOK(c, list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
c.Next()
default:
err = errors.New("db connect not exist")
tools.HasError(err, "", 500)
}
}
}
+14 -22
View File
@@ -2,12 +2,16 @@ package actions
import (
"errors"
"fmt"
"net/http"
"github.com/gin-gonic/gin"
"go-admin/tools/config"
"gorm.io/gorm"
"go-admin/common/apis"
"go-admin/common/log"
"go-admin/tools"
"go-admin/tools/app"
"go-admin/tools/config"
)
type dataPermission struct {
@@ -19,36 +23,24 @@ type dataPermission struct {
func PermissionAction() gin.HandlerFunc {
return func(c *gin.Context) {
var err error
idb, exist := c.Get("db")
if !exist {
err = errors.New("db connect not exist")
tools.HasError(err, "", 500)
db, err := apis.GetOrm(c)
if err != nil {
log.Error(err)
return
}
switch idb.(type) {
case *gorm.DB:
db := idb.(*gorm.DB)
msgID := tools.GenerateMsgIDFromContext(c)
var p = new(dataPermission)
if userId := tools.GetUserIdStr(c); userId != "" {
p, err = newDataPermission(db, userId)
if err != nil {
c.JSON(500, gin.H{
"code": 500,
"msg": fmt.Sprintf("权限范围鉴定错误, error:%v", err),
})
log.Errorf("MsgID[%s] PermissionAction error: %#v", msgID, err)
app.Error(c, http.StatusInternalServerError, err, "权限范围鉴定错误")
c.Abort()
return
}
}
c.Set(PermissionKey, p)
default:
c.JSON(500, gin.H{
"code": 500,
"msg": "db connect not exist",
})
c.Abort()
return
}
c.Next()
}
}
+30 -24
View File
@@ -1,35 +1,41 @@
package actions
import (
"errors"
"github.com/gin-gonic/gin"
dto2 "go-admin/common/dto"
"go-admin/common/models"
"gorm.io/gorm"
"net/http"
"github.com/gin-gonic/gin"
"go-admin/common/apis"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
)
// UpdateAction 通用更新动作
func UpdateAction(control dto2.Control) gin.HandlerFunc {
func UpdateAction(control dto.Control) gin.HandlerFunc {
return func(c *gin.Context) {
req := control.Generate()
var err error
idb, exist := c.Get("db")
if !exist {
err = errors.New("db connect not exist")
tools.HasError(err, "", 500)
db, err := apis.GetOrm(c)
if err != nil {
log.Error(err)
return
}
switch idb.(type) {
case *gorm.DB:
msgID := tools.GenerateMsgIDFromContext(c)
req := control.Generate()
//更新操作
db := idb.(*gorm.DB)
err = req.Bind(c)
tools.HasError(err, "参数验证失败", 422)
if err != nil {
app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object models.ActiveRecord
object, err = req.GenerateM()
tools.HasError(err, "参数验证失败", 422)
if err != nil {
app.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetUpdateBy(tools.GetUserIdUint(c))
//数据权限检查
@@ -38,16 +44,16 @@ func UpdateAction(control dto2.Control) gin.HandlerFunc {
db = db.WithContext(c).Scopes(
Permission(object.TableName(), p),
).Where(req.GetId()).Updates(object)
tools.HasError(db.Error, "更新失败", 500)
if db.Error != nil {
log.Errorf("MsgID[%s] Update error: %#v", msgID, err)
app.Error(c, http.StatusInternalServerError, err, "更新失败")
return
}
if db.RowsAffected == 0 {
err = errors.New("无权更新该数据")
tools.HasError(err, "", 403)
app.Error(c, http.StatusForbidden, nil, "无权更新该数据")
return
}
app.OK(c, object.GetId(), "更新成功")
c.Next()
default:
err = errors.New("db connect not exist")
tools.HasError(err, "", 500)
}
}
}
+26 -17
View File
@@ -2,35 +2,42 @@ package actions
import (
"errors"
"net/http"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
"go-admin/common/apis"
"go-admin/common/dto"
"go-admin/common/log"
"go-admin/common/models"
"go-admin/tools"
"go-admin/tools/app"
)
// ViewAction 通用详情动作
func ViewAction(control dto.Control) gin.HandlerFunc {
func ViewAction(control dto.Control, params ...interface{}) gin.HandlerFunc {
return func(c *gin.Context) {
var err error
idb, exist := c.Get("db")
if !exist {
err = errors.New("db connect not exist")
tools.HasError(err, "", 500)
db, err := apis.GetOrm(c)
if err != nil {
log.Error(err)
return
}
switch idb.(type) {
case *gorm.DB:
msgID := tools.GenerateMsgIDFromContext(c)
//查看详情
db := idb.(*gorm.DB)
req := control.Generate()
err = req.Bind(c)
tools.HasError(err, "参数验证失败", 422)
if err != nil {
app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object models.ActiveRecord
object, err = req.GenerateM()
tools.HasError(err, "模型生成失败", 500)
if err != nil {
app.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
//数据权限检查
p := getPermissionFromContext(c)
@@ -38,15 +45,17 @@ func ViewAction(control dto.Control) gin.HandlerFunc {
err = db.WithContext(c).Scopes(
Permission(object.TableName(), p),
).Where(req.GetId()).First(object).Error
if errors.Is(err, gorm.ErrRecordNotFound) {
tools.HasError(err, "查看失败", 404)
app.Error(c, http.StatusNotFound, nil, "查看对象不存在或无权查看")
return
}
if err != nil {
log.Errorf("MsgID[%s] Create error: %#v", msgID, err)
app.Error(c, http.StatusInternalServerError, err, "查看失败")
return
}
tools.HasError(err, "查看失败", 500)
app.OK(c, object, "查看成功")
c.Next()
default:
err = errors.New("db connect not exist")
tools.HasError(err, "", 500)
}
}
}
+4 -16
View File
@@ -3,10 +3,11 @@ package apis
import (
"errors"
"fmt"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/spf13/cast"
"gorm.io/gorm"
"go-admin/tools"
)
type Api struct {
@@ -18,7 +19,7 @@ func (e *Api) GetOrm(c *gin.Context) (*gorm.DB, error) {
// GetOrm 获取orm连接
func GetOrm(c *gin.Context) (*gorm.DB, error) {
msgID := GenerateMsgIDFromContext(c)
msgID := tools.GenerateMsgIDFromContext(c)
idb, exist := c.Get("db")
if !exist {
return nil, errors.New(fmt.Sprintf("msgID[%s], db connect not exist", msgID))
@@ -31,16 +32,3 @@ func GetOrm(c *gin.Context) (*gorm.DB, error) {
return nil, errors.New(fmt.Sprintf("msgID[%s], db connect not exist", msgID))
}
}
// GenerateMsgIDFromContext 生成msgID
func GenerateMsgIDFromContext(c *gin.Context) string {
var msgID string
data, ok := c.Get("msgID")
if !ok {
msgID = uuid.New().String()
c.Set("msgID", msgID)
return msgID
}
msgID = cast.ToString(data)
return msgID
}
+12 -11
View File
@@ -1,14 +1,14 @@
package dto
import (
"encoding/json"
"github.com/gin-gonic/gin"
"net/http"
"github.com/gin-gonic/gin"
)
type ObjectById struct {
Id int `uri:"id" validate:"required"`
Ids []json.Number `json:"ids"`
Id int `uri:"id"`
Ids []int `json:"ids"`
}
func (s *ObjectById) Bind(ctx *gin.Context) error {
@@ -26,13 +26,14 @@ func (s *ObjectById) Bind(ctx *gin.Context) error {
func (s *ObjectById) GetId() interface{} {
if len(s.Ids) > 0 {
ids := make([]int64, 0)
var i int64
for _, id := range s.Ids {
i, _ = id.Int64()
ids = append(ids, i)
}
return ids
return s.Ids
//ids := make([]int64, 0)
//var i int64
//for _, id := range s.Ids {
// i, _ = id.Int64()
// ids = append(ids, i)
//}
//return ids
}
return s.Id
}
+14 -51
View File
@@ -2,66 +2,29 @@ package log
import "go-admin/logger"
func SetLevel() {
}
var (
// Trace trace级日志输出
func Trace(args ...interface{}) {
logger.Trace(args...)
}
Trace = logger.Trace
// Trace trace级日志输出
func Tracef(format string, args ...interface{}) {
logger.Tracef(format, args...)
}
Tracef = logger.Tracef
// Debug debug级日志输出
func Debug(args ...interface{}) {
logger.Debug(args...)
}
Debug = logger.Debug
// Debugf debug级日志输出
func Debugf(format string, args ...interface{}) {
logger.Debugf(format, args...)
}
Debugf = logger.Debugf
// Info info级日志输出
func Info(args ...interface{}) {
logger.Info(args...)
}
Info = logger.Info
// Infof info级日志输出
func Infof(format string, args ...interface{}) {
logger.Infof(format, args...)
}
Infof = logger.Infof
// Warn warn级日志输出
func Warn(args ...interface{}) {
logger.Warn(args...)
}
Warn = logger.Warn
// Warnf warn级日志输出
func Warnf(format string, args ...interface{}) {
logger.Warnf(format, args...)
}
Warnf = logger.Warnf
// Error error级日志输出
func Error(args ...interface{}) {
logger.Error(args...)
}
Error = logger.Error
// Errorf error级日志输出
func Errorf(format string, args ...interface{}) {
logger.Errorf(format, args...)
}
Errorf = logger.Errorf
// Fatal fatal级日志输出
func Fatal(args ...interface{}) {
logger.Fatal(args...)
}
Fatal = logger.Fatal
// Fatalf fatal级日志输出
func Fatalf(format string, args ...interface{}) {
logger.Fatalf(format, args...)
}
Fatalf = logger.Fatalf
)
+14 -3
View File
@@ -6,6 +6,7 @@ import (
"go-admin/app/admin/models"
"go-admin/common/dto"
"go-admin/common/log"
common "go-admin/common/models"
)
@@ -26,7 +27,11 @@ func (m *{{.ClassName}}Search) GetNeedSearch() interface{} {
}
func (m *{{.ClassName}}Search) Bind(ctx *gin.Context) error {
return ctx.Bind(m)
err := ctx.Bind(m)
if err != nil {
log.Errorf("MsgID[%s] Bind error: %#v", err)
}
return err
}
func (m *{{.ClassName}}Search) Generate() dto.Index {
@@ -53,10 +58,16 @@ type {{.ClassName}}Control struct {
}
func (s *{{.ClassName}}Control) Bind(ctx *gin.Context) error {
if err := ctx.BindUri(s); err != nil {
err := ctx.BindUri(s)
if err != nil {
log.Errorf("MsgID[%s] Bind error: %#v", err)
return err
}
return ctx.Bind(s)
err := ctx.Bind(m)
if err != nil {
log.Errorf("MsgID[%s] Bind error: %#v", err)
}
return err
}
func (s *{{.ClassName}}Control) Generate() dto.Control {
+1 -1
View File
@@ -451,7 +451,7 @@
},
/** 删除按钮操作 */
handleDelete(row) {
var Ids = row.{{.PkJsonField}} || this.ids
var Ids = (row.{{.PkJsonField}} && [row.{{.PkJsonField}}]) || this.ids
if (this.ids.length === 0) {
Ids = [Ids]
}
+1
View File
@@ -7,6 +7,7 @@ type Response struct {
Data interface{} `json:"data"`
// 消息
Msg string `json:"msg"`
RequestId string `json:"requestId"`
}
type Page struct {
+6
View File
@@ -4,15 +4,20 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"go-admin/tools"
)
// 失败数据处理
func Error(c *gin.Context, code int, err error, msg string) {
var res Response
if err != nil {
res.Msg = err.Error()
}
if msg != "" {
res.Msg = msg
}
res.RequestId = tools.GenerateMsgIDFromContext(c)
c.JSON(http.StatusOK, res.ReturnError(code))
}
@@ -23,6 +28,7 @@ func OK(c *gin.Context, data interface{}, msg string) {
if msg != "" {
res.Msg = msg
}
res.RequestId = tools.GenerateMsgIDFromContext(c)
c.JSON(http.StatusOK, res.ReturnOK())
}
+16
View File
@@ -5,6 +5,9 @@ import (
"runtime"
"strconv"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/spf13/cast"
"golang.org/x/crypto/bcrypt"
)
@@ -57,3 +60,16 @@ func HasError(err error, msg string, code ...int) {
panic("CustomError#" + strconv.Itoa(statusCode) + "#" + msg)
}
}
// GenerateMsgIDFromContext 生成msgID
func GenerateMsgIDFromContext(c *gin.Context) string {
var msgID string
data, ok := c.Get("msgID")
if !ok {
msgID = uuid.New().String()
c.Set("msgID", msgID)
return msgID
}
msgID = cast.ToString(data)
return msgID
}