refactor🎨 优化Context设置方法
This commit is contained in:
1 parent
abcdf880fd
commit
70998c424d
6 files changed
+79
-85
No files matched your search
@@ -18,7 +18,7 @@ type SysConfig struct {
|
||||
}
|
||||
|
||||
func (e SysConfig) GetSysConfigList(c *gin.Context) {
|
||||
e.SetContext(c) //Context = c
|
||||
e.MakeContext(c)
|
||||
log := e.GetLogger()
|
||||
d := new(dto.SysConfigSearch)
|
||||
db, err := e.GetOrm()
|
||||
@@ -272,4 +272,4 @@ func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
e.OK(v, s.Msg)
|
||||
}
|
||||
}
|
||||
+65
-65
@@ -490,70 +490,70 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
|
||||
Amenu.UpdatedAt = timeNow
|
||||
Amenu.MenuId, err = Amenu.Create(db)
|
||||
|
||||
AList := models.SysApi{}
|
||||
AList.Name = ""
|
||||
AList.Title = "分页获取" + tab.TableComment
|
||||
AList.Path = "/api/v1/" + tab.ModuleFrontName
|
||||
AList.Action = "GET"
|
||||
AList.ParentId = Amenu.MenuId
|
||||
AList.Sort = 0
|
||||
AList.CreateBy = 1
|
||||
AList.UpdateBy = 1
|
||||
AList.CreatedAt = timeNow
|
||||
AList.UpdatedAt = timeNow
|
||||
AList.Id, err = AList.Create(db)
|
||||
|
||||
AGet := models.SysApi{}
|
||||
AList.Name = ""
|
||||
AGet.Title = "根据id获取" + tab.TableComment
|
||||
AGet.Path = "/api/v1/" + tab.ModuleFrontName + "/:id"
|
||||
AGet.Action = "GET"
|
||||
AGet.ParentId = Amenu.MenuId
|
||||
AGet.Sort = 0
|
||||
AGet.CreateBy = 1
|
||||
AGet.UpdateBy = 1
|
||||
AGet.CreatedAt = timeNow
|
||||
AGet.UpdatedAt = timeNow
|
||||
AGet.Id, err = AGet.Create(db)
|
||||
|
||||
ACreate := models.SysApi{}
|
||||
AList.Name = ""
|
||||
ACreate.Title = "创建" + tab.TableComment
|
||||
ACreate.Path = "/api/v1/" + tab.ModuleFrontName
|
||||
ACreate.Action = "POST"
|
||||
ACreate.ParentId = Amenu.MenuId
|
||||
ACreate.Sort = 0
|
||||
ACreate.CreateBy = 1
|
||||
ACreate.UpdateBy = 1
|
||||
ACreate.CreatedAt = timeNow
|
||||
ACreate.UpdatedAt = timeNow
|
||||
ACreate.Id, err = ACreate.Create(db)
|
||||
|
||||
AUpdate := models.SysApi{}
|
||||
AList.Name = ""
|
||||
AUpdate.Title = "修改" + tab.TableComment
|
||||
AUpdate.Path = "/api/v1/" + tab.ModuleFrontName + "/:id"
|
||||
AUpdate.Action = "PUT"
|
||||
AUpdate.ParentId = Amenu.MenuId
|
||||
AUpdate.Sort = 0
|
||||
AUpdate.CreateBy = 1
|
||||
AUpdate.UpdateBy = 1
|
||||
AUpdate.CreatedAt = timeNow
|
||||
AUpdate.UpdatedAt = timeNow
|
||||
AUpdate.Id, err = AUpdate.Create(db)
|
||||
|
||||
ADelete := models.SysApi{}
|
||||
AList.Name = ""
|
||||
ADelete.Title = "删除" + tab.TableComment
|
||||
ADelete.Path = "/api/v1/" + tab.ModuleFrontName
|
||||
ADelete.Action = "DELETE"
|
||||
ADelete.ParentId = Amenu.MenuId
|
||||
ADelete.Sort = 0
|
||||
ADelete.CreateBy = 1
|
||||
ADelete.UpdateBy = 1
|
||||
ADelete.CreatedAt = timeNow
|
||||
ADelete.UpdatedAt = timeNow
|
||||
ADelete.Id, err = ADelete.Create(db)
|
||||
//AList := models.SysApi{}
|
||||
//AList.Name = ""
|
||||
//AList.Title = "分页获取" + tab.TableComment
|
||||
//AList.Path = "/api/v1/" + tab.ModuleFrontName
|
||||
//AList.Action = "GET"
|
||||
//AList.ParentId = Amenu.MenuId
|
||||
//AList.Sort = 0
|
||||
//AList.CreateBy = 1
|
||||
//AList.UpdateBy = 1
|
||||
//AList.CreatedAt = timeNow
|
||||
//AList.UpdatedAt = timeNow
|
||||
//AList.Id, err = AList.Create(db)
|
||||
//
|
||||
//AGet := models.SysApi{}
|
||||
//AList.Name = ""
|
||||
//AGet.Title = "根据id获取" + tab.TableComment
|
||||
//AGet.Path = "/api/v1/" + tab.ModuleFrontName + "/:id"
|
||||
//AGet.Action = "GET"
|
||||
//AGet.ParentId = Amenu.MenuId
|
||||
//AGet.Sort = 0
|
||||
//AGet.CreateBy = 1
|
||||
//AGet.UpdateBy = 1
|
||||
//AGet.CreatedAt = timeNow
|
||||
//AGet.UpdatedAt = timeNow
|
||||
//AGet.Id, err = AGet.Create(db)
|
||||
//
|
||||
//ACreate := models.SysApi{}
|
||||
//AList.Name = ""
|
||||
//ACreate.Title = "创建" + tab.TableComment
|
||||
//ACreate.Path = "/api/v1/" + tab.ModuleFrontName
|
||||
//ACreate.Action = "POST"
|
||||
//ACreate.ParentId = Amenu.MenuId
|
||||
//ACreate.Sort = 0
|
||||
//ACreate.CreateBy = 1
|
||||
//ACreate.UpdateBy = 1
|
||||
//ACreate.CreatedAt = timeNow
|
||||
//ACreate.UpdatedAt = timeNow
|
||||
//ACreate.Id, err = ACreate.Create(db)
|
||||
//
|
||||
//AUpdate := models.SysApi{}
|
||||
//AList.Name = ""
|
||||
//AUpdate.Title = "修改" + tab.TableComment
|
||||
//AUpdate.Path = "/api/v1/" + tab.ModuleFrontName + "/:id"
|
||||
//AUpdate.Action = "PUT"
|
||||
//AUpdate.ParentId = Amenu.MenuId
|
||||
//AUpdate.Sort = 0
|
||||
//AUpdate.CreateBy = 1
|
||||
//AUpdate.UpdateBy = 1
|
||||
//AUpdate.CreatedAt = timeNow
|
||||
//AUpdate.UpdatedAt = timeNow
|
||||
//AUpdate.Id, err = AUpdate.Create(db)
|
||||
//
|
||||
//ADelete := models.SysApi{}
|
||||
//AList.Name = ""
|
||||
//ADelete.Title = "删除" + tab.TableComment
|
||||
//ADelete.Path = "/api/v1/" + tab.ModuleFrontName
|
||||
//ADelete.Action = "DELETE"
|
||||
//ADelete.ParentId = Amenu.MenuId
|
||||
//ADelete.Sort = 0
|
||||
//ADelete.CreateBy = 1
|
||||
//ADelete.UpdateBy = 1
|
||||
//ADelete.CreatedAt = timeNow
|
||||
//ADelete.UpdatedAt = timeNow
|
||||
//ADelete.Id, err = ADelete.Create(db)
|
||||
|
||||
e.OK("", "数据生成成功!")
|
||||
}
|
||||
}
|
||||
@@ -46,7 +46,7 @@ func (e SysJob) RemoveJobForService(c *gin.Context) {
|
||||
|
||||
// StartJobForService 启动job service实现
|
||||
func (e SysJob) StartJobForService(c *gin.Context) {
|
||||
e.SetContext(c)
|
||||
e.MakeContext(c)
|
||||
log := e.GetLogger()
|
||||
db, err := e.GetOrm()
|
||||
if err != nil {
|
||||
@@ -71,4 +71,4 @@ func (e SysJob) StartJobForService(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
e.OK(nil, s.Msg)
|
||||
}
|
||||
}
|
||||
@@ -41,7 +41,7 @@ type File struct {
|
||||
// @Success 200 {string} string "{"code": -1, "message": "添加失败"}"
|
||||
// @Router /api/v1/public/uploadFile [post]
|
||||
func (e File) UploadFile(c *gin.Context) {
|
||||
e.SetContext(c)
|
||||
e.MakeContext(c)
|
||||
tag, _ := c.GetPostForm("type")
|
||||
urlPrefix := fmt.Sprintf("http://%s/", c.Request.Host)
|
||||
var fileResponse FileResponse
|
||||
@@ -195,4 +195,4 @@ func ossUpload(name string, path string) error {
|
||||
func qiniuUpload(name string, path string) error {
|
||||
oss := file_store.ALiYunOSS{}
|
||||
return oss.UpLoad(name, path)
|
||||
}
|
||||
}
|
||||
@@ -18,7 +18,7 @@ type SysChinaAreaData struct {
|
||||
}
|
||||
|
||||
func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
|
||||
e.SetContext(c)
|
||||
e.MakeContext(c)
|
||||
log := e.GetLogger()
|
||||
d := new(dto2.SysChinaAreaDataSearch)
|
||||
db, err := e.GetOrm()
|
||||
@@ -52,7 +52,7 @@ func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
|
||||
e.SetContext(c)
|
||||
e.MakeContext(c)
|
||||
log := e.GetLogger()
|
||||
control := new(dto2.SysChinaAreaDataById)
|
||||
db, err := e.GetOrm()
|
||||
@@ -85,7 +85,7 @@ func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
|
||||
e.SetContext(c)
|
||||
e.MakeContext(c)
|
||||
log := e.GetLogger()
|
||||
control := new(dto2.SysChinaAreaDataControl)
|
||||
db, err := e.GetOrm()
|
||||
@@ -122,7 +122,7 @@ func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
|
||||
e.SetContext(c)
|
||||
e.MakeContext(c)
|
||||
log := e.GetLogger()
|
||||
control := new(dto2.SysChinaAreaDataControl)
|
||||
db, err := e.GetOrm()
|
||||
@@ -159,7 +159,7 @@ func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) {
|
||||
e.SetContext(c)
|
||||
e.MakeContext(c)
|
||||
log := e.GetLogger()
|
||||
control := new(dto2.SysChinaAreaDataById)
|
||||
db, err := e.GetOrm()
|
||||
|
||||
+3
-9
@@ -18,7 +18,8 @@ type Api struct {
|
||||
Logger *logger.Logger
|
||||
}
|
||||
|
||||
func (e Api) SetContext(c *gin.Context) {
|
||||
// MakeContext 设置http上下文
|
||||
func (e *Api) MakeContext(c *gin.Context) {
|
||||
fmt.Println(&c)
|
||||
e.Context = c
|
||||
fmt.Println(&e.Context)
|
||||
@@ -30,13 +31,6 @@ func (e Api) GetLogger() *logger.Logger {
|
||||
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 {
|
||||
var err error
|
||||
for i := range bindings {
|
||||
@@ -99,4 +93,4 @@ func (e Api) PageOK(result interface{}, count int, pageIndex int, pageSize int,
|
||||
// Custom 兼容函数
|
||||
func (e Api) Custom(data gin.H) {
|
||||
response.Custum(e.Context, data)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user