diff --git a/app/admin/apis/public/file.go b/app/admin/apis/public/file.go index d44bc36..da7285d 100644 --- a/app/admin/apis/public/file.go +++ b/app/admin/apis/public/file.go @@ -44,7 +44,8 @@ func UploadFile(c *gin.Context) { } else { switch tag { case "1": // 单图 - fileResponse, done := singleFile(c, fileResponse, urlPerfix) + var done bool + fileResponse, done = singleFile(c, fileResponse, urlPerfix) if done { return } diff --git a/app/admin/apis/sys_content/sys_content.go b/app/admin/apis/sys_content/sys_content.go index cf5d2ac..171e939 100644 --- a/app/admin/apis/sys_content/sys_content.go +++ b/app/admin/apis/sys_content/sys_content.go @@ -1,84 +1,84 @@ package sys_content -import ( - "github.com/gin-gonic/gin" - "github.com/gin-gonic/gin/binding" - - "go-admin/app/admin/models" - "go-admin/tools" - "go-admin/tools/app" - "go-admin/tools/app/msg" -) - -func GetSysContentList(c *gin.Context) { - var data models.SysContent - var err error - var pageSize = 10 - var pageIndex = 1 - - if size := c.Request.FormValue("pageSize"); size != "" { - pageSize, err = tools.StringToInt(size) - } - if index := c.Request.FormValue("pageIndex"); index != "" { - pageIndex, err = tools.StringToInt(index) - } - - data.CateId = c.Request.FormValue("cateId") - data.Name = c.Request.FormValue("name") - data.Status = c.Request.FormValue("status") - - data.DataScope = tools.GetUserIdStr(c) - result, count, err := data.GetPage(pageSize, pageIndex) - tools.HasError(err, "", -1) - - app.PageOK(c, result, count, pageIndex, pageSize, "") -} - -func GetSysContent(c *gin.Context) { - var data models.SysContent - data.Id, _ = tools.StringToInt(c.Param("id")) - result, err := data.Get() - tools.HasError(err, "抱歉未找到相关信息", -1) - - app.OK(c, result, "") -} - -// @Summary 添加内容管理 -// @Description 获取JSON -// @Tags 内容管理 -// @Accept application/json -// @Product application/json -// @Param data body models.SysContent true "data" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/syscontent [post] -func InsertSysContent(c *gin.Context) { - var data models.SysContent - err := c.ShouldBindJSON(&data) - data.CreateBy = tools.GetUserIdStr(c) - tools.HasError(err, "", 500) - result, err := data.Create() - tools.HasError(err, "", -1) - app.OK(c, result, "") -} - -func UpdateSysContent(c *gin.Context) { - var data models.SysContent - err := c.BindWith(&data, binding.JSON) - tools.HasError(err, "数据解析失败", -1) - data.UpdateBy = tools.GetUserIdStr(c) - result, err := data.Update(data.Id) - tools.HasError(err, "", -1) - - app.OK(c, result, "") -} - -func DeleteSysContent(c *gin.Context) { - var data models.SysContent - data.UpdateBy = tools.GetUserIdStr(c) - - IDS := tools.IdsStrToIdsIntGroup("id", c) - _, err := data.BatchDelete(IDS) - tools.HasError(err, msg.DeletedFail, 500) - app.OK(c, nil, msg.DeletedSuccess) -} +//import ( +// "github.com/gin-gonic/gin" +// "github.com/gin-gonic/gin/binding" +// +// "go-admin/app/admin/models" +// "go-admin/tools" +// "go-admin/tools/app" +// "go-admin/tools/app/msg" +//) +// +//func GetSysContentList(c *gin.Context) { +// var data models.SysContent +// var err error +// var pageSize = 10 +// var pageIndex = 1 +// +// if size := c.Request.FormValue("pageSize"); size != "" { +// pageSize, err = tools.StringToInt(size) +// } +// if index := c.Request.FormValue("pageIndex"); index != "" { +// pageIndex, err = tools.StringToInt(index) +// } +// +// data.CateId = c.Request.FormValue("cateId") +// data.Name = c.Request.FormValue("name") +// data.Status = c.Request.FormValue("status") +// +// data.DataScope = tools.GetUserIdStr(c) +// result, count, err := data.GetPage(pageSize, pageIndex) +// tools.HasError(err, "", -1) +// +// app.PageOK(c, result, count, pageIndex, pageSize, "") +//} +// +//func GetSysContent(c *gin.Context) { +// var data models.SysContent +// data.Id, _ = tools.StringToInt(c.Param("id")) +// result, err := data.Get() +// tools.HasError(err, "抱歉未找到相关信息", -1) +// +// app.OK(c, result, "") +//} +// +//// @Summary 添加内容管理 +//// @Description 获取JSON +//// @Tags 内容管理 +//// @Accept application/json +//// @Product application/json +//// @Param data body models.SysContent true "data" +//// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +//// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +//// @Router /api/v1/syscontent [post] +//func InsertSysContent(c *gin.Context) { +// var data models.SysContent +// err := c.ShouldBindJSON(&data) +// data.CreateBy = tools.GetUserIdStr(c) +// tools.HasError(err, "", 500) +// result, err := data.Create() +// tools.HasError(err, "", -1) +// app.OK(c, result, "") +//} +// +//func UpdateSysContent(c *gin.Context) { +// var data models.SysContent +// err := c.BindWith(&data, binding.JSON) +// tools.HasError(err, "数据解析失败", -1) +// data.UpdateBy = tools.GetUserIdStr(c) +// result, err := data.Update(data.Id) +// tools.HasError(err, "", -1) +// +// app.OK(c, result, "") +//} +// +//func DeleteSysContent(c *gin.Context) { +// var data models.SysContent +// data.UpdateBy = tools.GetUserIdStr(c) +// +// IDS := tools.IdsStrToIdsIntGroup("id", c) +// _, err := data.BatchDelete(IDS) +// tools.HasError(err, msg.DeletedFail, 500) +// app.OK(c, nil, msg.DeletedSuccess) +//} diff --git a/app/admin/apis/sys_file/sys_file_dir.go b/app/admin/apis/sys_file/sys_file_dir.go index f9f7426..d976344 100644 --- a/app/admin/apis/sys_file/sys_file_dir.go +++ b/app/admin/apis/sys_file/sys_file_dir.go @@ -1,15 +1,15 @@ package sys_file import ( - "github.com/gin-gonic/gin" - "go-admin/app/admin/service" "net/http" + "github.com/gin-gonic/gin" + "go-admin/app/admin/models" + "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/actions" "go-admin/common/apis" - "go-admin/common/log" "go-admin/tools" ) @@ -18,25 +18,27 @@ type SysFileDir struct { } func (e *SysFileDir) GetSysFileDirList(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) search := new(dto.SysFileDirSearch) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } err = c.ShouldBind(search) if err != nil { - log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error()) + log.Debugf("ShouldBind error: %s", err.Error()) } var list *[]models.SysFileDirL serviceStudent := service.SysFileDir{} - serviceStudent.MsgID = msgID + serviceStudent.Log = log serviceStudent.Orm = db list, err = serviceStudent.SetSysFileDir(search) if err != nil { + log.Errorf("SetSysFileDir error, %s", err) e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") return } @@ -46,27 +48,30 @@ func (e *SysFileDir) GetSysFileDirList(c *gin.Context) { func (e *SysFileDir) GetSysFileDir(c *gin.Context) { control := new(dto.SysFileDirById) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //查看详情 err = c.ShouldBindUri(control) if err != nil { - log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error()) + log.Warnf("ShouldBindUri error: %s", err.Error()) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") } var object models.SysFileDir serviceSysFileDir := service.SysFileDir{} - serviceSysFileDir.MsgID = msgID + serviceSysFileDir.Log = log serviceSysFileDir.Orm = db err = serviceSysFileDir.GetSysFileDir(control, &object) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") + log.Errorf("GetSysFileDir error, %s", err) + e.Error(c, http.StatusInternalServerError, err, "查询失败") return } @@ -75,31 +80,36 @@ func (e *SysFileDir) GetSysFileDir(c *gin.Context) { func (e *SysFileDir) InsertSysFileDir(c *gin.Context) { control := new(dto.SysFileDirControl) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //新增操作 err = c.ShouldBindUri(control) if err != nil { - log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error()) + log.Warnf("ShouldBindUri error: %s", err.Error()) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") + return } err = c.ShouldBind(control) if err != nil { - log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error()) + log.Warnf("ShouldBind error: %s", err.Error()) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") + return } // 设置创建人 control.CreateBy = tools.GetUserId(c) serviceSysFileDir := service.SysFileDir{} serviceSysFileDir.Orm = db - serviceSysFileDir.MsgID = msgID + serviceSysFileDir.Log = log err = serviceSysFileDir.InsertSysFileDir(control) if err != nil { - log.Error(err) + log.Errorf("InsertSysFileDir error, %s", err) e.Error(c, http.StatusInternalServerError, err, "创建失败") return } @@ -109,20 +119,23 @@ func (e *SysFileDir) InsertSysFileDir(c *gin.Context) { func (e *SysFileDir) UpdateSysFileDir(c *gin.Context) { control := new(dto.SysFileDirControl) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) err = c.ShouldBindUri(control) if err != nil { - log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error()) + log.Warnf("ShouldBindUri error: %s", err.Error()) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") } err = c.ShouldBind(control) if err != nil { - log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error()) + log.Warnf("ShouldBind error: %#v", err.Error()) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") } // 设置创建人 control.UpdateBy = tools.GetUserId(c) @@ -132,10 +145,11 @@ func (e *SysFileDir) UpdateSysFileDir(c *gin.Context) { serviceSysFileDir := service.SysFileDir{} serviceSysFileDir.Orm = db - serviceSysFileDir.MsgID = msgID + serviceSysFileDir.Log = log err = serviceSysFileDir.UpdateSysFileDir(control, p) if err != nil { - log.Error(err) + log.Errorf("UpdateSysFileDir error, %s", err) + e.Error(c, http.StatusInternalServerError, err, "更新失败") return } e.OK(c, control.ID, "更新成功") @@ -143,9 +157,11 @@ func (e *SysFileDir) UpdateSysFileDir(c *gin.Context) { func (e *SysFileDir) DeleteSysFileDir(c *gin.Context) { control := new(dto.SysFileDirById) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } @@ -153,11 +169,13 @@ func (e *SysFileDir) DeleteSysFileDir(c *gin.Context) { //删除操作 err = c.ShouldBindUri(control) if err != nil { - log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error()) + log.Warnf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error()) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") } err = c.ShouldBind(control) if err != nil { - log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error()) + log.Warnf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error()) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") } // 设置编辑人 @@ -171,7 +189,8 @@ func (e *SysFileDir) DeleteSysFileDir(c *gin.Context) { serviceSysFileDir.MsgID = msgID err = serviceSysFileDir.RemoveSysFileDir(control, p) if err != nil { - log.Error(err) + log.Errorf("RemoveSysFileDir error, %s", err) + e.Error(c, http.StatusInternalServerError, err, "删除失败") return } e.OK(c, control.Id, "删除成功") diff --git a/app/admin/apis/sys_file/sys_file_info.go b/app/admin/apis/sys_file/sys_file_info.go index 341f19d..088f068 100644 --- a/app/admin/apis/sys_file/sys_file_info.go +++ b/app/admin/apis/sys_file/sys_file_info.go @@ -1,16 +1,15 @@ package sys_file import ( - "github.com/gin-gonic/gin" - "go-admin/app/admin/service" - "go-admin/tools/app" "net/http" + "github.com/gin-gonic/gin" + "go-admin/app/admin/models" + "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/actions" "go-admin/common/apis" - "go-admin/common/log" "go-admin/tools" ) @@ -19,17 +18,18 @@ type SysFileInfo struct { } func (e *SysFileInfo) GetSysFileInfoList(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) search := new(dto.SysFileInfoSearch) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } err = c.ShouldBind(search) if err != nil { - log.Errorf("msgID[%s] 参数验证错误, error:%s", msgID, err) - app.Error(c, 422, err, "参数验证失败") + log.Warnf("参数验证错误, error: %s", err) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } @@ -39,11 +39,12 @@ func (e *SysFileInfo) GetSysFileInfoList(c *gin.Context) { list := make([]models.SysFileInfo, 0) var count int64 serviceStudent := service.SysFileInfo{} - serviceStudent.MsgID = msgID + serviceStudent.Log = log serviceStudent.Orm = db err = serviceStudent.GetSysFileInfoPage(search, p, &list, &count) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") + log.Errorf("GetSysFileInfoPage error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "查询失败") return } @@ -52,18 +53,19 @@ func (e *SysFileInfo) GetSysFileInfoList(c *gin.Context) { func (e *SysFileInfo) GetSysFileInfo(c *gin.Context) { control := new(dto.SysFileInfoById) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //查看详情 err = c.ShouldBindUri(control) if err != nil { - log.Errorf("msgID[%s] 参数验证错误, error:%s", msgID, err) - app.Error(c, 422, err, "参数验证失败") + log.Warnf("参数验证错误, error:%s", err) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } @@ -73,11 +75,12 @@ func (e *SysFileInfo) GetSysFileInfo(c *gin.Context) { p := actions.GetPermissionFromContext(c) serviceSysFileInfo := service.SysFileInfo{} - serviceSysFileInfo.MsgID = msgID + serviceSysFileInfo.Log = log serviceSysFileInfo.Orm = db err = serviceSysFileInfo.GetSysFileInfo(control, p, &object) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") + log.Errorf("GetSysFileInfo error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "查询失败") return } @@ -86,24 +89,25 @@ func (e *SysFileInfo) GetSysFileInfo(c *gin.Context) { func (e *SysFileInfo) InsertSysFileInfo(c *gin.Context) { control := new(dto.SysFileInfoControl) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //新增操作 err = c.ShouldBindUri(control) if err != nil { - log.Errorf("msgID[%s] 参数验证错误, error:%s", msgID, err) - app.Error(c, 422, err, "参数验证失败") + log.Warnf("参数验证错误, error: %s", err) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } err = c.ShouldBind(control) if err != nil { - log.Errorf("msgID[%s] 参数验证错误, error:%s", msgID, err) - app.Error(c, 422, err, "参数验证失败") + log.Warnf("参数验证错误, error: %s", err) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } // 设置创建人 @@ -111,10 +115,10 @@ func (e *SysFileInfo) InsertSysFileInfo(c *gin.Context) { serviceSysFileInfo := service.SysFileInfo{} serviceSysFileInfo.Orm = db - serviceSysFileInfo.MsgID = msgID + serviceSysFileInfo.Log = log err = serviceSysFileInfo.InsertSysFileInfo(control) if err != nil { - log.Error(err) + log.Errorf("InsertSysFileInfo error: %s", err) e.Error(c, http.StatusInternalServerError, err, "创建失败") return } @@ -124,23 +128,24 @@ func (e *SysFileInfo) InsertSysFileInfo(c *gin.Context) { func (e *SysFileInfo) UpdateSysFileInfo(c *gin.Context) { control := new(dto.SysFileInfoControl) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) err = c.ShouldBindUri(control) if err != nil { - log.Errorf("msgID[%s] 参数验证错误, error:%s", msgID, err) - app.Error(c, 422, err, "参数验证失败") + log.Warnf("参数验证错误, error: %s", err) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } err = c.ShouldBind(control) if err != nil { - log.Errorf("msgID[%s] 参数验证错误, error:%s", msgID, err) - app.Error(c, 422, err, "参数验证失败") + log.Warnf("参数验证错误, error:%s", err) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } // 设置创建人 @@ -151,10 +156,11 @@ func (e *SysFileInfo) UpdateSysFileInfo(c *gin.Context) { serviceSysFileInfo := service.SysFileInfo{} serviceSysFileInfo.Orm = db - serviceSysFileInfo.MsgID = msgID + serviceSysFileInfo.Log = log err = serviceSysFileInfo.UpdateSysFileInfo(control, p) if err != nil { - log.Error(err) + log.Errorf("UpdateSysFileInfo error: %s", err) + e.Error(c, http.StatusInternalServerError, err, "创建失败") return } e.OK(c, control.ID, "更新成功") @@ -162,24 +168,25 @@ func (e *SysFileInfo) UpdateSysFileInfo(c *gin.Context) { func (e *SysFileInfo) DeleteSysFileInfo(c *gin.Context) { control := new(dto.SysFileInfoById) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //删除操作 err = c.ShouldBindUri(control) if err != nil { - log.Errorf("msgID[%s] 参数验证错误, error:%s", msgID, err) - app.Error(c, 422, err, "参数验证失败") + log.Warnf("参数验证错误, error: %s", err) + e.Error(c, 422, err, "参数验证失败") return } err = c.ShouldBind(control) if err != nil { - log.Errorf("msgID[%s] 参数验证错误, error:%s", msgID, err) - app.Error(c, 422, err, "参数验证失败") + log.Warnf("参数验证错误, error: %s", err) + e.Error(c, 422, err, "参数验证失败") return } @@ -191,10 +198,11 @@ func (e *SysFileInfo) DeleteSysFileInfo(c *gin.Context) { serviceSysFileInfo := service.SysFileInfo{} serviceSysFileInfo.Orm = db - serviceSysFileInfo.MsgID = msgID + serviceSysFileInfo.Log = log err = serviceSysFileInfo.RemoveSysFileInfo(control, p) if err != nil { - log.Error(err) + log.Errorf("RemoveSysFileInfo error: %s", err) + e.Error(c, http.StatusInternalServerError, err, "创建失败") return } e.OK(c, control.Id, "删除成功") diff --git a/app/admin/apis/sys_job/sys_job.go b/app/admin/apis/sys_job/sys_job.go index 4f2b1a7..f5f30b4 100644 --- a/app/admin/apis/sys_job/sys_job.go +++ b/app/admin/apis/sys_job/sys_job.go @@ -2,12 +2,12 @@ package sys_job import ( "github.com/gin-gonic/gin" + "net/http" "go-admin/app/admin/service" "go-admin/common/apis" "go-admin/common/dto" - "go-admin/common/log" - "go-admin/tools" + "go-admin/common/global" "go-admin/tools/app" ) @@ -17,26 +17,28 @@ type SysJob struct { // RemoveJobForService 调用service实现 func (e *SysJob) RemoveJobForService(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) db, err := e.GetOrm(c) if err != nil { - log.Errorf("msgID[%s] error:%s", msgID, err) - app.Error(c, 500, err, "") + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } var v dto.GeneralDelDto err = c.BindUri(&v) if err != nil { - log.Errorf("msgID[%s] 参数验证错误, error:%s", msgID, err) - app.Error(c, 422, err, "参数验证失败") + log.Warnf("参数验证错误, error: %s", err) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } s := service.SysJob{} - s.MsgID = msgID + s.Log = log s.Orm = db + s.Cron = global.Cfg.GetCrontabKey(c.Request.Host) err = s.RemoveJob(&v) if err != nil { - app.Error(c, 500, err, "") + log.Errorf("RemoveJob error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "") return } app.OK(c, nil, s.Msg) @@ -44,26 +46,28 @@ func (e *SysJob) RemoveJobForService(c *gin.Context) { // StartJobForService 启动job service实现 func (e *SysJob) StartJobForService(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) db, err := e.GetOrm(c) if err != nil { - log.Errorf("msgID[%s] error:%s", msgID, err) - app.Error(c, 500, err, "") + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } var v dto.GeneralGetDto err = c.BindUri(&v) if err != nil { - log.Errorf("msgID[%s] 参数验证错误, error:%s", msgID, err) - app.Error(c, 422, err, "参数验证失败") + log.Warnf("参数验证错误, error: %s", err) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } s := service.SysJob{} s.Orm = db - s.MsgID = msgID + s.Log = log + s.Cron = global.Cfg.GetCrontabKey(c.Request.Host) err = s.StartJob(&v) if err != nil { - app.Error(c, 500, err, "") + log.Errorf("GetCrontabKey error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "") return } app.OK(c, nil, s.Msg) diff --git a/app/admin/apis/sys_user/sys_user.go b/app/admin/apis/sys_user/sys_user.go new file mode 100644 index 0000000..a31eb7a --- /dev/null +++ b/app/admin/apis/sys_user/sys_user.go @@ -0,0 +1,475 @@ +package sys_user + +import ( + "net/http" + + "github.com/gin-gonic/gin" + "github.com/google/uuid" + + "go-admin/app/admin/models" + "go-admin/app/admin/models/system" + "go-admin/app/admin/service" + "go-admin/app/admin/service/dto" + "go-admin/common/actions" + "go-admin/common/apis" + common "go-admin/common/models" + "go-admin/tools" +) + +type SysUser struct { + apis.Api +} + +// @Summary 列表用户信息数据 +// @Description 获取JSON +// @Tags 用户 +// @Param username query string false "username" +// @Success 200 {string} string "{"code": 200, "data": [...]}" +// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" +// @Router /api/v1/sysUser [get] +// @Security Bearer +func (e *SysUser) GetSysUserList(c *gin.Context) { + log := e.GetLogger(c) + d := new(dto.SysUserSearch) + db, err := tools.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + + req := d.Generate() + + //查询列表 + err = req.Bind(c) + if err != nil { + log.Warnf("Bind error: %s", err.Error()) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") + return + } + + //数据权限检查 + p := actions.GetPermissionFromContext(c) + + list := make([]system.SysUser, 0) + var count int64 + serviceStudent := service.SysUser{} + serviceStudent.Log = log + serviceStudent.Orm = db + err = serviceStudent.GetSysUserPage(req, p, &list, &count) + if err != nil { + e.Error(c, http.StatusInternalServerError, err, "查询失败") + return + } + + e.PageOK(c, list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") +} + +// @Summary 获取用户 +// @Description 获取JSON +// @Tags 用户 +// @Param userId path int true "用户编码" +// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/sysUser/{userId} [get] +// @Security Bearer +func (e *SysUser) GetSysUser(c *gin.Context) { + log := e.GetLogger(c) + control := new(dto.SysUserById) + db, err := tools.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + + //查看详情 + req := control.Generate() + err = req.Bind(c) + if err != nil { + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") + return + } + var object system.SysUser + + //数据权限检查 + p := actions.GetPermissionFromContext(c) + + serviceSysUser := service.SysUser{} + serviceSysUser.Log = log + serviceSysUser.Orm = db + err = serviceSysUser.GetSysUser(req, p, &object) + if err != nil { + e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") + return + } + + e.OK(c, object, "查看成功") +} + +// @Summary 创建用户 +// @Description 获取JSON +// @Tags 用户 +// @Accept application/json +// @Product application/json +// @Param data body models.SysUser true "用户数据" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/sysUser [post] +func (e *SysUser) InsertSysUser(c *gin.Context) { + log := e.GetLogger(c) + control := new(dto.SysUserControl) + db, err := tools.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + + //新增操作 + req := control.Generate() + err = req.Bind(c) + if err != nil { + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") + return + } + var object common.ActiveRecord + object, err = req.GenerateM() + if err != nil { + e.Error(c, http.StatusInternalServerError, err, "模型生成失败") + return + } + // 设置创建人 + object.SetCreateBy(tools.GetUserId(c)) + + serviceSysUser := service.SysUser{} + serviceSysUser.Orm = db + serviceSysUser.Log = log + err = serviceSysUser.InsertSysUser(object) + if err != nil { + log.Error(err) + e.Error(c, http.StatusInternalServerError, err, "创建失败") + return + } + + e.OK(c, object.GetId(), "创建成功") +} + +// @Summary 修改用户数据 +// @Description 获取JSON +// @Tags 用户 +// @Accept application/json +// @Product application/json +// @Param data body models.SysUser true "body" +// @Success 200 {string} string "{"code": 200, "message": "修改成功"}" +// @Success 200 {string} string "{"code": -1, "message": "修改失败"}" +// @Router /api/v1/sysuser/{userId} [put] +func (e *SysUser) UpdateSysUser(c *gin.Context) { + control := new(dto.SysUserControl) + + log := e.GetLogger(c) + db, err := tools.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + + req := control.Generate() + //更新操作 + err = req.Bind(c) + if err != nil { + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") + return + } + var object common.ActiveRecord + object, err = req.GenerateM() + if err != nil { + e.Error(c, http.StatusInternalServerError, err, "模型生成失败") + return + } + object.SetUpdateBy(tools.GetUserId(c)) + + //数据权限检查 + p := actions.GetPermissionFromContext(c) + + serviceSysUser := service.SysUser{} + serviceSysUser.Orm = db + serviceSysUser.Log = log + err = serviceSysUser.UpdateSysUser(object, p) + if err != nil { + log.Error(err) + return + } + e.OK(c, object.GetId(), "更新成功") +} + +// @Summary 删除用户数据 +// @Description 删除数据 +// @Tags 用户 +// @Param userId path int true "userId" +// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" +// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" +// @Router /api/v1/sysuser/{userId} [delete] +func (e *SysUser) DeleteSysUser(c *gin.Context) { + log := e.GetLogger(c) + control := new(dto.SysUserById) + + db, err := tools.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + + //删除操作 + req := control.Generate() + err = req.Bind(c) + if err != nil { + log.Errorf("Bind error: %s", err) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") + return + } + var object common.ActiveRecord + object, err = req.GenerateM() + if err != nil { + e.Error(c, http.StatusInternalServerError, err, "模型生成失败") + return + } + + // 设置编辑人 + object.SetUpdateBy(tools.GetUserId(c)) + + // 数据权限检查 + p := actions.GetPermissionFromContext(c) + + serviceSysUser := service.SysUser{} + serviceSysUser.Orm = db + serviceSysUser.Log = log + err = serviceSysUser.RemoveSysUser(req, object, p) + if err != nil { + log.Error(err) + return + } + e.OK(c, object.GetId(), "删除成功") +} + +// @Summary 修改头像 +// @Description 获取JSON +// @Tags 用户 +// @Accept multipart/form-data +// @Param file formData file true "file" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/user/avatar [post] +func (e *SysUser) InsetSysUserAvatar(c *gin.Context) { + log := e.GetLogger(c) + db, err := tools.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + + // 数据权限检查 + p := actions.GetPermissionFromContext(c) + + form, _ := c.MultipartForm() + files := form.File["upload[]"] + guid := uuid.New().String() + filPath := "static/uploadfile/" + guid + ".jpg" + for _, file := range files { + log.Debugf("upload avatar file: %s", file.Filename) + // 上传文件至指定目录 + err = c.SaveUploadedFile(file, filPath) + if err != nil { + log.Errorf("save file error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "") + return + } + } + + object := &system.SysUser{ + UserId: p.UserId, + Avatar: "/" + filPath, + } + serviceSysUser := service.SysUser{} + serviceSysUser.Orm = db + serviceSysUser.Log = log + err = serviceSysUser.UpdateSysUser(object, p) + if err != nil { + log.Error(err) + return + } + e.OK(c, filPath, "修改成功") +} + +// @Summary 重置密码 +// @Description 获取JSON +// @Tags 用户 +// @Accept application/json +// @Product application/json +// @Param data body dto.PassWord true "body" +// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/user/pwd [post] +// @Security Bearer +func (e *SysUser) SysUserUpdatePwd(c *gin.Context) { + log := e.GetLogger(c) + db, err := tools.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + + var pwd dto.PassWord + err = c.Bind(&pwd) + if err != nil { + log.Errorf("Bind error: %s", err) + e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") + return + } + + // 数据权限检查 + p := actions.GetPermissionFromContext(c) + + object := &system.SysUser{ + UserId: p.UserId, + Password: pwd.Password, + } + serviceSysUser := service.SysUser{} + serviceSysUser.Orm = db + serviceSysUser.Log = log + err = serviceSysUser.UpdateSysUser(object, p) + if err != nil { + log.Error(err) + return + } + e.OK(c, nil, "密码修改成功") +} + +// @Summary 获取个人中心用户 +// @Description 获取JSON +// @Tags 个人中心 +// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/user/profile [get] +// @Security Bearer +func (e *SysUser) GetSysUserProfile(c *gin.Context) { + log := e.GetLogger(c) + db, err := tools.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + + id := tools.GetUserId(c) + serviceSysUser := service.SysUser{} + serviceSysUser.Log = log + serviceSysUser.Orm = db + user := new(system.SysUser) + roles := make([]system.SysRole, 0) + posts := make([]system.SysPost, 0) + err = serviceSysUser.GetSysUserProfile(id, user, &roles, &posts) + if err != nil { + log.Errorf("get user profile error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "获取用户信息失败") + return + } + e.OK(c, gin.H{ + "user": user, + "roles": roles, + "posts": posts, + }, "查询成功") + //var SysUser models.SysUser + //userId := tools.GetUserIdStr(c) + //SysUser.UserId, _ = tools.StringToInt(userId) + //result, err := SysUser.Get() + //tools.HasError(err, "抱歉未找到相关信息", -1) + //var SysRole models.SysRole + //var Post models.Post + //var Dept models.SysDepts + ////获取角色列表 + //roles, err := SysRole.GetList() + ////获取职位列表 + //posts, err := Post.GetList() + ////获取部门列表 + //Dept.DeptId = result.DeptId + //dept, err := Dept.Get() + // + //postIds := make([]int, 0) + //postIds = append(postIds, result.PostId) + // + //roleIds := make([]int, 0) + //roleIds = append(roleIds, result.RoleId) + // + //app.Custum(c, gin.H{ + // "code": 200, + // "data": result, + // "postIds": postIds, + // "roleIds": roleIds, + // "roles": roles, + // "posts": posts, + // "dept": dept, + //}) +} + +func (e *SysUser) GetInfo(c *gin.Context) { + log := e.GetLogger(c) + + db, err := tools.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + + //数据权限检查 + p := actions.GetPermissionFromContext(c) + + var roles = make([]string, 1) + roles[0] = tools.GetRoleName(c) + + var permissions = make([]string, 1) + permissions[0] = "*:*:*" + + var buttons = make([]string, 1) + buttons[0] = "*:*:*" + + RoleMenu := models.RoleMenu{} + RoleMenu.RoleId = tools.GetRoleId(c) + + var mp = make(map[string]interface{}) + mp["roles"] = roles + if tools.GetRoleName(c) == "admin" || tools.GetRoleName(c) == "系统管理员" { + mp["permissions"] = permissions + mp["buttons"] = buttons + } else { + list, _ := RoleMenu.GetPermis(db) + mp["permissions"] = list + mp["buttons"] = list + } + + var user system.SysUser + req := new(dto.SysUserById) + req.Id = tools.GetUserId(c) + serviceSysUser := service.SysUser{} + serviceSysUser.Log = log + serviceSysUser.Orm = db + err = serviceSysUser.GetSysUser(req, p, &user) + if err != nil { + e.Error(c, http.StatusUnauthorized, err, "登录失败") + return + } + + mp["introduction"] = " am a super administrator" + + mp["avatar"] = "https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif" + if user.Avatar != "" { + mp["avatar"] = user.Avatar + } + mp["userName"] = user.NickName + mp["userId"] = user.UserId + mp["deptId"] = user.DeptId + mp["name"] = user.NickName + e.OK(c, mp, "") +} diff --git a/app/admin/apis/system/dept.go b/app/admin/apis/system/dept.go deleted file mode 100644 index d3c2f10..0000000 --- a/app/admin/apis/system/dept.go +++ /dev/null @@ -1,133 +0,0 @@ -package system - -import ( - "github.com/gin-gonic/gin" - "github.com/gin-gonic/gin/binding" - - "go-admin/app/admin/models" - "go-admin/tools" - "go-admin/tools/app" - "go-admin/tools/app/msg" -) - -// @Summary 分页部门列表数据 -// @Description 分页列表 -// @Tags 部门 -// @Param name query string false "name" -// @Param id query string false "id" -// @Param position query string false "position" -// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/deptList [get] -// @Security Bearer -func GetDeptList(c *gin.Context) { - var Dept models.SysDepts - Dept.DeptName = c.Request.FormValue("deptName") - Dept.Status = c.Request.FormValue("status") - Dept.DeptId, _ = tools.StringToInt(c.Request.FormValue("deptId")) - Dept.DataScope = tools.GetUserIdStr(c) - result, err := Dept.SetDept(true) - tools.HasError(err, "抱歉未找到相关信息", -1) - app.OK(c, result, "") -} - -func GetDeptTree(c *gin.Context) { - var Dept models.SysDepts - Dept.DeptName = c.Request.FormValue("deptName") - Dept.Status = c.Request.FormValue("status") - Dept.DeptId, _ = tools.StringToInt(c.Request.FormValue("deptId")) - result, err := Dept.SetDept(false) - tools.HasError(err, "抱歉未找到相关信息", -1) - app.OK(c, result, "") -} - -// @Summary 部门列表数据 -// @Description 获取JSON -// @Tags 部门 -// @Param deptId path string false "deptId" -// @Param position query string false "position" -// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/dept/{deptId} [get] -// @Security Bearer -func GetDept(c *gin.Context) { - var Dept models.SysDepts - Dept.DeptId, _ = tools.StringToInt(c.Param("deptId")) - Dept.DataScope = tools.GetUserIdStr(c) - result, err := Dept.Get() - tools.HasError(err, msg.NotFound, 404) - app.OK(c, result, msg.GetSuccess) -} - -// @Summary 添加部门 -// @Description 获取JSON -// @Tags 部门 -// @Accept application/json -// @Product application/json -// @Param data body models.SysDept true "data" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/dept [post] -// @Security Bearer -func InsertDept(c *gin.Context) { - var data models.SysDepts - err := c.BindWith(&data, binding.JSON) - tools.HasError(err, "", 500) - data.CreateBy = tools.GetUserIdStr(c) - result, err := data.Create() - tools.HasError(err, "", -1) - app.OK(c, result, msg.CreatedSuccess) -} - -// @Summary 修改部门 -// @Description 获取JSON -// @Tags 部门 -// @Accept application/json -// @Product application/json -// @Param id path int true "id" -// @Param data body models.SysDept true "body" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/dept [put] -// @Security Bearer -func UpdateDept(c *gin.Context) { - var data models.SysDepts - err := c.BindJSON(&data) - tools.HasError(err, "", -1) - data.UpdateBy = tools.GetUserIdStr(c) - result, err := data.Update(data.DeptId) - tools.HasError(err, "", -1) - app.OK(c, result, msg.UpdatedSuccess) -} - -// @Summary 删除部门 -// @Description 删除数据 -// @Tags 部门 -// @Param id path int true "id" -// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" -// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" -// @Router /api/v1/dept/{id} [delete] -func DeleteDept(c *gin.Context) { - var data models.SysDepts - id, err := tools.StringToInt(c.Param("id")) - _, err = data.Delete(id) - tools.HasError(err, "删除失败", 500) - app.OK(c, "", msg.DeletedSuccess) -} - -func GetDeptTreeRoleselect(c *gin.Context) { - var Dept models.SysDepts - var SysRole models.SysRole - id, err := tools.StringToInt(c.Param("roleId")) - SysRole.RoleId = id - result, err := Dept.SetDeptLable() - tools.HasError(err, msg.NotFound, -1) - menuIds := make([]int, 0) - if id != 0 { - menuIds, err = SysRole.GetRoleDeptId() - tools.HasError(err, "抱歉未找到相关信息", -1) - } - app.Custum(c, gin.H{ - "code": 200, - "depts": result, - "checkedKeys": menuIds, - }) -} diff --git a/app/admin/apis/system/dict/sys_dict_data.go b/app/admin/apis/system/dict/sys_dict_data.go index 0ddccea..0c43882 100644 --- a/app/admin/apis/system/dict/sys_dict_data.go +++ b/app/admin/apis/system/dict/sys_dict_data.go @@ -9,7 +9,6 @@ import ( "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" - "go-admin/common/log" common "go-admin/common/models" "go-admin/tools" ) @@ -30,10 +29,11 @@ type SysDictData struct { // @Router /api/v1/dict/data [get] // @Security Bearer func (e *SysDictData) GetSysDictDataList(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } @@ -42,6 +42,7 @@ func (e *SysDictData) GetSysDictDataList(c *gin.Context) { //查询列表 err = req.Bind(c) if err != nil { + log.Warnf("Bind error: %s", err.Error()) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } @@ -49,11 +50,12 @@ func (e *SysDictData) GetSysDictDataList(c *gin.Context) { list := make([]system.SysDictData, 0) var count int64 s := service.SysDictData{} - s.MsgID = msgID + s.Log = log s.Orm = db.Debug() err = s.GetPage(req, &list, &count) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") + log.Errorf("GetPage error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "查询失败") return } @@ -68,28 +70,31 @@ func (e *SysDictData) GetSysDictDataList(c *gin.Context) { // @Router /api/v1/dict/data/{dictCode} [get] // @Security Bearer func (e *SysDictData) GetSysDictData(c *gin.Context) { + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //查看详情 req := &dto.SysDictDataById{} err = req.Bind(c) if err != nil { + log.Warnf("Bind error: %s", err.Error()) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } var object system.SysDictData s := service.SysDictData{} - s.MsgID = msgID + s.Log = log s.Orm = db err = s.Get(req, &object) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") + log.Warnf("Get error: %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "查询失败") return } @@ -107,17 +112,19 @@ func (e *SysDictData) GetSysDictData(c *gin.Context) { // @Router /api/v1/dict/data [post] // @Security Bearer func (e *SysDictData) InsertSysDictData(c *gin.Context) { + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //新增操作 req := &dto.SysDictDataControl{} err = req.Bind(c) if err != nil { + log.Warnf("Bind error: %s", err.Error()) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } @@ -127,10 +134,10 @@ func (e *SysDictData) InsertSysDictData(c *gin.Context) { s := service.SysDictData{} s.Orm = db - s.MsgID = msgID + s.Log = log err = s.Insert(object.(*system.SysDictData)) if err != nil { - log.Error(err) + log.Errorf("Insert error, %s", err) e.Error(c, http.StatusInternalServerError, err, "创建失败") return } @@ -149,18 +156,19 @@ func (e *SysDictData) InsertSysDictData(c *gin.Context) { // @Router /api/v1/dict/data/{dictCode} [put] // @Security Bearer func (e *SysDictData) UpdateSysDictData(c *gin.Context) { + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) req := &dto.SysDictDataControl{} //更新操作 err = req.Bind(c) if err != nil { - log.Errorf("msgID[%s] request validate error, %s", msgID, err.Error()) + log.Warnf("request validate error, %s", err.Error()) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } @@ -169,10 +177,11 @@ func (e *SysDictData) UpdateSysDictData(c *gin.Context) { s := service.SysDictData{} s.Orm = db - s.MsgID = msgID + s.Log = log err = s.Update(object.(*system.SysDictData)) if err != nil { - log.Error(err) + log.Errorf("Update error, %s", err) + e.Error(c, http.StatusInternalServerError, err, "更新失败") return } e.OK(c, object.GetId(), "更新成功") @@ -186,24 +195,26 @@ func (e *SysDictData) UpdateSysDictData(c *gin.Context) { // @Success 200 {string} string "{"code": -1, "message": "删除失败"}" // @Router /api/v1/dict/data/{dictCode} [delete] func (e *SysDictData) DeleteSysDictData(c *gin.Context) { + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //删除操作 req := new(dto.SysDictDataById) err = req.Bind(c) if err != nil { - log.Errorf("MsgID[%s] Bind error: %s", msgID, err) + log.Warnf("Bind error: %s", err) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } var object common.ActiveRecord object, err = req.GenerateM() if err != nil { + log.Errorf("GenerateM error, %s", err.Error()) e.Error(c, http.StatusInternalServerError, err, "模型生成失败") return } @@ -213,20 +224,22 @@ func (e *SysDictData) DeleteSysDictData(c *gin.Context) { s := service.SysDictData{} s.Orm = db - s.MsgID = msgID + s.Log = log err = s.Remove(req, object.(*system.SysDictData)) if err != nil { - log.Error(err) + log.Errorf("Remove error, %s", err) + e.Error(c, http.StatusInternalServerError, err, "删除失败") return } e.OK(c, object.GetId(), "删除成功") } func (e *SysDictData) GetSysDictDataAll(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } @@ -235,17 +248,19 @@ func (e *SysDictData) GetSysDictDataAll(c *gin.Context) { //查询列表 err = req.Bind(c) if err != nil { + log.Warnf("Bind error: %s", err) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } list := make([]system.SysDictData, 0) s := service.SysDictData{} - s.MsgID = msgID + s.Log = log s.Orm = db err = s.GetAll(req, &list) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") + log.Errorf("GetAll error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "查询失败") return } diff --git a/app/admin/apis/system/dict/sys_dict_type.go b/app/admin/apis/system/dict/sys_dict_type.go index 9aa5a63..45dbdb2 100644 --- a/app/admin/apis/system/dict/sys_dict_type.go +++ b/app/admin/apis/system/dict/sys_dict_type.go @@ -9,7 +9,6 @@ import ( "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" - "go-admin/common/log" common "go-admin/common/models" "go-admin/tools" ) @@ -30,10 +29,11 @@ type SysDictType struct { // @Router /api/v1/dict/type [get] // @Security Bearer func (e *SysDictType) GetSysDictTypeList(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } @@ -49,11 +49,11 @@ func (e *SysDictType) GetSysDictTypeList(c *gin.Context) { list := make([]system.SysDictType, 0) var count int64 s := service.SysDictType{} - s.MsgID = msgID + s.Log = log s.Orm = db.Debug() err = s.GetPage(req, &list, &count) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") + e.Error(c, http.StatusInternalServerError, err, "查询失败") return } @@ -68,13 +68,14 @@ func (e *SysDictType) GetSysDictTypeList(c *gin.Context) { // @Router /api/v1/dict/type/{dictId} [get] // @Security Bearer func (e *SysDictType) GetSysDictType(c *gin.Context) { + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //查看详情 req := &dto.SysDictTypeById{} err = req.Bind(c) @@ -85,7 +86,7 @@ func (e *SysDictType) GetSysDictType(c *gin.Context) { var object system.SysDictType s := service.SysDictType{} - s.MsgID = msgID + s.Log = log s.Orm = db err = s.Get(req, &object) if err != nil { @@ -107,13 +108,14 @@ func (e *SysDictType) GetSysDictType(c *gin.Context) { // @Router /api/v1/dict/type [post] // @Security Bearer func (e *SysDictType) InsertSysDictType(c *gin.Context) { + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //新增操作 req := &dto.SysDictTypeControl{} err = req.Bind(c) @@ -127,7 +129,7 @@ func (e *SysDictType) InsertSysDictType(c *gin.Context) { s := service.SysDictType{} s.Orm = db - s.MsgID = msgID + s.Log = log err = s.Insert(object.(*system.SysDictType)) if err != nil { log.Error(err) @@ -149,13 +151,14 @@ func (e *SysDictType) InsertSysDictType(c *gin.Context) { // @Router /api/v1/dict/type/{dictId} [put] // @Security Bearer func (e *SysDictType) UpdateSysDictType(c *gin.Context) { + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) req := &dto.SysDictTypeControl{} //更新操作 err = req.Bind(c) @@ -168,7 +171,7 @@ func (e *SysDictType) UpdateSysDictType(c *gin.Context) { s := service.SysDictType{} s.Orm = db - s.MsgID = msgID + s.Log = log err = s.Update(object.(*system.SysDictType)) if err != nil { log.Error(err) @@ -185,18 +188,19 @@ func (e *SysDictType) UpdateSysDictType(c *gin.Context) { // @Success 200 {string} string "{"code": -1, "message": "删除失败"}" // @Router /api/v1/dict/type/{dictId} [delete] func (e *SysDictType) DeleteSysDictType(c *gin.Context) { + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //删除操作 req := new(dto.SysDictTypeById) err = req.Bind(c) if err != nil { - log.Errorf("MsgID[%s] Bind error: %s", msgID, err) + log.Errorf("Bind error: %s", err) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } @@ -212,7 +216,7 @@ func (e *SysDictType) DeleteSysDictType(c *gin.Context) { s := service.SysDictType{} s.Orm = db - s.MsgID = msgID + s.Log = log err = s.Remove(req, object.(*system.SysDictType)) if err != nil { log.Error(err) @@ -231,10 +235,11 @@ func (e *SysDictType) DeleteSysDictType(c *gin.Context) { // @Router /api/v1/dict/type-option-select [get] // @Security Bearer func (e *SysDictType) GetSysDictTypeAll(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } @@ -249,7 +254,7 @@ func (e *SysDictType) GetSysDictTypeAll(c *gin.Context) { list := make([]system.SysDictType, 0) s := service.SysDictType{} - s.MsgID = msgID + s.Log = log s.Orm = db err = s.GetAll(req, &list) if err != nil { diff --git a/app/admin/apis/system/info.go b/app/admin/apis/system/info.go deleted file mode 100644 index 694abcd..0000000 --- a/app/admin/apis/system/info.go +++ /dev/null @@ -1,53 +0,0 @@ -package system - -import ( - "github.com/gin-gonic/gin" - - "go-admin/app/admin/models" - "go-admin/tools" - "go-admin/tools/app" -) - -func GetInfo(c *gin.Context) { - - var roles = make([]string, 1) - roles[0] = tools.GetRoleName(c) - - var permissions = make([]string, 1) - permissions[0] = "*:*:*" - - var buttons = make([]string, 1) - buttons[0] = "*:*:*" - - RoleMenu := models.RoleMenu{} - RoleMenu.RoleId = tools.GetRoleId(c) - - var mp = make(map[string]interface{}) - mp["roles"] = roles - if tools.GetRoleName(c) == "admin" || tools.GetRoleName(c) == "系统管理员" { - mp["permissions"] = permissions - mp["buttons"] = buttons - } else { - list, _ := RoleMenu.GetPermis() - mp["permissions"] = list - mp["buttons"] = list - } - - sysuser := models.SysUser{} - sysuser.UserId = tools.GetUserId(c) - user, err := sysuser.Get() - tools.HasError(err, "", 500) - - mp["introduction"] = " am a super administrator" - - mp["avatar"] = "https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif" - if user.Avatar != "" { - mp["avatar"] = user.Avatar - } - mp["userName"] = user.NickName - mp["userId"] = user.UserId - mp["deptId"] = user.DeptId - mp["name"] = user.NickName - - app.OK(c, mp, "") -} diff --git a/app/admin/apis/system/menu.go b/app/admin/apis/system/menu.go deleted file mode 100644 index b76c4f7..0000000 --- a/app/admin/apis/system/menu.go +++ /dev/null @@ -1,185 +0,0 @@ -package system - -import ( - "github.com/gin-gonic/gin" - "github.com/gin-gonic/gin/binding" - - "go-admin/app/admin/models" - "go-admin/tools" - "go-admin/tools/app" -) - -// @Summary Menu列表数据 -// @Description 获取JSON -// @Tags 菜单 -// @Param menuName query string false "menuName" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" -// @Router /api/v1/menulist [get] -// @Security Bearer -func GetMenuList(c *gin.Context) { - var Menu models.Menu - Menu.MenuName = c.Request.FormValue("menuName") - Menu.Visible = c.Request.FormValue("visible") - Menu.Title = c.Request.FormValue("title") - Menu.DataScope = tools.GetUserIdStr(c) - result, err := Menu.SetMenu() - tools.HasError(err, "抱歉未找到相关信息", -1) - - app.OK(c, result, "") -} - -// @Summary Menu列表数据 -// @Description 获取JSON -// @Tags 菜单 -// @Param menuName query string false "menuName" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" -// @Router /api/v1/menu [get] -// @Security Bearer -func GetMenu(c *gin.Context) { - var data models.Menu - id, err := tools.StringToInt(c.Param("id")) - data.MenuId = id - result, err := data.GetByMenuId() - tools.HasError(err, "抱歉未找到相关信息", -1) - app.OK(c, result, "") -} - -// @Summary 创建菜单 -// @Description 获取JSON -// @Tags 菜单 -// @Accept application/x-www-form-urlencoded -// @Product application/x-www-form-urlencoded -// @Param menuName formData string true "menuName" -// @Param Path formData string false "Path" -// @Param Action formData string true "Action" -// @Param Permission formData string true "Permission" -// @Param ParentId formData string true "ParentId" -// @Param IsDel formData string true "IsDel" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/menu [post] -// @Security Bearer -func InsertMenu(c *gin.Context) { - var data models.Menu - err := c.BindWith(&data, binding.JSON) - tools.HasError(err, "抱歉未找到相关信息", -1) - data.CreateBy = tools.GetUserIdStr(c) - result, err := data.Create() - tools.HasError(err, "抱歉未找到相关信息", -1) - app.OK(c, result, "") -} - -// @Summary 修改菜单 -// @Description 获取JSON -// @Tags 菜单 -// @Accept application/x-www-form-urlencoded -// @Product application/x-www-form-urlencoded -// @Param id path int true "id" -// @Param data body models.Menu true "body" -// @Success 200 {string} string "{"code": 200, "message": "修改成功"}" -// @Success 200 {string} string "{"code": -1, "message": "修改失败"}" -// @Router /api/v1/menu/{id} [put] -// @Security Bearer -func UpdateMenu(c *gin.Context) { - var data models.Menu - err2 := c.BindWith(&data, binding.JSON) - data.UpdateBy = tools.GetUserIdStr(c) - tools.HasError(err2, "修改失败", -1) - _, err := data.Update(data.MenuId) - tools.HasError(err, "", 501) - app.OK(c, "", "修改成功") - -} - -// @Summary 删除菜单 -// @Description 删除数据 -// @Tags 菜单 -// @Param id path int true "id" -// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" -// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" -// @Router /api/v1/menu/{id} [delete] -func DeleteMenu(c *gin.Context) { - var data models.Menu - id, err := tools.StringToInt(c.Param("id")) - data.UpdateBy = tools.GetUserIdStr(c) - _, err = data.Delete(id) - tools.HasError(err, "删除失败", 500) - app.OK(c, "", "删除成功") -} - -// @Summary 根据角色名称获取菜单列表数据(左菜单使用) -// @Description 获取JSON -// @Tags 菜单 -// @Param id path int true "id" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" -// @Router /api/v1/menurole [get] -// @Security Bearer -func GetMenuRole(c *gin.Context) { - var Menu models.Menu - result, err := Menu.SetMenuRole(tools.GetRoleName(c)) - tools.HasError(err, "获取失败", 500) - app.OK(c, result, "") -} - -// @Summary 获取角色对应的菜单id数组 -// @Description 获取JSON -// @Tags 菜单 -// @Param id path int true "id" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" -// @Router /api/v1/menuids/{id} [get] -// @Security Bearer -func GetMenuIDS(c *gin.Context) { - var data models.RoleMenu - data.RoleName = c.GetString("role") - data.UpdateBy = tools.GetUserIdStr(c) - result, err := data.GetIDS() - tools.HasError(err, "获取失败", 500) - app.OK(c, result, "") -} - -// GetMenuTreeRoleselect 角色修改中的菜单列表 -func GetMenuTreeRoleselect(c *gin.Context) { - var Menu models.Menu - var SysRole models.SysRole - - id, err := tools.StringToInt(c.Param("roleId")) - SysRole.RoleId = id - //var r *models.SysRole - r, err := SysRole.Get() - - var result *[]models.MenuLable - menuIds := make([]int, 0) - if r.RoleKey != "admin" { - result, err = Menu.SetMenuLabel() - tools.HasError(err, "抱歉未找到相关信息", -1) - if id != 0 { - menuIds, err = SysRole.GetRoleMeunId() - tools.HasError(err, "抱歉未找到相关信息", -1) - } - } - app.Custum(c, gin.H{ - "code": 200, - "menus": result, - "checkedKeys": menuIds, - }) -} - -// @Summary 获取菜单树 -// @Description 获取JSON -// @Tags 菜单 -// @Accept application/x-www-form-urlencoded -// @Product application/x-www-form-urlencoded -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/menuTreeselect [get] -// @Security Bearer -func GetMenuTreeelect(c *gin.Context) { - var data models.Menu - result, err := data.SetMenuLabel() - tools.HasError(err, "抱歉未找到相关信息", -1) - app.OK(c, result, "") -} \ No newline at end of file diff --git a/app/admin/apis/system/post.go b/app/admin/apis/system/post.go deleted file mode 100644 index 9569ed1..0000000 --- a/app/admin/apis/system/post.go +++ /dev/null @@ -1,118 +0,0 @@ -package system - -import ( - "github.com/gin-gonic/gin" - - "go-admin/app/admin/models" - "go-admin/tools" - "go-admin/tools/app" -) - -// @Summary 岗位列表数据 -// @Description 获取JSON -// @Tags 岗位 -// @Param postName query string false "postName" -// @Param postCode query string false "postCode" -// @Param postId query string false "postId" -// @Param status query string false "status" -// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/post [get] -// @Security Bearer -func GetPostList(c *gin.Context) { - var data models.Post - var err error - var pageSize = 10 - var pageIndex = 1 - - if size := c.Request.FormValue("pageSize"); size != "" { - pageSize, err = tools.StringToInt(size) - } - - if index := c.Request.FormValue("pageIndex"); index != "" { - pageIndex, err = tools.StringToInt(index) - } - - id := c.Request.FormValue("postId") - data.PostId, _ = tools.StringToInt(id) - - data.PostCode = c.Request.FormValue("postCode") - data.PostName = c.Request.FormValue("postName") - data.Status = c.Request.FormValue("status") - - data.DataScope = tools.GetUserIdStr(c) - result, count, err := data.GetPage(pageSize, pageIndex) - tools.HasError(err, "", -1) - app.PageOK(c, result, count, pageIndex, pageSize, "") -} - -// @Summary 获取岗位信息 -// @Description 获取JSON -// @Tags 岗位 -// @Param postId path int true "postId" -// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/post/{postId} [get] -// @Security Bearer -func GetPost(c *gin.Context) { - var Post models.Post - Post.PostId, _ = tools.StringToInt(c.Param("postId")) - result, err := Post.Get() - tools.HasError(err, "抱歉未找到相关信息", -1) - app.OK(c, result, "") -} - -// @Summary 添加岗位 -// @Description 获取JSON -// @Tags 岗位 -// @Accept application/json -// @Product application/json -// @Param data body models.Post true "data" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/post [post] -// @Security Bearer -func InsertPost(c *gin.Context) { - var data models.Post - err := c.Bind(&data) - data.CreateBy = tools.GetUserIdStr(c) - tools.HasError(err, "", 500) - result, err := data.Create() - tools.HasError(err, "", -1) - app.OK(c, result, "") -} - -// @Summary 修改岗位 -// @Description 获取JSON -// @Tags 岗位 -// @Accept application/json -// @Product application/json -// @Param data body models.Post true "body" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/post/ [put] -// @Security Bearer -func UpdatePost(c *gin.Context) { - var data models.Post - - err := c.Bind(&data) - data.UpdateBy = tools.GetUserIdStr(c) - tools.HasError(err, "", -1) - result, err := data.Update(data.PostId) - tools.HasError(err, "", -1) - app.OK(c, result, "修改成功") -} - -// @Summary 删除岗位 -// @Description 删除数据 -// @Tags 岗位 -// @Param id path int true "id" -// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" -// @Success 500 {string} string "{"code": 500, "message": "删除失败"}" -// @Router /api/v1/post/{postId} [delete] -func DeletePost(c *gin.Context) { - var data models.Post - data.UpdateBy = tools.GetUserIdStr(c) - IDS := tools.IdsStrToIdsIntGroup("postId", c) - result, err := data.BatchDelete(IDS) - tools.HasError(err, "删除失败", 500) - app.OK(c, result, "删除成功") -} diff --git a/app/admin/apis/system/rolemenu.go b/app/admin/apis/system/rolemenu.go index 1844599..e20ef04 100644 --- a/app/admin/apis/system/rolemenu.go +++ b/app/admin/apis/system/rolemenu.go @@ -1,13 +1,7 @@ package system import ( - "fmt" - "net/http" - - "github.com/gin-gonic/gin" - "go-admin/app/admin/models" - "go-admin/tools/app" ) // @Summary RoleMenu列表数据 @@ -18,33 +12,33 @@ import ( // @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" // @Router /api/v1/rolemenu [get] // @Security Bearer -func GetRoleMenu(c *gin.Context) { - var Rm models.RoleMenu - err := c.ShouldBind(&Rm) - result, err := Rm.Get() - var res app.Response - if err != nil { - res.Msg = "抱歉未找到相关信息" - c.JSON(http.StatusOK, res.ReturnError(200)) - return - } - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) -} +//func GetRoleMenu(c *gin.Context) { +// var Rm models.RoleMenu +// err := c.ShouldBind(&Rm) +// result, err := Rm.Get() +// var res app.Response +// if err != nil { +// res.Msg = "抱歉未找到相关信息" +// c.JSON(http.StatusOK, res.ReturnError(200)) +// return +// } +// res.Data = result +// c.JSON(http.StatusOK, res.ReturnOK()) +//} type RoleMenuPost struct { RoleId string RoleMenu []models.RoleMenu } -func InsertRoleMenu(c *gin.Context) { - - var res app.Response - res.Msg = "添加成功" - c.JSON(http.StatusOK, res.ReturnOK()) - return - -} +//func InsertRoleMenu(c *gin.Context) { +// +// var res app.Response +// res.Msg = "添加成功" +// c.JSON(http.StatusOK, res.ReturnOK()) +// return +// +//} // @Summary 删除用户菜单数据 // @Description 删除数据 @@ -54,20 +48,20 @@ func InsertRoleMenu(c *gin.Context) { // @Success 200 {string} string "{"code": 200, "message": "删除成功"}" // @Success 200 {string} string "{"code": -1, "message": "删除失败"}" // @Router /api/v1/rolemenu/{id} [delete] -func DeleteRoleMenu(c *gin.Context) { - var t models.RoleMenu - id := c.Param("id") - menuId := c.Request.FormValue("menu_id") - fmt.Println(menuId) - _, err := t.Delete(id, menuId) - if err != nil { - var res app.Response - res.Msg = "删除失败" - c.JSON(http.StatusOK, res.ReturnError(200)) - return - } - var res app.Response - res.Msg = "删除成功" - c.JSON(http.StatusOK, res.ReturnOK()) - return -} +//func DeleteRoleMenu(c *gin.Context) { +// var t models.RoleMenu +// id := c.Param("id") +// menuId := c.Request.FormValue("menu_id") +// fmt.Println(menuId) +// _, err := t.Delete(id, menuId) +// if err != nil { +// var res app.Response +// res.Msg = "删除失败" +// c.JSON(http.StatusOK, res.ReturnError(200)) +// return +// } +// var res app.Response +// res.Msg = "删除成功" +// c.JSON(http.StatusOK, res.ReturnOK()) +// return +//} diff --git a/app/admin/apis/system/settings.go b/app/admin/apis/system/settings.go index 7972e28..c5e887c 100644 --- a/app/admin/apis/system/settings.go +++ b/app/admin/apis/system/settings.go @@ -2,16 +2,15 @@ package system import ( "fmt" - "go-admin/app/admin/service" - "go-admin/app/admin/service/dto" - "go-admin/common/apis" - "go-admin/common/log" "net/http" "strings" "github.com/gin-gonic/gin" "go-admin/app/admin/models" + "go-admin/app/admin/service" + "go-admin/app/admin/service/dto" + "go-admin/common/apis" "go-admin/tools" ) @@ -26,20 +25,21 @@ type SysSetting struct { // @Success 200 {string} string "{"code": -1, "message": "添加失败"}" // @Router /api/v1/setting [get] func (e *SysSetting) GetSetting(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } sysSettingService := service.SysSetting{} - sysSettingService.MsgID=msgID - sysSettingService.Orm=db + sysSettingService.Log = log + sysSettingService.Orm = db var model = models.SysSetting{} err = sysSettingService.GetSysSetting(&model) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") + e.Error(c, http.StatusInternalServerError, err, "查询失败") return } @@ -61,10 +61,11 @@ func (e *SysSetting) GetSetting(c *gin.Context) { // @Router /api/v1/system/setting [post] func (e *SysSetting) CreateOrUpdateSetting(c *gin.Context) { control := new(dto.SysSettingControl) - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } @@ -81,15 +82,14 @@ func (e *SysSetting) CreateOrUpdateSetting(c *gin.Context) { } sysSettingService := service.SysSetting{} - sysSettingService.MsgID=msgID - sysSettingService.Orm=db + sysSettingService.Log = log + sysSettingService.Orm = db err = sysSettingService.UpdateSysSetting(object) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "更新失败") + e.Error(c, http.StatusInternalServerError, err, "更新失败") return } - if object.Logo != "" { if !strings.HasPrefix(object.Logo, "http") { object.Logo = fmt.Sprintf("http://%s/%s", c.Request.Host, object.Logo) diff --git a/app/admin/apis/system/sys_config/sys_config.go b/app/admin/apis/system/sys_config/sys_config.go index 27e95e5..d23b73a 100644 --- a/app/admin/apis/system/sys_config/sys_config.go +++ b/app/admin/apis/system/sys_config/sys_config.go @@ -8,7 +8,6 @@ import ( "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" - "go-admin/common/log" "go-admin/tools" "go-admin/tools/app" ) @@ -18,11 +17,11 @@ type SysConfig struct { } func (e *SysConfig) GetSysConfigList(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) d := new(dto.SysConfigSearch) db, err := tools.GetOrm(c) if err != nil { - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } @@ -30,19 +29,19 @@ func (e *SysConfig) GetSysConfigList(c *gin.Context) { //查询列表 err = d.Bind(c) if err != nil { - log.Errorf("msgID[%s] 参数验证失败, error:%s", msgID, err) + log.Errorf("参数验证失败, error:%s", err) app.Error(c, 500, err, "参数验证失败") return } list := make([]system.SysConfig, 0) var count int64 - serviceStudent := service.SysConfig{} - serviceStudent.MsgID = msgID - serviceStudent.Orm = db - err = serviceStudent.GetSysConfigPage(d, &list, &count) + s := service.SysConfig{} + s.Log = log + s.Orm = db + err = s.GetSysConfigPage(d, &list, &count) if err != nil { - log.Errorf("msgID[%s] GetSysConfigPage 查询失败, error:%s", msgID, err) + log.Errorf("GetSysConfigPage 查询失败, error:%s", err) app.Error(c, 500, err, "查询失败") return } @@ -50,12 +49,12 @@ func (e *SysConfig) GetSysConfigList(c *gin.Context) { } func (e *SysConfig) GetSysConfig(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) control := new(dto.SysConfigById) db, err := tools.GetOrm(c) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "Orm获取失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } @@ -63,19 +62,19 @@ func (e *SysConfig) GetSysConfig(c *gin.Context) { err = control.Bind(c) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } var object system.SysConfig serviceSysLoginLog := service.SysConfig{} - serviceSysLoginLog.MsgID = msgID + serviceSysLoginLog.Log = log serviceSysLoginLog.Orm = db err = serviceSysLoginLog.GetSysConfig(control, &object) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } @@ -84,12 +83,12 @@ func (e *SysConfig) GetSysConfig(c *gin.Context) { } func (e *SysConfig) InsertSysConfig(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) control := new(dto.SysConfigControl) db, err := tools.GetOrm(c) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "Orm获取失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } @@ -98,14 +97,14 @@ func (e *SysConfig) InsertSysConfig(c *gin.Context) { err = control.Bind(c) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } object, err := control.Generate() if err != nil { e.Error(c, http.StatusInternalServerError, err, "模型生成失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } @@ -114,12 +113,12 @@ func (e *SysConfig) InsertSysConfig(c *gin.Context) { serviceSysLoginLog := service.SysConfig{} serviceSysLoginLog.Orm = db - serviceSysLoginLog.MsgID = msgID + serviceSysLoginLog.Log = log err = serviceSysLoginLog.InsertSysConfig(object) if err != nil { log.Error(err) e.Error(c, http.StatusInternalServerError, err, "创建失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } @@ -128,12 +127,12 @@ func (e *SysConfig) InsertSysConfig(c *gin.Context) { } func (e *SysConfig) UpdateSysConfig(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) control := new(dto.SysConfigControl) db, err := tools.GetOrm(c) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "Orm获取失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } @@ -143,14 +142,14 @@ func (e *SysConfig) UpdateSysConfig(c *gin.Context) { if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } object, err := control.Generate() if err != nil { e.Error(c, http.StatusInternalServerError, err, "模型生成失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } @@ -158,11 +157,11 @@ func (e *SysConfig) UpdateSysConfig(c *gin.Context) { serviceSysLoginLog := service.SysConfig{} serviceSysLoginLog.Orm = db - serviceSysLoginLog.MsgID = msgID + serviceSysLoginLog.Log = log err = serviceSysLoginLog.UpdateSysConfig(object) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "更新失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } @@ -170,12 +169,12 @@ func (e *SysConfig) UpdateSysConfig(c *gin.Context) { } func (e *SysConfig) DeleteSysConfig(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) control := new(dto.SysConfigById) db, err := tools.GetOrm(c) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "Orm获取失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } @@ -183,16 +182,16 @@ func (e *SysConfig) DeleteSysConfig(c *gin.Context) { //删除操作 err = control.Bind(c) if err != nil { - log.Errorf("MsgID[%s] Bind error: %s", msgID, err) + log.Errorf("Bind error: %s", err) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } object, err := control.GenerateM() if err != nil { e.Error(c, http.StatusInternalServerError, err, "模型生成失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } @@ -202,11 +201,11 @@ func (e *SysConfig) DeleteSysConfig(c *gin.Context) { serviceSysLoginLog := service.SysConfig{} serviceSysLoginLog.Orm = db - serviceSysLoginLog.MsgID = msgID + serviceSysLoginLog.Log = log err = serviceSysLoginLog.RemoveSysConfig(control, object) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "删除失败") - log.Errorf("msgID[%s] Orm获取失败, error:%s", msgID, err) + log.Errorf("Orm获取失败, error:%s", err) app.Error(c, 500, err, "Orm获取失败") return } @@ -215,26 +214,26 @@ func (e *SysConfig) DeleteSysConfig(c *gin.Context) { // GetSysConfigByKEYForService 根据Key获取SysConfig的Service func (e *SysConfig) GetSysConfigByKEYForService(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) db, err := e.GetOrm(c) if err != nil { - log.Errorf("msgID[%s] error:%s", msgID, err) + log.Errorf("error:%s", err) app.Error(c, 500, err, "") return } var v dto.SysConfigControl err = v.Bind(c) if err != nil { - log.Errorf("msgID[%s] 参数验证错误, error:%s", msgID, err) + log.Errorf("参数验证错误, error:%s", err) app.Error(c, 422, err, "参数验证失败") return } s := service.SysConfig{} - s.MsgID = msgID + s.Log = log s.Orm = db err = s.GetSysConfigByKEY(&v) if err != nil { - log.Errorf("msgID[%s] 通过Key获取配置失败, error:%s", msgID, err) + log.Errorf("通过Key获取配置失败, error:%s", err) app.Error(c, 500, err, "") return } diff --git a/app/admin/apis/system/sys_dept/sys_dept.go b/app/admin/apis/system/sys_dept/sys_dept.go index a564f7e..d1c6fd6 100644 --- a/app/admin/apis/system/sys_dept/sys_dept.go +++ b/app/admin/apis/system/sys_dept/sys_dept.go @@ -1,27 +1,37 @@ package sys_dept import ( + "net/http" + "github.com/gin-gonic/gin" - "go-admin/app/admin/models" + + "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" - "go-admin/common/log" "go-admin/tools" - - "net/http" ) type SysDept struct { apis.Api } +// @Summary 分页部门列表数据 +// @Description 分页列表 +// @Tags 部门 +// @Param name query string false "name" +// @Param id query string false "id" +// @Param position query string false "position" +// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/dept [get] +// @Security Bearer func (e *SysDept) GetSysDeptList(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) d := new(dto.SysDeptSearch) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } @@ -32,9 +42,9 @@ func (e *SysDept) GetSysDeptList(c *gin.Context) { return } - list := make([]models.SysDept, 0) + list := make([]system.SysDept, 0) serviceStudent := service.SysDept{} - serviceStudent.MsgID = msgID + serviceStudent.Log = log serviceStudent.Orm = db list, err = serviceStudent.SetDeptPage(d) if err != nil { @@ -45,25 +55,34 @@ func (e *SysDept) GetSysDeptList(c *gin.Context) { e.OK(c, list, "查询成功") } +// @Summary 部门列表数据 +// @Description 获取JSON +// @Tags 部门 +// @Param deptId path string false "deptId" +// @Param position query string false "position" +// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/dept/{deptId} [get] +// @Security Bearer func (e *SysDept) GetSysDept(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysDeptById) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //查看详情 err = control.Bind(c) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object models.SysDept + var object system.SysDept serviceSysOperlog := service.SysDept{} - serviceSysOperlog.MsgID = msgID + serviceSysOperlog.Log = log serviceSysOperlog.Orm = db err = serviceSysOperlog.GetSysDept(control, &object) if err != nil { @@ -74,15 +93,26 @@ func (e *SysDept) GetSysDept(c *gin.Context) { e.OK(c, object, "查看成功") } +// @Summary 添加部门 +// @Description 获取JSON +// @Tags 部门 +// @Accept application/json +// @Product application/json +// @Param data body models.SysDept true "data" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/dept [post] +// @Security Bearer func (e *SysDept) InsertSysDept(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysDeptControl) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //新增操作 err = control.Bind(c) if err != nil { @@ -99,7 +129,7 @@ func (e *SysDept) InsertSysDept(c *gin.Context) { serviceSysDept := service.SysDept{} serviceSysDept.Orm = db - serviceSysDept.MsgID = msgID + serviceSysDept.Log = log err = serviceSysDept.InsertSysDept(object) if err != nil { log.Error(err) @@ -110,15 +140,27 @@ func (e *SysDept) InsertSysDept(c *gin.Context) { e.OK(c, object.GetId(), "创建成功") } +// @Summary 修改部门 +// @Description 获取JSON +// @Tags 部门 +// @Accept application/json +// @Product application/json +// @Param id path int true "id" +// @Param data body models.SysDept true "body" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/dept/{deptId} [put] +// @Security Bearer func (e *SysDept) UpdateSysDept(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysDeptControl) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //更新操作 err = control.Bind(c) if err != nil { @@ -134,7 +176,7 @@ func (e *SysDept) UpdateSysDept(c *gin.Context) { serviceSysDept := service.SysDept{} serviceSysDept.Orm = db - serviceSysDept.MsgID = msgID + serviceSysDept.Log = log err = serviceSysDept.UpdateSysDept(object) if err != nil { log.Error(err) @@ -143,29 +185,38 @@ func (e *SysDept) UpdateSysDept(c *gin.Context) { e.OK(c, object.GetId(), "更新成功") } +// @Summary 删除部门 +// @Description 删除数据 +// @Tags 部门 +// @Param data body []int true "body" +// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" +// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" +// @Router /api/v1/dept [delete] func (e *SysDept) DeleteSysDept(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysDeptById) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //删除操作 err = control.Bind(c) if err != nil { - log.Errorf("MsgID[%s] Bind error: %s", msgID, err) + log.Errorf("Bind error: %s", err) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } serviceSysDept := service.SysDept{} serviceSysDept.Orm = db - serviceSysDept.MsgID = msgID + serviceSysDept.Log = log err = serviceSysDept.RemoveSysDept(control) if err != nil { - log.Error(err) + log.Errorf("RemoveSysDept error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "删除失败") return } e.OK(c, control.GetId(), "删除成功") @@ -173,11 +224,12 @@ func (e *SysDept) DeleteSysDept(c *gin.Context) { // GetDeptTree 用户管理 左侧部门树 func (e *SysDept) GetDeptTree(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) d := new(dto.SysDeptSearch) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } @@ -190,7 +242,7 @@ func (e *SysDept) GetDeptTree(c *gin.Context) { list := make([]dto.DeptLabel, 0) serviceStudent := service.SysDept{} - serviceStudent.MsgID = msgID + serviceStudent.Log = log serviceStudent.Orm = db list, err = serviceStudent.SetDeptTree(d) if err != nil { @@ -205,4 +257,32 @@ func (e *SysDept) GetDeptTree(c *gin.Context) { //result, err := Dept.SetDept(false) //tools.HasError(err, "抱歉未找到相关信息", -1) e.OK(c, list, "") -} \ No newline at end of file +} + +//func (e *SysDept) GetDeptTreeRoleSelect(c *gin.Context) { +// log := e.GetLogger(c) +// db, err := tools.GetOrm(c) +// if err != nil { +// log.Error(err) +// return +// } +// +// s := service.SysDept{} +// s.Orm = db +// s.MsgID = msgID +// id, err := tools.StringToInt(c.Param("roleId")) +// result, err := s.SetDeptLabel() +// if err != nil { +// log.Errorf("SetDeptLabel error, %s", msgID, err.Error()) +// e.Error(c, http.StatusInternalServerError, err, "") +// } +// menuIds := make([]int, 0) +// if id != 0 { +// menuIds, err = s.GetRoleDeptId(id) +// tools.HasError(err, "抱歉未找到相关信息", -1) +// } +// e.OK(c, gin.H{ +// "depts": result, +// "checkedKeys": menuIds, +// }, "") +//} diff --git a/app/admin/apis/system/sys_login_log/sys_login_log.go b/app/admin/apis/system/sys_login_log/sys_login_log.go index 67e47e4..831a8cd 100644 --- a/app/admin/apis/system/sys_login_log/sys_login_log.go +++ b/app/admin/apis/system/sys_login_log/sys_login_log.go @@ -1,16 +1,15 @@ package sys_login_log import ( - "github.com/gin-gonic/gin" - "go-admin/app/admin/models/system" + "net/http" + "github.com/gin-gonic/gin" + + "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" - "go-admin/common/log" "go-admin/tools" - - "net/http" ) type SysLoginLog struct { @@ -18,11 +17,12 @@ type SysLoginLog struct { } func (e *SysLoginLog) GetSysLoginLogList(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) d := new(dto.SysLoginLogSearch) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } @@ -36,7 +36,7 @@ func (e *SysLoginLog) GetSysLoginLogList(c *gin.Context) { list := make([]system.SysLoginLog, 0) var count int64 serviceStudent := service.SysLoginLog{} - serviceStudent.MsgID = msgID + serviceStudent.Log = log serviceStudent.Orm = db err = serviceStudent.GetSysLoginLogPage(d, &list, &count) if err != nil { @@ -48,14 +48,15 @@ func (e *SysLoginLog) GetSysLoginLogList(c *gin.Context) { } func (e *SysLoginLog) GetSysLoginLog(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysLoginLogById) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //查看详情 err = control.Bind(c) if err != nil { @@ -65,7 +66,7 @@ func (e *SysLoginLog) GetSysLoginLog(c *gin.Context) { var object system.SysLoginLog serviceSysLoginLog := service.SysLoginLog{} - serviceSysLoginLog.MsgID = msgID + serviceSysLoginLog.Log = log serviceSysLoginLog.Orm = db err = serviceSysLoginLog.GetSysLoginLog(control, &object) if err != nil { @@ -77,14 +78,15 @@ func (e *SysLoginLog) GetSysLoginLog(c *gin.Context) { } func (e *SysLoginLog) InsertSysLoginLog(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysLoginLogControl) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //新增操作 err = control.Bind(c) if err != nil { @@ -101,10 +103,10 @@ func (e *SysLoginLog) InsertSysLoginLog(c *gin.Context) { serviceSysLoginLog := service.SysLoginLog{} serviceSysLoginLog.Orm = db - serviceSysLoginLog.MsgID = msgID + serviceSysLoginLog.Log = log err = serviceSysLoginLog.InsertSysLoginLog(object) if err != nil { - log.Error(err) + log.Errorf("InsertSysLoginLog error, %s", err) e.Error(c, http.StatusInternalServerError, err, "创建失败") return } @@ -113,14 +115,15 @@ func (e *SysLoginLog) InsertSysLoginLog(c *gin.Context) { } func (e *SysLoginLog) UpdateSysLoginLog(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysLoginLogControl) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //更新操作 err = control.Bind(c) if err != nil { @@ -136,28 +139,30 @@ func (e *SysLoginLog) UpdateSysLoginLog(c *gin.Context) { serviceSysLoginLog := service.SysLoginLog{} serviceSysLoginLog.Orm = db - serviceSysLoginLog.MsgID = msgID + serviceSysLoginLog.Log = log err = serviceSysLoginLog.UpdateSysLoginLog(object) if err != nil { - log.Error(err) + log.Errorf("UpdateSysLoginLog error, %s", err) + e.Error(c, http.StatusInternalServerError, err, "更新失败") return } e.OK(c, object.GetId(), "更新成功") } func (e *SysLoginLog) DeleteSysLoginLog(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysLoginLogById) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //删除操作 err = control.Bind(c) if err != nil { - log.Errorf("MsgID[%s] Bind error: %s", msgID, err) + log.Errorf("Bind error: %s", err) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } @@ -172,10 +177,11 @@ func (e *SysLoginLog) DeleteSysLoginLog(c *gin.Context) { serviceSysLoginLog := service.SysLoginLog{} serviceSysLoginLog.Orm = db - serviceSysLoginLog.MsgID = msgID + serviceSysLoginLog.Log = log err = serviceSysLoginLog.RemoveSysLoginLog(control, object) if err != nil { - log.Error(err) + log.Errorf("RemoveSysLoginLog error, %s", err) + e.Error(c, http.StatusInternalServerError, err, "删除失败") return } e.OK(c, object.GetId(), "删除成功") diff --git a/app/admin/apis/system/sys_menu/sys_menu.go b/app/admin/apis/system/sys_menu/sys_menu.go index ab61c27..5d61573 100644 --- a/app/admin/apis/system/sys_menu/sys_menu.go +++ b/app/admin/apis/system/sys_menu/sys_menu.go @@ -1,27 +1,37 @@ package sys_menu import ( + "net/http" + "github.com/gin-gonic/gin" + "go-admin/app/admin/models" + "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" - "go-admin/common/log" "go-admin/tools" - "go-admin/tools/app" - "net/http" ) type SysMenu struct { apis.Api } +// @Summary Menu列表数据 +// @Description 获取JSON +// @Tags 菜单 +// @Param menuName query string false "menuName" +// @Success 200 {string} string "{"code": 200, "data": [...]}" +// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" +// @Router /api/v1/menulist [get] +// @Security Bearer func (e *SysMenu) GetSysMenuList(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) d := new(dto.SysMenuSearch) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } @@ -32,9 +42,9 @@ func (e *SysMenu) GetSysMenuList(c *gin.Context) { return } - var list *[]models.SysMenu + var list *[]system.SysMenu serviceSysMenu := service.SysMenu{} - serviceSysMenu.MsgID = msgID + serviceSysMenu.Log = log serviceSysMenu.Orm = db list, err = serviceSysMenu.GetSysMenuPage(d) if err != nil { @@ -45,25 +55,36 @@ func (e *SysMenu) GetSysMenuList(c *gin.Context) { e.OK(c, list, "查询成功") } +// @Summary Menu详情数据 +// @Description 获取JSON +// @Tags 菜单 +// @Param menuName query string false "menuName" +// @Success 200 {string} string "{"code": 200, "data": [...]}" +// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" +// @Router /api/v1/menu/{id} [get] +// @Security Bearer func (e *SysMenu) GetSysMenu(c *gin.Context) { control := new(dto.SysMenuById) + + log := e.GetLogger(c) + db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //查看详情 err = control.Bind(c) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object models.SysMenu + var object system.SysMenu serviceSysMenu := service.SysMenu{} - serviceSysMenu.MsgID = msgID + serviceSysMenu.Log = log serviceSysMenu.Orm = db err = serviceSysMenu.GetSysMenu(control, &object) if err != nil { @@ -74,15 +95,33 @@ func (e *SysMenu) GetSysMenu(c *gin.Context) { e.OK(c, object, "查看成功") } +// @Summary 创建菜单 +// @Description 获取JSON +// @Tags 菜单 +// @Accept application/x-www-form-urlencoded +// @Product application/x-www-form-urlencoded +// @Param menuName formData string true "menuName" +// @Param Path formData string false "Path" +// @Param Action formData string true "Action" +// @Param Permission formData string true "Permission" +// @Param ParentId formData string true "ParentId" +// @Param IsDel formData string true "IsDel" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/menu [post] +// @Security Bearer func (e *SysMenu) InsertSysMenu(c *gin.Context) { control := new(dto.SysMenuControl) + + log := e.GetLogger(c) + db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //新增操作 err = control.Bind(c) if err != nil { @@ -99,7 +138,7 @@ func (e *SysMenu) InsertSysMenu(c *gin.Context) { serviceSysMenu := service.SysMenu{} serviceSysMenu.Orm = db - serviceSysMenu.MsgID = msgID + serviceSysMenu.Log = log err = serviceSysMenu.InsertSysMenu(object) if err != nil { log.Error(err) @@ -110,15 +149,29 @@ func (e *SysMenu) InsertSysMenu(c *gin.Context) { e.OK(c, object.GetId(), "创建成功") } +// @Summary 修改菜单 +// @Description 获取JSON +// @Tags 菜单 +// @Accept application/x-www-form-urlencoded +// @Product application/x-www-form-urlencoded +// @Param id path int true "id" +// @Param data body models.Menu true "body" +// @Success 200 {string} string "{"code": 200, "message": "修改成功"}" +// @Success 200 {string} string "{"code": -1, "message": "修改失败"}" +// @Router /api/v1/menu/{id} [put] +// @Security Bearer func (e *SysMenu) UpdateSysMenu(c *gin.Context) { control := new(dto.SysMenuControl) + + log := e.GetLogger(c) + db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //更新操作 err = control.Bind(c) if err != nil { @@ -134,7 +187,7 @@ func (e *SysMenu) UpdateSysMenu(c *gin.Context) { serviceSysMenu := service.SysMenu{} serviceSysMenu.Orm = db - serviceSysMenu.MsgID = msgID + serviceSysMenu.Log = log err = serviceSysMenu.UpdateSysMenu(object) if err != nil { log.Error(err) @@ -143,29 +196,40 @@ func (e *SysMenu) UpdateSysMenu(c *gin.Context) { e.OK(c, object.GetId(), "更新成功") } +// @Summary 删除菜单 +// @Description 删除数据 +// @Tags 菜单 +// @Param data body []int true "body" +// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" +// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" +// @Router /api/v1/menu/ [delete] func (e *SysMenu) DeleteSysMenu(c *gin.Context) { control := new(dto.SysMenuById) + + log := e.GetLogger(c) + db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //删除操作 err = control.Bind(c) if err != nil { - log.Errorf("MsgID[%s] Bind error: %s", msgID, err) + log.Errorf("Bind error: %s", err) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } serviceSysMenu := service.SysMenu{} serviceSysMenu.Orm = db - serviceSysMenu.MsgID = msgID + serviceSysMenu.Log = log err = serviceSysMenu.RemoveSysMenu(control) if err != nil { - log.Error(err) + log.Errorf("RemoveSysMenu error, %s", err) + e.Error(c, http.StatusInternalServerError, err, "删除失败") return } e.OK(c, control.GetId(), "删除成功") @@ -180,24 +244,25 @@ func (e *SysMenu) DeleteSysMenu(c *gin.Context) { // @Router /api/v1/menurole [get] // @Security Bearer func (e *SysMenu) GetMenuRole(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } serviceSysMenu := service.SysMenu{} - serviceSysMenu.MsgID = msgID + serviceSysMenu.Log = log serviceSysMenu.Orm = db result, err := serviceSysMenu.SetMenuRole(tools.GetRoleName(c)) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") + e.Error(c, http.StatusInternalServerError, err, "查询失败") return } - app.OK(c, result, "") + e.OK(c, result, "") } // @Summary 获取角色对应的菜单id数组 @@ -209,41 +274,52 @@ func (e *SysMenu) GetMenuRole(c *gin.Context) { // @Router /api/v1/menuids/{id} [get] // @Security Bearer func (e *SysMenu) GetMenuIDS(c *gin.Context) { + log := e.GetLogger(c) + db, err := tools.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } var data models.RoleMenu data.RoleName = c.GetString("role") data.UpdateBy = tools.GetUserIdStr(c) - result, err := data.GetIDS() - tools.HasError(err, "获取失败", 500) - app.OK(c, result, "") -} - -// GetMenuTreeRoleselect 角色修改中的菜单列表 -func (e *SysMenu) GetMenuTreeRoleselect(c *gin.Context) { - var Menu models.Menu - var SysRole models.SysRole - - id, err := tools.StringToInt(c.Param("roleId")) - SysRole.RoleId = id - //var r *models.SysRole - r, err := SysRole.Get() - - var result *[]models.MenuLable - menuIds := make([]int, 0) - if r.RoleKey != "admin" { - result, err = Menu.SetMenuLabel() - tools.HasError(err, "抱歉未找到相关信息", -1) - if id != 0 { - menuIds, err = SysRole.GetRoleMeunId() - tools.HasError(err, "抱歉未找到相关信息", -1) - } + result, err := data.GetIDS(db) + if err != nil { + log.Errorf("GetIDS error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "获取失败") + return } - app.Custum(c, gin.H{ - "code": 200, - "menus": result, - "checkedKeys": menuIds, - }) + e.OK(c, result, "") } +//// GetMenuTreeRoleselect 角色修改中的菜单列表 +//func (e *SysMenu) GetMenuTreeRoleselect(c *gin.Context) { +// var Menu models.Menu +// var SysRole models.SysRole +// +// id, err := tools.StringToInt(c.Param("roleId")) +// SysRole.RoleId = id +// //var r *models.SysRole +// r, err := SysRole.Get() +// +// var result *[]models.MenuLable +// menuIds := make([]int, 0) +// if r.RoleKey != "admin" { +// result, err = Menu.SetMenuLabel() +// tools.HasError(err, "抱歉未找到相关信息", -1) +// if id != 0 { +// menuIds, err = SysRole.GetRoleMeunId() +// tools.HasError(err, "抱歉未找到相关信息", -1) +// } +// } +// app.Custum(c, gin.H{ +// "code": 200, +// "menus": result, +// "checkedKeys": menuIds, +// }) +//} + // @Summary 获取菜单树 // @Description 获取JSON // @Tags 菜单 @@ -254,14 +330,16 @@ func (e *SysMenu) GetMenuTreeRoleselect(c *gin.Context) { // @Router /api/v1/menuTreeselect [get] // @Security Bearer func (e *SysMenu) GetMenuTreeSelect(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) - d := new(dto.SysMenuSearch) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } + d := new(dto.SysMenuSearch) + err = d.Bind(c) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") @@ -269,7 +347,7 @@ func (e *SysMenu) GetMenuTreeSelect(c *gin.Context) { } serviceSysMenu := service.SysMenu{} - serviceSysMenu.MsgID = msgID + serviceSysMenu.Log = log serviceSysMenu.Orm = db result, err := serviceSysMenu.SetSysMenuLabel(d) diff --git a/app/admin/apis/system/sys_opera_log/sys_opera_log.go b/app/admin/apis/system/sys_opera_log/sys_opera_log.go index 31229d2..f9114cb 100644 --- a/app/admin/apis/system/sys_opera_log/sys_opera_log.go +++ b/app/admin/apis/system/sys_opera_log/sys_opera_log.go @@ -1,16 +1,15 @@ package sys_opera_log import ( + "net/http" + "github.com/gin-gonic/gin" "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" - "go-admin/common/log" "go-admin/tools" - - "net/http" ) type SysOperaLog struct { @@ -18,11 +17,12 @@ type SysOperaLog struct { } func (e *SysOperaLog) GetSysOperaLogList(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) d := new(dto.SysOperaLogSearch) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } @@ -36,7 +36,7 @@ func (e *SysOperaLog) GetSysOperaLogList(c *gin.Context) { list := make([]system.SysOperaLog, 0) var count int64 serviceStudent := service.SysOperaLog{} - serviceStudent.MsgID = msgID + serviceStudent.Log = log serviceStudent.Orm = db err = serviceStudent.GetSysOperaLogPage(d, &list, &count) if err != nil { @@ -48,14 +48,15 @@ func (e *SysOperaLog) GetSysOperaLogList(c *gin.Context) { } func (e *SysOperaLog) GetSysOperaLog(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysOperaLogById) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //查看详情 err = control.Bind(c) if err != nil { @@ -65,7 +66,7 @@ func (e *SysOperaLog) GetSysOperaLog(c *gin.Context) { var object system.SysOperaLog serviceSysOperlog := service.SysOperaLog{} - serviceSysOperlog.MsgID = msgID + serviceSysOperlog.Log = log serviceSysOperlog.Orm = db err = serviceSysOperlog.GetSysOperaLog(control, &object) if err != nil { @@ -77,14 +78,15 @@ func (e *SysOperaLog) GetSysOperaLog(c *gin.Context) { } func (e *SysOperaLog) InsertSysOperaLog(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysOperaLogControl) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //新增操作 err = control.Bind(c) if err != nil { @@ -101,7 +103,7 @@ func (e *SysOperaLog) InsertSysOperaLog(c *gin.Context) { serviceSysOperaLog := service.SysOperaLog{} serviceSysOperaLog.Orm = db - serviceSysOperaLog.MsgID = msgID + serviceSysOperaLog.Log = log err = serviceSysOperaLog.InsertSysOperaLog(object) if err != nil { log.Error(err) @@ -113,14 +115,15 @@ func (e *SysOperaLog) InsertSysOperaLog(c *gin.Context) { } func (e *SysOperaLog) UpdateSysOperaLog(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysOperaLogControl) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //更新操作 err = control.Bind(c) if err != nil { @@ -136,7 +139,7 @@ func (e *SysOperaLog) UpdateSysOperaLog(c *gin.Context) { serviceSysOperaLog := service.SysOperaLog{} serviceSysOperaLog.Orm = db - serviceSysOperaLog.MsgID = msgID + serviceSysOperaLog.Log = log err = serviceSysOperaLog.UpdateSysOperaLog(object) if err != nil { log.Error(err) @@ -146,25 +149,26 @@ func (e *SysOperaLog) UpdateSysOperaLog(c *gin.Context) { } func (e *SysOperaLog) DeleteSysOperaLog(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysOperaLogById) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //删除操作 err = control.Bind(c) if err != nil { - log.Errorf("MsgID[%s] Bind error: %s", msgID, err) + log.Errorf("Bind error: %s", err) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } serviceSysOperaLog := service.SysOperaLog{} serviceSysOperaLog.Orm = db - serviceSysOperaLog.MsgID = msgID + serviceSysOperaLog.Log = log err = serviceSysOperaLog.RemoveSysOperaLog(control) if err != nil { log.Error(err) diff --git a/app/admin/apis/system/sys_post/sys_post.go b/app/admin/apis/system/sys_post/sys_post.go index 8ab880f..22a9fde 100644 --- a/app/admin/apis/system/sys_post/sys_post.go +++ b/app/admin/apis/system/sys_post/sys_post.go @@ -1,28 +1,38 @@ package sys_post import ( + "net/http" + "github.com/gin-gonic/gin" "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" - "go-admin/common/log" "go-admin/tools" - - "net/http" ) type SysPost struct { apis.Api } +// @Summary 岗位列表数据 +// @Description 获取JSON +// @Tags 岗位 +// @Param postName query string false "postName" +// @Param postCode query string false "postCode" +// @Param postId query string false "postId" +// @Param status query string false "status" +// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/post [get] +// @Security Bearer func (e *SysPost) GetSysPostList(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) d := new(dto.SysPostSearch) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } @@ -36,7 +46,7 @@ func (e *SysPost) GetSysPostList(c *gin.Context) { list := make([]system.SysPost, 0) var count int64 serviceStudent := service.SysPost{} - serviceStudent.MsgID = msgID + serviceStudent.Log = log serviceStudent.Orm = db err = serviceStudent.GetSysPostPage(d, &list, &count) if err != nil { @@ -47,15 +57,23 @@ func (e *SysPost) GetSysPostList(c *gin.Context) { e.PageOK(c, list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") } +// @Summary 获取岗位信息 +// @Description 获取JSON +// @Tags 岗位 +// @Param postId path int true "postId" +// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" +// @Router /api/v1/post/{postId} [get] +// @Security Bearer func (e *SysPost) GetSysPost(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysPostById) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //查看详情 err = control.Bind(c) if err != nil { @@ -65,7 +83,7 @@ func (e *SysPost) GetSysPost(c *gin.Context) { var object system.SysPost serviceSysOperlog := service.SysPost{} - serviceSysOperlog.MsgID = msgID + serviceSysOperlog.Log = log serviceSysOperlog.Orm = db err = serviceSysOperlog.GetSysPost(control, &object) if err != nil { @@ -76,15 +94,26 @@ func (e *SysPost) GetSysPost(c *gin.Context) { e.OK(c, object, "查看成功") } +// @Summary 添加岗位 +// @Description 获取JSON +// @Tags 岗位 +// @Accept application/json +// @Product application/json +// @Param data body models.Post true "data" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/post [post] +// @Security Bearer func (e *SysPost) InsertSysPost(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysPostControl) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //新增操作 err = control.Bind(c) if err != nil { @@ -101,7 +130,7 @@ func (e *SysPost) InsertSysPost(c *gin.Context) { serviceSysPost := service.SysPost{} serviceSysPost.Orm = db - serviceSysPost.MsgID = msgID + serviceSysPost.Log = log err = serviceSysPost.InsertSysPost(object) if err != nil { log.Error(err) @@ -112,15 +141,26 @@ func (e *SysPost) InsertSysPost(c *gin.Context) { e.OK(c, object.GetId(), "创建成功") } +// @Summary 修改岗位 +// @Description 获取JSON +// @Tags 岗位 +// @Accept application/json +// @Product application/json +// @Param data body models.Post true "body" +// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" +// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" +// @Router /api/v1/post/ [put] +// @Security Bearer func (e *SysPost) UpdateSysPost(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysPostControl) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //更新操作 err = control.Bind(c) if err != nil { @@ -136,7 +176,7 @@ func (e *SysPost) UpdateSysPost(c *gin.Context) { serviceSysPost := service.SysPost{} serviceSysPost.Orm = db - serviceSysPost.MsgID = msgID + serviceSysPost.Log = log err = serviceSysPost.UpdateSysPost(object) if err != nil { log.Error(err) @@ -145,26 +185,34 @@ func (e *SysPost) UpdateSysPost(c *gin.Context) { e.OK(c, object.GetId(), "更新成功") } +// @Summary 删除岗位 +// @Description 删除数据 +// @Tags 岗位 +// @Param id path int true "id" +// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" +// @Success 500 {string} string "{"code": 500, "message": "删除失败"}" +// @Router /api/v1/post/{postId} [delete] func (e *SysPost) DeleteSysPost(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysPostById) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //删除操作 err = control.Bind(c) if err != nil { - log.Errorf("MsgID[%s] Bind error: %s", msgID, err) + log.Errorf("Bind error: %s", err) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } serviceSysPost := service.SysPost{} serviceSysPost.Orm = db - serviceSysPost.MsgID = msgID + serviceSysPost.Log = log err = serviceSysPost.RemoveSysPost(control) if err != nil { log.Error(err) diff --git a/app/admin/apis/system/sys_role/sys_role.go b/app/admin/apis/system/sys_role/sys_role.go index f66ddff..dd87fb5 100644 --- a/app/admin/apis/system/sys_role/sys_role.go +++ b/app/admin/apis/system/sys_role/sys_role.go @@ -1,15 +1,16 @@ package sys_role import ( + "net/http" + "github.com/gin-gonic/gin" + "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" "go-admin/common/global" - "go-admin/common/log" "go-admin/tools" - "net/http" ) type SysRole struct { @@ -28,11 +29,12 @@ type SysRole struct { // @Router /api/v1/role [get] // @Security Bearer func (e *SysRole) GetSysRoleList(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) + log := e.GetLogger(c) d := new(dto.SysRoleSearch) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } @@ -45,10 +47,10 @@ func (e *SysRole) GetSysRoleList(c *gin.Context) { list := make([]system.SysRole, 0) var count int64 - serviceStudent := service.SysRole{} - serviceStudent.MsgID = msgID - serviceStudent.Orm = db - err = serviceStudent.GetSysRolePage(d, &list, &count) + s := service.SysRole{} + s.Log = log + s.Orm = db + err = s.GetSysRolePage(d, &list, &count) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") return @@ -66,14 +68,15 @@ func (e *SysRole) GetSysRoleList(c *gin.Context) { // @Router /api/v1/role/{id} [get] // @Security Bearer func (e *SysRole) GetSysRole(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysRoleById) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //查看详情 err = control.Bind(c) if err != nil { @@ -82,10 +85,10 @@ func (e *SysRole) GetSysRole(c *gin.Context) { } var object system.SysRole - serviceSysOperlog := service.SysRole{} - serviceSysOperlog.MsgID = msgID - serviceSysOperlog.Orm = db - err = serviceSysOperlog.GetSysRole(control, &object) + s := service.SysRole{} + s.Log = log + s.Orm = db + err = s.GetSysRole(control, &object) if err != nil { e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") return @@ -105,14 +108,15 @@ func (e *SysRole) GetSysRole(c *gin.Context) { // @Router /api/v1/role [post] // @Security Bearer func (e *SysRole) InsertSysRole(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysRoleControl) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //新增操作 err = control.Bind(c) if err != nil { @@ -132,7 +136,7 @@ func (e *SysRole) InsertSysRole(c *gin.Context) { s := service.SysRole{} s.Orm = db - s.MsgID = msgID + s.Log = log err = s.InsertSysRole(object) if err != nil { log.Error(err) @@ -158,14 +162,15 @@ func (e *SysRole) InsertSysRole(c *gin.Context) { // @Router /api/v1/role/{id} [put] // @Security Bearer func (e *SysRole) UpdateSysRole(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysRoleControl) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //更新操作 err = control.Bind(c) if err != nil { @@ -181,7 +186,7 @@ func (e *SysRole) UpdateSysRole(c *gin.Context) { s := service.SysRole{} s.Orm = db - s.MsgID = msgID + s.Log = log err = s.UpdateSysRole(object) if err != nil { log.Error(err) @@ -204,25 +209,26 @@ func (e *SysRole) UpdateSysRole(c *gin.Context) { // @Router /api/v1/role [delete] // @Security Bearer func (e *SysRole) DeleteSysRole(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.SysRoleById) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //删除操作 err = control.Bind(c) if err != nil { - log.Errorf("MsgID[%s] Bind error: %s", msgID, err) + log.Errorf("Bind error: %s", err) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } s := service.SysRole{} s.Orm = db - s.MsgID = msgID + s.Log = log err = s.RemoveSysRole(control) if err != nil { log.Error(err) @@ -238,18 +244,19 @@ func (e *SysRole) DeleteSysRole(c *gin.Context) { } func (e *SysRole) UpdateRoleDataScope(c *gin.Context) { + log := e.GetLogger(c) control := new(dto.RoleDataScopeReq) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) //更新操作 err = c.Bind(control) if err != nil { - log.Errorf("msgID[%s] request bind error, %s", msgID, err.Error()) + log.Errorf("request bind error, %s", err.Error()) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } @@ -261,7 +268,7 @@ func (e *SysRole) UpdateRoleDataScope(c *gin.Context) { data.UpdateBy = tools.GetUserId(c) s := &service.SysRole{} s.Orm = db - s.MsgID = msgID + s.Log = log err = s.UpdateDataScope(data) if err != nil { e.Error(c, http.StatusInternalServerError, err, "") diff --git a/app/admin/apis/system/sysuser.go b/app/admin/apis/system/sysuser.go deleted file mode 100644 index c9cf229..0000000 --- a/app/admin/apis/system/sysuser.go +++ /dev/null @@ -1,234 +0,0 @@ -package system - -import ( - "github.com/gin-gonic/gin" - "github.com/gin-gonic/gin/binding" - "github.com/google/uuid" - - "go-admin/app/admin/models" - "go-admin/common/global" - "go-admin/tools" - "go-admin/tools/app" -) - -// @Summary 列表用户信息数据 -// @Description 获取JSON -// @Tags 用户 -// @Param username query string false "username" -// @Success 200 {string} string "{"code": 200, "data": [...]}" -// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}" -// @Router /api/v1/sysUserList [get] -// @Security Bearer -func GetSysUserList(c *gin.Context) { - var data models.SysUser - var err error - var pageSize = 10 - var pageIndex = 1 - - size := c.Request.FormValue("pageSize") - if size != "" { - pageSize, err = tools.StringToInt(size) - } - - index := c.Request.FormValue("pageIndex") - if index != "" { - pageIndex, err = tools.StringToInt(index) - } - - data.Username = c.Request.FormValue("username") - data.Status = c.Request.FormValue("status") - data.Phone = c.Request.FormValue("phone") - - postId := c.Request.FormValue("postId") - data.PostId, _ = tools.StringToInt(postId) - - deptId := c.Request.FormValue("deptId") - data.DeptId, _ = tools.StringToInt(deptId) - - data.DataScope = tools.GetUserIdStr(c) - result, count, err := data.GetPage(pageSize, pageIndex) - tools.HasError(err, "", -1) - - app.PageOK(c, result, count, pageIndex, pageSize, "") -} - -// @Summary 获取用户 -// @Description 获取JSON -// @Tags 用户 -// @Param userId path int true "用户编码" -// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/sysUser/{userId} [get] -// @Security Bearer -func GetSysUser(c *gin.Context) { - var SysUser models.SysUser - SysUser.UserId, _ = tools.StringToInt(c.Param("userId")) - result, err := SysUser.Get() - tools.HasError(err, "抱歉未找到相关信息", -1) - var SysRole models.SysRole - var Post models.Post - roles, err := SysRole.GetList() - posts, err := Post.GetList() - - postIds := make([]int, 0) - postIds = append(postIds, result.PostId) - - roleIds := make([]int, 0) - roleIds = append(roleIds, result.RoleId) - app.Custum(c, gin.H{ - "code": 200, - "data": result, - "postIds": postIds, - "roleIds": roleIds, - "roles": roles, - "posts": posts, - }) -} - -// @Summary 获取个人中心用户 -// @Description 获取JSON -// @Tags 个人中心 -// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/user/profile [get] -// @Security Bearer -func GetSysUserProfile(c *gin.Context) { - var SysUser models.SysUser - userId := tools.GetUserIdStr(c) - SysUser.UserId, _ = tools.StringToInt(userId) - result, err := SysUser.Get() - tools.HasError(err, "抱歉未找到相关信息", -1) - var SysRole models.SysRole - var Post models.Post - var Dept models.SysDepts - //获取角色列表 - roles, err := SysRole.GetList() - //获取职位列表 - posts, err := Post.GetList() - //获取部门列表 - Dept.DeptId = result.DeptId - dept, err := Dept.Get() - - postIds := make([]int, 0) - postIds = append(postIds, result.PostId) - - roleIds := make([]int, 0) - roleIds = append(roleIds, result.RoleId) - - app.Custum(c, gin.H{ - "code": 200, - "data": result, - "postIds": postIds, - "roleIds": roleIds, - "roles": roles, - "posts": posts, - "dept": dept, - }) -} - -// @Summary 获取用户角色和职位 -// @Description 获取JSON -// @Tags 用户 -// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" -// @Router /api/v1/sysUser [get] -// @Security Bearer -func GetSysUserInit(c *gin.Context) { - var SysRole models.SysRole - var Post models.Post - roles, err := SysRole.GetList() - posts, err := Post.GetList() - tools.HasError(err, "抱歉未找到相关信息", -1) - mp := make(map[string]interface{}, 2) - mp["roles"] = roles - mp["posts"] = posts - app.OK(c, mp, "") -} - -// @Summary 创建用户 -// @Description 获取JSON -// @Tags 用户 -// @Accept application/json -// @Product application/json -// @Param data body models.SysUser true "用户数据" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/sysUser [post] -func InsertSysUser(c *gin.Context) { - var sysuser models.SysUser - err := c.BindWith(&sysuser, binding.JSON) - tools.HasError(err, "非法数据格式", 500) - - sysuser.CreateBy = tools.GetUserIdStr(c) - id, err := sysuser.Insert() - tools.HasError(err, "添加失败", 500) - app.OK(c, id, "添加成功") -} - -// @Summary 修改用户数据 -// @Description 获取JSON -// @Tags 用户 -// @Accept application/json -// @Product application/json -// @Param data body models.SysUser true "body" -// @Success 200 {string} string "{"code": 200, "message": "修改成功"}" -// @Success 200 {string} string "{"code": -1, "message": "修改失败"}" -// @Router /api/v1/sysuser/{userId} [put] -func UpdateSysUser(c *gin.Context) { - var data models.SysUser - err := c.Bind(&data) - tools.HasError(err, "数据解析失败", -1) - data.UpdateBy = tools.GetUserIdStr(c) - result, err := data.Update(data.UserId) - tools.HasError(err, "修改失败", 500) - app.OK(c, result, "修改成功") -} - -// @Summary 删除用户数据 -// @Description 删除数据 -// @Tags 用户 -// @Param userId path int true "userId" -// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" -// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" -// @Router /api/v1/sysuser/{userId} [delete] -func DeleteSysUser(c *gin.Context) { - var data models.SysUser - data.UpdateBy = tools.GetUserIdStr(c) - IDS := tools.IdsStrToIdsIntGroup("userId", c) - result, err := data.BatchDelete(IDS) - tools.HasError(err, "删除失败", 500) - app.OK(c, result, "删除成功") -} - -// @Summary 修改头像 -// @Description 获取JSON -// @Tags 用户 -// @Accept multipart/form-data -// @Param file formData file true "file" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/user/profileAvatar [post] -func InsetSysUserAvatar(c *gin.Context) { - form, _ := c.MultipartForm() - files := form.File["upload[]"] - guid := uuid.New().String() - filPath := "static/uploadfile/" + guid + ".jpg" - for _, file := range files { - global.Logger.Debug(file.Filename) - // 上传文件至指定目录 - _ = c.SaveUploadedFile(file, filPath) - } - sysuser := models.SysUser{} - sysuser.UserId = tools.GetUserId(c) - sysuser.Avatar = "/" + filPath - sysuser.UpdateBy = tools.GetUserIdStr(c) - sysuser.Update(sysuser.UserId) - app.OK(c, filPath, "修改成功") -} - -func SysUserUpdatePwd(c *gin.Context) { - var pwd models.SysUserPwd - err := c.Bind(&pwd) - tools.HasError(err, "数据解析失败", 500) - sysuser := models.SysUser{} - sysuser.UserId = tools.GetUserId(c) - sysuser.SetPwd(pwd) - app.OK(c, "", "密码修改成功") -} diff --git a/app/admin/apis/tools/dbcolumns.go b/app/admin/apis/tools/dbcolumns.go index c2d1966..a1f22ca 100644 --- a/app/admin/apis/tools/dbcolumns.go +++ b/app/admin/apis/tools/dbcolumns.go @@ -6,6 +6,7 @@ import ( "github.com/gin-gonic/gin" "go-admin/app/admin/models/tools" + "go-admin/pkg/logger" tools2 "go-admin/tools" "go-admin/tools/app" ) @@ -19,6 +20,7 @@ import ( // @Success 200 {object} app.Response "{"code": 200, "data": [...]}" // @Router /api/v1/db/columns/page [get] func GetDBColumnList(c *gin.Context) { + log := logger.GetRequestLogger(c) var data tools.DBColumns var err error var pageSize = 10 @@ -32,9 +34,16 @@ func GetDBColumnList(c *gin.Context) { pageIndex, err = tools2.StringToInt(index) } + db, err := tools2.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + data.TableName = c.Request.FormValue("tableName") tools2.Assert(data.TableName == "", "table name cannot be empty!", 500) - result, count, err := data.GetPage(pageSize, pageIndex) + result, count, err := data.GetPage(db, pageSize, pageIndex) tools2.HasError(err, "", -1) var mp = make(map[string]interface{}, 3) diff --git a/app/admin/apis/tools/dbtables.go b/app/admin/apis/tools/dbtables.go index dbe62a9..a6c7850 100644 --- a/app/admin/apis/tools/dbtables.go +++ b/app/admin/apis/tools/dbtables.go @@ -6,6 +6,7 @@ import ( "github.com/gin-gonic/gin" "go-admin/app/admin/models/tools" + "go-admin/pkg/logger" tools2 "go-admin/tools" "go-admin/tools/app" "go-admin/tools/config" @@ -25,6 +26,7 @@ func GetDBTableList(c *gin.Context) { var err error var pageSize = 10 var pageIndex = 1 + log := logger.GetRequestLogger(c) if config.DatabaseConfig.Driver == "sqlite3" || config.DatabaseConfig.Driver == "postgres" { res.Msg = "对不起,sqlite3 或 postgres 不支持代码生成!" c.JSON(http.StatusOK, res.ReturnError(500)) @@ -39,8 +41,15 @@ func GetDBTableList(c *gin.Context) { pageIndex, err = tools2.StringToInt(index) } + db, err := tools2.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + data.TableName = c.Request.FormValue("tableName") - result, count, err := data.GetPage(pageSize, pageIndex) + result, count, err := data.GetPage(db, pageSize, pageIndex) tools2.HasError(err, "", -1) var mp = make(map[string]interface{}, 3) diff --git a/app/admin/apis/tools/gen.go b/app/admin/apis/tools/gen.go index a96cfda..39a7e0b 100644 --- a/app/admin/apis/tools/gen.go +++ b/app/admin/apis/tools/gen.go @@ -9,12 +9,14 @@ import ( "go-admin/app/admin/models" "go-admin/app/admin/models/tools" + "go-admin/pkg/logger" tools2 "go-admin/tools" "go-admin/tools/app" "go-admin/tools/config" ) func Preview(c *gin.Context) { + log := logger.GetRequestLogger(c) table := tools.SysTables{} id, err := tools2.StringToInt(c.Param("tableId")) tools2.HasError(err, "", -1) @@ -31,7 +33,15 @@ func Preview(c *gin.Context) { tools2.HasError(err, "", -1) t6, err := template.ParseFiles("template/v3/dto.go.template") tools2.HasError(err, "", -1) - tab, _ := table.Get() + + db, err := tools2.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + + tab, _ := table.Get(db) var b1 bytes.Buffer err = t1.Execute(&b1, tab) var b2 bytes.Buffer @@ -59,11 +69,20 @@ func Preview(c *gin.Context) { } func GenCodeV3(c *gin.Context) { + log := logger.GetRequestLogger(c) table := tools.SysTables{} id, err := tools2.StringToInt(c.Param("tableId")) tools2.HasError(err, "", -1) + + db, err := tools2.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + table.TableId = id - tab, _ := table.Get() + tab, _ := table.Get(db) if tab.IsActions == 1 { ActionsGenV3(tab) @@ -173,13 +192,22 @@ func ActionsGenV3(tab tools.SysTables) { } func GenMenuAndApi(c *gin.Context) { + log := logger.GetRequestLogger(c) table := tools.SysTables{} timeNow := tools2.GetCurrentTime() id, err := tools2.StringToInt(c.Param("tableId")) tools2.HasError(err, "", -1) + + db, err := tools2.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + table.TableId = id - tab, _ := table.Get() + tab, _ := table.Get(db) Mmenu := models.Menu{} Mmenu.MenuName = tab.TBName + "Manage" Mmenu.Title = tab.TableComment @@ -197,7 +225,7 @@ func GenMenuAndApi(c *gin.Context) { Mmenu.UpdateBy = "1" Mmenu.CreatedAt = timeNow Mmenu.UpdatedAt = timeNow - Mmenu.MenuId, err = Mmenu.Create() + Mmenu.MenuId, err = Mmenu.Create(db) Cmenu := models.Menu{} Cmenu.MenuName = tab.TBName @@ -217,7 +245,7 @@ func GenMenuAndApi(c *gin.Context) { Cmenu.UpdateBy = "1" Cmenu.CreatedAt = timeNow Cmenu.UpdatedAt = timeNow - Cmenu.MenuId, err = Cmenu.Create() + Cmenu.MenuId, err = Cmenu.Create(db) MList := models.Menu{} MList.MenuName = "" @@ -236,7 +264,7 @@ func GenMenuAndApi(c *gin.Context) { MList.UpdateBy = "1" MList.CreatedAt = timeNow MList.UpdatedAt = timeNow - MList.MenuId, err = MList.Create() + MList.MenuId, err = MList.Create(db) MCreate := models.Menu{} MCreate.MenuName = "" @@ -255,7 +283,7 @@ func GenMenuAndApi(c *gin.Context) { MCreate.UpdateBy = "1" MCreate.CreatedAt = timeNow MCreate.UpdatedAt = timeNow - MCreate.MenuId, err = MCreate.Create() + MCreate.MenuId, err = MCreate.Create(db) MUpdate := models.Menu{} MUpdate.MenuName = "" @@ -274,7 +302,7 @@ func GenMenuAndApi(c *gin.Context) { MUpdate.UpdateBy = "1" MUpdate.CreatedAt = timeNow MUpdate.UpdatedAt = timeNow - MUpdate.MenuId, err = MUpdate.Create() + MUpdate.MenuId, err = MUpdate.Create(db) MDelete := models.Menu{} MDelete.MenuName = "" @@ -293,7 +321,7 @@ func GenMenuAndApi(c *gin.Context) { MDelete.UpdateBy = "1" MDelete.CreatedAt = timeNow MDelete.UpdatedAt = timeNow - MDelete.MenuId, err = MDelete.Create() + MDelete.MenuId, err = MDelete.Create(db) var InterfaceId = 63 Amenu := models.Menu{} @@ -312,7 +340,7 @@ func GenMenuAndApi(c *gin.Context) { Amenu.UpdateBy = "1" Amenu.CreatedAt = timeNow Amenu.UpdatedAt = timeNow - Amenu.MenuId, err = Amenu.Create() + Amenu.MenuId, err = Amenu.Create(db) AList := models.Menu{} AList.MenuName = "" @@ -330,7 +358,7 @@ func GenMenuAndApi(c *gin.Context) { AList.UpdateBy = "1" AList.CreatedAt = timeNow AList.UpdatedAt = timeNow - AList.MenuId, err = AList.Create() + AList.MenuId, err = AList.Create(db) AGet := models.Menu{} AGet.MenuName = "" @@ -348,7 +376,7 @@ func GenMenuAndApi(c *gin.Context) { AGet.UpdateBy = "1" AGet.CreatedAt = timeNow AGet.UpdatedAt = timeNow - AGet.MenuId, err = AGet.Create() + AGet.MenuId, err = AGet.Create(db) ACreate := models.Menu{} ACreate.MenuName = "" @@ -366,7 +394,7 @@ func GenMenuAndApi(c *gin.Context) { ACreate.UpdateBy = "1" ACreate.CreatedAt = timeNow ACreate.UpdatedAt = timeNow - ACreate.MenuId, err = ACreate.Create() + ACreate.MenuId, err = ACreate.Create(db) AUpdate := models.Menu{} AUpdate.MenuName = "" @@ -384,7 +412,7 @@ func GenMenuAndApi(c *gin.Context) { AUpdate.UpdateBy = "1" AUpdate.CreatedAt = timeNow AUpdate.UpdatedAt = timeNow - AUpdate.MenuId, err = AUpdate.Create() + AUpdate.MenuId, err = AUpdate.Create(db) ADelete := models.Menu{} ADelete.MenuName = "" @@ -402,7 +430,7 @@ func GenMenuAndApi(c *gin.Context) { ADelete.UpdateBy = "1" ADelete.CreatedAt = timeNow ADelete.UpdatedAt = timeNow - ADelete.MenuId, err = ADelete.Create() + ADelete.MenuId, err = ADelete.Create(db) app.OK(c, "", "数据生成成功!") } diff --git a/app/admin/apis/tools/systables.go b/app/admin/apis/tools/systables.go index f4c9dc8..3e4ff38 100644 --- a/app/admin/apis/tools/systables.go +++ b/app/admin/apis/tools/systables.go @@ -1,6 +1,8 @@ package tools import ( + "go-admin/pkg/logger" + "gorm.io/gorm" "net/http" "strings" @@ -20,6 +22,7 @@ import ( // @Success 200 {object} app.Response "{"code": 200, "data": [...]}" // @Router /api/v1/sys/tables/page [get] func GetSysTableList(c *gin.Context) { + log := logger.GetRequestLogger(c) var data tools.SysTables var err error var pageSize = 10 @@ -33,9 +36,16 @@ func GetSysTableList(c *gin.Context) { pageIndex, err = tools2.StringToInt(index) } + db, err := tools2.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + data.TBName = c.Request.FormValue("tableName") data.TableComment = c.Request.FormValue("tableComment") - result, count, err := data.GetPage(pageSize, pageIndex) + result, count, err := data.GetPage(db, pageSize, pageIndex) tools2.HasError(err, "", -1) var mp = make(map[string]interface{}, 3) @@ -58,9 +68,17 @@ func GetSysTableList(c *gin.Context) { // @Router /api/v1/sys/tables/info/{tableId} [get] // @Security Bearer func GetSysTables(c *gin.Context) { + log := logger.GetRequestLogger(c) + db, err := tools2.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + var data tools.SysTables data.TableId, _ = tools2.StringToInt(c.Param("tableId")) - result, err := data.Get() + result, err := data.Get(db) tools2.HasError(err, "抱歉未找到相关信息", -1) var res app.Response @@ -73,11 +91,19 @@ func GetSysTables(c *gin.Context) { } func GetSysTablesInfo(c *gin.Context) { + log := logger.GetRequestLogger(c) + db, err := tools2.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + var data tools.SysTables if c.Request.FormValue("tableName") != "" { data.TBName = c.Request.FormValue("tableName") } - result, err := data.Get() + result, err := data.Get(db) tools2.HasError(err, "抱歉未找到相关信息", -1) var res app.Response @@ -90,8 +116,16 @@ func GetSysTablesInfo(c *gin.Context) { } func GetSysTablesTree(c *gin.Context) { + log := logger.GetRequestLogger(c) + db, err := tools2.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + var data tools.SysTables - result, err := data.GetTree() + result, err := data.GetTree(db) tools2.HasError(err, "抱歉未找到相关信息", -1) var res app.Response @@ -110,13 +144,20 @@ func GetSysTablesTree(c *gin.Context) { // @Router /api/v1/sys/tables/info [post] // @Security Bearer func InsertSysTable(c *gin.Context) { + log := logger.GetRequestLogger(c) + db, err := tools2.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } tablesList := strings.Split(c.Request.FormValue("tables"), ",") for i := 0; i < len(tablesList); i++ { - data, err := genTableInit(tablesList, i, c) + data, err := genTableInit(db, tablesList, i, c) - _, err = data.Create() + _, err = data.Create(db) tools2.HasError(err, "", -1) } var res app.Response @@ -125,7 +166,7 @@ func InsertSysTable(c *gin.Context) { } -func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables, error) { +func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tools.SysTables, error) { var data tools.SysTables var dbTable tools.DBTables var dbColumn tools.DBColumns @@ -133,7 +174,7 @@ func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables, data.CreateBy = tools2.GetUserIdStr(c) dbTable.TableName = data.TBName - dbtable, err := dbTable.Get() + dbtable, err := dbTable.Get(tx) dbColumn.TableName = data.TBName tablenamelist := strings.Split(dbColumn.TableName, "_") @@ -148,7 +189,7 @@ func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables, data.TplCategory = "crud" data.Crud = true - dbcolumn, err := dbColumn.GetList() + dbcolumn, err := dbColumn.GetList(tx) data.CreateBy = tools2.GetUserIdStr(c) data.TableComment = dbtable.TableComment if dbtable.TableComment == "" { @@ -241,8 +282,17 @@ func UpdateSysTable(c *gin.Context) { var data tools.SysTables err := c.Bind(&data) tools2.HasError(err, "数据解析失败", 500) + + log := logger.GetRequestLogger(c) + db, err := tools2.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + data.UpdateBy = tools2.GetUserIdStr(c) - result, err := data.Update() + result, err := data.Update(db) tools2.HasError(err, "", -1) var res app.Response @@ -259,9 +309,17 @@ func UpdateSysTable(c *gin.Context) { // @Success 200 {string} string "{"code": -1, "message": "删除失败"}" // @Router /api/v1/sys/tables/info/{tableId} [delete] func DeleteSysTables(c *gin.Context) { + log := logger.GetRequestLogger(c) + db, err := tools2.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + var data tools.SysTables IDS := tools2.IdsStrToIdsIntGroup("tableId", c) - _, err := data.BatchDelete(IDS) + _, err = data.BatchDelete(db, IDS) tools2.HasError(err, "删除失败", 500) var res app.Response res.Msg = "删除成功" diff --git a/app/admin/middleware/handler/auth.go b/app/admin/middleware/handler/auth.go index 741735f..260f22d 100644 --- a/app/admin/middleware/handler/auth.go +++ b/app/admin/middleware/handler/auth.go @@ -7,13 +7,12 @@ import ( "github.com/mojocn/base64Captcha" "github.com/mssola/user_agent" - "go-admin/app/admin/models" "go-admin/app/admin/models/system" "go-admin/app/admin/service" - "go-admin/common/global" - "go-admin/common/log" jwt "go-admin/pkg/jwtauth" + "go-admin/pkg/logger" "go-admin/tools" + "go-admin/tools/app" "go-admin/tools/config" ) @@ -21,8 +20,8 @@ var store = base64Captcha.DefaultMemStore func PayloadFunc(data interface{}) jwt.MapClaims { if v, ok := data.(map[string]interface{}); ok { - u, _ := v["user"].(models.SysUser) - r, _ := v["role"].(models.SysRole) + u, _ := v["user"].(system.SysUser) + r, _ := v["role"].(system.SysRole) return jwt.MapClaims{ jwt.IdentityKey: u.UserId, jwt.RoleIdKey: r.RoleId, @@ -60,16 +59,26 @@ func IdentityHandler(c *gin.Context) interface{} { // @Success 200 {string} string "{"code": 200, "expire": "2019-08-07T12:45:48+08:00", "token": ".eyJleHAiOjE1NjUxNTMxNDgsImlkIjoiYWRtaW4iLCJvcmlnX2lhdCI6MTU2NTE0OTU0OH0.-zvzHvbg0A" }" // @Router /login [post] func Authenticator(c *gin.Context) (interface{}, error) { - var loginVals models.Login + log := logger.GetRequestLogger(c) + db, err := tools.GetOrm(c) + if err != nil { + log.Errorf("get db error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return nil, jwt.ErrFailedAuthentication + } + + var loginVals system.Login var status = "2" var msg = "登录成功" var username = "" + defer func() { + LoginLogToDB(c, status, msg, username) + }() - if err := c.ShouldBind(&loginVals); err != nil { + if err = c.ShouldBind(&loginVals); err != nil { username = loginVals.Username msg = "数据解析失败" status = "1" - LoginLogToDB(c, status, msg, username) return nil, jwt.ErrMissingLoginValues } @@ -78,34 +87,31 @@ func Authenticator(c *gin.Context) (interface{}, error) { username = loginVals.Username msg = "验证码错误" status = "1" - LoginLogToDB(c, status, msg, username) return nil, jwt.ErrInvalidVerificationode } } - user, role, e := loginVals.GetUser() + user, role, e := loginVals.GetUser(db) if e == nil { username = loginVals.Username - LoginLogToDB(c, status, msg, username) return map[string]interface{}{"user": user, "role": role}, nil } else { msg = "登录失败" status = "1" - LoginLogToDB(c, status, msg, username) - global.RequestLogger.Error(e) + log.Warnf("%s login failed!", loginVals.Username) } return nil, jwt.ErrFailedAuthentication } // LoginLogToDB Write log to database func LoginLogToDB(c *gin.Context, status string, msg string, username string) { + log := logger.GetRequestLogger(c) if config.LoggerConfig.EnabledDB { var loginLog system.SysLoginLog - msgID := tools.GenerateMsgIDFromContext(c) db, err := tools.GetOrm(c) if err != nil { - log.Errorf("msgID[%s] 获取Orm失败, error:%s", msgID, err) + log.Errorf("获取Orm失败, error:%s", err) } ua := user_agent.New(c.Request.UserAgent()) loginLog.Ipaddr = c.ClientIP() @@ -136,6 +142,7 @@ func LoginLogToDB(c *gin.Context, status string, msg string, username string) { // @Router /logout [post] // @Security Bearer func LogOut(c *gin.Context) { + log := logger.GetRequestLogger(c) var loginLog system.SysLoginLog ua := user_agent.New(c.Request.UserAgent()) loginLog.Ipaddr = c.ClientIP() @@ -150,10 +157,9 @@ func LogOut(c *gin.Context) { loginLog.Platform = ua.Platform() loginLog.Username = tools.GetUserName(c) loginLog.Msg = "退出成功" - msgID := tools.GenerateMsgIDFromContext(c) db, err := tools.GetOrm(c) if err != nil { - log.Errorf("msgID[%s] 获取Orm失败, error:%s", msgID, err) + log.Errorf("获取Orm失败, error:%s", err) } serviceLoginLog := service.SysLoginLog{} serviceLoginLog.Orm = db @@ -169,12 +175,12 @@ func LogOut(c *gin.Context) { func Authorizator(data interface{}, c *gin.Context) bool { if v, ok := data.(map[string]interface{}); ok { - u, _ := v["user"].(models.SysUser) - r, _ := v["role"].(models.SysRole) + u, _ := v["user"].(system.SysUser) + r, _ := v["role"].(system.SysRole) c.Set("role", r.RoleName) c.Set("roleIds", r.RoleId) c.Set("userId", u.UserId) - c.Set("userName", u.UserName) + c.Set("userName", u.Username) c.Set("dataScope", r.DataScope) return true diff --git a/app/admin/middleware/init.go b/app/admin/middleware/init.go index 7c15185..08486be 100644 --- a/app/admin/middleware/init.go +++ b/app/admin/middleware/init.go @@ -2,10 +2,13 @@ package middleware import ( "github.com/gin-gonic/gin" + "go-admin/common/middleware" ) func InitMiddleware(r *gin.Engine) { + // 数据库链接 + r.Use(middleware.WithContextDb) // 日志处理 r.Use(LoggerToFile()) // 自定义错误处理 @@ -18,6 +21,4 @@ func InitMiddleware(r *gin.Engine) { r.Use(Secure) // 链路追踪 //r.Use(middleware.Trace()) - // 数据库链接 - r.Use(middleware.WithContextDb) } diff --git a/app/admin/middleware/logger.go b/app/admin/middleware/logger.go index 5e93e6e..9f70493 100644 --- a/app/admin/middleware/logger.go +++ b/app/admin/middleware/logger.go @@ -2,6 +2,7 @@ package middleware import ( "fmt" + "net/http" "strings" "time" @@ -10,18 +11,23 @@ import ( "go-admin/app/admin/models" "go-admin/app/admin/models/system" "go-admin/app/admin/service" - "go-admin/common/log" + "go-admin/pkg/logger" "go-admin/tools" + "go-admin/tools/app" "go-admin/tools/config" ) // LoggerToFile 日志记录到文件 func LoggerToFile() gin.HandlerFunc { return func(c *gin.Context) { + defer c.Next() + if c.Request.Method == http.MethodOptions { + return + } + log := logger.GetRequestLogger(c) // 开始时间 startTime := time.Now() // 处理请求 - c.Next() bd, bl := c.Get("body") var body = "" @@ -62,6 +68,8 @@ func LoggerToFile() gin.HandlerFunc { "uri": reqUri, } log.Info(logData) + //l := logger.Logger{Logger: log.Fields(logData)} + //l.Info(logData) if c.Request.Method != "GET" && c.Request.Method != "OPTIONS" && config.LoggerConfig.EnabledDB { SetDBOperLog(c, clientIP, statusCode, reqUri, reqMethod, latencyTime, body, result, statusBus) } @@ -70,10 +78,18 @@ func LoggerToFile() gin.HandlerFunc { // SetDBOperLog 写入操作日志表 fixme 该方法后续即将弃用 func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string, reqMethod string, latencyTime time.Duration, body string, result string, status int) { + log := logger.GetRequestLogger(c) + db, err := tools.GetOrm(c) + if err != nil { + log.Errorf("get db connection error, %s", err.Error()) + app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return + } + menu := models.Menu{} menu.Path = reqUri menu.Action = reqMethod - menuList, _ := menu.Get() + menuList, _ := menu.Get(db) sysOperaLog := system.SysOperaLog{} sysOperaLog.OperIp = clientIP sysOperaLog.OperLocation = tools.GetLocation(clientIP) @@ -115,11 +131,6 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string } else { sysOperaLog.Status = "1" } - msgID := tools.GenerateMsgIDFromContext(c) - db, err := tools.GetOrm(c) - if err != nil { - log.Errorf("msgID[%s] 获取Orm失败, error:%s", msgID, err) - } serviceOperaLog := service.SysOperaLog{} serviceOperaLog.Orm = db _ = serviceOperaLog.InsertSysOperaLog(&sysOperaLog) diff --git a/app/admin/middleware/permission.go b/app/admin/middleware/permission.go index 7918720..ab16e0a 100644 --- a/app/admin/middleware/permission.go +++ b/app/admin/middleware/permission.go @@ -1,44 +1,43 @@ package middleware import ( + "go-admin/pkg/logger" "net/http" "github.com/gin-gonic/gin" "go-admin/common/global" - "go-admin/common/log" "go-admin/pkg/jwtauth" - "go-admin/tools" "go-admin/tools/app" ) //权限检查中间件 func AuthCheckRole() gin.HandlerFunc { return func(c *gin.Context) { + log := logger.GetRequestLogger(c) data, _ := c.Get(jwtauth.JwtPayloadKey) v := data.(jwtauth.MapClaims) e := global.Cfg.GetCasbinKey(c.Request.Host) var res bool var err error - msgID := tools.GenerateMsgIDFromContext(c) //检查权限 if v["rolekey"] == "admin" { res = true - log.Infof("msgID[%s] info:%s method:%s path:%s", msgID, v["rolekey"], c.Request.Method, c.Request.URL.Path) + log.Infof("info:%s method:%s path:%s", v["rolekey"], c.Request.Method, c.Request.URL.Path) } else { res, err = e.Enforce(v["rolekey"], c.Request.URL.Path, c.Request.Method) if err != nil { - log.Errorf("msgID[%s] AuthCheckRole error:%s method:%s path:%s", msgID, err, c.Request.Method, c.Request.URL.Path) + log.Errorf("AuthCheckRole error:%s method:%s path:%s", err, c.Request.Method, c.Request.URL.Path) app.Error(c, 500, err, "") return } } if res { - log.Infof("msgID[%s] isTrue: %v role: %s method: %s path: %s", msgID, res, v["rolekey"], c.Request.Method, c.Request.URL.Path) + log.Infof("isTrue: %v role: %s method: %s path: %s", res, v["rolekey"], c.Request.Method, c.Request.URL.Path) c.Next() } else { - log.Warnf("msgID[%s] isTrue: %v role: %s method: %s path: %s message: %s", msgID, res, v["rolekey"], c.Request.Method, c.Request.URL.Path, "当前request无权限,请管理员确认!") + log.Warnf("isTrue: %v role: %s method: %s path: %s message: %s", res, v["rolekey"], c.Request.Method, c.Request.URL.Path, "当前request无权限,请管理员确认!") c.JSON(http.StatusOK, gin.H{ "code": 403, "msg": "对不起,您没有该接口访问权限,请联系管理员", diff --git a/app/admin/models/dept.go b/app/admin/models/dept.go deleted file mode 100644 index 1d791f5..0000000 --- a/app/admin/models/dept.go +++ /dev/null @@ -1,277 +0,0 @@ -package models - -import ( - "errors" - _ "time" - - orm "go-admin/common/global" - "go-admin/tools" -) - -type SysDepts struct { - DeptId int `json:"deptId" gorm:"primaryKey;autoIncrement;"` //部门编码 - ParentId int `json:"parentId" gorm:""` //上级部门 - DeptPath string `json:"deptPath" gorm:"size:255;"` // - DeptName string `json:"deptName" gorm:"size:128;"` //部门名称 - Sort int `json:"sort" gorm:""` //排序 - Leader string `json:"leader" gorm:"size:128;"` //负责人 - Phone string `json:"phone" gorm:"size:11;"` //手机 - Email string `json:"email" gorm:"size:64;"` //邮箱 - Status string `json:"status" gorm:"size:4;"` //状态 - CreateBy string `json:"createBy" gorm:"size:64;"` - UpdateBy string `json:"updateBy" gorm:"size:64;"` - BaseModel - - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` - Children []SysDepts `json:"children" gorm:"-"` -} - -func (SysDepts) TableName() string { - return "sys_dept" -} - -type DeptLable struct { - Id int `gorm:"-" json:"id"` - Label string `gorm:"-" json:"label"` - Children []DeptLable `gorm:"-" json:"children"` -} - -func (e *SysDepts) Create() (SysDepts, error) { - var doc SysDepts - result := orm.Eloquent.Table(e.TableName()).Create(&e) - if result.Error != nil { - err := result.Error - return doc, err - } - deptPath := "/" + tools.IntToString(e.DeptId) - if int(e.ParentId) != 0 { - var deptP SysDepts - orm.Eloquent.Table(e.TableName()).Where("dept_id = ?", e.ParentId).First(&deptP) - deptPath = deptP.DeptPath + deptPath - } else { - deptPath = "/0" + deptPath - } - var mp = map[string]string{} - mp["deptPath"] = deptPath - if err := orm.Eloquent.Table(e.TableName()).Where("dept_id = ?", e.DeptId).Updates(mp).Error; err != nil { - err := result.Error - return doc, err - } - doc = *e - doc.DeptPath = deptPath - return doc, nil -} - -func (e *SysDepts) Get() (SysDepts, error) { - var doc SysDepts - - table := orm.Eloquent.Table(e.TableName()) - if e.DeptId != 0 { - table = table.Where("dept_id = ?", e.DeptId) - } - if e.DeptName != "" { - table = table.Where("dept_name = ?", e.DeptName) - } - - if err := table.First(&doc).Error; err != nil { - return doc, err - } - return doc, nil -} - -func (e *SysDepts) GetList() ([]SysDepts, error) { - var doc []SysDepts - - table := orm.Eloquent.Table(e.TableName()) - if e.DeptId != 0 { - table = table.Where("dept_id = ?", e.DeptId) - } - if e.DeptName != "" { - table = table.Where("dept_name = ?", e.DeptName) - } - if e.Status != "" { - table = table.Where("status = ?", e.Status) - } - - if err := table.Order("sort").Find(&doc).Error; err != nil { - return doc, err - } - return doc, nil -} - -func (e *SysDepts) GetPage(bl bool) ([]SysDepts, error) { - var doc []SysDepts - - table := orm.Eloquent.Table(e.TableName()) - if e.DeptId != 0 { - table = table.Where("dept_id = ?", e.DeptId) - } - if e.DeptName != "" { - table = table.Where("dept_name = ?", e.DeptName) - } - if e.Status != "" { - table = table.Where("status = ?", e.Status) - } - if e.DeptPath != "" { - table = table.Where("deptPath like %?%", e.DeptPath) - } - if bl { - // 数据权限控制 - dataPermission := new(DataPermission) - dataPermission.UserId, _ = tools.StringToInt(e.DataScope) - 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 { - return nil, err - } - return doc, nil -} - -func (e *SysDepts) SetDept(bl bool) ([]SysDepts, error) { - list, err := e.GetPage(bl) - - m := make([]SysDepts, 0) - for i := 0; i < len(list); i++ { - if list[i].ParentId != 0 { - continue - } - info := Digui(&list, list[i]) - - m = append(m, info) - } - return m, err -} - -func Digui(deptlist *[]SysDepts, menu SysDepts) SysDepts { - list := *deptlist - - min := make([]SysDepts, 0) - for j := 0; j < len(list); j++ { - - if menu.DeptId != list[j].ParentId { - continue - } - mi := SysDepts{} - mi.DeptId = list[j].DeptId - mi.ParentId = list[j].ParentId - mi.DeptPath = list[j].DeptPath - mi.DeptName = list[j].DeptName - mi.Sort = list[j].Sort - mi.Leader = list[j].Leader - mi.Phone = list[j].Phone - mi.Email = list[j].Email - mi.Status = list[j].Status - mi.CreatedAt = list[j].CreatedAt - mi.Children = []SysDepts{} - ms := Digui(deptlist, mi) - min = append(min, ms) - - } - menu.Children = min - return menu -} - -func (e *SysDepts) Update(id int) (update SysDepts, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("dept_id = ?", id).First(&update).Error; err != nil { - return - } - - deptPath := "/" + tools.IntToString(e.DeptId) - if int(e.ParentId) != 0 { - var deptP SysDepts - orm.Eloquent.Table(e.TableName()).Where("dept_id = ?", e.ParentId).First(&deptP) - deptPath = deptP.DeptPath + deptPath - } else { - deptPath = "/0" + deptPath - } - e.DeptPath = deptPath - - if e.DeptPath != "" && e.DeptPath != update.DeptPath { - return update, errors.New("上级部门不允许修改!") - } - - //参数1:是要修改的数据 - //参数2:是修改的数据 - - if err = orm.Eloquent.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { - return - } - - return -} - -func (e *SysDepts) Delete(id int) (success bool, err error) { - - user := SysUser{} - user.DeptId = id - userlist, err := user.GetList() - tools.HasError(err, "", 500) - tools.Assert(len(userlist) <= 0, "当前部门存在用户,不能删除!", 500) - - tx := orm.Eloquent.Begin() - defer func() { - if r := recover(); r != nil { - tx.Rollback() - } - }() - - if err = tx.Error; err != nil { - success = false - return - } - - if err = tx.Table(e.TableName()).Where("dept_id = ?", id).Delete(&SysDepts{}).Error; err != nil { - success = false - tx.Rollback() - return - } - if err = tx.Commit().Error; err != nil { - success = false - return - } - success = true - - return -} - -func (dept *SysDepts) SetDeptLable() (m []DeptLable, err error) { - deptlist, err := dept.GetList() - - m = make([]DeptLable, 0) - for i := 0; i < len(deptlist); i++ { - if deptlist[i].ParentId != 0 { - continue - } - e := DeptLable{} - e.Id = deptlist[i].DeptId - e.Label = deptlist[i].DeptName - deptsInfo := DiguiDeptLable(&deptlist, e) - - m = append(m, deptsInfo) - } - return -} - -func DiguiDeptLable(deptlist *[]SysDepts, dept DeptLable) DeptLable { - list := *deptlist - - min := make([]DeptLable, 0) - for j := 0; j < len(list); j++ { - - if dept.Id != list[j].ParentId { - continue - } - mi := DeptLable{list[j].DeptId, list[j].DeptName, []DeptLable{}} - ms := DiguiDeptLable(deptlist, mi) - min = append(min, ms) - - } - dept.Children = min - return dept -} diff --git a/app/admin/models/gorm/data.go b/app/admin/models/gorm/data.go index 3b7a589..5f60479 100644 --- a/app/admin/models/gorm/data.go +++ b/app/admin/models/gorm/data.go @@ -1,14 +1,13 @@ package gorm import ( + "go-admin/app/admin/models/system" "gorm.io/gorm" - - "go-admin/app/admin/models" ) func InitData(db *gorm.DB) { - list := []models.CasbinRule{ + list := []system.CasbinRule{ {"p", "admin", "/api/v1/menulist", "GET", "", "", ""}, {"p", "admin", "/api/v1/menu", "POST", "", "", ""}, {"p", "admin", "/api/v1/dict/databytype/", "GET", "", "", ""}, diff --git a/app/admin/models/login.go b/app/admin/models/login.go deleted file mode 100644 index a045976..0000000 --- a/app/admin/models/login.go +++ /dev/null @@ -1,30 +0,0 @@ -package models - -import ( - orm "go-admin/common/global" - "go-admin/tools" -) - -type Login struct { - Username string `form:"UserName" json:"username" binding:"required"` - Password string `form:"Password" json:"password" binding:"required"` - Code string `form:"Code" json:"code" binding:"required"` - UUID string `form:"UUID" json:"uuid" binding:"required"` -} - -func (u *Login) GetUser() (user SysUser, role SysRole, e error) { - - e = orm.Eloquent.Table("sys_user").Where("username = ? and status = 2", u.Username).Find(&user).Error - if e != nil { - return - } - _, e = tools.CompareHashAndPassword(user.Password, u.Password) - if e != nil { - return - } - e = orm.Eloquent.Table("sys_role").Where("role_id = ? ", user.RoleId).First(&role).Error - if e != nil { - return - } - return -} diff --git a/app/admin/models/menu.go b/app/admin/models/menu.go index 3ac3245..5db970a 100644 --- a/app/admin/models/menu.go +++ b/app/admin/models/menu.go @@ -2,9 +2,10 @@ package models import ( "errors" + "gorm.io/gorm" - orm "go-admin/common/global" + "go-admin/app/admin/models/system" "go-admin/tools" ) @@ -81,162 +82,162 @@ type MenuRole struct { type MS []Menu -func (e *Menu) GetByMenuId() (Menu Menu, err error) { +//func (e *Menu) GetByMenuId() (Menu Menu, err error) { +// +// table := orm.Eloquent.Table(e.TableName()) +// table = table.Where("menu_id = ?", e.MenuId) +// if err = table.Find(&Menu).Error; err != nil { +// return +// } +// return +//} - table := orm.Eloquent.Table(e.TableName()) - table = table.Where("menu_id = ?", e.MenuId) - if err = table.Find(&Menu).Error; err != nil { - return - } - return -} +//func (e *Menu) SetMenu() (m []Menu, err error) { +// menulist, err := e.GetPage() +// +// m = make([]Menu, 0) +// for i := 0; i < len(menulist); i++ { +// if menulist[i].ParentId != 0 { +// continue +// } +// menusInfo := DiguiMenu(&menulist, menulist[i]) +// +// m = append(m, menusInfo) +// } +// return +//} -func (e *Menu) SetMenu() (m []Menu, err error) { - menulist, err := e.GetPage() +//func DiguiMenu(menulist *[]Menu, menu Menu) Menu { +// list := *menulist +// +// min := make([]Menu, 0) +// for j := 0; j < len(list); j++ { +// +// if menu.MenuId != list[j].ParentId { +// continue +// } +// mi := Menu{} +// mi.MenuId = list[j].MenuId +// mi.MenuName = list[j].MenuName +// mi.Title = list[j].Title +// mi.Icon = list[j].Icon +// mi.Path = list[j].Path +// mi.MenuType = list[j].MenuType +// mi.Action = list[j].Action +// mi.Permission = list[j].Permission +// mi.ParentId = list[j].ParentId +// mi.NoCache = list[j].NoCache +// mi.Breadcrumb = list[j].Breadcrumb +// mi.Component = list[j].Component +// mi.Sort = list[j].Sort +// mi.Visible = list[j].Visible +// mi.CreatedAt = list[j].CreatedAt +// mi.Children = []Menu{} +// +// if mi.MenuType != "F" { +// ms := DiguiMenu(menulist, mi) +// min = append(min, ms) +// +// } else { +// min = append(min, mi) +// } +// +// } +// menu.Children = min +// return menu +//} - m = make([]Menu, 0) - for i := 0; i < len(menulist); i++ { - if menulist[i].ParentId != 0 { - continue - } - menusInfo := DiguiMenu(&menulist, menulist[i]) +//func (e *Menu) SetMenuLabel() (m *[]MenuLable, err error) { +// menulist, err := e.Get() +// +// ml := make([]MenuLable, 0) +// for i := 0; i < len(menulist); i++ { +// if menulist[i].ParentId != 0 { +// continue +// } +// e := MenuLable{} +// e.Id = menulist[i].MenuId +// e.Label = menulist[i].Title +// menusInfo := MenuLabelCall(&menulist, e) +// +// ml = append(ml, menusInfo) +// } +// return &ml, err +//} - m = append(m, menusInfo) - } - return -} +//func MenuLabelCall(menulist *[]Menu, menu MenuLable) MenuLable { +// list := *menulist +// +// min := make([]MenuLable, 0) +// for j := 0; j < len(list); j++ { +// +// if menu.Id != list[j].ParentId { +// continue +// } +// mi := MenuLable{} +// mi.Id = list[j].MenuId +// mi.Label = list[j].Title +// mi.Children = []MenuLable{} +// if list[j].MenuType != "F" { +// ms := MenuLabelCall(menulist, mi) +// min = append(min, ms) +// } else { +// min = append(min, mi) +// } +// +// } +// if len(min) > 0 { +// menu.Children = min +// } else { +// menu.Children = nil +// } +// return menu +//} -func DiguiMenu(menulist *[]Menu, menu Menu) Menu { - list := *menulist +//func (e *Menu) SetMenuRole(roleName string) (m []Menu, err error) { +// +// menus, err := e.GetByRoleName(roleName) +// +// m = make([]Menu, 0) +// for i := 0; i < len(menus); i++ { +// if menus[i].ParentId != 0 { +// continue +// } +// menusInfo := DiguiMenu(&menus, menus[i]) +// +// m = append(m, menusInfo) +// } +// return +//} - min := make([]Menu, 0) - for j := 0; j < len(list); j++ { +//func (e *MenuRole) Get(tx *gorm.DB) (Menus []MenuRole, err error) { +// table := tx.Table(e.TableName()) +// if e.MenuName != "" { +// table = table.Where("menu_name = ?", e.MenuName) +// } +// if err = table.Order("sort").Find(&Menus).Error; err != nil { +// return +// } +// return +//} - if menu.MenuId != list[j].ParentId { - continue - } - mi := Menu{} - mi.MenuId = list[j].MenuId - mi.MenuName = list[j].MenuName - mi.Title = list[j].Title - mi.Icon = list[j].Icon - mi.Path = list[j].Path - mi.MenuType = list[j].MenuType - mi.Action = list[j].Action - mi.Permission = list[j].Permission - mi.ParentId = list[j].ParentId - mi.NoCache = list[j].NoCache - mi.Breadcrumb = list[j].Breadcrumb - mi.Component = list[j].Component - mi.Sort = list[j].Sort - mi.Visible = list[j].Visible - mi.CreatedAt = list[j].CreatedAt - mi.Children = []Menu{} +//func (e *Menu) GetByRoleName(roleName string) (Menus []Menu, err error) { +// var table *gorm.DB +// if roleName == "admin" { +// table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*") +// table = table.Where(" menu_type in ('M','C')") +// } else { +// table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*").Joins("left join sys_role_menu on sys_role_menu.menu_id=sys_menu.menu_id") +// table = table.Where("sys_role_menu.role_name=? and menu_type in ('M','C')", roleName) +// } +// if err = table.Order("sort").Find(&Menus).Error; err != nil { +// return +// } +// return +//} - if mi.MenuType != "F" { - ms := DiguiMenu(menulist, mi) - min = append(min, ms) - - } else { - min = append(min, mi) - } - - } - menu.Children = min - return menu -} - -func (e *Menu) SetMenuLabel() (m *[]MenuLable, err error) { - menulist, err := e.Get() - - ml := make([]MenuLable, 0) - for i := 0; i < len(menulist); i++ { - if menulist[i].ParentId != 0 { - continue - } - e := MenuLable{} - e.Id = menulist[i].MenuId - e.Label = menulist[i].Title - menusInfo := MenuLabelCall(&menulist, e) - - ml = append(ml, menusInfo) - } - return &ml, err -} - -func MenuLabelCall(menulist *[]Menu, menu MenuLable) MenuLable { - list := *menulist - - min := make([]MenuLable, 0) - for j := 0; j < len(list); j++ { - - if menu.Id != list[j].ParentId { - continue - } - mi := MenuLable{} - mi.Id = list[j].MenuId - mi.Label = list[j].Title - mi.Children = []MenuLable{} - if list[j].MenuType != "F" { - ms := MenuLabelCall(menulist, mi) - min = append(min, ms) - } else { - min = append(min, mi) - } - - } - if len(min) > 0 { - menu.Children = min - } else { - menu.Children = nil - } - return menu -} - -func (e *Menu) SetMenuRole(roleName string) (m []Menu, err error) { - - menus, err := e.GetByRoleName(roleName) - - m = make([]Menu, 0) - for i := 0; i < len(menus); i++ { - if menus[i].ParentId != 0 { - continue - } - menusInfo := DiguiMenu(&menus, menus[i]) - - m = append(m, menusInfo) - } - return -} - -func (e *MenuRole) Get() (Menus []MenuRole, err error) { - table := orm.Eloquent.Table(e.TableName()) - if e.MenuName != "" { - table = table.Where("menu_name = ?", e.MenuName) - } - if err = table.Order("sort").Find(&Menus).Error; err != nil { - return - } - return -} - -func (e *Menu) GetByRoleName(roleName string) (Menus []Menu, err error) { - var table *gorm.DB - if roleName == "admin" { - table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*") - table = table.Where(" menu_type in ('M','C')") - } else { - table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*").Joins("left join sys_role_menu on sys_role_menu.menu_id=sys_menu.menu_id") - table = table.Where("sys_role_menu.role_name=? and menu_type in ('M','C')", roleName) - } - if err = table.Order("sort").Find(&Menus).Error; err != nil { - return - } - return -} - -func (e *Menu) Get() (Menus []Menu, err error) { - table := orm.Eloquent.Table(e.TableName()) +func (e *Menu) Get(tx *gorm.DB) (Menus []Menu, err error) { + table := tx.Table(e.TableName()) if e.MenuName != "" { table = table.Where("menu_name = ?", e.MenuName) } @@ -256,8 +257,8 @@ func (e *Menu) Get() (Menus []Menu, err error) { return } -func (e *Menu) GetPage() (Menus []Menu, err error) { - table := orm.Eloquent.Table(e.TableName()) +func (e *Menu) GetPage(tx *gorm.DB) (Menus []Menu, err error) { + table := tx.Table(e.TableName()) if e.MenuName != "" { table = table.Where("menu_name = ?", e.MenuName) } @@ -272,7 +273,7 @@ func (e *Menu) GetPage() (Menus []Menu, err error) { } // 数据权限控制 - dataPermission := new(DataPermission) + dataPermission := new(system.DataPermission) dataPermission.UserId, _ = tools.StringToInt(e.DataScope) table, err = dataPermission.GetDataScope("sys_menu", table) if err != nil { @@ -284,13 +285,13 @@ func (e *Menu) GetPage() (Menus []Menu, err error) { return } -func (e *Menu) Create() (id int, err error) { - result := orm.Eloquent.Table(e.TableName()).Create(&e) +func (e *Menu) Create(tx *gorm.DB) (id int, err error) { + result := tx.Table(e.TableName()).Create(&e) if result.Error != nil { err = result.Error return } - err = InitPaths(e) + err = InitPaths(tx, e) if err != nil { return } @@ -298,10 +299,10 @@ func (e *Menu) Create() (id int, err error) { return } -func InitPaths(menu *Menu) (err error) { +func InitPaths(tx *gorm.DB, menu *Menu) (err error) { parentMenu := new(Menu) - if int(menu.ParentId) != 0 { - orm.Eloquent.Table("sys_menu").Where("menu_id = ?", menu.ParentId).First(parentMenu) + if menu.ParentId != 0 { + tx.Table("sys_menu").Where("menu_id = ?", menu.ParentId).First(parentMenu) if parentMenu.Paths == "" { err = errors.New("父级paths异常,请尝试对当前节点父级菜单进行更新操作!") return @@ -310,32 +311,32 @@ func InitPaths(menu *Menu) (err error) { } else { menu.Paths = "/0/" + tools.IntToString(menu.MenuId) } - orm.Eloquent.Table("sys_menu").Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths) + tx.Table("sys_menu").Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths) return } -func (e *Menu) Update(id int) (update Menu, err error) { - if err = orm.Eloquent.Table(e.TableName()).First(&update, id).Error; err != nil { - return - } +//func (e *Menu) Update(tx *gorm.DB, id int) (update Menu, err error) { +// if err = tx.Table(e.TableName()).First(&update, id).Error; err != nil { +// return +// } +// +// //参数1:是要修改的数据 +// //参数2:是修改的数据 +// if err = tx.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { +// return +// } +// err = InitPaths(tx, e) +// if err != nil { +// return +// } +// return +//} - //参数1:是要修改的数据 - //参数2:是修改的数据 - if err = orm.Eloquent.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { - return - } - err = InitPaths(e) - if err != nil { - return - } - return -} - -func (e *Menu) Delete(id int) (success bool, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("menu_id = ?", id).Delete(&Menu{}).Error; err != nil { - success = false - return - } - success = true - return -} +//func (e *Menu) Delete(tx *gorm.DB, id int) (success bool, err error) { +// if err = tx.Table(e.TableName()).Where("menu_id = ?", id).Delete(&Menu{}).Error; err != nil { +// success = false +// return +// } +// success = true +// return +//} diff --git a/app/admin/models/post.go b/app/admin/models/post.go deleted file mode 100644 index 0b50956..0000000 --- a/app/admin/models/post.go +++ /dev/null @@ -1,145 +0,0 @@ -package models - -import ( - orm "go-admin/common/global" - "go-admin/tools" -) - -type Post struct { - PostId int `gorm:"primaryKey;autoIncrement" json:"postId"` //岗位编号 - PostName string `gorm:"size:128;" json:"postName"` //岗位名称 - PostCode string `gorm:"size:128;" json:"postCode"` //岗位代码 - Sort int `gorm:"" json:"sort"` //岗位排序 - Status string `gorm:"size:4;" json:"status"` //状态 - Remark string `gorm:"size:255;" json:"remark"` //描述 - CreateBy string `gorm:"size:128;" json:"createBy"` - UpdateBy string `gorm:"size:128;" json:"updateBy"` - BaseModel - - DataScope string `gorm:"-" json:"dataScope"` - Params string `gorm:"-" json:"params"` -} - -func (Post) TableName() string { - return "sys_post" -} - -func (e *Post) Create() (Post, error) { - var doc Post - result := orm.Eloquent.Table(e.TableName()).Create(&e) - if result.Error != nil { - err := result.Error - return doc, err - } - doc = *e - return doc, nil -} - -func (e *Post) Get() (Post, error) { - var doc Post - - table := orm.Eloquent.Table(e.TableName()) - if e.PostId != 0 { - table = table.Where("post_id = ?", e.PostId) - } - if e.PostName != "" { - table = table.Where("post_name = ?", e.PostName) - } - if e.PostCode != "" { - table = table.Where("post_code = ?", e.PostCode) - } - if e.Status != "" { - table = table.Where("status = ?", e.Status) - } - - if err := table.First(&doc).Error; err != nil { - return doc, err - } - return doc, nil -} - -func (e *Post) GetList() ([]Post, error) { - var doc []Post - - table := orm.Eloquent.Table(e.TableName()) - if e.PostId != 0 { - table = table.Where("post_id = ?", e.PostId) - } - if e.PostName != "" { - table = table.Where("post_name = ?", e.PostName) - } - if e.PostCode != "" { - table = table.Where("post_code = ?", e.PostCode) - } - if e.Status != "" { - table = table.Where("status = ?", e.Status) - } - - if err := table.Find(&doc).Error; err != nil { - return doc, err - } - return doc, nil -} - -func (e *Post) GetPage(pageSize int, pageIndex int) ([]Post, int, error) { - var doc []Post - - table := orm.Eloquent.Table(e.TableName()) - if e.PostId != 0 { - table = table.Where("post_id = ?", e.PostId) - } - if e.PostName != "" { - table = table.Where("post_name = ?", e.PostName) - } - if e.PostCode != "" { - table = table.Where("post_code = ?", e.PostCode) - } - if e.Status != "" { - table = table.Where("status = ?", e.Status) - } - - // 数据权限控制 - dataPermission := new(DataPermission) - dataPermission.UserId, _ = tools.StringToInt(e.DataScope) - table, err := dataPermission.GetDataScope("sys_post", table) - if err != nil { - return nil, 0, err - } - var count int64 - - if err := table.Order("sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { - return nil, 0, err - } - //table.Where("`deleted_at` IS NULL").Count(&count) - return doc, int(count), nil -} - -func (e *Post) Update(id int) (update Post, err error) { - if err = orm.Eloquent.Table(e.TableName()).First(&update, id).Error; err != nil { - return - } - - //参数1:是要修改的数据 - //参数2:是修改的数据 - if err = orm.Eloquent.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { - return - } - return -} - -func (e *Post) Delete(id int) (success bool, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("post_id = ?", id).Delete(&Post{}).Error; err != nil { - success = false - return - } - success = true - return -} - -func (e *Post) BatchDelete(id []int) (Result bool, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("post_id in (?)", id).Delete(&Post{}).Error; err != nil { - return - } - Result = true - return -} diff --git a/app/admin/models/role.go b/app/admin/models/role.go index e477301..e68ffa5 100644 --- a/app/admin/models/role.go +++ b/app/admin/models/role.go @@ -1,24 +1,15 @@ package models -import ( - "errors" - - "gorm.io/gorm" - - orm "go-admin/common/global" - "go-admin/tools" -) - type SysRole struct { RoleId int `json:"roleId" gorm:"primaryKey;autoIncrement"` // 角色编码 - RoleName string `json:"roleName" gorm:"size:128;"` // 角色名称 - Status string `json:"status" gorm:"size:4;"` // - RoleKey string `json:"roleKey" gorm:"size:128;"` //角色代码 - RoleSort int `json:"roleSort" gorm:""` //角色排序 - Flag string `json:"flag" gorm:"size:128;"` // - CreateBy string `json:"createBy" gorm:"size:128;"` // - UpdateBy string `json:"updateBy" gorm:"size:128;"` // - Remark string `json:"remark" gorm:"size:255;"` //备注 + RoleName string `json:"roleName" gorm:"size:128;"` // 角色名称 + Status string `json:"status" gorm:"size:4;"` // + RoleKey string `json:"roleKey" gorm:"size:128;"` //角色代码 + RoleSort int `json:"roleSort" gorm:""` //角色排序 + Flag string `json:"flag" gorm:"size:128;"` // + CreateBy string `json:"createBy" gorm:"size:128;"` // + UpdateBy string `json:"updateBy" gorm:"size:128;"` // + Remark string `json:"remark" gorm:"size:255;"` //备注 Admin bool `json:"admin" gorm:"size:4;"` DataScope string `json:"dataScope" gorm:"size:128;"` BaseModel @@ -36,216 +27,216 @@ type MenuIdList struct { MenuId int `json:"menuId"` } -func (role *SysRole) GetById(tx *gorm.DB, id interface{}) error { - return tx.First(role, id).Error -} - -func (role *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int, error) { - var doc []SysRole - - table := orm.Eloquent.Table("sys_role") - if role.RoleId != 0 { - table = table.Where("role_id = ?", role.RoleId) - } - if role.RoleName != "" { - table = table.Where("role_name = ?", role.RoleName) - } - if role.Status != "" { - table = table.Where("status = ?", role.Status) - } - if role.RoleKey != "" { - table = table.Where("role_key = ?", role.RoleKey) - } - - // 数据权限控制 - dataPermission := new(DataPermission) - dataPermission.UserId, _ = tools.StringToInt(role.DataScope) - table, err := dataPermission.GetDataScope("sys_role", table) - if err != nil { - return nil, 0, err - } - var count int64 - - if err := table.Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { - return nil, 0, err - } - //table.Where("`deleted_at` IS NULL").Count(&count) - return doc, int(count), nil -} - -func (role *SysRole) Get() (SysRole SysRole, err error) { - table := orm.Eloquent.Table("sys_role") - if role.RoleId != 0 { - table = table.Where("role_id = ?", role.RoleId) - } - if role.RoleName != "" { - table = table.Where("role_name = ?", role.RoleName) - } - if err = table.First(&SysRole).Error; err != nil { - return - } - - return -} - -func (role *SysRole) GetOne(sysRole *SysRole) (err error) { - table := orm.Eloquent.Table("sys_role") - if role.RoleId != 0 { - table = table.Where("role_id = ?", role.RoleId) - } - if role.RoleName != "" { - table = table.Where("role_name = ?", role.RoleName) - } - if err = table.First(sysRole).Error; err != nil { - return - } - - return -} - -func (role *SysRole) GetList() (SysRole []SysRole, err error) { - table := orm.Eloquent.Table("sys_role") - if role.RoleId != 0 { - table = table.Where("role_id = ?", role.RoleId) - } - if role.RoleName != "" { - table = table.Where("role_name = ?", role.RoleName) - } - if err = table.Order("role_sort").Find(&SysRole).Error; err != nil { - return - } - - return -} - -// 获取角色对应的菜单ids -func (role *SysRole) GetRoleMeunId() ([]int, error) { - menuIds := make([]int, 0) - menuList := make([]MenuIdList, 0) - if err := orm.Eloquent.Table("sys_role_menu"). - Select("sys_role_menu.menu_id"). - Where("role_id = ? ", role.RoleId). - Where(" sys_role_menu.menu_id not in(select sys_menu.parent_id from sys_role_menu " + - "LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id where role_id =? and parent_id is not null)", role.RoleId). - Find(&menuList).Error; err != nil { - return nil, err - } - - for i := 0; i < len(menuList); i++ { - menuIds = append(menuIds, menuList[i].MenuId) - } - return menuIds, nil -} - -func (role *SysRole) Insert() (id int, err error) { - var i int64 - orm.Eloquent.Table(role.TableName()).Where("role_name=? or role_key = ?", role.RoleName, role.RoleKey).Count(&i) - if i > 0 { - return 0, errors.New("角色名称或者角色标识已经存在!") - } - role.UpdateBy = "" - result := orm.Eloquent.Table(role.TableName()).Create(&role) - if result.Error != nil { - err = result.Error - return - } - id = role.RoleId - return -} - -type DeptIdList struct { - DeptId int `json:"DeptId"` -} - -func (role *SysRole) GetRoleDeptId() ([]int, error) { - deptIds := make([]int, 0) - deptList := make([]DeptIdList, 0) - if err := orm.Eloquent.Table("sys_role_dept").Select("sys_role_dept.dept_id").Joins("LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id").Where("role_id = ? ", role.RoleId).Where(" sys_role_dept.dept_id not in(select sys_dept.parent_id from sys_role_dept LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id where role_id =? )", role.RoleId).Find(&deptList).Error; err != nil { - return nil, err - } - - for i := 0; i < len(deptList); i++ { - deptIds = append(deptIds, deptList[i].DeptId) - } - - return deptIds, nil -} - -//修改 -func (role *SysRole) Update(id int) (update SysRole, err error) { - if err = orm.Eloquent.Table(role.TableName()).First(&update, id).Error; err != nil { - return - } - - if role.RoleName != "" && role.RoleName != update.RoleName { - return update, errors.New("角色名称不允许修改!") - } - - if role.RoleKey != "" && role.RoleKey != update.RoleKey { - return update, errors.New("角色标识不允许修改!") - } - - //参数1:是要修改的数据 - //参数2:是修改的数据 - if err = orm.Eloquent.Table(role.TableName()).Model(&update).Updates(&role).Error; err != nil { - return - } - return -} - -//批量删除 -func (role *SysRole) BatchDelete(id []int) (Result bool, err error) { - tx := orm.Eloquent.Begin() - - defer func() { - if r := recover(); r != nil { - tx.Rollback() - } - }() - - if err := tx.Error; err != nil { - return false, err - } - // 查询角色 - var roles []SysRole - if err := tx.Table("sys_role").Where("role_id in (?)", id).Find(&roles).Error; err != nil { - tx.Rollback() - return false, err - } - - var count int64 - if err := tx.Table("sys_user").Where("role_id in (?)", id).Count(&count).Error; err != nil { - tx.Rollback() - return false, err - } - if count > 0 { - tx.Rollback() - return false, errors.New("存在绑定用户,请解绑后重试") - } - - // 删除角色 - if err = tx.Table(role.TableName()).Where("role_id in (?)", id).Unscoped().Delete(&SysRole{}).Error; err != nil { - tx.Rollback() - return false, err - } - - // 删除角色菜单 - if err := tx.Table("sys_role_menu").Where("role_id in (?)", id).Delete(&RoleMenu{}).Error; err != nil { - tx.Rollback() - return false, err - } - - // 删除casbin配置 - for i := 0; i < len(roles); i++ { - if err := tx.Table("sys_casbin_rule").Where("v0 in (?)", roles[0].RoleKey).Delete(&CasbinRule{}).Error; err != nil { - tx.Rollback() - return false, err - } - } - - if err := tx.Commit().Error; err != nil { - return false, err - } - - return true, nil -} +//func (role *SysRole) GetById(tx *gorm.DB, id interface{}) error { +// return tx.First(role, id).Error +//} +// +//func (role *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int, error) { +// var doc []SysRole +// +// table := orm.Eloquent.Table("sys_role") +// if role.RoleId != 0 { +// table = table.Where("role_id = ?", role.RoleId) +// } +// if role.RoleName != "" { +// table = table.Where("role_name = ?", role.RoleName) +// } +// if role.Status != "" { +// table = table.Where("status = ?", role.Status) +// } +// if role.RoleKey != "" { +// table = table.Where("role_key = ?", role.RoleKey) +// } +// +// // 数据权限控制 +// dataPermission := new(DataPermission) +// dataPermission.UserId, _ = tools.StringToInt(role.DataScope) +// table, err := dataPermission.GetDataScope("sys_role", table) +// if err != nil { +// return nil, 0, err +// } +// var count int64 +// +// if err := table.Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { +// return nil, 0, err +// } +// //table.Where("`deleted_at` IS NULL").Count(&count) +// return doc, int(count), nil +//} +// +//func (role *SysRole) Get() (SysRole SysRole, err error) { +// table := orm.Eloquent.Table("sys_role") +// if role.RoleId != 0 { +// table = table.Where("role_id = ?", role.RoleId) +// } +// if role.RoleName != "" { +// table = table.Where("role_name = ?", role.RoleName) +// } +// if err = table.First(&SysRole).Error; err != nil { +// return +// } +// +// return +//} +// +//func (role *SysRole) GetOne(sysRole *SysRole) (err error) { +// table := orm.Eloquent.Table("sys_role") +// if role.RoleId != 0 { +// table = table.Where("role_id = ?", role.RoleId) +// } +// if role.RoleName != "" { +// table = table.Where("role_name = ?", role.RoleName) +// } +// if err = table.First(sysRole).Error; err != nil { +// return +// } +// +// return +//} +// +//func (role *SysRole) GetList() (SysRole []SysRole, err error) { +// table := orm.Eloquent.Table("sys_role") +// if role.RoleId != 0 { +// table = table.Where("role_id = ?", role.RoleId) +// } +// if role.RoleName != "" { +// table = table.Where("role_name = ?", role.RoleName) +// } +// if err = table.Order("role_sort").Find(&SysRole).Error; err != nil { +// return +// } +// +// return +//} +// +//// 获取角色对应的菜单ids +//func (role *SysRole) GetRoleMeunId() ([]int, error) { +// menuIds := make([]int, 0) +// menuList := make([]MenuIdList, 0) +// if err := orm.Eloquent.Table("sys_role_menu"). +// Select("sys_role_menu.menu_id"). +// Where("role_id = ? ", role.RoleId). +// Where(" sys_role_menu.menu_id not in(select sys_menu.parent_id from sys_role_menu " + +// "LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id where role_id =? and parent_id is not null)", role.RoleId). +// Find(&menuList).Error; err != nil { +// return nil, err +// } +// +// for i := 0; i < len(menuList); i++ { +// menuIds = append(menuIds, menuList[i].MenuId) +// } +// return menuIds, nil +//} +// +//func (role *SysRole) Insert() (id int, err error) { +// var i int64 +// orm.Eloquent.Table(role.TableName()).Where("role_name=? or role_key = ?", role.RoleName, role.RoleKey).Count(&i) +// if i > 0 { +// return 0, errors.New("角色名称或者角色标识已经存在!") +// } +// role.UpdateBy = "" +// result := orm.Eloquent.Table(role.TableName()).Create(&role) +// if result.Error != nil { +// err = result.Error +// return +// } +// id = role.RoleId +// return +//} +// +//type DeptIdList struct { +// DeptId int `json:"DeptId"` +//} +// +//func (role *SysRole) GetRoleDeptId() ([]int, error) { +// deptIds := make([]int, 0) +// deptList := make([]DeptIdList, 0) +// if err := orm.Eloquent.Table("sys_role_dept").Select("sys_role_dept.dept_id").Joins("LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id").Where("role_id = ? ", role.RoleId).Where(" sys_role_dept.dept_id not in(select sys_dept.parent_id from sys_role_dept LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id where role_id =? )", role.RoleId).Find(&deptList).Error; err != nil { +// return nil, err +// } +// +// for i := 0; i < len(deptList); i++ { +// deptIds = append(deptIds, deptList[i].DeptId) +// } +// +// return deptIds, nil +//} +// +////修改 +//func (role *SysRole) Update(id int) (update SysRole, err error) { +// if err = orm.Eloquent.Table(role.TableName()).First(&update, id).Error; err != nil { +// return +// } +// +// if role.RoleName != "" && role.RoleName != update.RoleName { +// return update, errors.New("角色名称不允许修改!") +// } +// +// if role.RoleKey != "" && role.RoleKey != update.RoleKey { +// return update, errors.New("角色标识不允许修改!") +// } +// +// //参数1:是要修改的数据 +// //参数2:是修改的数据 +// if err = orm.Eloquent.Table(role.TableName()).Model(&update).Updates(&role).Error; err != nil { +// return +// } +// return +//} +// +////批量删除 +//func (role *SysRole) BatchDelete(id []int) (Result bool, err error) { +// tx := orm.Eloquent.Begin() +// +// defer func() { +// if r := recover(); r != nil { +// tx.Rollback() +// } +// }() +// +// if err := tx.Error; err != nil { +// return false, err +// } +// // 查询角色 +// var roles []SysRole +// if err := tx.Table("sys_role").Where("role_id in (?)", id).Find(&roles).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// +// var count int64 +// if err := tx.Table("sys_user").Where("role_id in (?)", id).Count(&count).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// if count > 0 { +// tx.Rollback() +// return false, errors.New("存在绑定用户,请解绑后重试") +// } +// +// // 删除角色 +// if err = tx.Table(role.TableName()).Where("role_id in (?)", id).Unscoped().Delete(&SysRole{}).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// +// // 删除角色菜单 +// if err := tx.Table("sys_role_menu").Where("role_id in (?)", id).Delete(&RoleMenu{}).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// +// // 删除casbin配置 +// for i := 0; i < len(roles); i++ { +// if err := tx.Table("sys_casbin_rule").Where("v0 in (?)", roles[0].RoleKey).Delete(&CasbinRule{}).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// } +// +// if err := tx.Commit().Error; err != nil { +// return false, err +// } +// +// return true, nil +//} diff --git a/app/admin/models/rolemenu.go b/app/admin/models/rolemenu.go index ef7909e..6a1c8ac 100644 --- a/app/admin/models/rolemenu.go +++ b/app/admin/models/rolemenu.go @@ -1,10 +1,7 @@ package models import ( - "fmt" - - orm "go-admin/common/global" - "go-admin/tools" + "gorm.io/gorm" ) type RoleMenu struct { @@ -23,22 +20,22 @@ type MenuPath struct { Path string `json:"path"` } -func (rm *RoleMenu) Get() ([]RoleMenu, error) { - var r []RoleMenu - table := orm.Eloquent.Table("sys_role_menu") - if rm.RoleId != 0 { - table = table.Where("role_id = ?", rm.RoleId) +//func (rm *RoleMenu) Get(tx *gorm.DB) ([]RoleMenu, error) { +// var r []RoleMenu +// table := tx.Table("sys_role_menu") +// if rm.RoleId != 0 { +// table = table.Where("role_id = ?", rm.RoleId) +// +// } +// if err := table.Find(&r).Error; err != nil { +// return nil, err +// } +// return r, nil +//} - } - if err := table.Find(&r).Error; err != nil { - return nil, err - } - return r, nil -} - -func (rm *RoleMenu) GetPermis() ([]string, error) { +func (rm *RoleMenu) GetPermis(tx *gorm.DB) ([]string, error) { var r []Menu - table := orm.Eloquent.Select("sys_menu.permission").Table("sys_menu").Joins("left join sys_role_menu on sys_menu.menu_id = sys_role_menu.menu_id") + table := tx.Select("sys_menu.permission").Table("sys_menu").Joins("left join sys_role_menu on sys_menu.menu_id = sys_role_menu.menu_id") table = table.Where("role_id = ?", rm.RoleId) @@ -53,9 +50,9 @@ func (rm *RoleMenu) GetPermis() ([]string, error) { return list, nil } -func (rm *RoleMenu) GetIDS() ([]MenuPath, error) { +func (rm *RoleMenu) GetIDS(tx *gorm.DB) ([]MenuPath, error) { var r []MenuPath - table := orm.Eloquent.Select("sys_menu.path").Table("sys_role_menu") + table := tx.Select("sys_menu.path").Table("sys_role_menu") table = table.Joins("left join sys_role on sys_role.role_id=sys_role_menu.role_id") table = table.Joins("left join sys_menu on sys_menu.id=sys_role_menu.menu_id") table = table.Where("sys_role.role_name = ? and sys_menu.type=1", rm.RoleName) @@ -65,170 +62,170 @@ func (rm *RoleMenu) GetIDS() ([]MenuPath, error) { return r, nil } -func (rm *RoleMenu) DeleteRoleMenu(roleId int) (bool, error) { - tx := orm.Eloquent.Begin() - defer func() { - if r := recover(); r != nil { - tx.Rollback() - } - }() - - if err := tx.Error; err != nil { - return false, err - } - - if err := tx.Table("sys_role_dept").Where("role_id = ?", roleId).Delete(&rm).Error; err != nil { - tx.Rollback() - return false, err - } - if err := tx.Table("sys_role_menu").Where("role_id = ?", roleId).Delete(&rm).Error; err != nil { - tx.Rollback() - return false, err - } - var role SysRole - if err := tx.Table("sys_role").Where("role_id = ?", roleId).First(&role).Error; err != nil { - tx.Rollback() - return false, err - } - sql3 := "delete from sys_casbin_rule where v0= '" + role.RoleKey + "';" - if err := tx.Exec(sql3).Error; err != nil { - tx.Rollback() - return false, err - } - if err := tx.Commit().Error; err != nil { - return false, err - } - - return true, nil - -} +//func (rm *RoleMenu) DeleteRoleMenu(roleId int) (bool, error) { +// tx := orm.Eloquent.Begin() +// defer func() { +// if r := recover(); r != nil { +// tx.Rollback() +// } +// }() +// +// if err := tx.Error; err != nil { +// return false, err +// } +// +// if err := tx.Table("sys_role_dept").Where("role_id = ?", roleId).Delete(&rm).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// if err := tx.Table("sys_role_menu").Where("role_id = ?", roleId).Delete(&rm).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// var role SysRole +// if err := tx.Table("sys_role").Where("role_id = ?", roleId).First(&role).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// sql3 := "delete from sys_casbin_rule where v0= '" + role.RoleKey + "';" +// if err := tx.Exec(sql3).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// if err := tx.Commit().Error; err != nil { +// return false, err +// } +// +// return true, nil +// +//} // 该方法即将弃用 -func (rm *RoleMenu) BatchDeleteRoleMenu(roleIds []int) (bool, error) { - tx := orm.Eloquent.Begin() - defer func() { - if r := recover(); r != nil { - tx.Rollback() - } - }() +//func (rm *RoleMenu) BatchDeleteRoleMenu(roleIds []int) (bool, error) { +// tx := orm.Eloquent.Begin() +// defer func() { +// if r := recover(); r != nil { +// tx.Rollback() +// } +// }() +// +// if err := tx.Error; err != nil { +// return false, err +// } +// +// if err := tx.Table("sys_role_menu").Where("role_id in (?)", roleIds).Delete(&rm).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// var role []SysRole +// if err := tx.Table("sys_role").Where("role_id in (?)", roleIds).Find(&role).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// sql := "" +// for i := 0; i < len(role); i++ { +// sql += "delete from sys_casbin_rule where v0= '" + role[i].RoleName + "';" +// } +// if err := tx.Exec(sql).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// if err := tx.Commit().Error; err != nil { +// return false, err +// } +// return true, nil +// +//} - if err := tx.Error; err != nil { - return false, err - } +//func (rm *RoleMenu) Insert(roleId int, menuId []int) (bool, error) { +// var ( +// role SysRole +// menu []Menu +// casbinRuleQueue []system.CasbinRule // casbinRule 待插入队列 +// ) +// +// // 开始事务 +// tx := orm.Eloquent.Begin() +// defer func() { +// if r := recover(); r != nil { +// tx.Rollback() +// } +// }() +// +// if err := tx.Error; err != nil { +// return false, err +// } +// +// // 在事务中做一些数据库操作(从这一点使用'tx',而不是'db') +// if err := tx.Table("sys_role").Where("role_id = ?", roleId).First(&role).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// if err := tx.Table("sys_menu").Where("menu_id in (?)", menuId).Find(&menu).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// //ORM不支持批量插入所以需要拼接 sql 串 +// sysRoleMenuSql := "INSERT INTO `sys_role_menu` (`role_id`,`menu_id`,`role_name`) VALUES " +// casbinRuleSql := "INSERT INTO `sys_casbin_rule` (`p_type`,`v0`,`v1`,`v2`) VALUES " +// +// for i, m := range menu { +// // 拼装'role_menu'表批量插入SQL语句 +// sysRoleMenuSql += fmt.Sprintf("(%d,%d,'%s')", role.RoleId, m.MenuId, role.RoleKey) +// if i == len(menu)-1 { +// sysRoleMenuSql += ";" //最后一条数据 以分号结尾 +// } else { +// sysRoleMenuSql += "," +// } +// if m.MenuType == "A" { +// // 加入队列 +// casbinRuleQueue = append(casbinRuleQueue, +// system.CasbinRule{ +// V0: role.RoleKey, +// V1: m.Path, +// V2: m.Action, +// }) +// } +// } +// // 执行批量插入sys_role_menu +// if err := tx.Exec(sysRoleMenuSql).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// +// // 拼装'sys_casbin_rule'批量插入SQL语句 +// // TODO: casbinRuleQueue队列不为空时才会拼装,否则直接忽略不执行'for'循环 +// for i, v := range casbinRuleQueue { +// casbinRuleSql += fmt.Sprintf("('p','%s','%s','%s')", v.V0, v.V1, v.V2) +// if i == len(casbinRuleQueue)-1 { +// casbinRuleSql += ";" +// } else { +// casbinRuleSql += "," +// } +// } +// // 执行批量插入sys_casbin_rule +// if len(casbinRuleQueue) > 0 { +// if err := tx.Exec(casbinRuleSql).Error; err != nil { +// tx.Rollback() +// return false, err +// } +// } +// +// if err := tx.Commit().Error; err != nil { +// return false, err +// } +// return true, nil +//} - if err := tx.Table("sys_role_menu").Where("role_id in (?)", roleIds).Delete(&rm).Error; err != nil { - tx.Rollback() - return false, err - } - var role []SysRole - if err := tx.Table("sys_role").Where("role_id in (?)", roleIds).Find(&role).Error; err != nil { - tx.Rollback() - return false, err - } - sql := "" - for i := 0; i < len(role); i++ { - sql += "delete from sys_casbin_rule where v0= '" + role[i].RoleName + "';" - } - if err := tx.Exec(sql).Error; err != nil { - tx.Rollback() - return false, err - } - if err := tx.Commit().Error; err != nil { - return false, err - } - return true, nil - -} - -func (rm *RoleMenu) Insert(roleId int, menuId []int) (bool, error) { - var ( - role SysRole - menu []Menu - casbinRuleQueue []CasbinRule // casbinRule 待插入队列 - ) - - // 开始事务 - tx := orm.Eloquent.Begin() - defer func() { - if r := recover(); r != nil { - tx.Rollback() - } - }() - - if err := tx.Error; err != nil { - return false, err - } - - // 在事务中做一些数据库操作(从这一点使用'tx',而不是'db') - if err := tx.Table("sys_role").Where("role_id = ?", roleId).First(&role).Error; err != nil { - tx.Rollback() - return false, err - } - if err := tx.Table("sys_menu").Where("menu_id in (?)", menuId).Find(&menu).Error; err != nil { - tx.Rollback() - return false, err - } - //ORM不支持批量插入所以需要拼接 sql 串 - sysRoleMenuSql := "INSERT INTO `sys_role_menu` (`role_id`,`menu_id`,`role_name`) VALUES " - casbinRuleSql := "INSERT INTO `sys_casbin_rule` (`p_type`,`v0`,`v1`,`v2`) VALUES " - - for i, m := range menu { - // 拼装'role_menu'表批量插入SQL语句 - sysRoleMenuSql += fmt.Sprintf("(%d,%d,'%s')", role.RoleId, m.MenuId, role.RoleKey) - if i == len(menu)-1 { - sysRoleMenuSql += ";" //最后一条数据 以分号结尾 - } else { - sysRoleMenuSql += "," - } - if m.MenuType == "A" { - // 加入队列 - casbinRuleQueue = append(casbinRuleQueue, - CasbinRule{ - V0: role.RoleKey, - V1: m.Path, - V2: m.Action, - }) - } - } - // 执行批量插入sys_role_menu - if err := tx.Exec(sysRoleMenuSql).Error; err != nil { - tx.Rollback() - return false, err - } - - // 拼装'sys_casbin_rule'批量插入SQL语句 - // TODO: casbinRuleQueue队列不为空时才会拼装,否则直接忽略不执行'for'循环 - for i, v := range casbinRuleQueue { - casbinRuleSql += fmt.Sprintf("('p','%s','%s','%s')", v.V0, v.V1, v.V2) - if i == len(casbinRuleQueue)-1 { - casbinRuleSql += ";" - } else { - casbinRuleSql += "," - } - } - // 执行批量插入sys_casbin_rule - if len(casbinRuleQueue) > 0 { - if err := tx.Exec(casbinRuleSql).Error; err != nil { - tx.Rollback() - return false, err - } - } - - if err := tx.Commit().Error; err != nil { - return false, err - } - return true, nil -} - -func (rm *RoleMenu) Delete(RoleId string, MenuID string) (bool, error) { - rm.RoleId, _ = tools.StringToInt(RoleId) - table := orm.Eloquent.Table("sys_role_menu").Where("role_id = ?", RoleId) - if MenuID != "" { - table = table.Where("menu_id = ?", MenuID) - } - if err := table.Delete(&rm).Error; err != nil { - return false, err - } - return true, nil - -} +//func (rm *RoleMenu) Delete(RoleId string, MenuID string) (bool, error) { +// rm.RoleId, _ = tools.StringToInt(RoleId) +// table := orm.Eloquent.Table("sys_role_menu").Where("role_id = ?", RoleId) +// if MenuID != "" { +// table = table.Where("menu_id = ?", MenuID) +// } +// if err := table.Delete(&rm).Error; err != nil { +// return false, err +// } +// return true, nil +// +//} diff --git a/app/admin/models/syscontent.go b/app/admin/models/syscontent.go index 0acf332..420dd5f 100644 --- a/app/admin/models/syscontent.go +++ b/app/admin/models/syscontent.go @@ -1,132 +1,137 @@ package models import ( - orm "go-admin/common/global" - "go-admin/tools" + "go-admin/common/models" ) type SysContent struct { - Id int `json:"id" gorm:"type:int(11);primaryKey;autoIncrement"` // id - CateId string `json:"cateId" gorm:"type:int(11);"` // 分类id - Name string `json:"name" gorm:"type:varchar(255);"` // 名称 - Status string `json:"status" gorm:"type:int(1);"` // 状态 - Img string `json:"img" gorm:"type:varchar(255);"` // 图片 - Content string `json:"content" gorm:"type:text;"` // 内容 - Remark string `json:"remark" gorm:"type:varchar(255);"` // 备注 - Sort string `json:"sort" gorm:"type:int(4);"` // 排序 - CreateBy string `json:"createBy" gorm:"type:varchar(128);"` // 创建者 - UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` // 更新者 - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` - BaseModel + Id int `json:"id" gorm:"type:int(11);primaryKey;autoIncrement"` // id + CateId string `json:"cateId" gorm:"type:int(11);comment:分类id"` + Name string `json:"name" gorm:"type:varchar(255);comment:名称"` + Status string `json:"status" gorm:"type:int(1);comment:状态"` + Img string `json:"img" gorm:"type:varchar(255);comment:图片"` + Content string `json:"content" gorm:"type:text;comment:内容"` + Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` + Sort string `json:"sort" gorm:"type:int(4);comment:排序"` + models.ControlBy + models.ModelTime } func (SysContent) TableName() string { return "sys_content" } -// 创建SysContent -func (e *SysContent) Create() (SysContent, error) { - var doc SysContent - result := orm.Eloquent.Table(e.TableName()).Create(&e) - if result.Error != nil { - err := result.Error - return doc, err - } - doc = *e - return doc, nil +func (e *SysContent) Generate() models.ActiveRecord { + o := *e + return &o } -// 获取SysContent -func (e *SysContent) Get() (SysContent, error) { - var doc SysContent - table := orm.Eloquent.Table(e.TableName()) - - if e.Id != 0 { - table = table.Where("id = ?", e.Id) - } - - if e.CateId != "" { - table = table.Where("cate_id = ?", e.CateId) - } - - if e.Name != "" { - table = table.Where("name like ?", "%"+e.Name+"%") - } - - if e.Status != "" { - table = table.Where("status = ?", e.Status) - } - - if err := table.First(&doc).Error; err != nil { - return doc, err - } - return doc, nil +func (e *SysContent) GetId() interface{} { + return e.Id } -// 获取SysContent带分页 -func (e *SysContent) GetPage(pageSize int, pageIndex int) ([]SysContent, int, error) { - var doc []SysContent - - table := orm.Eloquent.Table(e.TableName()) - - if e.CateId != "" { - table = table.Where("cate_id = ?", e.CateId) - } - - if e.Name != "" { - table = table.Where("name like ?", "%"+e.Name+"%") - } - - if e.Status != "" { - table = table.Where("status = ?", e.Status) - } - - // 数据权限控制(如果不需要数据权限请将此处去掉) - dataPermission := new(DataPermission) - dataPermission.UserId, _ = tools.StringToInt(e.DataScope) - table, err := dataPermission.GetDataScope(e.TableName(), table) - if err != nil { - return nil, 0, err - } - var count int64 - - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { - return nil, 0, err - } - //table.Where("`deleted_at` IS NULL").Count(&count) - return doc, int(count), nil -} - -// 更新SysContent -func (e *SysContent) Update(id int) (update SysContent, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("id = ?", id).First(&update).Error; err != nil { - return - } - - //参数1:是要修改的数据 - //参数2:是修改的数据 - if err = orm.Eloquent.Table(e.TableName()).Model(&update).Where("id = ?", id).Updates(&e).Error; err != nil { - return - } - return -} - -// 删除SysContent -func (e *SysContent) Delete(id int) (success bool, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("id = ?", id).Delete(&SysContent{}).Error; err != nil { - success = false - return - } - success = true - return -} - -//批量删除 -func (e *SysContent) BatchDelete(id []int) (Result bool, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("id in (?)", id).Delete(&SysContent{}).Error; err != nil { - return - } - Result = true - return -} +//// 创建SysContent +//func (e *SysContent) Create() (SysContent, error) { +// var doc SysContent +// result := orm.Eloquent.Table(e.TableName()).Create(&e) +// if result.Error != nil { +// err := result.Error +// return doc, err +// } +// doc = *e +// return doc, nil +//} +// +//// 获取SysContent +//func (e *SysContent) Get() (SysContent, error) { +// var doc SysContent +// table := orm.Eloquent.Table(e.TableName()) +// +// if e.Id != 0 { +// table = table.Where("id = ?", e.Id) +// } +// +// if e.CateId != "" { +// table = table.Where("cate_id = ?", e.CateId) +// } +// +// if e.Name != "" { +// table = table.Where("name like ?", "%"+e.Name+"%") +// } +// +// if e.Status != "" { +// table = table.Where("status = ?", e.Status) +// } +// +// if err := table.First(&doc).Error; err != nil { +// return doc, err +// } +// return doc, nil +//} +// +//// 获取SysContent带分页 +//func (e *SysContent) GetPage(pageSize int, pageIndex int) ([]SysContent, int, error) { +// var doc []SysContent +// +// table := orm.Eloquent.Table(e.TableName()) +// +// if e.CateId != "" { +// table = table.Where("cate_id = ?", e.CateId) +// } +// +// if e.Name != "" { +// table = table.Where("name like ?", "%"+e.Name+"%") +// } +// +// if e.Status != "" { +// table = table.Where("status = ?", e.Status) +// } +// +// // 数据权限控制(如果不需要数据权限请将此处去掉) +// dataPermission := new(system.DataPermission) +// dataPermission.UserId, _ = tools.StringToInt(e.DataScope) +// table, err := dataPermission.GetDataScope(e.TableName(), table) +// if err != nil { +// return nil, 0, err +// } +// var count int64 +// +// if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { +// return nil, 0, err +// } +// //table.Where("`deleted_at` IS NULL").Count(&count) +// return doc, int(count), nil +//} +// +//// 更新SysContent +//func (e *SysContent) Update(id int) (update SysContent, err error) { +// if err = orm.Eloquent.Table(e.TableName()).Where("id = ?", id).First(&update).Error; err != nil { +// return +// } +// +// //参数1:是要修改的数据 +// //参数2:是修改的数据 +// if err = orm.Eloquent.Table(e.TableName()).Model(&update).Where("id = ?", id).Updates(&e).Error; err != nil { +// return +// } +// return +//} +// +//// 删除SysContent +//func (e *SysContent) Delete(id int) (success bool, err error) { +// if err = orm.Eloquent.Table(e.TableName()).Where("id = ?", id).Delete(&SysContent{}).Error; err != nil { +// success = false +// return +// } +// success = true +// return +//} +// +////批量删除 +//func (e *SysContent) BatchDelete(id []int) (Result bool, err error) { +// if err = orm.Eloquent.Table(e.TableName()).Where("id in (?)", id).Delete(&SysContent{}).Error; err != nil { +// return +// } +// Result = true +// return +//} diff --git a/app/admin/models/sysjob.go b/app/admin/models/sysjob.go index c18e37a..ef9ca4b 100644 --- a/app/admin/models/sysjob.go +++ b/app/admin/models/sysjob.go @@ -1,30 +1,28 @@ package models import ( - "go-admin/common/dto" - orm "go-admin/common/global" "go-admin/common/models" - "go-admin/tools" + "gorm.io/gorm" "strconv" ) type SysJob struct { - JobId int `json:"jobId" gorm:"primaryKey;autoIncrement"` // 编码 - JobName string `json:"jobName" gorm:"size:255;"` // 名称 - JobGroup string `json:"jobGroup" gorm:"size:255;"` // 任务分组 - JobType int `json:"jobType" gorm:"size:1;"` // 任务类型 - CronExpression string `json:"cronExpression" gorm:"size:255;"` // cron表达式 - InvokeTarget string `json:"invokeTarget" gorm:"size:255;"` // 调用目标 - Args string `json:"args" gorm:"size:255;"` // 目标参数 - MisfirePolicy int `json:"misfirePolicy" gorm:"size:255;"` // 执行策略 - Concurrent int `json:"concurrent" gorm:"size:1;"` // 是否并发 - Status int `json:"status" gorm:"size:1;"` // 状态 - EntryId int `json:"entry_id" gorm:"size:11;"` // job启动时返回的id - CreateBy string `json:"createBy" gorm:"size:128;"` // - UpdateBy string `json:"updateBy" gorm:"size:128;"` // + JobId int `json:"jobId" gorm:"primaryKey;autoIncrement"` // 编码 + JobName string `json:"jobName" gorm:"size:255;"` // 名称 + JobGroup string `json:"jobGroup" gorm:"size:255;"` // 任务分组 + JobType int `json:"jobType" gorm:"size:1;"` // 任务类型 + CronExpression string `json:"cronExpression" gorm:"size:255;"` // cron表达式 + InvokeTarget string `json:"invokeTarget" gorm:"size:255;"` // 调用目标 + Args string `json:"args" gorm:"size:255;"` // 目标参数 + MisfirePolicy int `json:"misfirePolicy" gorm:"size:255;"` // 执行策略 + Concurrent int `json:"concurrent" gorm:"size:1;"` // 是否并发 + Status int `json:"status" gorm:"size:1;"` // 状态 + EntryId int `json:"entry_id" gorm:"size:11;"` // job启动时返回的id + CreateBy string `json:"createBy" gorm:"size:128;"` // + UpdateBy string `json:"updateBy" gorm:"size:128;"` // BaseModel - DataScope string `json:"dataScope" gorm:"-"` + DataScope string `json:"dataScope" gorm:"-"` } func (SysJob) TableName() string { @@ -49,65 +47,65 @@ func (e *SysJob) SetUpdateBy(updateBy int) { } // 创建SysJob -func (e *SysJob) Create() (err error) { - return orm.Eloquent.Table(e.TableName()).Create(e).Error -} +//func (e *SysJob) Create() (err error) { +// return orm.Eloquent.Table(e.TableName()).Create(e).Error +//} // 获取SysJob -func (e *SysJob) Get(id interface{}) (err error) { - return orm.Eloquent.Table(e.TableName()).First(e, id).Error -} +//func (e *SysJob) Get(id interface{}) (err error) { +// return orm.Eloquent.Table(e.TableName()).First(e, id).Error +//} // 获取SysJob带分页 -func (e *SysJob) GetPage(pageSize int, pageIndex int, v interface{}, list interface{}) (int, error) { - table := orm.Eloquent.Table(e.TableName()).Scopes(dto.MakeCondition(v)) +//func (e *SysJob) GetPage(pageSize int, pageIndex int, v interface{}, list interface{}) (int, error) { +// table := orm.Eloquent.Table(e.TableName()).Scopes(dto.MakeCondition(v)) +// +// // 数据权限控制(如果不需要数据权限请将此处去掉) +// //dataPermission := new(DataPermission) +// userid, _ := tools.StringToInt(e.DataScope) +// +// var count int64 +// +// if err := table.Scopes(system.DataScopes(e.TableName(), userid), dto.Paginate(pageSize, pageIndex)).Find(list).Offset(-1).Limit(-1).Count(&count).Error; err != nil { +// return 0, err +// } +// return int(count), nil +//} - // 数据权限控制(如果不需要数据权限请将此处去掉) - //dataPermission := new(DataPermission) - userid, _ := tools.StringToInt(e.DataScope) - - var count int64 - - if err := table.Scopes(DataScopes(e.TableName(), userid), dto.Paginate(pageSize, pageIndex)).Find(list).Offset(-1).Limit(-1).Count(&count).Error; err != nil { - return 0, err - } - return int(count), nil -} - -func (e *SysJob) GetList(list interface{}) (err error) { - return orm.Eloquent.Table(e.TableName()).Where("status = ?", 2).Find(list).Error +func (e *SysJob) GetList(tx *gorm.DB, list interface{}) (err error) { + return tx.Table(e.TableName()).Where("status = ?", 2).Find(list).Error } // 更新SysJob -func (e *SysJob) Update(id interface{}) (err error) { - return orm.Eloquent.Table(e.TableName()).Where(id).Updates(&e).Error +func (e *SysJob) Update(tx *gorm.DB, id interface{}) (err error) { + return tx.Table(e.TableName()).Where(id).Updates(&e).Error } -func (e *SysJob) RemoveAllEntryID() (update SysJob, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("entry_id > ?", 0).Update("entry_id", 0).Error; err != nil { +func (e *SysJob) RemoveAllEntryID(tx *gorm.DB) (update SysJob, err error) { + if err = tx.Table(e.TableName()).Where("entry_id > ?", 0).Update("entry_id", 0).Error; err != nil { return } return } -func (e *SysJob) RemoveEntryID(entryID int) (update SysJob, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("entry_id = ?", entryID).Updates(map[string]interface{}{"entry_id": 0}).Error; err != nil { - return - } - return -} +//func (e *SysJob) RemoveEntryID(entryID int) (update SysJob, err error) { +// if err = orm.Eloquent.Table(e.TableName()).Where("entry_id = ?", entryID).Updates(map[string]interface{}{"entry_id": 0}).Error; err != nil { +// return +// } +// return +//} // 删除SysJob -func (e *SysJob) Delete(id int) (success bool, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where(id).Delete(&SysJob{}).Error; err != nil { - success = false - return - } - success = true - return -} +//func (e *SysJob) Delete(id int) (success bool, err error) { +// if err = orm.Eloquent.Table(e.TableName()).Where(id).Delete(&SysJob{}).Error; err != nil { +// success = false +// return +// } +// success = true +// return +//} //批量删除 -func (e *SysJob) BatchDelete(id []int) error { - return orm.Eloquent.Table(e.TableName()).Where(id).Delete(&SysJob{}).Error -} +//func (e *SysJob) BatchDelete(id []int) error { +// return orm.Eloquent.Table(e.TableName()).Where(id).Delete(&SysJob{}).Error +//} diff --git a/app/admin/models/system.go b/app/admin/models/system.go index 77525c9..05dd1e7 100644 --- a/app/admin/models/system.go +++ b/app/admin/models/system.go @@ -1,7 +1,6 @@ package models import ( - orm "go-admin/common/global" "go-admin/common/models" ) @@ -21,22 +20,22 @@ func (s *SysSetting) GetId() interface{} { } //查询 -func (s *SysSetting) Get() (create SysSetting, err error) { - result := orm.Eloquent.Table("sys_setting").First(&create) - if result.Error != nil { - err = result.Error - return - } - return create, nil -} +//func (s *SysSetting) Get() (create SysSetting, err error) { +// result := orm.Eloquent.Table("sys_setting").First(&create) +// if result.Error != nil { +// err = result.Error +// return +// } +// return create, nil +//} //修改 -func (s *SysSetting) Update() (update SysSetting, err error) { - if err = orm.Eloquent.Table("sys_setting").Model(&update).Where("settings_id = ?", s.SettingsId).Updates(&s).Error; err != nil { - return - } - return -} +//func (s *SysSetting) Update() (update SysSetting, err error) { +// if err = orm.Eloquent.Table("sys_setting").Model(&update).Where("settings_id = ?", s.SettingsId).Updates(&s).Error; err != nil { +// return +// } +// return +//} type ResponseSystemConfig struct { Name string `json:"name" binding:"required"` // 名称 diff --git a/app/admin/models/casbinrule.go b/app/admin/models/system/casbinrule.go similarity index 96% rename from app/admin/models/casbinrule.go rename to app/admin/models/system/casbinrule.go index 014e2fd..7563420 100644 --- a/app/admin/models/casbinrule.go +++ b/app/admin/models/system/casbinrule.go @@ -1,4 +1,4 @@ -package models +package system //sys_casbin_rule type CasbinRule struct { diff --git a/app/admin/models/datascope.go b/app/admin/models/system/datascope.go similarity index 59% rename from app/admin/models/datascope.go rename to app/admin/models/system/datascope.go index 6e9ad60..68dc945 100644 --- a/app/admin/models/datascope.go +++ b/app/admin/models/system/datascope.go @@ -1,10 +1,10 @@ -package models +package system import ( "errors" "gorm.io/gorm" - "go-admin/common/log" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/tools" "go-admin/tools/config" ) @@ -16,53 +16,50 @@ type DataPermission struct { RoleId int } -func (e *DataPermission) GetDataScope(tbname string, table *gorm.DB) (*gorm.DB, error) { +func (e *DataPermission) GetDataScope(tableName string, db *gorm.DB) (*gorm.DB, error) { if !config.ApplicationConfig.EnableDP { usageStr := `数据权限已经为您` + tools.Green(`关闭`) + `,如需开启请参考配置文件字段说明` log.Debug("%s\n", usageStr) - return table, nil + return db, nil } - SysUser := new(SysUser) - SysRole := new(SysRole) - SysUser.UserId = e.UserId - user, err := SysUser.Get() + user := new(SysUser) + role := new(SysRole) + err := db.Find(user, e.UserId).Error if err != nil { return nil, errors.New("获取用户数据出错 msg:" + err.Error()) } - SysRole.RoleId = user.RoleId - role, err := SysRole.Get() + err = db.Find(role, user.RoleId).Error 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) + db = db.Where(tableName+".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) } if role.DataScope == "3" { - table = table.Where(tbname+".create_by in (SELECT user_id from sys_user where dept_id = ? )", user.DeptId) + db = db.Where(tableName+".create_by in (SELECT user_id from sys_user where dept_id = ? )", user.DeptId) } if role.DataScope == "4" { - table = table.Where(tbname+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+tools.IntToString(user.DeptId)+"%") + db = db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+tools.IntToString(user.DeptId)+"%") } if role.DataScope == "5" || role.DataScope == "" { - table = table.Where(tbname+".create_by = ?", e.UserId) + db = db.Where(tableName+".create_by = ?", e.UserId) } - return table, nil + return db, nil } -func DataScopes(tableName string, userid int) func(db *gorm.DB) *gorm.DB { +func DataScopes(tableName string, userId int) func(db *gorm.DB) *gorm.DB { return func(db *gorm.DB) *gorm.DB { - SysUser := new(SysUser) - SysRole := new(SysRole) - SysUser.UserId = userid - user, err := SysUser.Get() + user := new(SysUser) + role := new(SysRole) + user.UserId = userId + err := db.Find(user, userId).Error if err != nil { db.Error = errors.New("获取用户数据出错 msg:" + err.Error()) return db } - SysRole.RoleId = user.RoleId - role, err := SysRole.Get() + err = db.Find(role, user.RoleId).Error if err != nil { db.Error = errors.New("获取用户数据出错 msg:" + err.Error()) return db @@ -77,7 +74,7 @@ func DataScopes(tableName string, userid int) func(db *gorm.DB) *gorm.DB { return db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+tools.IntToString(user.DeptId)+"%") } if role.DataScope == "5" || role.DataScope == "" { - return db.Where(tableName+".create_by = ?", userid) + return db.Where(tableName+".create_by = ?", userId) } return db } diff --git a/app/admin/models/system/login.go b/app/admin/models/system/login.go new file mode 100644 index 0000000..7238b5f --- /dev/null +++ b/app/admin/models/system/login.go @@ -0,0 +1,35 @@ +package system + +import ( + "fmt" + log "github.com/go-admin-team/go-admin-core/logger" + "go-admin/tools" + "gorm.io/gorm" +) + +type Login struct { + Username string `form:"UserName" json:"username" binding:"required"` + Password string `form:"Password" json:"password" binding:"required"` + Code string `form:"Code" json:"code" binding:"required"` + UUID string `form:"UUID" json:"uuid" binding:"required"` +} + +func (u *Login) GetUser(tx *gorm.DB) (user SysUser, role SysRole, err error) { + err = tx.Table("sys_user").Where("username = ? and status = 2", u.Username).First(&user).Error + if err != nil { + log.Errorf("get user error, %s", err.Error()) + return + } + fmt.Println(user.Password, u.Password) + _, err = tools.CompareHashAndPassword(user.Password, u.Password) + if err != nil { + log.Errorf("user login error, %s", err.Error()) + return + } + err = tx.Table("sys_role").Where("role_id = ? ", user.RoleId).First(&role).Error + if err != nil { + log.Errorf("get role error, %s", err.Error()) + return + } + return +} diff --git a/app/admin/models/system/role_menu.go b/app/admin/models/system/role_menu.go index 6ba97d8..9ddb627 100644 --- a/app/admin/models/system/role_menu.go +++ b/app/admin/models/system/role_menu.go @@ -2,10 +2,10 @@ package system import ( "fmt" + "github.com/casbin/casbin/v2" "gorm.io/gorm" - "go-admin/app/admin/models" "go-admin/tools" ) @@ -39,7 +39,7 @@ func (rm *RoleMenu) Get(tx *gorm.DB) ([]RoleMenu, error) { } func (rm *RoleMenu) GetPermis(tx *gorm.DB) ([]string, error) { - var r []models.Menu + var r []SysMenu table := tx.Select("sys_menu.permission").Table("sys_menu").Joins("left join sys_role_menu on sys_menu.menu_id = sys_role_menu.menu_id") table = table.Where("role_id = ?", rm.RoleId) @@ -113,8 +113,8 @@ func (rm *RoleMenu) Insert(tx *gorm.DB, enforcer *casbin.SyncedEnforcer, roleId var err error var ( role SysRole - menu []models.Menu - casbinRules []models.CasbinRule // casbinRule 待插入队列 + menu []SysMenu + casbinRules []CasbinRule // casbinRule 待插入队列 ) // 在事务中做一些数据库操作(从这一点使用'tx',而不是'db') if err = tx.Table("sys_role").Where("role_id = ?", roleId).First(&role).Error; err != nil { @@ -137,7 +137,7 @@ func (rm *RoleMenu) Insert(tx *gorm.DB, enforcer *casbin.SyncedEnforcer, roleId if m.MenuType == "A" { // 加入队列 casbinRules = append(casbinRules, - models.CasbinRule{ + CasbinRule{ V0: role.RoleKey, V1: m.Path, V2: m.Action, diff --git a/app/admin/models/sys_dept.go b/app/admin/models/system/sys_dept.go similarity index 88% rename from app/admin/models/sys_dept.go rename to app/admin/models/system/sys_dept.go index 530e9b4..d076031 100644 --- a/app/admin/models/sys_dept.go +++ b/app/admin/models/system/sys_dept.go @@ -1,17 +1,17 @@ -package models +package system import "go-admin/common/models" type SysDept struct { DeptId int `json:"deptId" gorm:"primaryKey;autoIncrement;"` //部门编码 - ParentId int `json:"parentId" gorm:""` //上级部门 - DeptPath string `json:"deptPath" gorm:"size:255;"` // - DeptName string `json:"deptName" gorm:"size:128;"` //部门名称 - Sort int `json:"sort" gorm:""` //排序 - Leader string `json:"leader" gorm:"size:128;"` //负责人 - Phone string `json:"phone" gorm:"size:11;"` //手机 - Email string `json:"email" gorm:"size:64;"` //邮箱 - Status string `json:"status" gorm:"size:4;"` //状态 + ParentId int `json:"parentId" gorm:""` //上级部门 + DeptPath string `json:"deptPath" gorm:"size:255;"` // + DeptName string `json:"deptName" gorm:"size:128;"` //部门名称 + Sort int `json:"sort" gorm:""` //排序 + Leader string `json:"leader" gorm:"size:128;"` //负责人 + Phone string `json:"phone" gorm:"size:11;"` //手机 + Email string `json:"email" gorm:"size:64;"` //邮箱 + Status string `json:"status" gorm:"size:4;"` //状态 models.ControlBy models.ModelTime DataScope string `json:"dataScope" gorm:"-"` diff --git a/app/admin/models/sys_menu.go b/app/admin/models/system/sys_menu.go similarity index 99% rename from app/admin/models/sys_menu.go rename to app/admin/models/system/sys_menu.go index 9e2f240..dbcf803 100644 --- a/app/admin/models/sys_menu.go +++ b/app/admin/models/system/sys_menu.go @@ -1,4 +1,4 @@ -package models +package system import "go-admin/common/models" diff --git a/app/admin/models/system/sys_user.go b/app/admin/models/system/sys_user.go new file mode 100644 index 0000000..57291c1 --- /dev/null +++ b/app/admin/models/system/sys_user.go @@ -0,0 +1,77 @@ +package system + +import ( + "go-admin/common/models" + "golang.org/x/crypto/bcrypt" + "gorm.io/gorm" +) + +type SysUser struct { + models.ControlBy + models.ModelTime + UserId int `gorm:"primaryKey;autoIncrement;comment:编码" json:"userId"` + Username string `json:"username" gorm:"type:varchar(64);comment:用户名"` + Password string `json:"password" gorm:"type:varchar(128);comment:密码"` + NickName string `json:"nickName" gorm:"type:varchar(128);comment:昵称"` + Phone string `json:"phone" gorm:"type:varchar(11);comment:手机号"` + RoleId int `json:"roleId" gorm:"type:bigint(20);comment:角色ID"` + Salt string `json:"salt" gorm:"type:varchar(255);comment:加盐"` + Avatar string `json:"avatar" gorm:"type:varchar(255);comment:头像"` + Sex string `json:"sex" gorm:"type:varchar(255);comment:性别"` + Email string `json:"email" gorm:"type:varchar(128);comment:邮箱"` + DeptId int `json:"deptId" gorm:"type:bigint(20);comment:部门"` + PostId int `json:"postId" gorm:"type:bigint(20);comment:岗位"` + Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` + Status string `json:"status" gorm:"type:varchar(4);comment:状态"` + DeptIds []int `json:"deptIds" gorm:"-"` + PostIds []int `json:"postIds" gorm:"-"` + RoleIds []int `json:"roleIds" gorm:"-"` + Dept *SysDept `json:"dept"` +} + +func (SysUser) TableName() string { + return "sys_user" +} + +func (e *SysUser) Generate() models.ActiveRecord { + o := *e + return &o +} + +func (e *SysUser) GetId() interface{} { + return e.UserId +} + +//加密 +func (e *SysUser) Encrypt() (err error) { + if e.Password == "" { + return + } + + var hash []byte + if hash, err = bcrypt.GenerateFromPassword([]byte(e.Password), bcrypt.DefaultCost); err != nil { + return + } else { + e.Password = string(hash) + return + } +} + +func (e *SysUser) BeforeCreate(_ *gorm.DB) error { + return e.Encrypt() +} + +func (e *SysUser) BeforeUpdate(_ *gorm.DB) error { + var err error + if e.Password != "" { + err = e.Encrypt() + } + return err +} + +func (e *SysUser) AfterFind(_ *gorm.DB) error { + e.DeptIds = []int{e.DeptId} + e.PostIds = []int{e.PostId} + e.RoleIds = []int{e.RoleId} + return nil +} diff --git a/app/admin/models/sysuser.go b/app/admin/models/sysuser.go deleted file mode 100644 index c273365..0000000 --- a/app/admin/models/sysuser.go +++ /dev/null @@ -1,322 +0,0 @@ -package models - -import ( - "errors" - "gorm.io/gorm" - "log" - "strings" - - "golang.org/x/crypto/bcrypt" - - orm "go-admin/common/global" - "go-admin/tools" -) - -// User -type User struct { - // key - IdentityKey string - // 用户名 - UserName string - FirstName string - LastName string - // 角色 - Role string -} - -type UserName struct { - Username string `gorm:"size:64" json:"username"` -} - -type PassWord struct { - // 密码 - Password string `gorm:"size:128" json:"password"` -} - -type LoginM struct { - UserName - PassWord -} - -type SysUserId struct { - UserId int `gorm:"primaryKey;autoIncrement" json:"userId"` // 编码 -} - -type SysUserB struct { - NickName string `gorm:"size:128" json:"nickName"` // 昵称 - Phone string `gorm:"size:11" json:"phone"` // 手机号 - RoleId int `gorm:"" json:"roleId"` // 角色编码 - Salt string `gorm:"size:255" json:"salt"` //盐 - Avatar string `gorm:"size:255" json:"avatar"` //头像 - Sex string `gorm:"size:255" json:"sex"` //性别 - Email string `gorm:"size:128" json:"email"` //邮箱 - DeptId int `gorm:"" json:"deptId"` //部门编码 - PostId int `gorm:"" json:"postId"` //职位编码 - CreateBy string `gorm:"size:128" json:"createBy"` // - UpdateBy string `gorm:"size:128" json:"updateBy"` // - Remark string `gorm:"size:255" json:"remark"` //备注 - Status string `gorm:"size:4;" json:"status"` - BaseModel - - DataScope string `gorm:"-" json:"dataScope"` - Params string `gorm:"-" json:"params"` -} - -type SysUser struct { - SysUserId - LoginM - SysUserB -} - -func (SysUser) TableName() string { - return "sys_user" -} - -type SysUserPwd struct { - OldPassword string `json:"oldPassword"` - NewPassword string `json:"newPassword"` -} - -type SysUserPage struct { - SysUserId - SysUserB - LoginM - DeptName string `gorm:"-" json:"deptName"` -} - -type SysUserView struct { - SysUserId - SysUserB - LoginM - RoleName string `gorm:"column:role_name" json:"role_name"` -} - -// 获取用户数据 -func (e *SysUser) Get() (SysUserView SysUserView, err error) { - - table := orm.Eloquent.Table(e.TableName()).Select([]string{"sys_user.*", "sys_role.role_name"}) - table = table.Joins("left join sys_role on sys_user.role_id=sys_role.role_id") - if e.UserId != 0 { - table = table.Where("user_id = ?", e.UserId) - } - - if e.Username != "" { - table = table.Where("username = ?", e.Username) - } - - if e.Password != "" { - table = table.Where("password = ?", e.Password) - } - - if e.RoleId != 0 { - table = table.Where("role_id = ?", e.RoleId) - } - - if e.DeptId != 0 { - table = table.Where("dept_id = ?", e.DeptId) - } - - if e.PostId != 0 { - table = table.Where("post_id = ?", e.PostId) - } - - if err = table.First(&SysUserView).Error; err != nil { - return - } - - SysUserView.Password = "" - return -} - -func (e *SysUser) GetUserInfo() (SysUserView SysUserView, err error) { - - table := orm.Eloquent.Table(e.TableName()).Select([]string{"sys_user.*", "sys_role.role_name"}) - table = table.Joins("left join sys_role on sys_user.role_id=sys_role.role_id") - if e.UserId != 0 { - table = table.Where("user_id = ?", e.UserId) - } - - if e.Username != "" { - table = table.Where("username = ?", e.Username) - } - - if e.Password != "" { - table = table.Where("password = ?", e.Password) - } - - if e.RoleId != 0 { - table = table.Where("role_id = ?", e.RoleId) - } - - if e.DeptId != 0 { - table = table.Where("dept_id = ?", e.DeptId) - } - - if e.PostId != 0 { - table = table.Where("post_id = ?", e.PostId) - } - - if err = table.First(&SysUserView).Error; err != nil { - return - } - return -} - -func (e *SysUser) GetList() (SysUserView []SysUserView, err error) { - - table := orm.Eloquent.Table(e.TableName()).Select([]string{"sys_user.*", "sys_role.role_name"}) - table = table.Joins("left join sys_role on sys_user.role_id=sys_role.role_id") - if e.UserId != 0 { - table = table.Where("user_id = ?", e.UserId) - } - - if e.Username != "" { - table = table.Where("username = ?", e.Username) - } - - if e.Password != "" { - table = table.Where("password = ?", e.Password) - } - - if e.RoleId != 0 { - table = table.Where("role_id = ?", e.RoleId) - } - - if e.DeptId != 0 { - table = table.Where("dept_id = ?", e.DeptId) - } - - if e.PostId != 0 { - table = table.Where("post_id = ?", e.PostId) - } - - if err = table.Find(&SysUserView).Error; err != nil { - return - } - return -} - -func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, error) { - var doc []SysUserPage - table := orm.Eloquent.Select("sys_user.*,sys_dept.dept_name").Table(e.TableName()) - table = table.Joins("left join sys_dept on sys_dept.dept_id = sys_user.dept_id") - - if e.Username != "" { - table = table.Where("username = ?", e.Username) - } - if e.Status != "" { - table = table.Where("sys_user.status = ?", e.Status) - } - - if e.Phone != "" { - table = table.Where("sys_user.phone = ?", e.Phone) - } - - if e.DeptId != 0 { - table = table.Where("sys_user.dept_id in (select dept_id from sys_dept where dept_path like ? )", "%"+tools.IntToString(e.DeptId)+"%") - } - - // 数据权限控制(如果不需要数据权限请将此处去掉) - dataPermission := new(DataPermission) - dataPermission.UserId, _ = tools.StringToInt(e.DataScope) - table, err := dataPermission.GetDataScope(e.TableName(), table) - if err != nil { - return nil, 0, err - } - var count int64 - - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { - return nil, 0, err - } - return doc, int(count), nil -} - -//加密 -func (e *SysUser) Encrypt() (err error) { - if e.Password == "" { - return - } - - var hash []byte - if hash, err = bcrypt.GenerateFromPassword([]byte(e.Password), bcrypt.DefaultCost); err != nil { - return - } else { - e.Password = string(hash) - return - } -} - -//添加 -func (e SysUser) Insert() (id int, err error) { - if err = e.Encrypt(); err != nil { - return - } - - // check 用户名 - var count int64 - orm.Eloquent.Table(e.TableName()).Where("username = ?", e.Username).Count(&count) - if count > 0 { - err = errors.New("账户已存在!") - return - } - - //添加数据 - if err = orm.Eloquent.Table(e.TableName()).Create(&e).Error; err != nil { - return - } - id = e.UserId - return -} - -//修改 -func (e *SysUser) Update(id int) (update SysUser, err error) { - if e.Password != "" { - if err = e.Encrypt(); err != nil { - return - } - } - if err = orm.Eloquent.Table(e.TableName()).First(&update, id).Error; err != nil { - return - } - if e.RoleId == 0 { - e.RoleId = update.RoleId - } - - //参数1:是要修改的数据 - //参数2:是修改的数据 - if err = orm.Eloquent.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { - return - } - return -} - -func (e *SysUser) BatchDelete(id []int) (Result bool, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("user_id in (?)", id).Delete(&SysUser{}).Error; err != nil { - return - } - Result = true - return -} - -func (e *SysUser) SetPwd(pwd SysUserPwd) (Result bool, err error) { - user, err := e.GetUserInfo() - 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") { - tools.HasError(err, "密码错误(代码202)", 500) - } - log.Print(err) - return - } - e.Password = pwd.NewPassword - _, err = e.Update(e.UserId) - tools.HasError(err, "更新密码失败(代码202)", 500) - return -} - -func (e *SysUser) GetByUserId(tx *gorm.DB, id interface{}) error { - return tx.First(e, id).Error -} diff --git a/app/admin/models/tools/dbcolumns.go b/app/admin/models/tools/dbcolumns.go index 5a01d4b..8f33076 100644 --- a/app/admin/models/tools/dbcolumns.go +++ b/app/admin/models/tools/dbcolumns.go @@ -5,9 +5,8 @@ import ( "gorm.io/gorm" - orm "go-admin/common/global" "go-admin/tools" - config2 "go-admin/tools/config" + "go-admin/tools/config" ) type DBColumns struct { @@ -25,14 +24,14 @@ type DBColumns struct { ColumnComment string `gorm:"column:COLUMN_COMMENT" json:"columnComment"` } -func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int, error) { +func (e *DBColumns) GetPage(tx *gorm.DB, pageSize int, pageIndex int) ([]DBColumns, int, error) { var doc []DBColumns var count int64 table := new(gorm.DB) - if config2.DatabaseConfig.Driver == "mysql" { - table = orm.Eloquent.Table("information_schema.`COLUMNS`") - table = table.Where("table_schema= ? ", config2.GenConfig.DBName) + if config.DatabaseConfig.Driver == "mysql" { + table = tx.Table("information_schema.`COLUMNS`") + table = table.Where("table_schema= ? ", config.GenConfig.DBName) if e.TableName != "" { return nil, 0, errors.New("table name cannot be empty!") @@ -49,7 +48,7 @@ func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int, erro } -func (e *DBColumns) GetList() ([]DBColumns, error) { +func (e *DBColumns) GetList(tx *gorm.DB) ([]DBColumns, error) { var doc []DBColumns table := new(gorm.DB) @@ -57,9 +56,9 @@ func (e *DBColumns) GetList() ([]DBColumns, error) { return nil, errors.New("table name cannot be empty!") } - if config2.DatabaseConfig.Driver == "mysql" { - table = orm.Eloquent.Table("information_schema.columns") - table = table.Where("table_schema= ? ", config2.GenConfig.DBName) + if config.DatabaseConfig.Driver == "mysql" { + table = tx.Table("information_schema.columns") + table = table.Where("table_schema= ? ", config.GenConfig.DBName) table = table.Where("TABLE_NAME = ?", e.TableName).Order("ORDINAL_POSITION asc") } else { diff --git a/app/admin/models/tools/dbtables.go b/app/admin/models/tools/dbtables.go index e57400d..728354c 100644 --- a/app/admin/models/tools/dbtables.go +++ b/app/admin/models/tools/dbtables.go @@ -5,7 +5,6 @@ import ( "gorm.io/gorm" - orm "go-admin/common/global" "go-admin/tools" config2 "go-admin/tools/config" ) @@ -20,13 +19,13 @@ type DBTables struct { TableComment string `gorm:"column:TABLE_COMMENT" json:"tableComment"` } -func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error) { +func (e *DBTables) GetPage(tx *gorm.DB, pageSize int, pageIndex int) ([]DBTables, int, error) { var doc []DBTables table := new(gorm.DB) var count int64 if config2.DatabaseConfig.Driver == "mysql" { - table = orm.Eloquent.Table("information_schema.tables") + table = tx.Table("information_schema.tables") table = table.Where("TABLE_NAME not in (select table_name from `" + config2.GenConfig.DBName + "`.sys_tables) ") table = table.Where("table_schema= ? ", config2.GenConfig.DBName) @@ -44,21 +43,20 @@ func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error) return doc, int(count), nil } -func (e *DBTables) Get() (DBTables, error) { +func (e *DBTables) Get(tx *gorm.DB) (DBTables, error) { var doc DBTables - table := new(gorm.DB) if config2.DatabaseConfig.Driver == "mysql" { - table = orm.Eloquent.Table("information_schema.tables") + table := tx.Table("information_schema.tables") table = table.Where("table_schema= ? ", config2.GenConfig.DBName) if e.TableName == "" { return doc, errors.New("table name cannot be empty!") } table = table.Where("TABLE_NAME = ?", e.TableName) + if err := table.First(&doc).Error; err != nil { + return doc, err + } } else { tools.Assert(true, "目前只支持mysql数据库", 500) } - if err := table.First(&doc).Error; err != nil { - return doc, err - } return doc, nil } diff --git a/app/admin/models/tools/syscolumns.go b/app/admin/models/tools/syscolumns.go index 830db6d..4f678cf 100644 --- a/app/admin/models/tools/syscolumns.go +++ b/app/admin/models/tools/syscolumns.go @@ -2,7 +2,7 @@ package tools import ( "go-admin/app/admin/models" - orm "go-admin/common/global" + "gorm.io/gorm" ) type SysColumns struct { @@ -51,10 +51,10 @@ func (SysColumns) TableName() string { return "sys_columns" } -func (e *SysColumns) GetList() ([]SysColumns, error) { +func (e *SysColumns) GetList(tx *gorm.DB) ([]SysColumns, error) { var doc []SysColumns - table := orm.Eloquent.Table("sys_columns") + table := tx.Table("sys_columns") table = table.Where("table_id = ?", e.TableId) @@ -64,9 +64,9 @@ func (e *SysColumns) GetList() ([]SysColumns, error) { return doc, nil } -func (e *SysColumns) Create() (SysColumns, error) { +func (e *SysColumns) Create(tx *gorm.DB) (SysColumns, error) { var doc SysColumns - result := orm.Eloquent.Table("sys_columns").Create(&e) + result := tx.Table("sys_columns").Create(&e) if result.Error != nil { err := result.Error return doc, err @@ -75,14 +75,14 @@ func (e *SysColumns) Create() (SysColumns, error) { return doc, nil } -func (e *SysColumns) Update() (update SysColumns, err error) { - if err = orm.Eloquent.Table("sys_columns").First(&update, e.ColumnId).Error; err != nil { +func (e *SysColumns) Update(tx *gorm.DB) (update SysColumns, err error) { + if err = tx.Table("sys_columns").First(&update, e.ColumnId).Error; err != nil { return } //参数1:是要修改的数据 //参数2:是修改的数据 - if err = orm.Eloquent.Table("sys_columns").Model(&update).Updates(&e).Error; err != nil { + if err = tx.Table("sys_columns").Model(&update).Updates(&e).Error; err != nil { return } diff --git a/app/admin/models/tools/systables.go b/app/admin/models/tools/systables.go index d0c6746..6151dd7 100644 --- a/app/admin/models/tools/systables.go +++ b/app/admin/models/tools/systables.go @@ -1,14 +1,14 @@ package tools import ( + "gorm.io/gorm" "strings" "go-admin/app/admin/models" - orm "go-admin/common/global" ) type SysTables struct { - TableId int `gorm:"primaryKey;autoIncrement" json:"tableId"` //表编码 + TableId int `gorm:"primaryKey;autoIncrement" json:"tableId"` //表编码 TBName string `gorm:"column:table_name;size:255;" json:"tableName"` //表名称 TableComment string `gorm:"size:255;" json:"tableComment"` //表备注 ClassName string `gorm:"size:255;" json:"className"` //类名 @@ -53,10 +53,10 @@ type Params struct { TreeName string `gorm:"-" json:"treeName"` } -func (e *SysTables) GetPage(pageSize int, pageIndex int) ([]SysTables, int, error) { +func (e *SysTables) GetPage(tx *gorm.DB, pageSize int, pageIndex int) ([]SysTables, int, error) { var doc []SysTables - table := orm.Eloquent.Table("sys_tables") + table := tx.Table("sys_tables") if e.TBName != "" { table = table.Where("table_name = ?", e.TBName) @@ -74,10 +74,10 @@ func (e *SysTables) GetPage(pageSize int, pageIndex int) ([]SysTables, int, erro return doc, int(count), nil } -func (e *SysTables) Get() (SysTables, error) { +func (e *SysTables) Get(tx *gorm.DB) (SysTables, error) { var doc SysTables var err error - table := orm.Eloquent.Table("sys_tables") + table := tx.Table("sys_tables") if e.TBName != "" { table = table.Where("table_name = ?", e.TBName) @@ -94,17 +94,17 @@ func (e *SysTables) Get() (SysTables, error) { } var col SysColumns col.TableId = doc.TableId - if doc.Columns, err = col.GetList(); err != nil { + if doc.Columns, err = col.GetList(tx); err != nil { return doc, err } return doc, nil } -func (e *SysTables) GetTree() ([]SysTables, error) { +func (e *SysTables) GetTree(tx *gorm.DB) ([]SysTables, error) { var doc []SysTables var err error - table := orm.Eloquent.Table("sys_tables") + table := tx.Table("sys_tables") if e.TBName != "" { table = table.Where("table_name = ?", e.TBName) @@ -123,7 +123,7 @@ func (e *SysTables) GetTree() ([]SysTables, error) { var col SysColumns //col.FkCol = append(col.FkCol, SysColumns{ColumnId: 0, ColumnName: "请选择"}) col.TableId = doc[i].TableId - if doc[i].Columns, err = col.GetList(); err != nil { + if doc[i].Columns, err = col.GetList(tx); err != nil { return doc, err } @@ -132,9 +132,9 @@ func (e *SysTables) GetTree() ([]SysTables, error) { return doc, nil } -func (e *SysTables) Create() (SysTables, error) { +func (e *SysTables) Create(tx *gorm.DB) (SysTables, error) { var doc SysTables - result := orm.Eloquent.Table("sys_tables").Create(&e) + result := tx.Table("sys_tables").Create(&e) if result.Error != nil { err := result.Error return doc, err @@ -143,20 +143,20 @@ func (e *SysTables) Create() (SysTables, error) { for i := 0; i < len(e.Columns); i++ { e.Columns[i].TableId = doc.TableId - e.Columns[i].Create() + _, _ = e.Columns[i].Create(tx) } return doc, nil } -func (e *SysTables) Update() (update SysTables, err error) { +func (e *SysTables) Update(tx *gorm.DB) (update SysTables, err error) { //if err = orm.Eloquent.Table("sys_tables").First(&update, e.TableId).Error; err != nil { // return //} //参数1:是要修改的数据 //参数2:是修改的数据 - if err = orm.Eloquent.Table("sys_tables").Where("table_id = ?", e.TableId).Updates(&e).Error; err != nil { + if err = tx.Table("sys_tables").Where("table_id = ?", e.TableId).Updates(&e).Error; err != nil { return } @@ -170,7 +170,7 @@ func (e *SysTables) Update() (update SysTables, err error) { tables := make([]SysTables, 0) tableMap := make(map[string]*SysTables) if len(tableNames) > 0 { - if err = orm.Eloquent.Table("sys_tables").Where("table_name in (?)", tableNames).Find(&tables).Error; err != nil { + if err = tx.Table("sys_tables").Where("table_name in (?)", tableNames).Find(&tables).Error; err != nil { return } for i := range tables { @@ -196,13 +196,13 @@ func (e *SysTables) Update() (update SysTables, err error) { } } } - _, _ = e.Columns[i].Update() + _, _ = e.Columns[i].Update(tx) } return } -func (e *SysTables) Delete() (success bool, err error) { - tx := orm.Eloquent.Begin() +func (e *SysTables) Delete(db *gorm.DB) (success bool, err error) { + tx := db.Begin() defer func() { if err != nil { tx.Rollback() @@ -222,8 +222,8 @@ func (e *SysTables) Delete() (success bool, err error) { return } -func (e *SysTables) BatchDelete(id []int) (Result bool, err error) { - if err = orm.Eloquent.Unscoped().Table(e.TableName()).Where(" table_id in (?)", id).Delete(&SysColumns{}).Error; err != nil { +func (e *SysTables) BatchDelete(tx *gorm.DB, id []int) (Result bool, err error) { + if err = tx.Unscoped().Table(e.TableName()).Where(" table_id in (?)", id).Delete(&SysColumns{}).Error; err != nil { return } Result = true diff --git a/app/admin/router/init_router.go b/app/admin/router/init_router.go index c3b6245..80924d0 100644 --- a/app/admin/router/init_router.go +++ b/app/admin/router/init_router.go @@ -3,18 +3,19 @@ package router import ( "os" + "github.com/gin-gonic/gin" + log "github.com/go-admin-team/go-admin-core/logger" + "go-admin/app/admin/middleware" "go-admin/app/admin/middleware/handler" "go-admin/common/global" - "go-admin/common/log" common "go-admin/common/middleware" - _ "go-admin/pkg/jwtauth" + //_ "go-admin/pkg/jwtauth" "go-admin/tools" "go-admin/tools/config" - - "github.com/gin-gonic/gin" ) +// InitRouter 路由初始化,不要怀疑,这里用到了 func InitRouter() { var r *gin.Engine h := global.Cfg.GetEngine() @@ -33,12 +34,14 @@ func InitRouter() { r.Use(handler.TlsHandler()) } - r.Use(common.Sentinel()) + r.Use(common.Sentinel()). + Use(common.RequestIdLogger(tools.TrafficKey, tools.LoggerKey)) middleware.InitMiddleware(r) // the jwt middleware - var err error authMiddleware, err := middleware.AuthInit() - tools.HasError(err, "JWT Init Error", 500) + if err != nil { + log.Fatalf("JWT Init Error, %s", err.Error()) + } // 注册系统路由 InitSysRouter(r, authMiddleware) @@ -46,6 +49,4 @@ func InitRouter() { // 注册业务路由 // TODO: 这里可存放业务路由,里边并无实际路由只有演示代码 InitExamplesRouter(r, authMiddleware) - - //return r } diff --git a/app/admin/router/monitor.go b/app/admin/router/monitor.go index 467cd20..01b66b7 100644 --- a/app/admin/router/monitor.go +++ b/app/admin/router/monitor.go @@ -3,8 +3,8 @@ package router import ( "net/http" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/common/global" - "go-admin/common/log" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/tools/transfer" diff --git a/app/admin/router/sys_content.go b/app/admin/router/sys_content.go index 39131d3..6c138a0 100644 --- a/app/admin/router/sys_content.go +++ b/app/admin/router/sys_content.go @@ -2,13 +2,14 @@ package router import ( "github.com/gin-gonic/gin" - "go-admin/app/admin/apis/sys_content" "go-admin/app/admin/middleware" + "go-admin/app/admin/models" + "go-admin/app/admin/service/dto" + "go-admin/common/actions" jwt "go-admin/pkg/jwtauth" ) - -func init() { +func init() { routerCheckRole = append(routerCheckRole, registerSysContentRouter) } @@ -17,10 +18,20 @@ func registerSysContentRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMid r := v1.Group("/syscontent").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - r.GET("", sys_content.GetSysContentList) - r.GET("/:id", sys_content.GetSysContent) - r.POST("", sys_content.InsertSysContent) - r.PUT("", sys_content.UpdateSysContent) - r.DELETE("/:id", sys_content.DeleteSysContent) + //r.GET("", sys_content.GetSysContentList) + //r.GET("/:id", sys_content.GetSysContent) + //r.POST("", sys_content.InsertSysContent) + //r.PUT("", sys_content.UpdateSysContent) + //r.DELETE("/:id", sys_content.DeleteSysContent) + + model := &models.SysContent{} + r.GET("", actions.PermissionAction(), actions.IndexAction(model, new(dto.SysContentSearch), func() interface{} { + list := make([]models.SysContent, 0) + return &list + })) + r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto.SysContentById), nil)) + r.POST("", actions.CreateAction(new(dto.SysContentControl))) + r.PUT("/:id", actions.PermissionAction(), actions.UpdateAction(new(dto.SysContentControl))) + r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysContentById))) } } diff --git a/app/admin/router/sys_dept.go b/app/admin/router/sys_dept.go index 432d0d7..e22e9ec 100644 --- a/app/admin/router/sys_dept.go +++ b/app/admin/router/sys_dept.go @@ -28,5 +28,4 @@ func registerSysDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle r1.GET("/deptTree", api.GetDeptTree) } - } diff --git a/app/admin/router/sys_menu.go b/app/admin/router/sys_menu.go index 1b34dfa..4bedad2 100644 --- a/app/admin/router/sys_menu.go +++ b/app/admin/router/sys_menu.go @@ -33,7 +33,7 @@ func registerSysMenuRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { r1.GET("/menurole", api.GetMenuRole) + r1.GET("/menuids", api.GetMenuIDS) } - } diff --git a/app/admin/router/sys_router.go b/app/admin/router/sys_router.go index ba202a1..dd1cf77 100644 --- a/app/admin/router/sys_router.go +++ b/app/admin/router/sys_router.go @@ -1,6 +1,7 @@ package router import ( + "go-admin/app/admin/apis/system/sys_menu" "mime" "go-admin/app/admin/apis/monitor" @@ -62,7 +63,6 @@ func sysNoCheckRoleRouter(r *gin.RouterGroup) { v1.GET("/gen/toproject/:tableId", GenCodeV3) v1.GET("/gen/todb/:tableId", GenMenuAndApi) v1.GET("/gen/tabletree", GetSysTablesTree) - v1.GET("/menuTreeselect", system.GetMenuTreeelect) registerDBRouter(v1) registerSysTableRouter(v1) @@ -101,60 +101,61 @@ func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle r.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/wslogout/:id/:channel", ws.WebsocketManager.UnWsClient) v1 := r.Group("/api/v1") - registerPageRouter(v1, authMiddleware) + //registerPageRouter(v1, authMiddleware) registerBaseRouter(v1, authMiddleware) registerDictRouter(v1, authMiddleware) - registerSysUserRouter(v1, authMiddleware) - registerUserCenterRouter(v1, authMiddleware) + //registerSysUserRouter(v1, authMiddleware) + //registerUserCenterRouter(v1, authMiddleware) } func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { + api := sys_menu.SysMenu{} v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - v1auth.GET("/getinfo", system.GetInfo) - v1auth.GET("/roleMenuTreeselect/:roleId", system.GetMenuTreeRoleselect) - v1auth.GET("/roleDeptTreeselect/:roleId", system.GetDeptTreeRoleselect) + //v1auth.GET("/getinfo", system.GetInfo) + v1auth.GET("/roleMenuTreeselect/:roleId", api.GetMenuTreeSelect) + v1.GET("/menuTreeselect", api.GetMenuTreeSelect) + //v1auth.GET("/roleDeptTreeselect/:roleId", system.GetDeptTreeRoleselect) v1auth.POST("/logout", handler.LogOut) - v1auth.GET("/menuids", system.GetMenuIDS) } } -func registerPageRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) - { - v1auth.GET("/sysUserList", system.GetSysUserList) - } -} +//func registerPageRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { +// v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) +// { +// v1auth.GET("/sysUserList", system.GetSysUserList) +// } +//} -func registerUserCenterRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) - { - user.GET("/profile", system.GetSysUserProfile) - user.POST("/avatar", system.InsetSysUserAvatar) - user.PUT("/pwd", system.SysUserUpdatePwd) - } -} +//func registerUserCenterRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { +// user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) +// { +// user.GET("/profile", system.GetSysUserProfile) +// user.POST("/avatar", system.InsetSysUserAvatar) +// user.PUT("/pwd", system.SysUserUpdatePwd) +// } +//} -func registerPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - post := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) - { - post.GET("/:postId", system.GetPost) - post.POST("", system.InsertPost) - post.PUT("", system.UpdatePost) - post.DELETE("/:postId", system.DeletePost) - } -} +//func registerPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { +// post := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) +// { +// post.GET("/:postId", system.GetPost) +// post.POST("", system.InsertPost) +// post.PUT("", system.UpdatePost) +// post.DELETE("/:postId", system.DeletePost) +// } +//} -func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - sysuser := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) - { - sysuser.GET("/:userId", system.GetSysUser) - sysuser.GET("/", system.GetSysUserInit) - sysuser.POST("", system.InsertSysUser) - sysuser.PUT("", system.UpdateSysUser) - sysuser.DELETE("/:userId", system.DeleteSysUser) - } -} +//func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { +// sysuser := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) +// { +// sysuser.GET("/:userId", system.GetSysUser) +// sysuser.GET("/", system.GetSysUserInit) +// sysuser.POST("", system.InsertSysUser) +// sysuser.PUT("", system.UpdateSysUser) +// sysuser.DELETE("/:userId", system.DeleteSysUser) +// } +//} func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { dictApi := &dict.SysDictType{} diff --git a/app/admin/router/sys_user.go b/app/admin/router/sys_user.go new file mode 100644 index 0000000..7fc300c --- /dev/null +++ b/app/admin/router/sys_user.go @@ -0,0 +1,37 @@ +package router + +import ( + "github.com/gin-gonic/gin" + "go-admin/app/admin/apis/sys_user" + "go-admin/app/admin/middleware" + "go-admin/common/actions" + jwt "go-admin/pkg/jwtauth" +) + +func init() { + routerCheckRole = append(routerCheckRole, registerSysUserRouter) +} + +// 需认证的路由代码 +func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { + api := &sys_user.SysUser{} + r := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()).Use(actions.PermissionAction()) + { + r.GET("", api.GetSysUserList) + r.GET("/:id", api.GetSysUser) + r.POST("", api.InsertSysUser) + r.PUT("", api.UpdateSysUser) + r.DELETE("", api.DeleteSysUser) + } + + user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()).Use(actions.PermissionAction()) + { + user.GET("/profile", api.GetSysUserProfile) + user.POST("/avatar", api.InsetSysUserAvatar) + user.PUT("/pwd", api.SysUserUpdatePwd) + } + v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) + { + v1auth.GET("/getinfo", api.GetInfo) + } +} diff --git a/app/admin/service/dto/sys_category.go b/app/admin/service/dto/sys_category.go index 398ddae..a580798 100644 --- a/app/admin/service/dto/sys_category.go +++ b/app/admin/service/dto/sys_category.go @@ -2,9 +2,9 @@ package dto import ( "github.com/gin-gonic/gin" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/app/admin/models" "go-admin/common/dto" - "go-admin/common/log" common "go-admin/common/models" "go-admin/tools" ) diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index bb791a5..3284a4a 100644 --- a/app/admin/service/dto/sys_config.go +++ b/app/admin/service/dto/sys_config.go @@ -4,9 +4,9 @@ import ( "encoding/json" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/app/admin/models/system" "go-admin/common/dto" - "go-admin/common/log" common "go-admin/common/models" "go-admin/tools" ) diff --git a/app/admin/service/dto/sys_content.go b/app/admin/service/dto/sys_content.go new file mode 100644 index 0000000..f416464 --- /dev/null +++ b/app/admin/service/dto/sys_content.go @@ -0,0 +1,92 @@ +package dto + +import ( + "github.com/gin-gonic/gin" + log "github.com/go-admin-team/go-admin-core/logger" + "go-admin/app/admin/models" + "go-admin/common/dto" + common "go-admin/common/models" + "go-admin/tools" +) + +type SysContentSearch struct { + dto.Pagination `search:"-"` +} + +func (m *SysContentSearch) GetNeedSearch() interface{} { + return *m +} + +func (m *SysContentSearch) Bind(ctx *gin.Context) error { + msgID := tools.GenerateMsgIDFromContext(ctx) + err := ctx.ShouldBind(m) + if err != nil { + log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error()) + } + return err +} + +func (m *SysContentSearch) Generate() dto.Index { + o := *m + return &o +} + +type SysContentControl struct { + ID int `uri:"ID" comment:""` // + CateId string `json:"cateId" comment:""` + Name string `json:"name" comment:""` + Status string `json:"status" comment:""` + Img string `json:"img" comment:""` + Content string `json:"content" comment:""` + Remark string `json:"remark" comment:""` + Sort string `json:"sort" comment:""` +} + +func (s *SysContentControl) Bind(ctx *gin.Context) error { + msgID := tools.GenerateMsgIDFromContext(ctx) + err := ctx.ShouldBindUri(s) + if err != nil { + log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error()) + return err + } + err = ctx.ShouldBind(s) + if err != nil { + log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error()) + } + return err +} + +func (s *SysContentControl) Generate() dto.Control { + cp := *s + return &cp +} + +func (s *SysContentControl) GenerateM() (common.ActiveRecord, error) { + return &models.SysContent{ + Id: s.ID, + CateId: s.CateId, + Name: s.Name, + Status: s.Status, + Img: s.Img, + Content: s.Content, + Remark: s.Remark, + Sort: s.Sort, + }, nil +} + +func (s *SysContentControl) GetId() interface{} { + return s.ID +} + +type SysContentById struct { + dto.ObjectById +} + +func (s *SysContentById) Generate() dto.Control { + cp := *s + return &cp +} + +func (s *SysContentById) GenerateM() (common.ActiveRecord, error) { + return &models.SysContent{}, nil +} diff --git a/app/admin/service/dto/sys_dept.go b/app/admin/service/dto/sys_dept.go index 4e1133d..b8a3e54 100644 --- a/app/admin/service/dto/sys_dept.go +++ b/app/admin/service/dto/sys_dept.go @@ -4,9 +4,9 @@ import ( "encoding/json" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" - "go-admin/app/admin/models" + log "github.com/go-admin-team/go-admin-core/logger" + "go-admin/app/admin/models/system" "go-admin/common/dto" - "go-admin/common/log" "go-admin/tools" ) @@ -73,8 +73,8 @@ func (s *SysDeptControl) Bind(ctx *gin.Context) error { } // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysDeptControl) Generate() (*models.SysDept, error) { - return &models.SysDept{ +func (s *SysDeptControl) Generate() (*system.SysDept, error) { + return &system.SysDept{ DeptId: s.DeptId, DeptName: s.DeptName, ParentId: s.ParentId, @@ -121,8 +121,8 @@ func (s *SysDeptById) Bind(ctx *gin.Context) error { return err } -func (s *SysDeptById) GenerateM() (*models.SysDept, error) { - return &models.SysDept{}, nil +func (s *SysDeptById) GenerateM() (*system.SysDept, error) { + return &system.SysDept{}, nil } type DeptLabel struct { diff --git a/app/admin/service/dto/sys_dict_data.go b/app/admin/service/dto/sys_dict_data.go index 8da5df9..f7cddc0 100644 --- a/app/admin/service/dto/sys_dict_data.go +++ b/app/admin/service/dto/sys_dict_data.go @@ -4,9 +4,9 @@ import ( "github.com/gin-gonic/gin" "net/http" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/app/admin/models/system" "go-admin/common/dto" - "go-admin/common/log" common "go-admin/common/models" "go-admin/tools" ) diff --git a/app/admin/service/dto/sys_dict_type.go b/app/admin/service/dto/sys_dict_type.go index 57ebfd8..381df42 100644 --- a/app/admin/service/dto/sys_dict_type.go +++ b/app/admin/service/dto/sys_dict_type.go @@ -4,8 +4,8 @@ import ( "github.com/gin-gonic/gin" "go-admin/app/admin/models/system" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/common/dto" - "go-admin/common/log" common "go-admin/common/models" "go-admin/tools" ) diff --git a/app/admin/service/dto/sys_file_dir.go b/app/admin/service/dto/sys_file_dir.go index 01be4cc..929f3f8 100644 --- a/app/admin/service/dto/sys_file_dir.go +++ b/app/admin/service/dto/sys_file_dir.go @@ -1,9 +1,9 @@ package dto import ( + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/app/admin/models" "go-admin/common/dto" - "go-admin/common/log" common "go-admin/common/models" "go-admin/tools" diff --git a/app/admin/service/dto/sys_job.go b/app/admin/service/dto/sys_job.go index 32d29ba..838f88e 100644 --- a/app/admin/service/dto/sys_job.go +++ b/app/admin/service/dto/sys_job.go @@ -3,9 +3,9 @@ package dto import ( "github.com/gin-gonic/gin" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/app/admin/models" "go-admin/common/dto" - "go-admin/common/log" common "go-admin/common/models" ) diff --git a/app/admin/service/dto/sys_login_log.go b/app/admin/service/dto/sys_login_log.go index 62ec681..da838df 100644 --- a/app/admin/service/dto/sys_login_log.go +++ b/app/admin/service/dto/sys_login_log.go @@ -2,9 +2,9 @@ package dto import ( "github.com/gin-gonic/gin" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/app/admin/models/system" "go-admin/common/dto" - "go-admin/common/log" common "go-admin/common/models" "go-admin/tools" diff --git a/app/admin/service/dto/sys_menu.go b/app/admin/service/dto/sys_menu.go index 46e5cd8..d2b5921 100644 --- a/app/admin/service/dto/sys_menu.go +++ b/app/admin/service/dto/sys_menu.go @@ -4,9 +4,9 @@ import ( "encoding/json" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" - "go-admin/app/admin/models" + log "github.com/go-admin-team/go-admin-core/logger" + "go-admin/app/admin/models/system" "go-admin/common/dto" - "go-admin/common/log" "go-admin/tools" ) @@ -79,8 +79,8 @@ func (s *SysMenuControl) Bind(ctx *gin.Context) error { } // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysMenuControl) Generate() (*models.SysMenu, error) { - return &models.SysMenu{ +func (s *SysMenuControl) Generate() (*system.SysMenu, error) { + return &system.SysMenu{ MenuId: s.MenuId, MenuName: s.MenuName, Title: s.Title, @@ -134,8 +134,8 @@ func (s *SysMenuById) Bind(ctx *gin.Context) error { return err } -func (s *SysMenuById) GenerateM() (*models.SysMenu, error) { - return &models.SysMenu{}, nil +func (s *SysMenuById) GenerateM() (*system.SysMenu, error) { + return &system.SysMenu{}, nil } type MenuLabel struct { @@ -145,6 +145,6 @@ type MenuLabel struct { } type MenuRole struct { - models.SysMenus + system.SysMenus IsSelect bool `json:"is_select" gorm:"-"` } diff --git a/app/admin/service/dto/sys_opera_log.go b/app/admin/service/dto/sys_opera_log.go index b9cf977..6089976 100644 --- a/app/admin/service/dto/sys_opera_log.go +++ b/app/admin/service/dto/sys_opera_log.go @@ -2,9 +2,9 @@ package dto import ( "github.com/gin-gonic/gin" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/app/admin/models/system" "go-admin/common/dto" - "go-admin/common/log" common "go-admin/common/models" "go-admin/tools" diff --git a/app/admin/service/dto/sys_post.go b/app/admin/service/dto/sys_post.go index 59df058..f23736f 100644 --- a/app/admin/service/dto/sys_post.go +++ b/app/admin/service/dto/sys_post.go @@ -4,9 +4,9 @@ import ( "encoding/json" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/app/admin/models/system" "go-admin/common/dto" - "go-admin/common/log" "go-admin/tools" ) @@ -74,7 +74,7 @@ func (s *SysPostControl) Generate() (*system.SysPost, error) { PostCode: s.PostCode, Sort: s.Sort, Status: s.Status, - Remark: s.Remark, + Remark: s.Remark, }, nil } diff --git a/app/admin/service/dto/sys_role.go b/app/admin/service/dto/sys_role.go index 9cc19d3..24b9d41 100644 --- a/app/admin/service/dto/sys_role.go +++ b/app/admin/service/dto/sys_role.go @@ -4,10 +4,9 @@ import ( "encoding/json" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" - "go-admin/app/admin/models" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/app/admin/models/system" "go-admin/common/dto" - "go-admin/common/log" "go-admin/tools" ) @@ -110,8 +109,8 @@ func (s *SysRoleById) GetId() interface{} { return s.Id } -func (s *SysRoleById) GenerateM() (*models.SysRole, error) { - return &models.SysRole{}, nil +func (s *SysRoleById) GenerateM() (*system.SysRole, error) { + return &system.SysRole{}, nil } // RoleDataScopeReq 角色数据权限修改 @@ -120,3 +119,7 @@ type RoleDataScopeReq struct { DataScope string `json:"dataScope" binding:"required"` DeptIds []int `json:"deptIds"` } + +type DeptIdList struct { + DeptId int `json:"DeptId"` +} diff --git a/app/admin/service/dto/sys_setting.go b/app/admin/service/dto/sys_setting.go index 272b4cd..23fa990 100644 --- a/app/admin/service/dto/sys_setting.go +++ b/app/admin/service/dto/sys_setting.go @@ -3,8 +3,8 @@ package dto import ( "encoding/json" "github.com/gin-gonic/gin" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/app/admin/models" - "go-admin/common/log" "go-admin/tools" ) diff --git a/app/admin/service/dto/sys_user.go b/app/admin/service/dto/sys_user.go new file mode 100644 index 0000000..47893d6 --- /dev/null +++ b/app/admin/service/dto/sys_user.go @@ -0,0 +1,117 @@ +package dto + +import ( + "github.com/gin-gonic/gin" + + "go-admin/app/admin/models/system" + "go-admin/common/dto" + common "go-admin/common/models" + "go-admin/pkg/logger" +) + +type SysUserSearch struct { + dto.Pagination `search:"-"` + UserId int `form:"UserId" search:"type:exact;column:user_id;table:sys_user" comment:"用户ID"` + Username string `form:"username" search:"type:contains;column:username;table:sys_user" comment:"用户名"` + NickName string `form:"nickName" search:"type:contains;column:nick_name;table:sys_user" comment:"昵称"` + Phone string `form:"phone" search:"type:contains;column:phone;table:sys_user" comment:"手机号"` + RoleId string `form:"roleId" search:"type:exact;column:role_id;table:sys_user" comment:"角色ID"` + Sex string `form:"sex" search:"type:exact;column:sex;table:sys_user" comment:"性别"` + Email string `form:"email" search:"type:contains;column:email;table:sys_user" comment:"邮箱"` + DeptId string `form:"deptId" search:"type:exact;column:dept_id;table:sys_user" comment:"部门"` + PostId string `form:"postId" search:"type:exact;column:post_id;table:sys_user" comment:"岗位"` + Status string `form:"status" search:"type:exact;column:status;table:sys_user" comment:"状态"` +} + +func (m *SysUserSearch) GetNeedSearch() interface{} { + return *m +} + +func (m *SysUserSearch) Bind(ctx *gin.Context) error { + log := logger.GetRequestLogger(ctx) + err := ctx.ShouldBind(m) + if err != nil { + log.Debugf("ShouldBind error: %s", err.Error()) + } + return err +} + +func (m *SysUserSearch) Generate() dto.Index { + o := *m + return &o +} + +type SysUserControl struct { + UserId int `json:"userId" comment:"用户ID"` // 用户ID + Username string `json:"username" comment:"用户名"` + Password string `json:"password" comment:"密码"` + NickName string `json:"nickName" comment:"昵称"` + Phone string `json:"phone" comment:"手机号"` + RoleId int `json:"roleId" comment:"角色ID"` + Avatar string `json:"avatar" comment:"头像"` + Sex string `json:"sex" comment:"性别"` + Email string `json:"email" comment:"邮箱"` + DeptId int `json:"deptId" comment:"部门"` + PostId int `json:"postId" comment:"岗位"` + Remark string `json:"remark" comment:"备注"` + Status string `json:"status" comment:"状态"` +} + +func (s *SysUserControl) Bind(ctx *gin.Context) error { + log := logger.GetRequestLogger(ctx) + //err := ctx.ShouldBindUri(s) + //if err != nil { + // log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error()) + // return err + //} + err := ctx.ShouldBind(s) + if err != nil { + log.Debugf("ShouldBind error: %s", err.Error()) + } + return err +} + +func (s *SysUserControl) Generate() dto.Control { + cp := *s + return &cp +} + +func (s *SysUserControl) GenerateM() (common.ActiveRecord, error) { + return &system.SysUser{ + UserId: s.UserId, + Username: s.Username, + Password: s.Password, + NickName: s.NickName, + Phone: s.Phone, + RoleId: s.RoleId, + Avatar: s.Avatar, + Sex: s.Sex, + Email: s.Email, + DeptId: s.DeptId, + PostId: s.PostId, + Remark: s.Remark, + Status: s.Status, + }, nil +} + +func (s *SysUserControl) GetId() interface{} { + return s.UserId +} + +type SysUserById struct { + dto.ObjectById +} + +func (s *SysUserById) Generate() dto.Control { + cp := *s + return &cp +} + +func (s *SysUserById) GenerateM() (common.ActiveRecord, error) { + return &system.SysUser{}, nil +} + +// PassWord 密码 +type PassWord struct { + Password string `json:"password"` +} diff --git a/app/admin/service/sys_config.go b/app/admin/service/sys_config.go index acdbb6c..d3176f8 100644 --- a/app/admin/service/sys_config.go +++ b/app/admin/service/sys_config.go @@ -5,7 +5,6 @@ import ( "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/service" "gorm.io/gorm" ) @@ -14,12 +13,10 @@ type SysConfig struct { service.Service } - // GetSysConfigPage 获取SysConfig列表 func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysConfig, count *int64) error { var err error var data system.SysConfig - msgID := e.MsgID err = e.Orm.Model(&data). Scopes( @@ -29,7 +26,7 @@ func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysC Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -39,18 +36,17 @@ func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysC func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) error { var err error var data system.SysConfig - msgID := e.MsgID db := e.Orm.Model(&data). First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -60,12 +56,11 @@ func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error { var err error var data system.SysConfig - msgID := e.MsgID err = e.Orm.Model(&data). Create(model).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -75,12 +70,11 @@ func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error { func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error { var err error var data system.SysConfig - msgID := e.MsgID db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if db.RowsAffected == 0 { @@ -91,16 +85,15 @@ func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error { } // RemoveSysConfig 删除SysConfig -func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById,c *system.SysConfig) error { +func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) error { var err error var data system.SysConfig - msgID := e.MsgID db := e.Orm.Model(&data). Where(d.GetId()).Delete(c) if db.Error != nil { err = db.Error - log.Errorf("MsgID[%s] Delete error: %s", msgID, err) + e.Log.Errorf("Delete error: %s", err) return err } if db.RowsAffected == 0 { @@ -114,11 +107,10 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById,c *system.SysConfig) er func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error { var err error var data system.SysConfig - msgID := e.MsgID data.ConfigKey = c.ConfigKey err = e.Orm.Table(data.TableName()).Where("config_key = ?", data.ConfigKey).First(c).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } diff --git a/app/admin/service/sys_dept.go b/app/admin/service/sys_dept.go index e4b8c03..bc34138 100644 --- a/app/admin/service/sys_dept.go +++ b/app/admin/service/sys_dept.go @@ -2,13 +2,14 @@ package service import ( "errors" - "go-admin/app/admin/models" + + "gorm.io/gorm" + + "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/service" "go-admin/tools" - "gorm.io/gorm" ) type SysDept struct { @@ -16,10 +17,9 @@ type SysDept struct { } // GetSysDeptPage 获取SysDept列表 -func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]models.SysDept) error { +func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]system.SysDept) error { var err error - var data models.SysDept - msgID := e.MsgID + var data system.SysDept err = e.Orm.Model(&data). Scopes( @@ -27,48 +27,46 @@ func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]models.SysDept) e ). Find(list).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil } // GetSysDept 获取SysDept对象 -func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *models.SysDept) error { +func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *system.SysDept) error { var err error - var data models.SysDept - msgID := e.MsgID + var data system.SysDept db := e.Orm.Model(&data). First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil } // InsertSysDept 创建SysDept对象 -func (e *SysDept) InsertSysDept(model *models.SysDept) error { +func (e *SysDept) InsertSysDept(model *system.SysDept) error { var err error - var data models.SysDept - msgID := e.MsgID + var data system.SysDept err = e.Orm.Model(&data). Create(model).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } deptPath := "/" + tools.IntToString(model.DeptId) if model.ParentId != 0 { - var deptP models.SysDepts + var deptP system.SysDept e.Orm.Model(&data).First(&deptP, model.ParentId) deptPath = deptP.DeptPath + deptPath } else { @@ -76,23 +74,22 @@ func (e *SysDept) InsertSysDept(model *models.SysDept) error { } var mp = map[string]string{} mp["dept_path"] = deptPath - if err := e.Orm.Model(&model).Update("dept_path",deptPath).Error; err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + if err := e.Orm.Model(&model).Update("dept_path", deptPath).Error; err != nil { + e.Log.Errorf("db error:%s", err) return err } return nil } // UpdateSysDept 修改SysDept对象 -func (e *SysDept) UpdateSysDept(c *models.SysDept) error { +func (e *SysDept) UpdateSysDept(c *system.SysDept) error { var err error - var data models.SysDept - msgID := e.MsgID + var data system.SysDept db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if db.RowsAffected == 0 { @@ -108,14 +105,13 @@ func (e *SysDept) UpdateSysDept(c *models.SysDept) error { // RemoveSysDept 删除SysDept func (e *SysDept) RemoveSysDept(d *dto.SysDeptById) error { var err error - var data models.SysDept - msgID := e.MsgID + var data system.SysDept db := e.Orm.Model(&data). Where(d.GetId()).Delete(&data) if db.Error != nil { err = db.Error - log.Errorf("MsgID[%s] Delete error: %s", msgID, err) + e.Log.Errorf("Delete error: %s", err) return err } if db.RowsAffected == 0 { @@ -126,10 +122,9 @@ func (e *SysDept) RemoveSysDept(d *dto.SysDeptById) error { } // GetSysDeptList 获取组织数据 -func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]models.SysDept) error { +func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]system.SysDept) error { var err error - var data models.SysDept - msgID := e.MsgID + var data system.SysDept err = e.Orm.Model(&data). Scopes( @@ -137,7 +132,7 @@ func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]models.SysDept) e ). Find(list).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -145,7 +140,7 @@ func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]models.SysDept) e // SetDeptTree 设置组织数据 func (e *SysDept) SetDeptTree(c *dto.SysDeptSearch) (m []dto.DeptLabel, err error) { - var list []models.SysDept + var list []system.SysDept err = e.getSysDeptList(c, &list) m = make([]dto.DeptLabel, 0) @@ -164,7 +159,7 @@ func (e *SysDept) SetDeptTree(c *dto.SysDeptSearch) (m []dto.DeptLabel, err erro } // Call 递归构造组织数据 -func deptTreeCall(deptlist *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel { +func deptTreeCall(deptlist *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabel { list := *deptlist min := make([]dto.DeptLabel, 0) for j := 0; j < len(list); j++ { @@ -180,8 +175,8 @@ func deptTreeCall(deptlist *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel } // SetDeptPage 设置dept页面数据 -func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []models.SysDept, err error) { - var list []models.SysDept +func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []system.SysDept, err error) { + var list []system.SysDept err = e.getSysDeptList(c, &list) //m := make([]models.SysDept, 0) @@ -196,16 +191,16 @@ func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []models.SysDept, err err return } -func (e *SysDept) deptPageCall(deptlist *[]models.SysDept, menu models.SysDept) models.SysDept { +func (e *SysDept) deptPageCall(deptlist *[]system.SysDept, menu system.SysDept) system.SysDept { list := *deptlist - min := make([]models.SysDept, 0) + min := make([]system.SysDept, 0) for j := 0; j < len(list); j++ { if menu.DeptId != list[j].ParentId { continue } - mi := models.SysDept{} + mi := system.SysDept{} mi.DeptId = list[j].DeptId mi.ParentId = list[j].ParentId mi.DeptPath = list[j].DeptPath @@ -216,7 +211,7 @@ func (e *SysDept) deptPageCall(deptlist *[]models.SysDept, menu models.SysDept) mi.Email = list[j].Email mi.Status = list[j].Status mi.CreatedAt = list[j].CreatedAt - mi.Children = []models.SysDept{} + mi.Children = []system.SysDept{} ms := e.deptPageCall(deptlist, mi) min = append(min, ms) @@ -224,3 +219,67 @@ func (e *SysDept) deptPageCall(deptlist *[]models.SysDept, menu models.SysDept) menu.Children = min return menu } + +//// GetRoleDeptId 获取角色的部门ID集合 +//func (e *SysDept) GetRoleDeptId(roleId int) ([]int, error) { +// deptIds := make([]int, 0) +// deptList := make([]dto.DeptIdList, 0) +// if err := e.Orm.Table("sys_role_dept"). +// Select("sys_role_dept.dept_id"). +// Joins("LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id"). +// Where("role_id = ? ", roleId). +// Where(" sys_role_dept.dept_id not in(select sys_dept.parent_id from sys_role_dept LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id where role_id =? )", roleId). +// Find(&deptList).Error; err != nil { +// return nil, err +// } +// +// for i := 0; i < len(deptList); i++ { +// deptIds = append(deptIds, deptList[i].DeptId) +// } +// +// return deptIds, nil +//} +// +//func (e *SysDept) SetDeptLabel() (m []dto.DeptLabel, err error) { +// list := make([]models.SysDept, 0) +// err = e.Orm.Find(&list).Error +// if err != nil { +// log.Error("find dept list error, %s", e.err) +// return +// } +// +// m = make([]dto.DeptLabel, 0) +// var item dto.DeptLabel +// for i := range list { +// if list[i].ParentId != 0 { +// continue +// } +// item = dto.DeptLabel{} +// item.Id = list[i].DeptId +// item.Label = list[i].DeptName +// deptInfo := digitDeptLabel(&list, item) +// +// m = append(m, deptInfo) +// } +// return +//} +// +//// digitDeptLabel +//func digitDeptLabel(deptList *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel { +// list := *deptList +// +// var mi dto.DeptLabel +// min := make([]dto.DeptLabel, 0) +// for j := 0; j < len(list); j++ { +// +// if dept.Id != list[j].ParentId { +// continue +// } +// mi = dto.DeptLabel{Id: list[j].DeptId, Label: list[j].DeptName, Children: []dto.DeptLabel{}} +// ms := digitDeptLabel(deptList, mi) +// min = append(min, ms) +// +// } +// dept.Children = min +// return dept +//} diff --git a/app/admin/service/sys_dict_data.go b/app/admin/service/sys_dict_data.go index e17a589..9217902 100644 --- a/app/admin/service/sys_dict_data.go +++ b/app/admin/service/sys_dict_data.go @@ -8,7 +8,6 @@ import ( "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/service" ) @@ -20,7 +19,6 @@ type SysDictData struct { func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]system.SysDictData, count *int64) error { var err error var data system.SysDictData - msgID := e.MsgID err = e.Orm.Model(&data). Scopes( @@ -30,7 +28,7 @@ func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]system.SysDictDa Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil @@ -40,18 +38,17 @@ func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]system.SysDictDa func (e *SysDictData) Get(d *dto.SysDictDataById, model *system.SysDictData) error { var err error var data system.SysDictData - msgID := e.MsgID db := e.Orm.Model(&data). First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil @@ -61,12 +58,11 @@ func (e *SysDictData) Get(d *dto.SysDictDataById, model *system.SysDictData) err func (e *SysDictData) Insert(model *system.SysDictData) error { var err error var data system.SysDictData - msgID := e.MsgID err = e.Orm.Model(&data). Create(model).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil @@ -76,12 +72,11 @@ func (e *SysDictData) Insert(model *system.SysDictData) error { func (e *SysDictData) Update(c *system.SysDictData) error { var err error var data system.SysDictData - msgID := e.MsgID db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } if db.RowsAffected == 0 { @@ -95,13 +90,12 @@ func (e *SysDictData) Update(c *system.SysDictData) error { func (e *SysDictData) Remove(d *dto.SysDictDataById, c *system.SysDictData) error { var err error var data system.SysDictData - msgID := e.MsgID db := e.Orm.Model(&data). Where(d.GetId()).Delete(c) if db.Error != nil { err = db.Error - log.Errorf("MsgID[%s] Delete error: %s", msgID, err) + e.Log.Errorf("Delete error: %s", err) return err } if db.RowsAffected == 0 { @@ -115,7 +109,6 @@ func (e *SysDictData) Remove(d *dto.SysDictDataById, c *system.SysDictData) erro func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]system.SysDictData) error { var err error var data system.SysDictData - msgID := e.MsgID err = e.Orm.Model(&data). Scopes( @@ -123,7 +116,7 @@ func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]system.SysDictDat ). Find(list).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil diff --git a/app/admin/service/sys_dict_type.go b/app/admin/service/sys_dict_type.go index fbc215c..c242df2 100644 --- a/app/admin/service/sys_dict_type.go +++ b/app/admin/service/sys_dict_type.go @@ -8,7 +8,6 @@ import ( "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/service" ) @@ -20,7 +19,6 @@ type SysDictType struct { func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]system.SysDictType, count *int64) error { var err error var data system.SysDictType - msgID := e.MsgID err = e.Orm.Model(&data). Scopes( @@ -30,7 +28,7 @@ func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]system.SysDictTy Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil @@ -40,18 +38,17 @@ func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]system.SysDictTy func (e *SysDictType) Get(d *dto.SysDictTypeById, model *system.SysDictType) error { var err error var data system.SysDictType - msgID := e.MsgID db := e.Orm.Model(&data). First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil @@ -61,12 +58,11 @@ func (e *SysDictType) Get(d *dto.SysDictTypeById, model *system.SysDictType) err func (e *SysDictType) Insert(model *system.SysDictType) error { var err error var data system.SysDictType - msgID := e.MsgID err = e.Orm.Model(&data). Create(model).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil @@ -76,12 +72,11 @@ func (e *SysDictType) Insert(model *system.SysDictType) error { func (e *SysDictType) Update(c *system.SysDictType) error { var err error var data system.SysDictType - msgID := e.MsgID db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } if db.RowsAffected == 0 { @@ -95,13 +90,12 @@ func (e *SysDictType) Update(c *system.SysDictType) error { func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *system.SysDictType) error { var err error var data system.SysDictType - msgID := e.MsgID db := e.Orm.Model(&data). Where(d.GetId()).Delete(c) if db.Error != nil { err = db.Error - log.Errorf("MsgID[%s] Delete error: %s", msgID, err) + e.Log.Errorf("Delete error: %s", err) return err } if db.RowsAffected == 0 { @@ -115,7 +109,6 @@ func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *system.SysDictType) erro func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]system.SysDictType) error { var err error var data system.SysDictType - msgID := e.MsgID err = e.Orm.Model(&data). Scopes( @@ -123,7 +116,7 @@ func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]system.SysDictTyp ). Find(list).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil diff --git a/app/admin/service/sys_file_dir.go b/app/admin/service/sys_file_dir.go index e7267e8..2cf2946 100644 --- a/app/admin/service/sys_file_dir.go +++ b/app/admin/service/sys_file_dir.go @@ -3,13 +3,14 @@ package service import ( "errors" "fmt" + + "gorm.io/gorm" + "go-admin/app/admin/models" "go-admin/app/admin/service/dto" "go-admin/common/actions" cDto "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/service" - "gorm.io/gorm" ) type SysFileDir struct { @@ -20,7 +21,6 @@ type SysFileDir struct { func (e *SysFileDir) GetSysFileDirPage(c *dto.SysFileDirSearch, list *[]models.SysFileDirL) error { var err error var data models.SysFileDir - msgID := e.MsgID err = e.Orm.Model(&data). Scopes( @@ -29,7 +29,7 @@ func (e *SysFileDir) GetSysFileDirPage(c *dto.SysFileDirSearch, list *[]models.S Find(list). //Limit(-1).Offset(-1). Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil @@ -39,18 +39,17 @@ func (e *SysFileDir) GetSysFileDirPage(c *dto.SysFileDirSearch, list *[]models.S func (e *SysFileDir) GetSysFileDir(d cDto.Control, model *models.SysFileDir) error { var err error var data models.SysFileDir - msgID := e.MsgID db := e.Orm.Model(&data). First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -61,11 +60,9 @@ func (e *SysFileDir) InsertSysFileDir(model *dto.SysFileDirControl) error { var err error data, _ := model.GenerateM() - msgID := e.MsgID - err = e.Orm.Create(data).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } path := fmt.Sprintf("/%d", model.ID) @@ -82,7 +79,7 @@ func (e *SysFileDir) InsertSysFileDir(model *dto.SysFileDirControl) error { } //var mp = map[string]string{} //mp["path"] = path - if err := e.Orm.Model(&models.SysFileDir{}).Where("id = ?", model.ID).Update("path", path).Error; err != nil { + if err = e.Orm.Model(&models.SysFileDir{}).Where("id = ?", model.ID).Update("path", path).Error; err != nil { return err } @@ -93,14 +90,13 @@ func (e *SysFileDir) InsertSysFileDir(model *dto.SysFileDirControl) error { func (e *SysFileDir) UpdateSysFileDir(c *dto.SysFileDirControl, p *actions.DataPermission) error { var err error data, _ := c.GenerateM() - msgID := e.MsgID db := e.Orm. Scopes( actions.Permission(data.TableName(), p), ).Where(c.ID).Updates(data) if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } if db.RowsAffected == 0 { @@ -113,7 +109,6 @@ func (e *SysFileDir) UpdateSysFileDir(c *dto.SysFileDirControl, p *actions.DataP func (e *SysFileDir) RemoveSysFileDir(d *dto.SysFileDirById, p *actions.DataPermission) error { var err error var data models.SysFileDir - msgID := e.MsgID db := e.Orm.Model(&data). Scopes( @@ -121,7 +116,7 @@ func (e *SysFileDir) RemoveSysFileDir(d *dto.SysFileDirById, p *actions.DataPerm ).Where(d.Id).Delete(&data) if db.Error != nil { err = db.Error - log.Errorf("MsgID[%s] Delete error: %s", msgID, err) + e.Log.Errorf("Delete error: %s", err) return err } if db.RowsAffected == 0 { diff --git a/app/admin/service/sys_file_info.go b/app/admin/service/sys_file_info.go index 140cd5e..d72db34 100644 --- a/app/admin/service/sys_file_info.go +++ b/app/admin/service/sys_file_info.go @@ -2,13 +2,14 @@ package service import ( "errors" + + "gorm.io/gorm" + "go-admin/app/admin/models" "go-admin/app/admin/service/dto" "go-admin/common/actions" cDto "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/service" - "gorm.io/gorm" ) type SysFileInfo struct { @@ -19,7 +20,6 @@ type SysFileInfo struct { func (e *SysFileInfo) GetSysFileInfoPage(c *dto.SysFileInfoSearch, p *actions.DataPermission, list *[]models.SysFileInfo, count *int64) error { var err error var data models.SysFileInfo - msgID := e.MsgID err = e.Orm.Model(&data). Scopes( @@ -30,7 +30,7 @@ func (e *SysFileInfo) GetSysFileInfoPage(c *dto.SysFileInfoSearch, p *actions.Da Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil @@ -40,7 +40,6 @@ func (e *SysFileInfo) GetSysFileInfoPage(c *dto.SysFileInfoSearch, p *actions.Da func (e *SysFileInfo) GetSysFileInfo(d *dto.SysFileInfoById, p *actions.DataPermission, model *models.SysFileInfo) error { var err error var data models.SysFileInfo - msgID := e.MsgID db := e.Orm.Model(&data). Scopes( @@ -50,11 +49,11 @@ func (e *SysFileInfo) GetSysFileInfo(d *dto.SysFileInfoById, p *actions.DataPerm err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil @@ -64,18 +63,17 @@ func (e *SysFileInfo) GetSysFileInfo(d *dto.SysFileInfoById, p *actions.DataPerm func (e *SysFileInfo) InsertSysFileInfo(model *dto.SysFileInfoControl) error { var err error var data *models.SysFileInfo - msgID := e.MsgID data, err = model.Generate() if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } err = e.Orm.Model(&data). Create(data).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil @@ -85,11 +83,10 @@ func (e *SysFileInfo) InsertSysFileInfo(model *dto.SysFileInfoControl) error { func (e *SysFileInfo) UpdateSysFileInfo(c *dto.SysFileInfoControl, p *actions.DataPermission) error { var err error var data *models.SysFileInfo - msgID := e.MsgID data, err = c.Generate() if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } err = e.Orm.Debug().Model(&data). @@ -97,7 +94,7 @@ func (e *SysFileInfo) UpdateSysFileInfo(c *dto.SysFileInfoControl, p *actions.Da actions.Permission(data.TableName(), p), ).Where("id = ?", c.ID).Updates(&data).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } if err == gorm.ErrRecordNotFound { @@ -111,7 +108,6 @@ func (e *SysFileInfo) UpdateSysFileInfo(c *dto.SysFileInfoControl, p *actions.Da func (e *SysFileInfo) RemoveSysFileInfo(d *dto.SysFileInfoById, p *actions.DataPermission) error { var err error var data models.SysFileInfo - msgID := e.MsgID db := e.Orm.Model(&data). Scopes( @@ -119,7 +115,7 @@ func (e *SysFileInfo) RemoveSysFileInfo(d *dto.SysFileInfoById, p *actions.DataP ).Where(d.GetId()).Delete(&data) if db.Error != nil { err = db.Error - log.Errorf("MsgID[%s] Delete error: %s", msgID, err) + e.Log.Errorf("Delete error: %s", err) return err } if db.RowsAffected == 0 { diff --git a/app/admin/service/sys_job.go b/app/admin/service/sys_job.go index 2cf31ff..450c6e3 100644 --- a/app/admin/service/sys_job.go +++ b/app/admin/service/sys_job.go @@ -1,39 +1,39 @@ package service import ( + "github.com/robfig/cron/v3" "time" "go-admin/app/admin/models" "go-admin/app/jobs" "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/service" "go-admin/tools/app/msg" ) type SysJob struct { service.Service + Cron *cron.Cron } // RemoveJob 删除job func (e *SysJob) RemoveJob(c *dto.GeneralDelDto) error { var err error var data models.SysJob - msgID := e.MsgID data.JobId = c.Id err = e.Orm.Table(data.TableName()).First(&data).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } - cn := jobs.Remove(data.EntryId) + cn := jobs.Remove(e.Cron, data.EntryId) select { case res := <-cn: if res { err = e.Orm.Table(data.TableName()).Where("entry_id = ?", data.EntryId).Update("entry_id", 0).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) } return err } @@ -48,10 +48,9 @@ func (e *SysJob) RemoveJob(c *dto.GeneralDelDto) error { func (e *SysJob) StartJob(c *dto.GeneralGetDto) error { var data models.SysJob var err error - msgID := e.MsgID err = e.Orm.Table(data.TableName()).First(&data, c.Id).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } if data.JobType == 1 { @@ -60,9 +59,9 @@ func (e *SysJob) StartJob(c *dto.GeneralGetDto) error { j.CronExpression = data.CronExpression j.JobId = data.JobId j.Name = data.JobName - data.EntryId, err = jobs.AddJob(j) + data.EntryId, err = jobs.AddJob(e.Cron, j) if err != nil { - log.Errorf("msgID[%s] jobs AddJob[HttpJob] error:%s", msgID, err) + e.Log.Errorf("jobs AddJob[HttpJob] error: %s", err) } } else { var j = &jobs.ExecJob{} @@ -71,9 +70,9 @@ func (e *SysJob) StartJob(c *dto.GeneralGetDto) error { j.JobId = data.JobId j.Name = data.JobName j.Args = data.Args - data.EntryId, err = jobs.AddJob(j) + data.EntryId, err = jobs.AddJob(e.Cron, j) if err != nil { - log.Errorf("msgID[%s] jobs AddJob[ExecJob] error:%s", msgID, err) + e.Log.Errorf("jobs AddJob[ExecJob] error: %s", err) } } if err != nil { @@ -82,7 +81,7 @@ func (e *SysJob) StartJob(c *dto.GeneralGetDto) error { err = e.Orm.Table(data.TableName()).Where(c.Id).Updates(&data).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) } return err } diff --git a/app/admin/service/sys_login_log.go b/app/admin/service/sys_login_log.go index 69064d6..800a1f1 100644 --- a/app/admin/service/sys_login_log.go +++ b/app/admin/service/sys_login_log.go @@ -2,13 +2,14 @@ package service import ( "errors" + + "gorm.io/gorm" + "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" - "go-admin/common/log" common "go-admin/common/models" "go-admin/common/service" - "gorm.io/gorm" ) type SysLoginLog struct { @@ -19,7 +20,6 @@ type SysLoginLog struct { func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]system.SysLoginLog, count *int64) error { var err error var data system.SysLoginLog - msgID := e.MsgID err = e.Orm.Model(&data). Scopes( @@ -29,7 +29,7 @@ func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]syste Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -39,18 +39,17 @@ func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]syste func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *system.SysLoginLog) error { var err error var data system.SysLoginLog - msgID := e.MsgID db := e.Orm.Model(&data). First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -60,12 +59,11 @@ func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *system.SysLo func (e *SysLoginLog) InsertSysLoginLog(model common.ActiveRecord) error { var err error var data system.SysLoginLog - msgID := e.MsgID err = e.Orm.Model(&data). Create(model).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -75,12 +73,11 @@ func (e *SysLoginLog) InsertSysLoginLog(model common.ActiveRecord) error { func (e *SysLoginLog) UpdateSysLoginLog(c common.ActiveRecord) error { var err error var data system.SysLoginLog - msgID := e.MsgID db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if db.RowsAffected == 0 { @@ -94,13 +91,12 @@ func (e *SysLoginLog) UpdateSysLoginLog(c common.ActiveRecord) error { func (e *SysLoginLog) RemoveSysLoginLog(d *dto.SysLoginLogById, c common.ActiveRecord) error { var err error var data system.SysLoginLog - msgID := e.MsgID db := e.Orm.Model(&data). Where(d.Ids).Delete(c) if db.Error != nil { err = db.Error - log.Errorf("MsgID[%s] Delete error: %s", msgID, err) + e.Log.Errorf("Delete error: %s", err) return err } if db.RowsAffected == 0 { diff --git a/app/admin/service/sys_menu.go b/app/admin/service/sys_menu.go index 024a9ad..fcee714 100644 --- a/app/admin/service/sys_menu.go +++ b/app/admin/service/sys_menu.go @@ -2,10 +2,9 @@ package service import ( "errors" - "go-admin/app/admin/models" + "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/service" "go-admin/tools" "gorm.io/gorm" @@ -16,10 +15,10 @@ type SysMenu struct { } // GetSysMenuPage 获取SysMenu列表 -func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]models.SysMenu, error) { - var m = make([]models.SysMenu, 0) +func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]system.SysMenu, error) { + var m = make([]system.SysMenu, 0) var err error - var menu = make([]models.SysMenu, 0) + var menu = make([]system.SysMenu, 0) err = e.getSysMenuPage(c, &menu) for i := 0; i < len(menu); i++ { if menu[i].ParentId != 0 { @@ -33,10 +32,9 @@ func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]models.SysMenu, error } // getSysMenuPage 菜单列表 -func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]models.SysMenu) error { +func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]system.SysMenu) error { var err error - var data models.SysMenu - msgID := e.MsgID + var data system.SysMenu err = e.Orm.Model(&data). Scopes( @@ -45,53 +43,51 @@ func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]models.SysMenu) e ). Find(list).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil } // GetSysMenu 获取SysMenu对象 -func (e *SysMenu) GetSysMenu(d *dto.SysMenuById, model *models.SysMenu) error { +func (e *SysMenu) GetSysMenu(d *dto.SysMenuById, model *system.SysMenu) error { var err error - var data models.SysMenu - msgID := e.MsgID + var data system.SysMenu db := e.Orm.Model(&data). First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil } // InsertSysMenu 创建SysMenu对象 -func (e *SysMenu) InsertSysMenu(model *models.SysMenu) error { +func (e *SysMenu) InsertSysMenu(model *system.SysMenu) error { var err error - var data models.SysMenu - msgID := e.MsgID + var data system.SysMenu err = e.Orm.Model(&data). Create(model).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil } -func (e *SysMenu) initPaths(menu *models.SysMenu) error { +func (e *SysMenu) initPaths(menu *system.SysMenu) error { var err error - var data models.SysMenu - parentMenu := new(models.SysMenu) - if int(menu.ParentId) != 0 { + var data system.SysMenu + parentMenu := new(system.SysMenu) + if menu.ParentId != 0 { e.Orm.Model(&data).First(parentMenu, menu.ParentId) if parentMenu.Paths == "" { err = errors.New("父级paths异常,请尝试对当前节点父级菜单进行更新操作!") @@ -106,15 +102,14 @@ func (e *SysMenu) initPaths(menu *models.SysMenu) error { } // UpdateSysMenu 修改SysMenu对象 -func (e *SysMenu) UpdateSysMenu(c *models.SysMenu) error { +func (e *SysMenu) UpdateSysMenu(c *system.SysMenu) error { var err error - var data models.SysMenu - msgID := e.MsgID + var data system.SysMenu db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if db.RowsAffected == 0 { @@ -127,14 +122,13 @@ func (e *SysMenu) UpdateSysMenu(c *models.SysMenu) error { // RemoveSysMenu 删除SysMenu func (e *SysMenu) RemoveSysMenu(d *dto.SysMenuById) error { var err error - var data models.SysMenu - msgID := e.MsgID + var data system.SysMenu db := e.Orm.Model(&data). Where(d.GetId()).Delete(&data) if db.Error != nil { err = db.Error - log.Errorf("MsgID[%s] Delete error: %s", msgID, err) + e.Log.Errorf("Delete error: %s", err) return err } if db.RowsAffected == 0 { @@ -145,10 +139,9 @@ func (e *SysMenu) RemoveSysMenu(d *dto.SysMenuById) error { } // GetSysMenuList 获取菜单数据 -func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]models.SysMenu) error { +func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]system.SysMenu) error { var err error - var data models.SysMenu - msgID := e.MsgID + var data system.SysMenu err = e.Orm.Model(&data). Scopes( @@ -156,7 +149,7 @@ func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]models.SysMenu) e ). Find(list).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -164,7 +157,7 @@ func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]models.SysMenu) e // SetSysMenuTree 设置菜单数据 func (e *SysMenu) SetSysMenuLabel(c *dto.SysMenuSearch) (m []dto.MenuLabel, err error) { - var list []models.SysMenu + var list []system.SysMenu err = e.GetSysMenuList(c, &list) m = make([]dto.MenuLabel, 0) @@ -183,10 +176,9 @@ func (e *SysMenu) SetSysMenuLabel(c *dto.SysMenuSearch) (m []dto.MenuLabel, err } // 左侧菜单 -func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []models.SysMenu, err error) { +func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []system.SysMenu, err error) { var table *gorm.DB - var data models.SysMenu - msgID := e.MsgID + var data system.SysMenu if roleName == "admin" { table = e.Orm.Model(&data).Select("sys_menu.*") @@ -199,14 +191,14 @@ func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []models.SysMenu, err = table.Order("sort").Find(&Menus).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return } return } // menuLabelCall 递归构造组织数据 -func menuLabelCall(elist *[]models.SysMenu, dept dto.MenuLabel) dto.MenuLabel { +func menuLabelCall(elist *[]system.SysMenu, dept dto.MenuLabel) dto.MenuLabel { list := *elist min := make([]dto.MenuLabel, 0) @@ -234,16 +226,16 @@ func menuLabelCall(elist *[]models.SysMenu, dept dto.MenuLabel) dto.MenuLabel { return dept } -func menuCall(menulist *[]models.SysMenu, menu models.SysMenu) models.SysMenu { +func menuCall(menulist *[]system.SysMenu, menu system.SysMenu) system.SysMenu { list := *menulist - min := make([]models.SysMenu, 0) + min := make([]system.SysMenu, 0) for j := 0; j < len(list); j++ { if menu.MenuId != list[j].ParentId { continue } - mi := models.SysMenu{} + mi := system.SysMenu{} mi.MenuId = list[j].MenuId mi.MenuName = list[j].MenuName mi.Title = list[j].Title @@ -259,7 +251,7 @@ func menuCall(menulist *[]models.SysMenu, menu models.SysMenu) models.SysMenu { mi.Sort = list[j].Sort mi.Visible = list[j].Visible mi.CreatedAt = list[j].CreatedAt - mi.Children = []models.SysMenu{} + mi.Children = []system.SysMenu{} if mi.MenuType != "F" { ms := menuCall(menulist, mi) @@ -274,11 +266,11 @@ func menuCall(menulist *[]models.SysMenu, menu models.SysMenu) models.SysMenu { return menu } -func (e *SysMenu) SetMenuRole(roleName string) (m []models.SysMenu, err error) { +func (e *SysMenu) SetMenuRole(roleName string) (m []system.SysMenu, err error) { menus, err := e.getByRoleName(roleName) - m = make([]models.SysMenu, 0) + m = make([]system.SysMenu, 0) for i := 0; i < len(menus); i++ { if menus[i].ParentId != 0 { continue @@ -290,9 +282,9 @@ func (e *SysMenu) SetMenuRole(roleName string) (m []models.SysMenu, err error) { return } -func (e *SysMenu) getByRoleName(roleName string) (Menus []models.SysMenu, err error) { - var data models.SysMenu - msgID := e.MsgID +func (e *SysMenu) getByRoleName(roleName string) (Menus []system.SysMenu, err error) { + var data system.SysMenu + var table *gorm.DB if roleName == "admin" { table = e.Orm.Model(&data).Select("sys_menu.*") @@ -304,9 +296,9 @@ func (e *SysMenu) getByRoleName(roleName string) (Menus []models.SysMenu, err er err = table.Scopes( cDto.OrderDest("sort", false), ).Find(&Menus).Error - + if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return } return diff --git a/app/admin/service/sys_opera_log.go b/app/admin/service/sys_opera_log.go index c14f80d..5dccf3c 100644 --- a/app/admin/service/sys_opera_log.go +++ b/app/admin/service/sys_opera_log.go @@ -5,7 +5,6 @@ import ( "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/service" "gorm.io/gorm" ) @@ -18,7 +17,6 @@ type SysOperaLog struct { func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]system.SysOperaLog, count *int64) error { var err error var data system.SysOperaLog - msgID := e.MsgID err = e.Orm.Model(&data). Scopes( @@ -28,7 +26,7 @@ func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]syste Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf(" db error:%s", err) return err } return nil @@ -38,18 +36,17 @@ func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]syste func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *system.SysOperaLog) error { var err error var data system.SysOperaLog - msgID := e.MsgID db := e.Orm.Model(&data). First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf(" db error:%s", err) return err } if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf(" db error:%s", err) return err } return nil @@ -59,12 +56,11 @@ func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *system.SysOp func (e *SysOperaLog) InsertSysOperaLog(model *system.SysOperaLog) error { var err error var data system.SysOperaLog - msgID := e.MsgID err = e.Orm.Model(&data). Create(model).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf(" db error:%s", err) return err } return nil @@ -74,12 +70,11 @@ func (e *SysOperaLog) InsertSysOperaLog(model *system.SysOperaLog) error { func (e *SysOperaLog) UpdateSysOperaLog(c *system.SysOperaLog) error { var err error var data system.SysOperaLog - msgID := e.MsgID db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf(" db error:%s", err) return err } if db.RowsAffected == 0 { @@ -93,12 +88,11 @@ func (e *SysOperaLog) UpdateSysOperaLog(c *system.SysOperaLog) error { func (e *SysOperaLog) RemoveSysOperaLog(d *dto.SysOperaLogById) error { var err error var data system.SysOperaLog - msgID := e.MsgID db := e.Orm.Model(&data).Where(d.Ids).Delete(&data) if db.Error != nil { err = db.Error - log.Errorf("MsgID[%s] Delete error: %s", msgID, err) + e.Log.Errorf(" Delete error: %s", err) return err } if db.RowsAffected == 0 { diff --git a/app/admin/service/sys_post.go b/app/admin/service/sys_post.go index 6dfad2a..7d3fe28 100644 --- a/app/admin/service/sys_post.go +++ b/app/admin/service/sys_post.go @@ -2,12 +2,13 @@ package service import ( "errors" + + "gorm.io/gorm" + "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/service" - "gorm.io/gorm" ) type SysPost struct { @@ -18,7 +19,6 @@ type SysPost struct { func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]system.SysPost, count *int64) error { var err error var data system.SysPost - msgID := e.MsgID err = e.Orm.Model(&data). Scopes( @@ -28,7 +28,7 @@ func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]system.SysPost, c Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -38,18 +38,17 @@ func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]system.SysPost, c func (e *SysPost) GetSysPost(d *dto.SysPostById, model *system.SysPost) error { var err error var data system.SysPost - msgID := e.MsgID db := e.Orm.Model(&data). First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -59,12 +58,11 @@ func (e *SysPost) GetSysPost(d *dto.SysPostById, model *system.SysPost) error { func (e *SysPost) InsertSysPost(model *system.SysPost) error { var err error var data system.SysPost - msgID := e.MsgID err = e.Orm.Model(&data). Create(model).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -74,12 +72,11 @@ func (e *SysPost) InsertSysPost(model *system.SysPost) error { func (e *SysPost) UpdateSysPost(c *system.SysPost) error { var err error var data system.SysPost - msgID := e.MsgID db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if db.RowsAffected == 0 { @@ -93,12 +90,11 @@ func (e *SysPost) UpdateSysPost(c *system.SysPost) error { func (e *SysPost) RemoveSysPost(d *dto.SysPostById) error { var err error var data system.SysPost - msgID := e.MsgID db := e.Orm.Model(&data).Delete(&data, d.GetId()) if db.Error != nil { err = db.Error - log.Errorf("MsgID[%s] Delete error: %s", msgID, err) + e.Log.Errorf("Delete error: %s", err) return err } if db.RowsAffected == 0 { diff --git a/app/admin/service/sys_role.go b/app/admin/service/sys_role.go index 5303d07..a3e0f7c 100644 --- a/app/admin/service/sys_role.go +++ b/app/admin/service/sys_role.go @@ -9,8 +9,6 @@ import ( "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" - orm "go-admin/common/global" - "go-admin/common/log" "go-admin/common/service" ) @@ -22,7 +20,6 @@ type SysRole struct { func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]system.SysRole, count *int64) error { var err error var data system.SysRole - msgID := e.MsgID err = e.Orm.Model(&data). Scopes( @@ -32,7 +29,7 @@ func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]system.SysRole, c Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -42,23 +39,22 @@ func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]system.SysRole, c func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error { var err error var data system.SysRole - msgID := e.MsgID db := e.Orm.Model(&data). First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } - data.MenuIds, err = e.GetRoleMenuId(data.RoleId) + data.MenuIds, err = e.GetRoleMenuId(e.Orm, data.RoleId) if err != nil { - log.Errorf("msgID[%s] get menuIds error, %s", msgID, err.Error()) + e.Log.Errorf("get menuIds error, %s", err.Error()) return err } return nil @@ -68,7 +64,6 @@ func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error { func (e *SysRole) InsertSysRole(c *system.SysRole) error { var err error var data system.SysRole - msgID := e.MsgID tx := e.Orm.Begin() defer func() { @@ -82,16 +77,16 @@ func (e *SysRole) InsertSysRole(c *system.SysRole) error { err = tx.Model(&data). Create(c).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if len(c.MenuIds) > 0 { s := SysRoleMenu{} s.Orm = e.Orm - s.MsgID = msgID + s.Log = e.Log err = s.ReloadRule(tx, c.RoleId, c.MenuIds) if err != nil { - log.Errorf("msgID[%s] reload casbin rule error, %", msgID, err.Error()) + e.Log.Errorf("reload casbin rule error, %", err.Error()) return err } } @@ -101,7 +96,6 @@ func (e *SysRole) InsertSysRole(c *system.SysRole) error { // UpdateSysRole 修改SysRole对象 func (e *SysRole) UpdateSysRole(c *system.SysRole) error { var err error - msgID := e.MsgID tx := e.Orm.Debug().Begin() defer func() { @@ -114,7 +108,7 @@ func (e *SysRole) UpdateSysRole(c *system.SysRole) error { db := tx.Model(&c). Where(c.GetId()).Updates(c) if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if db.RowsAffected == 0 { @@ -124,16 +118,16 @@ func (e *SysRole) UpdateSysRole(c *system.SysRole) error { var t system.RoleMenu err = t.DeleteRoleMenu(tx, c.RoleId) if err != nil { - log.Errorf("msgID[%s] delete role menu error, %", msgID, err.Error()) + e.Log.Errorf("delete role menu error, %", err.Error()) return err } if len(c.MenuIds) > 0 { s := SysRoleMenu{} s.Orm = e.Orm - s.MsgID = msgID + s.Log = e.Log err = s.ReloadRule(tx, c.RoleId, c.MenuIds) if err != nil { - log.Errorf("msgID[%s] reload casbin rule error, %", msgID, err.Error()) + e.Log.Errorf("reload casbin rule error, %", err.Error()) return err } } @@ -144,7 +138,6 @@ func (e *SysRole) UpdateSysRole(c *system.SysRole) error { func (e *SysRole) RemoveSysRole(d *dto.SysRoleById) error { var err error var data system.SysRole - msgID := e.MsgID tx := e.Orm.Begin() defer func() { @@ -157,18 +150,18 @@ func (e *SysRole) RemoveSysRole(d *dto.SysRoleById) error { s := SysRoleMenu{} s.Orm = tx - s.MsgID = msgID + s.Log = e.Log for _, roleId := range d.Ids { err = s.DeleteRoleMenu(tx, roleId) if err != nil { - log.Errorf("msgID[%s] insert role menu error, %", msgID, err.Error()) + e.Log.Errorf("insert role menu error, %", err.Error()) return err } } db := tx.Model(&data).Delete(&data, d.Ids) if db.Error != nil { err = db.Error - log.Errorf("MsgID[%s] Delete error: %s", msgID, err) + e.Log.Errorf("Delete error: %s", err) return err } if db.RowsAffected == 0 { @@ -179,10 +172,10 @@ func (e *SysRole) RemoveSysRole(d *dto.SysRoleById) error { } // 获取角色对应的菜单ids -func (e *SysRole) GetRoleMenuId(roleId int) ([]int, error) { +func (e *SysRole) GetRoleMenuId(tx *gorm.DB, roleId int) ([]int, error) { menuIds := make([]int, 0) menuList := make([]models.MenuIdList, 0) - if err := orm.Eloquent.Table("sys_role_menu"). + if err := tx.Table("sys_role_menu"). Select("sys_role_menu.menu_id"). Where("role_id = ? ", roleId). Where(" sys_role_menu.menu_id not in(select sys_menu.parent_id from sys_role_menu "+ diff --git a/app/admin/service/sys_role_menu.go b/app/admin/service/sys_role_menu.go index a4fe849..0f271c9 100644 --- a/app/admin/service/sys_role_menu.go +++ b/app/admin/service/sys_role_menu.go @@ -1,9 +1,9 @@ package service import ( + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/app/admin/models" "go-admin/app/admin/models/system" - "go-admin/common/log" "go-admin/common/service" "gorm.io/gorm" ) @@ -19,7 +19,7 @@ func (e *SysRoleMenu) ReloadRule(tx *gorm.DB, roleId int, menuId []int) (err err menu := make([]models.Menu, 0) roleMenu := make([]system.RoleMenu, len(menuId)) - casbinRule := make([]models.CasbinRule, 0) + casbinRule := make([]system.CasbinRule, 0) //先删除所有的 err = e.DeleteRoleMenu(tx, roleId) if err != nil { @@ -46,7 +46,7 @@ func (e *SysRoleMenu) ReloadRule(tx *gorm.DB, roleId int, menuId []int) (err err RoleName: role.RoleKey, } if menu[i].MenuType == "A" { - casbinRule = append(casbinRule, models.CasbinRule{ + casbinRule = append(casbinRule, system.CasbinRule{ PType: "p", V0: role.RoleKey, V1: menu[i].Path, @@ -92,7 +92,7 @@ func (e *SysRoleMenu) DeleteRoleMenu(tx *gorm.DB, roleId int) (err error) { return } err = tx.Where("v0 = ?", role.RoleKey). - Delete(&models.CasbinRule{}).Error + Delete(&system.CasbinRule{}).Error if err != nil { log.Errorf("msgID[%s] delete casbin rule error, %s", msgID, err.Error()) return diff --git a/app/admin/service/sys_setting.go b/app/admin/service/sys_setting.go index e0adb46..5e61c0a 100644 --- a/app/admin/service/sys_setting.go +++ b/app/admin/service/sys_setting.go @@ -2,10 +2,11 @@ package service import ( "errors" - "go-admin/app/admin/models" - "go-admin/common/log" - "go-admin/common/service" + "gorm.io/gorm" + + "go-admin/app/admin/models" + "go-admin/common/service" ) type SysSetting struct { @@ -16,18 +17,17 @@ type SysSetting struct { func (e *SysSetting) GetSysSetting(model *models.SysSetting) error { var err error var data models.SysSetting - msgID := e.MsgID db := e.Orm.Model(&data). First(model) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil @@ -37,12 +37,11 @@ func (e *SysSetting) GetSysSetting(model *models.SysSetting) error { func (e *SysSetting) UpdateSysSetting(c *models.SysSetting) error { var err error var data models.SysSetting - msgID := e.MsgID db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } if db.RowsAffected == 0 { diff --git a/app/admin/service/sys_user.go b/app/admin/service/sys_user.go new file mode 100644 index 0000000..87ad4bd --- /dev/null +++ b/app/admin/service/sys_user.go @@ -0,0 +1,159 @@ +package service + +import ( + "errors" + + "gorm.io/gorm" + + "go-admin/app/admin/models/system" + "go-admin/common/actions" + cDto "go-admin/common/dto" + common "go-admin/common/models" + "go-admin/common/service" +) + +type SysUser struct { + service.Service +} + +// GetSysUserPage 获取SysUser列表 +func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list *[]system.SysUser, count *int64) error { + var err error + var data system.SysUser + + err = e.Orm.Model(&data). + Scopes( + cDto.MakeCondition(c.GetNeedSearch()), + cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), + actions.Permission(data.TableName(), p), + ). + Find(list).Limit(-1).Offset(-1). + Count(count).Error + if err != nil { + e.Log.Errorf("db error: %s", err) + return err + } + return nil +} + +// GetSysUser 获取SysUser对象 +func (e *SysUser) GetSysUser(d cDto.Control, p *actions.DataPermission, model *system.SysUser) error { + var err error + var data system.SysUser + + db := e.Orm.Model(&data). + Scopes( + actions.Permission(data.TableName(), p), + ). + First(model, d.GetId()) + err = db.Error + if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { + err = errors.New("查看对象不存在或无权查看") + e.Log.Errorf("db error: %s", err) + return err + } + if db.Error != nil { + e.Log.Errorf("db error: %s", err) + return err + } + return nil +} + +// InsertSysUser 创建SysUser对象 +func (e *SysUser) InsertSysUser(model common.ActiveRecord) error { + var err error + var data system.SysUser + + err = e.Orm.Model(&data). + Create(model).Error + if err != nil { + e.Log.Errorf("db error: %s", err) + return err + } + return nil +} + +// UpdateSysUser 修改SysUser对象 +func (e *SysUser) UpdateSysUser(c common.ActiveRecord, p *actions.DataPermission) error { + var err error + + db := e.Orm.Model(c). + Scopes( + actions.Permission(c.TableName(), p), + ).Where(c.GetId()).Updates(c) + if db.Error != nil { + e.Log.Errorf("db error: %s", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("无权更新该数据") + + } + return nil +} + +// RemoveSysUser 删除SysUser +func (e *SysUser) RemoveSysUser(d cDto.Control, c common.ActiveRecord, p *actions.DataPermission) error { + var err error + var data system.SysUser + + db := e.Orm.Model(&data). + Scopes( + actions.Permission(data.TableName(), p), + ).Where(d.GetId()).Delete(c) + if db.Error != nil { + err = db.Error + e.Log.Errorf("Delete error: %s", err) + return err + } + if db.RowsAffected == 0 { + err = errors.New("无权删除该数据") + return err + } + return nil +} + +// UpdateSysUserPwd 修改SysUser对象密码 +func (e *SysUser) UpdateSysUserPwd(c *system.SysUser, p *actions.DataPermission) error { + var err error + + if c.Password == "" { + return nil + } + + err = c.Encrypt() + if err != nil { + return err + } + + db := e.Orm.Model(c). + Scopes( + actions.Permission(c.TableName(), p), + ).Where(c.GetId()).Updates(c) + if db.Error != nil { + e.Log.Errorf("db error: %s", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("无权更新该数据") + + } + return nil +} + +func (e *SysUser) GetSysUserProfile(id int, user *system.SysUser, roles *[]system.SysRole, posts *[]system.SysPost) error { + err := e.Orm.Preload("Dept").First(user, "user_id = ?", id).Error + if err != nil { + return err + } + err = e.Orm.Find(roles, user.RoleId).Error + if err != nil { + return err + } + err = e.Orm.Find(posts, user.PostIds).Error + if err != nil { + return err + } + + return nil +} diff --git a/app/jobs/jobbase.go b/app/jobs/jobbase.go index 4e8f546..50d03be 100644 --- a/app/jobs/jobbase.go +++ b/app/jobs/jobbase.go @@ -2,6 +2,8 @@ package jobs import ( "fmt" + log "github.com/go-admin-team/go-admin-core/logger" + "gorm.io/gorm" "sync" "time" @@ -41,7 +43,7 @@ func (e *ExecJob) Run() { startTime := time.Now() var obj = jobList[e.InvokeTarget] if obj == nil { - global.JobLogger.Warn(" ExecJob Run job nil") + log.Warn("[Job] ExecJob Run job nil") return } err := CallExec(obj.(JobsExec), e.Args) @@ -57,7 +59,7 @@ func (e *ExecJob) Run() { //TODO: 待完善部分 //str := time.Now().Format(timeFormat) + " [INFO] JobCore " + string(e.EntryId) + "exec success , spend :" + latencyTime.String() //ws.SendAll(str) - global.JobLogger.Info(time.Now().Format(timeFormat), " [INFO] JobCore ", e, "exec success , spend :", latencyTime) + log.Info("[Job] JobCore %s exec success , spend :%v", e.Name, latencyTime) return } @@ -89,20 +91,26 @@ LOOP: latencyTime := endTime.Sub(startTime) //TODO: 待完善部分 - global.JobLogger.Info(time.Now().Format(timeFormat), " [INFO] JobCore ", h, "exec success , spend :", latencyTime) + log.Infof("[Job] JobCore %s exec success , spend :%v", h.Name, latencyTime) return } // 初始化 -func Setup() { +func Setup(dbs map[string]*gorm.DB) { fmt.Println(time.Now().Format(timeFormat), " [INFO] JobCore Starting...") - global.GADMCron = cronjob.NewWithSeconds() + for k, db := range dbs { + global.Cfg.SetCrontab(k, cronjob.NewWithSeconds()) + setup(k, db) + } +} +func setup(key string, db *gorm.DB) { + crontab := global.Cfg.GetCrontabKey(key) sysJob := models.SysJob{} jobList := make([]models.SysJob, 0) - err := sysJob.GetList(&jobList) + err := sysJob.GetList(db, &jobList) if err != nil { fmt.Println(time.Now().Format(timeFormat), " [ERROR] JobCore init error", err) } @@ -110,7 +118,7 @@ func Setup() { fmt.Println(time.Now().Format(timeFormat), " [INFO] JobCore total:0") } - _, err = sysJob.RemoveAllEntryID() + _, err = sysJob.RemoveAllEntryID(db) if err != nil { fmt.Println(time.Now().Format(timeFormat), " [ERROR] JobCore remove entry_id error", err) } @@ -123,7 +131,7 @@ func Setup() { j.JobId = jobList[i].JobId j.Name = jobList[i].JobName - sysJob.EntryId, err = AddJob(j) + sysJob.EntryId, err = AddJob(crontab, j) } else if jobList[i].JobType == 2 { j := &ExecJob{} j.InvokeTarget = jobList[i].InvokeTarget @@ -131,30 +139,30 @@ func Setup() { j.JobId = jobList[i].JobId j.Name = jobList[i].JobName j.Args = jobList[i].Args - sysJob.EntryId, err = AddJob(j) + sysJob.EntryId, err = AddJob(crontab, j) } - err = sysJob.Update(jobList[i].JobId) + err = sysJob.Update(db, jobList[i].JobId) } // 其中任务 - global.GADMCron.Start() + crontab.Start() fmt.Println(time.Now().Format(timeFormat), " [INFO] JobCore start success.") // 关闭任务 - defer global.GADMCron.Stop() + defer crontab.Stop() select {} } // 添加任务 AddJob(invokeTarget string, jobId int, jobName string, cronExpression string) -func AddJob(job Job) (int, error) { +func AddJob(c *cron.Cron, job Job) (int, error) { if job == nil { fmt.Println("unknown") return 0, nil } - return job.addJob() + return job.addJob(c) } -func (h *HttpJob) addJob() (int, error) { - id, err := global.GADMCron.AddJob(h.CronExpression, h) +func (h *HttpJob) addJob(c *cron.Cron) (int, error) { + id, err := c.AddJob(h.CronExpression, h) if err != nil { fmt.Println(time.Now().Format(timeFormat), " [ERROR] JobCore AddJob error", err) return 0, err @@ -163,8 +171,8 @@ func (h *HttpJob) addJob() (int, error) { return EntryId, nil } -func (h *ExecJob) addJob() (int, error) { - id, err := global.GADMCron.AddJob(h.CronExpression, h) +func (h *ExecJob) addJob(c *cron.Cron) (int, error) { + id, err := c.AddJob(h.CronExpression, h) if err != nil { fmt.Println(time.Now().Format(timeFormat), " [ERROR] JobCore AddJob error", err) return 0, err @@ -174,10 +182,10 @@ func (h *ExecJob) addJob() (int, error) { } // 移除任务 -func Remove(entryID int) chan bool { +func Remove(c *cron.Cron, entryID int) chan bool { ch := make(chan bool) go func() { - global.GADMCron.Remove(cron.EntryID(entryID)) + c.Remove(cron.EntryID(entryID)) fmt.Println(time.Now().Format(timeFormat), " [INFO] JobCore Remove success ,info entryID :", entryID) ch <- true }() @@ -185,11 +193,11 @@ func Remove(entryID int) chan bool { } // 任务停止 -func Stop() chan bool { - ch := make(chan bool) - go func() { - global.GADMCron.Stop() - ch <- true - }() - return ch -} +//func Stop() chan bool { +// ch := make(chan bool) +// go func() { +// global.GADMCron.Stop() +// ch <- true +// }() +// return ch +//} diff --git a/app/jobs/type.go b/app/jobs/type.go index a7ede6a..b29b6b9 100644 --- a/app/jobs/type.go +++ b/app/jobs/type.go @@ -1,8 +1,10 @@ package jobs +import "github.com/robfig/cron/v3" + type Job interface { Run() - addJob() (int, error) + addJob(*cron.Cron) (int, error) } type JobsExec interface { diff --git a/cmd/api/server.go b/cmd/api/server.go index 3197a06..8f0129d 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -3,6 +3,7 @@ package api import ( "context" "fmt" + "log" "net/http" "os" "os/signal" @@ -16,7 +17,6 @@ import ( "go-admin/app/jobs" "go-admin/common/database" "go-admin/common/global" - "go-admin/common/log" "go-admin/pkg/logger" "go-admin/tools" "go-admin/tools/config" @@ -53,15 +53,17 @@ func setup() { config.Setup(file.NewSource, file.WithPath(configYml)) go config.Watch() //2. 设置日志 - global.Logger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "bus") - global.JobLogger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "job") - global.RequestLogger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "request") + global.Cfg.SetLogger( + logger.SetupLogger( + config.LoggerConfig.Type, + config.LoggerConfig.Path, + config.LoggerConfig.Level, + config.LoggerConfig.Stdout)) //3. 初始化数据库链接 database.Setup() - usageStr := `starting api server` - log.Info(usageStr) - + usageStr := `starting api server...` + log.Println(usageStr) } func run() error { @@ -90,7 +92,7 @@ func run() error { } go func() { jobs.InitJob() - jobs.Setup() + jobs.Setup(global.Cfg.GetDb()) }() @@ -127,7 +129,7 @@ func run() error { if err := srv.Shutdown(ctx); err != nil { log.Fatal("Server Shutdown:", err) } - log.Info("Server exiting") + log.Println("Server exiting") return nil } diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go index ba500d3..a453d3c 100644 --- a/cmd/migrate/migration/version/1599190683659_tables.go +++ b/cmd/migrate/migration/version/1599190683659_tables.go @@ -19,19 +19,19 @@ func init() { func _1599190683659Tables(db *gorm.DB, version string) error { err := db.Debug().Migrator().AutoMigrate( - new(models.CasbinRule), - new(models.SysDept), + new(system.CasbinRule), + new(system.SysDept), new(system.SysConfig), new(tools.SysTables), new(tools.SysColumns), - new(models.SysMenu), + new(system.SysMenu), new(system.SysLoginLog), new(system.SysOperaLog), new(models.RoleMenu), new(system.SysRoleDept), - new(models.SysUser), + new(system.SysUser), new(system.SysRole), - new(models.Post), + new(Post), new(DictData), new(DictType), new(models.SysJob), diff --git a/cmd/migrate/migration/version/1599190683670_migrate.go b/cmd/migrate/migration/version/1599190683670_migrate.go index ee2034f..e430647 100644 --- a/cmd/migrate/migration/version/1599190683670_migrate.go +++ b/cmd/migrate/migration/version/1599190683670_migrate.go @@ -20,7 +20,7 @@ func init() { func _1599190683670Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - list3 := []models.SysDept{ + list3 := []system.SysDept{ {DeptId: 1, ParentId: 0, DeptPath: "/0/1", DeptName: "爱拓科技", Sort: 0, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, {DeptId: 7, ParentId: 1, DeptPath: "/0/1/7", DeptName: "研发部", Sort: 1, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, {DeptId: 8, ParentId: 1, DeptPath: "/0/1/8", DeptName: "运维部", Sort: 0, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, @@ -34,10 +34,10 @@ func _1599190683670Test(db *gorm.DB, version string) error { {Model: common.Model{ID: 3}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}, ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ConfigName: "主框架页-侧边栏主题", ConfigKey: "sys_index_sideTheme", ConfigValue: "theme-dark", ConfigType: "Y", Remark: "深色主题theme-dark,浅色主题theme-light"}, } - list5 := []models.Post{ - {PostId: 1, PostName: "首席执行官", PostCode: "CEO", Sort: 0, Status: "2", Remark: "首席执行官", CreateBy: "1", UpdateBy: "1", BaseModel: models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {PostId: 2, PostName: "首席技术执行官", PostCode: "CTO", Sort: 2, Status: "2", Remark: "首席技术执行官", CreateBy: "1", UpdateBy: "1", BaseModel: models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {PostId: 3, PostName: "首席运营官", PostCode: "COO", Sort: 3, Status: "2", Remark: "测试工程师", CreateBy: "1", UpdateBy: "1", BaseModel: models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, + list5 := []Post{ + {PostId: 1, PostName: "首席执行官", PostCode: "CEO", Sort: 0, Status: "2", Remark: "首席执行官", CreateBy: "1", UpdateBy: "1", CreatedAt: time.Now(), UpdatedAt: time.Now()}, + {PostId: 2, PostName: "首席技术执行官", PostCode: "CTO", Sort: 2, Status: "2", Remark: "首席技术执行官", CreateBy: "1", UpdateBy: "1", CreatedAt: time.Now(), UpdatedAt: time.Now()}, + {PostId: 3, PostName: "首席运营官", PostCode: "COO", Sort: 3, Status: "2", Remark: "测试工程师", CreateBy: "1", UpdateBy: "1", CreatedAt: time.Now(), UpdatedAt: time.Now()}, } list6 := []models.SysRole{ @@ -57,8 +57,32 @@ func _1599190683670Test(db *gorm.DB, version string) error { {DictId: 10, DictName: "通知状态", DictType: "sys_notice_status", Status: "2", CreateBy: "1", UpdateBy: "", Remark: "通知状态列表", BaseModel: models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, } - list8 := []models.SysUser{ - {models.SysUserId{1}, models.LoginM{models.UserName{"admin"}, models.PassWord{"$2a$10$cKFFTCzGOvaIHHJY2K45Zuwt8TD6oPzYi4s5MzYIBAWCLL6ZhouP2"}}, models.SysUserB{"zhangwj", "13818888888", 1, "", "", "0", "1@qq.com", 1, 1, "1", "1", "", "2", models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}, "", ""}}, + list8 := []system.SysUser{ + { + ControlBy: common.ControlBy{ + CreateBy: 1, + UpdateBy: 1, + }, + ModelTime: common.ModelTime{ + CreatedAt: time.Now(), + UpdatedAt: time.Now(), + }, + UserId: 1, + Username: "admin", + Password: "$2a$10$cKFFTCzGOvaIHHJY2K45Zuwt8TD6oPzYi4s5MzYIBAWCLL6ZhouP2", + NickName: "zhangwj", + Phone: "13818888888", + RoleId: 1, + Salt: "", + Avatar: "", + Sex: "1", + Email: "1@qq.com", + DeptId: 1, + PostId: 1, + Remark: "", + Status: "2", + }, + //{models.SysUserId{1}, models.LoginM{models.UserName{"admin"}, models.PassWord{"$2a$10$cKFFTCzGOvaIHHJY2K45Zuwt8TD6oPzYi4s5MzYIBAWCLL6ZhouP2"}}, models.SysUserB{"zhangwj", "13818888888", 1, "", "", "0", "1@qq.com", 1, 1, "1", "1", "", "2", models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}, "", ""}}, } list9 := []DictData{ diff --git a/cmd/migrate/migration/version/1602644950000_migrate.go b/cmd/migrate/migration/version/1602644950000_migrate.go index c2f87ce..8a7ca0b 100644 --- a/cmd/migrate/migration/version/1602644950000_migrate.go +++ b/cmd/migrate/migration/version/1602644950000_migrate.go @@ -24,7 +24,7 @@ func _1602644950000Test(db *gorm.DB, version string) error { return err } } - list2 := []models.CasbinRule{ + list2 := []system.CasbinRule{ {PType: "p", V0: "admin", V1: "/api/v1/config", V2: "GET"}, } err := tx.Create(list2).Error diff --git a/cmd/migrate/migration/version/1606579402398_migrate.go b/cmd/migrate/migration/version/1606579402398_migrate.go index fb2ed5e..0e5c522 100644 --- a/cmd/migrate/migration/version/1606579402398_migrate.go +++ b/cmd/migrate/migration/version/1606579402398_migrate.go @@ -1,7 +1,8 @@ package version import ( - "go-admin/app/admin/models" + "go-admin/app/admin/models/system" + //"go-admin/app/admin/models" "gorm.io/gorm" "runtime" @@ -30,7 +31,7 @@ func _1606579402398Test(db *gorm.DB, version string) error { return err } - user := models.SysUser{} + user := system.SysUser{} err = tx.Model(&user).Where("user_id = ?", 1).Update("status", 2).Error if err != nil { return err diff --git a/cmd/migrate/migration/version/1606582844753_migrate.go b/cmd/migrate/migration/version/1606582844753_migrate.go index 0717e3c..9245a9d 100644 --- a/cmd/migrate/migration/version/1606582844753_migrate.go +++ b/cmd/migrate/migration/version/1606582844753_migrate.go @@ -1,7 +1,8 @@ package version import ( - "go-admin/app/admin/models" + "go-admin/app/admin/models/system" + //"go-admin/app/admin/models" "gorm.io/gorm" "runtime" @@ -18,7 +19,7 @@ func init() { func _1606582844753Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - dept := models.SysDept{} + dept := system.SysDept{} err := tx.Model(&dept).Where("status = ?", 0).Update("status", 2).Error if err != nil { return err diff --git a/cmd/migrate/migration/version/1610427732413_migrate.go b/cmd/migrate/migration/version/1610427732413_migrate.go index bf14a18..83fc1c6 100644 --- a/cmd/migrate/migration/version/1610427732413_migrate.go +++ b/cmd/migrate/migration/version/1610427732413_migrate.go @@ -1,7 +1,8 @@ package version import ( - "go-admin/app/admin/models" + "go-admin/app/admin/models/system" + //"go-admin/app/admin/models" "gorm.io/gorm" "runtime" @@ -18,8 +19,8 @@ func init() { func _1610427732413Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - // TODO: 这里开始写入要变更的内容 - user := models.SysUser{} + // TODO: 这里开始写入要变更的内容 + user := system.SysUser{} err := tx.Model(&user).Where("status = ?", 0).Update("status", 2).Error if err != nil { return err diff --git a/cmd/migrate/migration/version/1613638159444_migrate.go b/cmd/migrate/migration/version/1613638159444_migrate.go index b8d4e93..9a0c4fa 100644 --- a/cmd/migrate/migration/version/1613638159444_migrate.go +++ b/cmd/migrate/migration/version/1613638159444_migrate.go @@ -1,7 +1,6 @@ package version import ( - "go-admin/app/admin/models" "go-admin/app/admin/models/system" //"go-admin/app/admin/models" @@ -20,29 +19,27 @@ func init() { func _1613638159444Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - // TODO: 这里开始写入要变更的内容 + // TODO: 这里开始写入要变更的内容 - // TODO: 例如 修改表字段 使用过程中请删除此段代码 - err := tx.Migrator().AlterColumn(&system.SysRole{}, "create_by") + // TODO: 例如 修改表字段 使用过程中请删除此段代码 + err := tx.Migrator().AlterColumn(&system.SysRole{}, "create_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&system.SysRole{}, "update_by") + err = tx.Migrator().AlterColumn(&system.SysRole{}, "update_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&models.SysMenu{}, "update_by") + err = tx.Migrator().AlterColumn(&system.SysMenu{}, "update_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&models.SysMenu{}, "create_by") + err = tx.Migrator().AlterColumn(&system.SysMenu{}, "create_by") if err != nil { return err } - - return tx.Create(&common.Migration{ Version: version, }).Error diff --git a/cmd/migrate/migration/version/1613697961697_migrate.go b/cmd/migrate/migration/version/1613697961697_migrate.go index 8a47c93..9e52af8 100644 --- a/cmd/migrate/migration/version/1613697961697_migrate.go +++ b/cmd/migrate/migration/version/1613697961697_migrate.go @@ -1,7 +1,6 @@ package version import ( - "go-admin/app/admin/models" "go-admin/app/admin/models/system" //"go-admin/app/admin/models" @@ -21,11 +20,11 @@ func _1613697961697Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { //修改字段类型 - err := tx.Migrator().AlterColumn(&models.SysMenu{}, "create_by") + err := tx.Migrator().AlterColumn(&system.SysMenu{}, "create_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&models.SysMenu{}, "update_by") + err = tx.Migrator().AlterColumn(&system.SysMenu{}, "update_by") if err != nil { return err } diff --git a/cmd/migrate/migration/version/1614604763713_migrate.go b/cmd/migrate/migration/version/1614604763713_migrate.go new file mode 100644 index 0000000..631851c --- /dev/null +++ b/cmd/migrate/migration/version/1614604763713_migrate.go @@ -0,0 +1,73 @@ +package version + +import ( + "go-admin/app/admin/models" + "go-admin/app/admin/models/system" + + //"go-admin/app/admin/models" + "gorm.io/gorm" + "runtime" + + "go-admin/cmd/migrate/migration" + common "go-admin/common/models" +) + +func init() { + _, fileName, _, _ := runtime.Caller(0) + migration.Migrate.SetVersion(migration.GetFilename(fileName), _1614604763713Test) +} + +func _1614604763713Test(db *gorm.DB, version string) error { + return db.Transaction(func(tx *gorm.DB) error { + + err := tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/dict/typeoptionselect").Update("path", "/api/v1/dict/type-option-select").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("action = ?", "GET"). + Where("path = ?", "/api/v1/sysUserList").Update("path", "/api/v1/sysUser").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("action = ?", "DELETE"). + Where("path = ?", "/api/v1/sysUser/:id").Update("path", "/api/v1/sysUser").Error + if err != nil { + return err + } + + err = tx.Migrator().AlterColumn(&system.SysUser{}, "create_by") + if err != nil { + return err + } + err = tx.Migrator().AlterColumn(&system.SysUser{}, "update_by") + if err != nil { + return err + } + + err = tx.Migrator().AlterColumn(&models.SysContent{}, "create_by") + if err != nil { + return err + } + err = tx.Migrator().AlterColumn(&models.SysContent{}, "update_by") + if err != nil { + return err + } + err = tx.Model(&models.Menu{}).Where("action = ?", "PUT"). + Where("path = ?", "/api/v1/syscontent").Update("path", "/api/v1/syscontent/:id").Error + if err != nil { + return err + } + + err = tx.Model(&models.Menu{}).Where("action = ?", "DELETE"). + Where("path = ?", "/api/v1/syscontent/:id").Update("path", "/api/v1/syscontent").Error + if err != nil { + return err + } + + return tx.Create(&common.Migration{ + Version: version, + }).Error + }) +} diff --git a/cmd/migrate/migration/version/post.go b/cmd/migrate/migration/version/post.go new file mode 100644 index 0000000..12be3f1 --- /dev/null +++ b/cmd/migrate/migration/version/post.go @@ -0,0 +1,23 @@ +package version + +import ( + "time" +) + +type Post struct { + PostId int `gorm:"primaryKey;autoIncrement" json:"postId"` //岗位编号 + PostName string `gorm:"size:128;" json:"postName"` //岗位名称 + PostCode string `gorm:"size:128;" json:"postCode"` //岗位代码 + Sort int `gorm:"" json:"sort"` //岗位排序 + Status string `gorm:"size:4;" json:"status"` //状态 + Remark string `gorm:"size:255;" json:"remark"` //描述 + CreateBy string `gorm:"size:128;" json:"createBy"` + UpdateBy string `gorm:"size:128;" json:"updateBy"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` + DeletedAt *time.Time `json:"deletedAt"` +} + +func (Post) TableName() string { + return "sys_post" +} diff --git a/cmd/migrate/server.go b/cmd/migrate/server.go index f47ebf7..adc8f78 100644 --- a/cmd/migrate/server.go +++ b/cmd/migrate/server.go @@ -25,6 +25,7 @@ var ( configYml string generate bool goAdmin bool + host string StartCmd = &cobra.Command{ Use: "migrate", Short: "Initialize the database", @@ -39,6 +40,7 @@ func init() { StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file") StartCmd.PersistentFlags().BoolVarP(&generate, "generate", "g", false, "generate migration file") StartCmd.PersistentFlags().BoolVarP(&goAdmin, "goAdmin", "a", false, "generate go-admin migration file") + StartCmd.PersistentFlags().StringVarP(&host, "domain", "d", "*", "select tenant host") } func run() { @@ -48,9 +50,12 @@ func run() { //1. 读取配置 config.Setup(file.NewSource, file.WithPath(configYml)) //2. 设置日志 - global.Logger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "bus") - global.JobLogger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "job") - global.RequestLogger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "request") + global.Cfg.SetLogger( + logger.SetupLogger( + config.LoggerConfig.Type, + config.LoggerConfig.Path, + config.LoggerConfig.Level, + config.LoggerConfig.Stdout)) _ = initDB() } else { fmt.Println(`generate migration file`) @@ -59,14 +64,19 @@ func run() { } func migrateModel() error { - if config.DatabaseConfig.Driver == "mysql" { - global.Eloquent.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4") + if host == "" { + host = "*" } - err := global.Eloquent.Debug().AutoMigrate(&models.Migration{}) + db := global.Cfg.GetDbByKey(host) + if config.DatabasesConfig[host].Driver == "mysql" { + //初始化数据库时候用 + db.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4") + } + err := db.Debug().AutoMigrate(&models.Migration{}) if err != nil { return err } - migration.Migrate.SetDb(global.Eloquent.Debug()) + migration.Migrate.SetDb(db.Debug()) migration.Migrate.Migrate() return err } diff --git a/common/actions/create.go b/common/actions/create.go index b7bb293..d86fa39 100644 --- a/common/actions/create.go +++ b/common/actions/create.go @@ -6,8 +6,8 @@ import ( "github.com/gin-gonic/gin" "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/models" + "go-admin/pkg/logger" "go-admin/tools" "go-admin/tools/app" ) @@ -15,13 +15,13 @@ import ( // CreateAction 通用新增动作 func CreateAction(control dto.Control) gin.HandlerFunc { return func(c *gin.Context) { + log := logger.GetRequestLogger(c) db, err := tools.GetOrm(c) if err != nil { log.Error(err) return } - msgID := tools.GenerateMsgIDFromContext(c) //新增操作 req := control.Generate() err = req.Bind(c) @@ -38,7 +38,7 @@ func CreateAction(control dto.Control) gin.HandlerFunc { object.SetCreateBy(tools.GetUserId(c)) err = db.WithContext(c).Create(object).Error if err != nil { - log.Errorf("MsgID[%s] Create error: %s", msgID, err) + log.Errorf("Create error: %s", err) app.Error(c, http.StatusInternalServerError, err, "创建失败") return } diff --git a/common/actions/delete.go b/common/actions/delete.go index e055b60..5507e91 100644 --- a/common/actions/delete.go +++ b/common/actions/delete.go @@ -5,8 +5,8 @@ import ( "github.com/gin-gonic/gin" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/models" "go-admin/tools" "go-admin/tools/app" diff --git a/common/actions/index.go b/common/actions/index.go index 3f8f7fa..5071e87 100644 --- a/common/actions/index.go +++ b/common/actions/index.go @@ -7,8 +7,8 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/models" "go-admin/tools" "go-admin/tools/app" diff --git a/common/actions/permission.go b/common/actions/permission.go index 92df643..78b7d0f 100644 --- a/common/actions/permission.go +++ b/common/actions/permission.go @@ -7,7 +7,7 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" - "go-admin/common/log" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/tools" "go-admin/tools/app" "go-admin/tools/config" @@ -94,4 +94,4 @@ func getPermissionFromContext(c *gin.Context) *DataPermission { // PermissionForNoAction 提供非action写法数据范围约束 func GetPermissionFromContext(c *gin.Context) *DataPermission { return getPermissionFromContext(c) -} \ No newline at end of file +} diff --git a/common/actions/update.go b/common/actions/update.go index 74d4662..03c3d8f 100644 --- a/common/actions/update.go +++ b/common/actions/update.go @@ -5,8 +5,8 @@ import ( "github.com/gin-gonic/gin" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/models" "go-admin/tools" "go-admin/tools/app" diff --git a/common/actions/view.go b/common/actions/view.go index 015d54b..c0463d5 100644 --- a/common/actions/view.go +++ b/common/actions/view.go @@ -7,8 +7,8 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/common/dto" - "go-admin/common/log" "go-admin/common/models" "go-admin/tools" "go-admin/tools/app" diff --git a/common/apis/api.go b/common/apis/api.go index 66de1a9..ffb6406 100644 --- a/common/apis/api.go +++ b/common/apis/api.go @@ -2,11 +2,12 @@ package apis import ( "encoding/json" - "github.com/gin-gonic/gin" - "go-admin/common/log" - "gorm.io/gorm" "net/http" + "github.com/gin-gonic/gin" + "go-admin/pkg/logger" + "gorm.io/gorm" + "go-admin/common/models" "go-admin/tools" ) @@ -14,6 +15,11 @@ import ( type Api struct { } +// GetLogger 获取上下文提供的日志 +func (e *Api) GetLogger(c *gin.Context) logger.Logger { + return logger.GetRequestLogger(c) +} + // GetOrm 获取Orm DB func (e *Api) GetOrm(c *gin.Context) (*gorm.DB, error) { return tools.GetOrm(c) @@ -30,7 +36,7 @@ func (e *Api) Error(c *gin.Context, code int, err error, msg string) { } res.RequestId = tools.GenerateMsgIDFromContext(c) Return := res.ReturnError(code) - setResult(c, Return, res.RequestId, code) + e.setResult(c, Return, res.RequestId, code) c.AbortWithStatusJSON(http.StatusOK, Return) } @@ -43,7 +49,7 @@ func (e *Api) OK(c *gin.Context, data interface{}, msg string) { } res.RequestId = tools.GenerateMsgIDFromContext(c) Return := res.ReturnOK() - setResult(c, Return, res.RequestId, 200) + e.setResult(c, Return, res.RequestId, 200) c.AbortWithStatusJSON(http.StatusOK, Return) } @@ -61,15 +67,15 @@ func (e *Api) PageOK(c *gin.Context, result interface{}, count int, pageIndex in func (e *Api) Custom(c *gin.Context, data gin.H) { msgID := tools.GenerateMsgIDFromContext(c) Return := data - setResult(c, Return, msgID, 200) + e.setResult(c, Return, msgID, 200) c.AbortWithStatusJSON(http.StatusOK, Return) } -func setResult(c *gin.Context, Return interface{}, msgID string, status int) { - var jsonStr []byte +func (e *Api) setResult(c *gin.Context, Return interface{}, msgID string, status int) { + requestLogger := e.GetLogger(c) jsonStr, err := json.Marshal(Return) if err != nil { - log.Debugf("MsgID[%s] setResult error: %#v", msgID, err.Error()) + requestLogger.Debugf("setResult error: %#v", msgID, err.Error()) } c.Set("result", string(jsonStr)) c.Set("status", status) diff --git a/common/config/config.go b/common/config/config.go index 0b5fa43..a5af0c9 100644 --- a/common/config/config.go +++ b/common/config/config.go @@ -5,6 +5,7 @@ import ( "github.com/casbin/casbin/v2" "github.com/go-admin-team/go-admin-core/logger" + "github.com/robfig/cron/v3" "gorm.io/gorm" ) @@ -12,6 +13,7 @@ type Config struct { dbs map[string]*gorm.DB casbins map[string]*casbin.SyncedEnforcer engine http.Handler + crontab map[string]*cron.Cron } // SetDb 设置对应key的db @@ -69,5 +71,24 @@ func NewConfig() *Config { return &Config{ dbs: make(map[string]*gorm.DB), casbins: make(map[string]*casbin.SyncedEnforcer), + crontab: make(map[string]*cron.Cron), } } + +// SetCrontab 设置对应key的crontab +func (c *Config) SetCrontab(key string, crontab *cron.Cron) { + c.crontab[key] = crontab +} + +// GetCrontab 获取所有map里的crontab数据 +func (c *Config) GetCrontab() map[string]*cron.Cron { + return c.crontab +} + +// GetCrontabKey 根据key获取crontab +func (c *Config) GetCrontabKey(key string) *cron.Cron { + if e, ok := c.crontab["*"]; ok { + return e + } + return c.crontab[key] +} diff --git a/common/config/type.go b/common/config/type.go index c3f772a..726c7f5 100644 --- a/common/config/type.go +++ b/common/config/type.go @@ -2,6 +2,7 @@ package config import ( "github.com/casbin/casbin/v2" + "github.com/robfig/cron/v3" "net/http" "github.com/go-admin-team/go-admin-core/logger" @@ -24,4 +25,9 @@ type Conf interface { //使用go-admin定义的logger,参考来源go-micro SetLogger(logger logger.Logger) GetLogger() logger.Logger + + //crontab + SetCrontab(key string, crontab *cron.Cron) + GetCrontab() map[string]*cron.Cron + GetCrontabKey(key string) *cron.Cron } diff --git a/common/database/initialize.go b/common/database/initialize.go index 2f3be92..0164abb 100644 --- a/common/database/initialize.go +++ b/common/database/initialize.go @@ -10,8 +10,8 @@ import ( "gorm.io/gorm/logger" "gorm.io/gorm/schema" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/common/global" - "go-admin/common/log" mycasbin "go-admin/pkg/casbin" "go-admin/tools" toolsConfig "go-admin/tools/config" @@ -61,9 +61,9 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) { e := mycasbin.Setup(db, "sys_") - if host == "*" { - global.Eloquent = db - } + //if host == "*" { + // global.Eloquent = db + //} global.Cfg.SetDb(host, db) global.Cfg.SetCasbin(host, e) diff --git a/common/global/adm.go b/common/global/adm.go index 58d20b0..e5ef2b3 100644 --- a/common/global/adm.go +++ b/common/global/adm.go @@ -1,12 +1,7 @@ package global import ( - "github.com/gin-gonic/gin" - "github.com/robfig/cron/v3" - "gorm.io/gorm" - "go-admin/common/config" - "go-admin/pkg/logger" ) const ( @@ -16,19 +11,8 @@ const ( var Cfg config.Conf = config.NewConfig() -var GinEngine *gin.Engine -var Eloquent *gorm.DB - -var GADMCron *cron.Cron - var ( Source string Driver string DBName string ) - -var ( - Logger = &logger.Logger{} - JobLogger = &logger.Logger{} - RequestLogger = &logger.Logger{} -) diff --git a/common/log/log.go b/common/log/log.go deleted file mode 100644 index d5aad7e..0000000 --- a/common/log/log.go +++ /dev/null @@ -1,30 +0,0 @@ -package log - -import "github.com/go-admin-team/go-admin-core/logger" - -var ( - // Trace trace级日志输出 - Trace = logger.Trace - // Tracef trace级日志输出 - Tracef = logger.Tracef - // Debug debug级日志输出 - Debug = logger.Debug - // Debugf debug级日志输出 - Debugf = logger.Debugf - // Info info级日志输出 - Info = logger.Info - // Infof info级日志输出 - Infof = logger.Infof - // Warn warn级日志输出 - Warn = logger.Warn - // Warnf warn级日志输出 - Warnf = logger.Warnf - // Error error级日志输出 - Error = logger.Error - // Errorf error级日志输出 - Errorf = logger.Errorf - // Fatal fatal级日志输出 - Fatal = logger.Fatal - // Fatalf fatal级日志输出 - Fatalf = logger.Fatalf -) diff --git a/common/middleware/log.go b/common/middleware/log.go new file mode 100644 index 0000000..e91e45d --- /dev/null +++ b/common/middleware/log.go @@ -0,0 +1,9 @@ +package middleware + +import "github.com/gin-gonic/gin" + +func SetLogger() gin.HandlerFunc { + return func(ctx *gin.Context) { + + } +} diff --git a/common/middleware/request_id.go b/common/middleware/request_id.go new file mode 100644 index 0000000..390107a --- /dev/null +++ b/common/middleware/request_id.go @@ -0,0 +1,27 @@ +package middleware + +import ( + "strings" + + "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/logger" + "github.com/google/uuid" +) + +// RequestIdLogger 自动增加requestId +func RequestIdLogger(trafficKey, loggerKey string) gin.HandlerFunc { + return func(c *gin.Context) { + requestId := c.GetHeader(trafficKey) + if requestId == "" { + requestId = c.GetHeader(strings.ToLower(trafficKey)) + } + if requestId == "" { + requestId = uuid.New().String() + } + c.Header(trafficKey, requestId) + c.Set(loggerKey, logger.DefaultLogger.Fields(map[string]interface{}{ + strings.ToLower(trafficKey): requestId, + })) + c.Next() + } +} diff --git a/common/middleware/sentinel.go b/common/middleware/sentinel.go index f10cdfc..c4ea95a 100644 --- a/common/middleware/sentinel.go +++ b/common/middleware/sentinel.go @@ -5,7 +5,7 @@ import ( "github.com/alibaba/sentinel-golang/core/system" "github.com/gin-gonic/gin" - "go-admin/common/log" + log "github.com/go-admin-team/go-admin-core/logger" ) // Sentinel 限流 diff --git a/common/models/by.go b/common/models/by.go index 48e31ad..97409b7 100644 --- a/common/models/by.go +++ b/common/models/by.go @@ -1,8 +1,9 @@ package models import ( - "gorm.io/gorm" "time" + + "gorm.io/gorm" ) type ControlBy struct { diff --git a/common/service/service.go b/common/service/service.go index 05dbf27..283dec3 100644 --- a/common/service/service.go +++ b/common/service/service.go @@ -1,9 +1,13 @@ package service -import "gorm.io/gorm" +import ( + "go-admin/pkg/logger" + "gorm.io/gorm" +) type Service struct { Orm *gorm.DB Msg string MsgID string + Log logger.Logger } diff --git a/config/settings.full.yml b/config/settings.full.yml index 54b3ab5..96b2aab 100644 --- a/config/settings.full.yml +++ b/config/settings.full.yml @@ -24,18 +24,12 @@ settings: logger: # 日志存放路径 path: temp/logs - # 控制台日志 - stdout: true - # 日志等级 - level: all - # 业务日志开关 - enabledbus: false - # 请求日志开关 - enabledreq: false + # 日志输出,file:文件,default:命令行,其他:命令行 + stdout: '' #控制台日志,启用后,不输出到文件 + # 日志等级, trace, debug, info, warn, error, fatal + level: trace # 数据库日志开关 dev模式,将自动开启 enableddb: false - # 自动任务日志开关 dev模式,将自动开启 - enabledjob: false jwt: # token 密钥,生产环境时及的修改 secret: go-admin diff --git a/config/settings.sqlite.yml b/config/settings.sqlite.yml index 0d10baa..987ead5 100644 --- a/config/settings.sqlite.yml +++ b/config/settings.sqlite.yml @@ -15,18 +15,12 @@ settings: logger: # 日志存放路径 path: temp/logs - # 控制台日志 - stdout: true - # 日志等级 - level: all - # 业务日志开关 - enabledbus: true - # 请求日志开关 - enabledreq: false + # 日志输出,file:文件,default:命令行,其他:命令行 + stdout: '' #控制台日志,启用后,不输出到文件 + # 日志等级, trace, debug, info, warn, error, fatal + level: trace # 数据库日志开关 dev模式,将自动开启 enableddb: false - # 自动任务日志开关 dev模式,将自动开启 - enabledjob: false jwt: # token 密钥,生产环境时及的修改 secret: go-admin diff --git a/config/settings.yml b/config/settings.yml index e16f3d6..878ec6a 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -15,18 +15,12 @@ settings: logger: # 日志存放路径 path: temp/logs - # 控制台日志 - stdout: true - # 日志等级 - level: all - # 业务日志开关 - enabledbus: true - # 请求日志开关 - enabledreq: false + # 日志输出,file:文件,default:命令行,其他:命令行 + stdout: '' #控制台日志,启用后,不输出到文件 + # 日志等级, trace, debug, info, warn, error, fatal + level: trace # 数据库日志开关 dev模式,将自动开启 enableddb: false - # 自动任务日志开关 dev模式,将自动开启 - enabledjob: false jwt: # token 密钥,生产环境时及的修改 secret: go-admin diff --git a/examples/run.go b/examples/run.go index 74a23de..39330c4 100644 --- a/examples/run.go +++ b/examples/run.go @@ -6,13 +6,11 @@ import ( "log" "github.com/gin-gonic/gin" - "gorm.io/driver/mysql" "gorm.io/gorm" "go-admin/common/global" - mycasbin "go-admin/pkg/casbin" - "go-admin/pkg/logger" - "go-admin/tools/config" + myCasbin "go-admin/pkg/casbin" + "gorm.io/driver/mysql" ) func main() { @@ -20,11 +18,11 @@ func main() { if err != nil { panic(err) } - _ = mycasbin.Setup(db, "sys_") - global.Logger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "bus") - global.JobLogger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "job") - global.RequestLogger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "request") - global.GinEngine = gin.Default() - //router.InitRouter() - log.Fatal(global.GinEngine.Run(":8000")) + syncEnforce := myCasbin.Setup(db, "sys_") + global.Cfg.SetDb("*", db) + global.Cfg.SetCasbin("*", syncEnforce) + + e := gin.Default() + global.Cfg.SetEngine(e) + log.Fatal(e.Run(":8000")) } diff --git a/go.mod b/go.mod index e1dd9d7..3b2d3db 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,8 @@ require ( github.com/casbin/gorm-adapter/v3 v3.0.2 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-gonic/gin v1.6.3 - github.com/go-admin-team/go-admin-core v1.2.3-0.20210225031955-e373f5bcdf3f + github.com/go-admin-team/go-admin-core v1.2.3-0.20210304081332-24763d77c51b + github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210304081332-24763d77c51b github.com/go-redis/redis/v7 v7.4.0 github.com/google/uuid v1.1.2 github.com/gorilla/websocket v1.4.2 @@ -36,7 +37,6 @@ require ( gorm.io/driver/postgres v1.0.6-0.20201208020313-1ed927cfab53 gorm.io/driver/sqlite v1.1.5-0.20201206014648-c84401fbe3ba gorm.io/gorm v1.20.12 - gorm.io/plugin/dbresolver v1.1.0 sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67 // indirect ) diff --git a/go.sum b/go.sum index a813f5e..d17539f 100644 --- a/go.sum +++ b/go.sum @@ -178,8 +178,11 @@ github.com/git-chglog/git-chglog v0.0.0-20190611050339-63a4e637021f h1:8l4Aw3Jmx github.com/git-chglog/git-chglog v0.0.0-20190611050339-63a4e637021f/go.mod h1:Dcsy1kii/xFyNad5JqY/d0GO5mu91sungp5xotbm3Yk= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-acme/lego/v3 v3.4.0/go.mod h1:xYbLDuxq3Hy4bMUT1t9JIuz6GWIWb3m5X+TeTHYaT7M= -github.com/go-admin-team/go-admin-core v1.2.3-0.20210225031955-e373f5bcdf3f h1:1gId+aP+7wyexzwQJmLArCzI9Ffqql9rJdfniCNnX60= github.com/go-admin-team/go-admin-core v1.2.3-0.20210225031955-e373f5bcdf3f/go.mod h1:hNfmIFc75XLFdfWGeGV1ted94FGnozbKfXXVLTDJKMM= +github.com/go-admin-team/go-admin-core v1.2.3-0.20210304081332-24763d77c51b h1:b7aUd7Hztcl/yLCWoxGT5lvmJZmU7ntdTFWzbeJcSGY= +github.com/go-admin-team/go-admin-core v1.2.3-0.20210304081332-24763d77c51b/go.mod h1:hNfmIFc75XLFdfWGeGV1ted94FGnozbKfXXVLTDJKMM= +github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210304081332-24763d77c51b h1:weBy1iEvCNnowYIRvy66eFNaroZv8jB9G4bCNHWqklc= +github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210304081332-24763d77c51b/go.mod h1:U4GEXHDPRUv6Z5OQWzdkwrIZUZ8JIpWPPfyYsUICXWo= github.com/go-cmd/cmd v1.0.5/go.mod h1:y8q8qlK5wQibcw63djSl/ntiHUHXHGdCkPk0j4QeW4s= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= @@ -712,16 +715,21 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= +go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= +go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -767,6 +775,7 @@ golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -1019,6 +1028,7 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go index c1bae33..5571932 100644 --- a/pkg/logger/logger.go +++ b/pkg/logger/logger.go @@ -1,6 +1,8 @@ package logger import ( + "github.com/gin-gonic/gin" + "go-admin/tools" "os" "github.com/go-admin-team/go-admin-core/logger" @@ -23,52 +25,68 @@ func (l *Logger) Infof(template string, args ...interface{}) { // Trace trace级日志输出 func (l *Logger) Trace(args ...interface{}) { - l.Log(logger.InfoLevel, args...) + l.Log(logger.TraceLevel, args...) } // Tracef trace级日志输出 func (l *Logger) Tracef(template string, args ...interface{}) { - l.Logf(logger.InfoLevel, template, args...) + l.Logf(logger.TraceLevel, template, args...) } // Debug debug级日志输出 func (l *Logger) Debug(args ...interface{}) { - l.Log(logger.InfoLevel, args...) + l.Log(logger.DebugLevel, args...) } // Debugf debug级日志输出 func (l *Logger) Debugf(template string, args ...interface{}) { - l.Logf(logger.InfoLevel, template, args...) + l.Logf(logger.DebugLevel, template, args...) } // Warn warn级日志输出 func (l *Logger) Warn(args ...interface{}) { - l.Log(logger.InfoLevel, args...) + l.Log(logger.WarnLevel, args...) } // Warnf warn级日志输出 func (l *Logger) Warnf(template string, args ...interface{}) { - l.Logf(logger.InfoLevel, template, args...) + l.Logf(logger.WarnLevel, template, args...) } // Error error级日志输出 func (l *Logger) Error(args ...interface{}) { - l.Log(logger.InfoLevel, args...) + l.Log(logger.ErrorLevel, args...) } // Errorf error级日志输出 func (l *Logger) Errorf(template string, args ...interface{}) { - l.Logf(logger.InfoLevel, template, args...) + l.Logf(logger.ErrorLevel, template, args...) } // Fatal fatal级日志输出 func (l *Logger) Fatal(args ...interface{}) { - l.Log(logger.InfoLevel, args...) + l.Log(logger.FatalLevel, args...) os.Exit(1) } // Fatalf fatal级日志输出 func (l *Logger) Fatalf(template string, args ...interface{}) { - l.Logf(logger.InfoLevel, template, args...) + l.Logf(logger.FatalLevel, template, args...) os.Exit(1) } + +// GetRequestLogger 获取上下文提供的日志 +func GetRequestLogger(c *gin.Context) Logger { + if c == nil { + return Logger{Logger: logger.DefaultLogger} + } + l, ok := c.Get(tools.LoggerKey) + if !ok { + return Logger{Logger: logger.DefaultLogger} + } + requestLogger, ok := l.(Logger) + if !ok { + return Logger{Logger: logger.DefaultLogger} + } + return requestLogger +} diff --git a/pkg/logger/setup.go b/pkg/logger/setup.go index 36670b7..c7e5eec 100644 --- a/pkg/logger/setup.go +++ b/pkg/logger/setup.go @@ -1,15 +1,19 @@ package logger import ( + "io" + "os" + "github.com/go-admin-team/go-admin-core/debug/writer" "github.com/go-admin-team/go-admin-core/logger" + "github.com/go-admin-team/go-admin-core/plugins/logger/zap" - "go-admin/common/log" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/tools" ) // SetupLogger 日志 -func SetupLogger(path string, prefix string) logger.Logger { +func SetupLogger(logType, path, levelStr, outputType string) logger.Logger { var setLogger logger.Logger if !tools.PathExist(path) { err := tools.PathCreate(path) @@ -17,10 +21,33 @@ func SetupLogger(path string, prefix string) logger.Logger { log.Fatalf("create dir error: %s", err.Error()) } } - output, err := writer.NewFileWriter(path, "log") + var err error + var output io.Writer + switch outputType { + case "file": + output, err = writer.NewFileWriter(path, "log") + if err != nil { + log.Fatal("logger setup error: %s", err.Error()) + } + default: + output = os.Stdout + } + var level logger.Level + level, err = logger.GetLevel(levelStr) if err != nil { - log.Fatal("%s logger setup error: %s", prefix, err.Error()) + log.Fatalf("get logger level error, %s", err.Error()) + } + + switch logType { + case "zap": + setLogger, err = zap.NewLogger(logger.WithLevel(level), logger.WithOutput(output), zap.WithCallerSkip(2)) + if err != nil { + log.Fatalf("new zap logger error, %s", err.Error()) + } + //case "logrus": + // setLogger = logrus.NewLogger(logger.WithLevel(level), logger.WithOutput(output), logrus.ReportCaller()) + default: + setLogger = logger.NewLogger(logger.WithLevel(level), logger.WithOutput(output)) } - setLogger = logger.NewHelper(logger.NewLogger(logger.WithOutput(output), logger.WithName(prefix))) return setLogger } diff --git a/template/v3/dto.go.template b/template/v3/dto.go.template index 5287afc..563fa95 100644 --- a/template/v3/dto.go.template +++ b/template/v3/dto.go.template @@ -6,7 +6,7 @@ import ( "go-admin/app/admin/models" "go-admin/common/dto" - "go-admin/common/log" + log "github.com/go-admin-team/go-admin-core/logger" common "go-admin/common/models" "go-admin/tools" ) diff --git a/template/v3/no_actions/apis.go.template b/template/v3/no_actions/apis.go.template index 70437f5..99a4b54 100644 --- a/template/v3/no_actions/apis.go.template +++ b/template/v3/no_actions/apis.go.template @@ -10,7 +10,7 @@ import ( "go-admin/app/admin/service/dto" "go-admin/common/actions" "go-admin/common/apis" - "go-admin/common/log" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/tools" ) diff --git a/template/v3/no_actions/service.go.template b/template/v3/no_actions/service.go.template index 0b7faf5..2efd905 100644 --- a/template/v3/no_actions/service.go.template +++ b/template/v3/no_actions/service.go.template @@ -5,7 +5,7 @@ import ( "go-admin/app/admin/models" "go-admin/common/actions" cDto "go-admin/common/dto" - "go-admin/common/log" + log "github.com/go-admin-team/go-admin-core/logger" common "go-admin/common/models" "go-admin/common/service" "gorm.io/gorm" @@ -116,4 +116,4 @@ func (e *{{.ClassName}}) Remove{{.ClassName}}(d cDto.Control, c common.ActiveRec return err } return nil -} \ No newline at end of file +} diff --git a/template/v4/dto.go.template b/template/v4/dto.go.template index c967c3b..f3585b1 100644 --- a/template/v4/dto.go.template +++ b/template/v4/dto.go.template @@ -6,8 +6,8 @@ import ( "go-admin/app/admin/models" "go-admin/common/dto" - "go-admin/common/log" "go-admin/tools" + "go-admin/pkg/logger" ) type {{.ClassName}}Search struct { @@ -27,10 +27,10 @@ func (m *{{.ClassName}}Search) GetNeedSearch() interface{} { } func (m *{{.ClassName}}Search) Bind(ctx *gin.Context) error { - msgID := tools.GenerateMsgIDFromContext(ctx) + log := logger.GetRequestLogger(ctx) err := ctx.ShouldBind(m) if err != nil { - log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error()) + log.Debugf("ShouldBind error: %s", err.Error()) } return err } @@ -54,15 +54,15 @@ type {{.ClassName}}Control struct { } func (s *{{.ClassName}}Control) Bind(ctx *gin.Context) error { - msgID := tools.GenerateMsgIDFromContext(ctx) + log := logger.GetRequestLogger(ctx) err := ctx.ShouldBindUri(s) if err != nil { - log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error()) + log.Debugf("ShouldBindUri error: %s", err.Error()) return err } err = ctx.ShouldBind(s) if err != nil { - log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error()) + log.Debugf("ShouldBind error: %s", err.Error()) } return err } @@ -105,15 +105,15 @@ func (s *{{.ClassName}}ById) GetId() interface{} { } func (s *{{.ClassName}}ById) Bind(ctx *gin.Context) error { - msgID := tools.GenerateMsgIDFromContext(ctx) + log := logger.GetRequestLogger(ctx) err := ctx.ShouldBindUri(s) if err != nil { - log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error()) + log.Debugf("ShouldBindUri error: %s", err.Error()) return err } err = ctx.ShouldBind(s) if err != nil { - log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error()) + log.Debugf("ShouldBind error: %s", err.Error()) } return err } diff --git a/template/v4/no_actions/apis.go.template b/template/v4/no_actions/apis.go.template index 60beaf0..7f1853f 100644 --- a/template/v4/no_actions/apis.go.template +++ b/template/v4/no_actions/apis.go.template @@ -9,7 +9,6 @@ import ( "go-admin/app/admin/service/dto" "go-admin/common/actions" "go-admin/common/apis" - "go-admin/common/log" "go-admin/tools" ) @@ -18,17 +17,19 @@ type {{.ClassName}} struct { } func (e *{{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) { - msgID := tools.GenerateMsgIDFromContext(c) - d := new(dto.{{.ClassName}}Search) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } + d := new(dto.{{.ClassName}}Search) //查询列表 err = d.Bind(c) if err != nil { + log.Warnf("request body bind error, %s", err.Error()) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } @@ -38,12 +39,13 @@ func (e *{{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) { list := make([]models.{{.ClassName}}, 0) var count int64 - serviceStudent := service.{{.ClassName}}{} - serviceStudent.MsgID = msgID - serviceStudent.Orm = db - err = serviceStudent.Get{{.ClassName}}Page(d, p, &list, &count) + service{{.ClassName}} := service.{{.ClassName}}{} + service{{.ClassName}}.Log = log + service{{.ClassName}}.Orm = db + err = service{{.ClassName}}.Get{{.ClassName}}Page(d, p, &list, &count) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") + log.Errorf("Get {{.ClassName}} Page error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "查询失败") return } @@ -51,17 +53,20 @@ func (e *{{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) { } func (e *{{.ClassName}}) Get{{.ClassName}}(c *gin.Context) { - control := new(dto.{{.ClassName}}ById) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) + control := new(dto.{{.ClassName}}ById) + //查看详情 err = control.Bind(c) if err != nil { + log.Warnf("request body bind error, %s", err.Error()) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } @@ -71,11 +76,12 @@ func (e *{{.ClassName}}) Get{{.ClassName}}(c *gin.Context) { p := actions.GetPermissionFromContext(c) service{{.ClassName}} := service.{{.ClassName}}{} - service{{.ClassName}}.MsgID = msgID + service{{.ClassName}}.Log = log service{{.ClassName}}.Orm = db err = service{{.ClassName}}.Get{{.ClassName}}(control, p, &object) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "查询失败") + log.Errorf("Get {{.ClassName}} error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "查询失败") return } @@ -83,22 +89,26 @@ func (e *{{.ClassName}}) Get{{.ClassName}}(c *gin.Context) { } func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) { - control := new(dto.{{.ClassName}}Control) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) + control := new(dto.{{.ClassName}}Control) + //新增操作 err = control.Bind(c) if err != nil { + log.Warnf("request body bind error, %s", err.Error()) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } object, err := control.Generate() if err != nil { + log.Errorf("generate {{.ClassName}} model error, %s", err.Error()) e.Error(c, http.StatusInternalServerError, err, "模型生成失败") return } @@ -107,10 +117,10 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) { service{{.ClassName}} := service.{{.ClassName}}{} service{{.ClassName}}.Orm = db - service{{.ClassName}}.MsgID = msgID + service{{.ClassName}}.Log = log err = service{{.ClassName}}.Insert{{.ClassName}}(object) if err != nil { - log.Error(err) + log.Errorf("Insert {{.ClassName}} error, %s", err.Error()) e.Error(c, http.StatusInternalServerError, err, "创建失败") return } @@ -119,22 +129,26 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) { } func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) { - control := new(dto.{{.ClassName}}Control) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) + control := new(dto.{{.ClassName}}Control) + //更新操作 err = control.Bind(c) if err != nil { + log.Warnf("request body bind error, %s", err.Error()) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } object, err := control.Generate() if err != nil { + log.Errorf("generate {{.ClassName}} model error, %s", err.Error()) e.Error(c, http.StatusInternalServerError, err, "模型生成失败") return } @@ -145,28 +159,31 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) { service{{.ClassName}} := service.{{.ClassName}}{} service{{.ClassName}}.Orm = db - service{{.ClassName}}.MsgID = msgID + service{{.ClassName}}.Log = log err = service{{.ClassName}}.Update{{.ClassName}}(object, p) if err != nil { - log.Error(err) + log.Errorf("Update {{.ClassName}} error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "更新失败") return } e.OK(c, object.GetId(), "更新成功") } func (e *{{.ClassName}}) Delete{{.ClassName}}(c *gin.Context) { - control := new(dto.{{.ClassName}}ById) + log := e.GetLogger(c) db, err := tools.GetOrm(c) if err != nil { - log.Error(err) + log.Errorf("get db connection error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") return } - msgID := tools.GenerateMsgIDFromContext(c) + control := new(dto.{{.ClassName}}ById) + //删除操作 err = control.Bind(c) if err != nil { - log.Errorf("MsgID[%s] Bind error: %s", msgID, err) + log.Warnf("request body bind error, %s", err.Error()) e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } @@ -179,10 +196,11 @@ func (e *{{.ClassName}}) Delete{{.ClassName}}(c *gin.Context) { service{{.ClassName}} := service.{{.ClassName}}{} service{{.ClassName}}.Orm = db - service{{.ClassName}}.MsgID = msgID + service{{.ClassName}}.Log = log err = service{{.ClassName}}.Remove{{.ClassName}}(control, p) if err != nil { - log.Error(err) + log.Errorf("Remove {{.ClassName}} error, %s", err.Error()) + e.Error(c, http.StatusInternalServerError, err, "删除失败") return } e.OK(c, control.GetId(), "删除成功") diff --git a/template/v4/no_actions/service.go.template b/template/v4/no_actions/service.go.template index e0ac9bd..65304e5 100644 --- a/template/v4/no_actions/service.go.template +++ b/template/v4/no_actions/service.go.template @@ -5,7 +5,6 @@ import ( "go-admin/app/admin/models" "go-admin/common/actions" cDto "go-admin/common/dto" - "go-admin/common/log" "go-admin/app/admin/service/dto" "go-admin/common/service" "gorm.io/gorm" @@ -19,7 +18,6 @@ type {{.ClassName}} struct { func (e *{{.ClassName}}) Get{{.ClassName}}Page(c *dto.{{.ClassName}}Search, p *actions.DataPermission, list *[]models.{{.ClassName}}, count *int64) error { var err error var data models.{{.ClassName}} - msgID := e.MsgID err = e.Orm.Model(&data). Scopes( @@ -30,7 +28,7 @@ func (e *{{.ClassName}}) Get{{.ClassName}}Page(c *dto.{{.ClassName}}Search, p *a Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil @@ -40,7 +38,6 @@ func (e *{{.ClassName}}) Get{{.ClassName}}Page(c *dto.{{.ClassName}}Search, p *a func (e *{{.ClassName}}) Get{{.ClassName}}(d *dto.{{.ClassName}}ById, p *actions.DataPermission, model *models.{{.ClassName}}) error { var err error var data models.{{.ClassName}} - msgID := e.MsgID db := e.Orm.Model(&data). Scopes( @@ -50,26 +47,23 @@ func (e *{{.ClassName}}) Get{{.ClassName}}(d *dto.{{.ClassName}}ById, p *actions err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error:%s", err) return err } return nil } // Insert{{.ClassName}} 创建{{.ClassName}}对象 -func (e *{{.ClassName}}) Insert{{.ClassName}}(model *models.{{.ClassName}}) error { +func (e *{{.ClassName}}) Insert{{.ClassName}}(c *models.{{.ClassName}}) error { var err error - var data models.{{.ClassName}} - msgID := e.MsgID - err = e.Orm.Model(&data). - Create(model).Error + err = e.Orm.Create(c).Error if err != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } return nil @@ -78,15 +72,13 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(model *models.{{.ClassName}}) erro // Update{{.ClassName}} 修改{{.ClassName}}对象 func (e *{{.ClassName}}) Update{{.ClassName}}(c *models.{{.ClassName}}, p *actions.DataPermission) error { var err error - var data models.{{.ClassName}} - msgID := e.MsgID - db := e.Orm.Model(&data). + db := e.Orm.Model(c). Scopes( - actions.Permission(data.TableName(), p), + actions.Permission(c.TableName(), p), ).Where(c.GetId()).Updates(c) if db.Error != nil { - log.Errorf("msgID[%s] db error:%s", msgID, err) + e.Log.Errorf("db error: %s", err) return err } if db.RowsAffected == 0 { @@ -100,7 +92,6 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *models.{{.ClassName}}, p *actio func (e *{{.ClassName}}) Remove{{.ClassName}}(d *dto.{{.ClassName}}ById, p *actions.DataPermission) error { var err error var data models.{{.ClassName}} - msgID := e.MsgID db := e.Orm.Model(&data). Scopes( @@ -108,7 +99,7 @@ func (e *{{.ClassName}}) Remove{{.ClassName}}(d *dto.{{.ClassName}}ById, p *acti ).Delete(&data, d.GetId()) if db.Error != nil { err = db.Error - log.Errorf("MsgID[%s] Delete error: %s", msgID, err) + e.Log.Errorf("Delete error: %s", err) return err } if db.RowsAffected == 0 { @@ -116,4 +107,4 @@ func (e *{{.ClassName}}) Remove{{.ClassName}}(d *dto.{{.ClassName}}ById, p *acti return err } return nil -} \ No newline at end of file +} diff --git a/tools/app/return.go b/tools/app/return.go index f9240d6..843b164 100644 --- a/tools/app/return.go +++ b/tools/app/return.go @@ -6,7 +6,7 @@ import ( "github.com/gin-gonic/gin" - "go-admin/common/log" + log "github.com/go-admin-team/go-admin-core/logger" "go-admin/tools" ) diff --git a/tools/config/logger.go b/tools/config/logger.go index ec08f69..590e5cb 100644 --- a/tools/config/logger.go +++ b/tools/config/logger.go @@ -1,13 +1,11 @@ package config type Logger struct { - Path string - Level string - Stdout bool - EnabledBUS bool - EnabledREQ bool - EnabledDB bool - EnabledJOB bool `default:"false"` + Type string + Path string + Level string + Stdout string + EnabledDB bool } var LoggerConfig = new(Logger) diff --git a/tools/utils.go b/tools/utils.go index 13823a1..01b735e 100644 --- a/tools/utils.go +++ b/tools/utils.go @@ -13,7 +13,10 @@ import ( "gorm.io/gorm" ) -const TrafficKey = "X-Request-Id" +const ( + TrafficKey = "X-Request-Id" + LoggerKey = "_go-admin-logger-request" +) func CompareHashAndPassword(e string, p string) (bool, error) { err := bcrypt.CompareHashAndPassword([]byte(e), []byte(p))