refactor🎨 优化Context设置方法

This commit is contained in:
wenjianzhang committed 2021-05-12 18:47:29 +08:00
1 parent abcdf880fd
commit 70998c424d
6 files changed
+74 -80

No files matched your search

+1 -1
View File
@@ -18,7 +18,7 @@ type SysConfig struct {
} }
func (e SysConfig) GetSysConfigList(c *gin.Context) { func (e SysConfig) GetSysConfigList(c *gin.Context) {
e.SetContext(c) //Context = c e.MakeContext(c)
log := e.GetLogger() log := e.GetLogger()
d := new(dto.SysConfigSearch) d := new(dto.SysConfigSearch)
db, err := e.GetOrm() db, err := e.GetOrm()
+64 -64
View File
@@ -490,70 +490,70 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
Amenu.UpdatedAt = timeNow Amenu.UpdatedAt = timeNow
Amenu.MenuId, err = Amenu.Create(db) Amenu.MenuId, err = Amenu.Create(db)
AList := models.SysApi{} //AList := models.SysApi{}
AList.Name = "" //AList.Name = ""
AList.Title = "分页获取" + tab.TableComment //AList.Title = "分页获取" + tab.TableComment
AList.Path = "/api/v1/" + tab.ModuleFrontName //AList.Path = "/api/v1/" + tab.ModuleFrontName
AList.Action = "GET" //AList.Action = "GET"
AList.ParentId = Amenu.MenuId //AList.ParentId = Amenu.MenuId
AList.Sort = 0 //AList.Sort = 0
AList.CreateBy = 1 //AList.CreateBy = 1
AList.UpdateBy = 1 //AList.UpdateBy = 1
AList.CreatedAt = timeNow //AList.CreatedAt = timeNow
AList.UpdatedAt = timeNow //AList.UpdatedAt = timeNow
AList.Id, err = AList.Create(db) //AList.Id, err = AList.Create(db)
//
AGet := models.SysApi{} //AGet := models.SysApi{}
AList.Name = "" //AList.Name = ""
AGet.Title = "根据id获取" + tab.TableComment //AGet.Title = "根据id获取" + tab.TableComment
AGet.Path = "/api/v1/" + tab.ModuleFrontName + "/:id" //AGet.Path = "/api/v1/" + tab.ModuleFrontName + "/:id"
AGet.Action = "GET" //AGet.Action = "GET"
AGet.ParentId = Amenu.MenuId //AGet.ParentId = Amenu.MenuId
AGet.Sort = 0 //AGet.Sort = 0
AGet.CreateBy = 1 //AGet.CreateBy = 1
AGet.UpdateBy = 1 //AGet.UpdateBy = 1
AGet.CreatedAt = timeNow //AGet.CreatedAt = timeNow
AGet.UpdatedAt = timeNow //AGet.UpdatedAt = timeNow
AGet.Id, err = AGet.Create(db) //AGet.Id, err = AGet.Create(db)
//
ACreate := models.SysApi{} //ACreate := models.SysApi{}
AList.Name = "" //AList.Name = ""
ACreate.Title = "创建" + tab.TableComment //ACreate.Title = "创建" + tab.TableComment
ACreate.Path = "/api/v1/" + tab.ModuleFrontName //ACreate.Path = "/api/v1/" + tab.ModuleFrontName
ACreate.Action = "POST" //ACreate.Action = "POST"
ACreate.ParentId = Amenu.MenuId //ACreate.ParentId = Amenu.MenuId
ACreate.Sort = 0 //ACreate.Sort = 0
ACreate.CreateBy = 1 //ACreate.CreateBy = 1
ACreate.UpdateBy = 1 //ACreate.UpdateBy = 1
ACreate.CreatedAt = timeNow //ACreate.CreatedAt = timeNow
ACreate.UpdatedAt = timeNow //ACreate.UpdatedAt = timeNow
ACreate.Id, err = ACreate.Create(db) //ACreate.Id, err = ACreate.Create(db)
//
AUpdate := models.SysApi{} //AUpdate := models.SysApi{}
AList.Name = "" //AList.Name = ""
AUpdate.Title = "修改" + tab.TableComment //AUpdate.Title = "修改" + tab.TableComment
AUpdate.Path = "/api/v1/" + tab.ModuleFrontName + "/:id" //AUpdate.Path = "/api/v1/" + tab.ModuleFrontName + "/:id"
AUpdate.Action = "PUT" //AUpdate.Action = "PUT"
AUpdate.ParentId = Amenu.MenuId //AUpdate.ParentId = Amenu.MenuId
AUpdate.Sort = 0 //AUpdate.Sort = 0
AUpdate.CreateBy = 1 //AUpdate.CreateBy = 1
AUpdate.UpdateBy = 1 //AUpdate.UpdateBy = 1
AUpdate.CreatedAt = timeNow //AUpdate.CreatedAt = timeNow
AUpdate.UpdatedAt = timeNow //AUpdate.UpdatedAt = timeNow
AUpdate.Id, err = AUpdate.Create(db) //AUpdate.Id, err = AUpdate.Create(db)
//
ADelete := models.SysApi{} //ADelete := models.SysApi{}
AList.Name = "" //AList.Name = ""
ADelete.Title = "删除" + tab.TableComment //ADelete.Title = "删除" + tab.TableComment
ADelete.Path = "/api/v1/" + tab.ModuleFrontName //ADelete.Path = "/api/v1/" + tab.ModuleFrontName
ADelete.Action = "DELETE" //ADelete.Action = "DELETE"
ADelete.ParentId = Amenu.MenuId //ADelete.ParentId = Amenu.MenuId
ADelete.Sort = 0 //ADelete.Sort = 0
ADelete.CreateBy = 1 //ADelete.CreateBy = 1
ADelete.UpdateBy = 1 //ADelete.UpdateBy = 1
ADelete.CreatedAt = timeNow //ADelete.CreatedAt = timeNow
ADelete.UpdatedAt = timeNow //ADelete.UpdatedAt = timeNow
ADelete.Id, err = ADelete.Create(db) //ADelete.Id, err = ADelete.Create(db)
e.OK("", "数据生成成功!") e.OK("", "数据生成成功!")
} }
+1 -1
View File
@@ -46,7 +46,7 @@ func (e SysJob) RemoveJobForService(c *gin.Context) {
// StartJobForService 启动job service实现 // StartJobForService 启动job service实现
func (e SysJob) StartJobForService(c *gin.Context) { func (e SysJob) StartJobForService(c *gin.Context) {
e.SetContext(c) e.MakeContext(c)
log := e.GetLogger() log := e.GetLogger()
db, err := e.GetOrm() db, err := e.GetOrm()
if err != nil { if err != nil {
+1 -1
View File
@@ -41,7 +41,7 @@ type File struct {
// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" // @Success 200 {string} string "{"code": -1, "message": "添加失败"}"
// @Router /api/v1/public/uploadFile [post] // @Router /api/v1/public/uploadFile [post]
func (e File) UploadFile(c *gin.Context) { func (e File) UploadFile(c *gin.Context) {
e.SetContext(c) e.MakeContext(c)
tag, _ := c.GetPostForm("type") tag, _ := c.GetPostForm("type")
urlPrefix := fmt.Sprintf("http://%s/", c.Request.Host) urlPrefix := fmt.Sprintf("http://%s/", c.Request.Host)
var fileResponse FileResponse var fileResponse FileResponse
+5 -5
View File
@@ -18,7 +18,7 @@ type SysChinaAreaData struct {
} }
func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) { func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
e.SetContext(c) e.MakeContext(c)
log := e.GetLogger() log := e.GetLogger()
d := new(dto2.SysChinaAreaDataSearch) d := new(dto2.SysChinaAreaDataSearch)
db, err := e.GetOrm() db, err := e.GetOrm()
@@ -52,7 +52,7 @@ func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
} }
func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) { func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
e.SetContext(c) e.MakeContext(c)
log := e.GetLogger() log := e.GetLogger()
control := new(dto2.SysChinaAreaDataById) control := new(dto2.SysChinaAreaDataById)
db, err := e.GetOrm() db, err := e.GetOrm()
@@ -85,7 +85,7 @@ func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
} }
func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) { func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
e.SetContext(c) e.MakeContext(c)
log := e.GetLogger() log := e.GetLogger()
control := new(dto2.SysChinaAreaDataControl) control := new(dto2.SysChinaAreaDataControl)
db, err := e.GetOrm() db, err := e.GetOrm()
@@ -122,7 +122,7 @@ func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
} }
func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) { func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
e.SetContext(c) e.MakeContext(c)
log := e.GetLogger() log := e.GetLogger()
control := new(dto2.SysChinaAreaDataControl) control := new(dto2.SysChinaAreaDataControl)
db, err := e.GetOrm() db, err := e.GetOrm()
@@ -159,7 +159,7 @@ func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
} }
func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) { func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) {
e.SetContext(c) e.MakeContext(c)
log := e.GetLogger() log := e.GetLogger()
control := new(dto2.SysChinaAreaDataById) control := new(dto2.SysChinaAreaDataById)
db, err := e.GetOrm() db, err := e.GetOrm()
+2 -8
View File
@@ -18,7 +18,8 @@ type Api struct {
Logger *logger.Logger Logger *logger.Logger
} }
func (e Api) SetContext(c *gin.Context) { // MakeContext 设置http上下文
func (e *Api) MakeContext(c *gin.Context) {
fmt.Println(&c) fmt.Println(&c)
e.Context = c e.Context = c
fmt.Println(&e.Context) fmt.Println(&e.Context)
@@ -30,13 +31,6 @@ func (e Api) GetLogger() *logger.Logger {
return api.GetRequestLogger(e.Context) return api.GetRequestLogger(e.Context)
} }
//func (e Api) GetLogger() (*logger.Logger, error) {
// if e.Context == nil {
// return nil, errors.New("API context cannot be nil")
// }
// return api.GetRequestLogger(e.Context), nil
//}
func (e Api) Bind(d interface{}, bindings ...binding.Binding) error { func (e Api) Bind(d interface{}, bindings ...binding.Binding) error {
var err error var err error
for i := range bindings { for i := range bindings {