From 1105d98f27328fed06aceea28c49faa17594c95b Mon Sep 17 00:00:00 2001
From: linwenxiang <991154416@qq.com>
Date: Thu, 4 Mar 2021 23:52:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/service/dto/syschinaareadata.go | 95 ++++++++++-------------
 1 file changed, 41 insertions(+), 54 deletions(-)

diff --git a/app/admin/service/dto/syschinaareadata.go b/app/admin/service/dto/syschinaareadata.go
index 1c3fcc9b..28f05a45 100644
--- a/app/admin/service/dto/syschinaareadata.go
+++ b/app/admin/service/dto/syschinaareadata.go
@@ -1,22 +1,20 @@
 package dto
 
 import (
+	"time"
+
 	"github.com/gin-gonic/gin"
+
 	"go-admin/app/admin/models"
 	"go-admin/common/dto"
-	"go-admin/common/log"
 	common "go-admin/common/models"
-	"go-admin/tools"
-	"time"
+	"go-admin/pkg/logger"
 )
 
 type SysChinaAreaDataSearch struct {
-	dto.Pagination     `search:"-"`
-    PId string `form:"pId" search:"type:exact;column:p_id;table:sys_china_area_data" comment:"上级编码"`
-
-    Name string `form:"name" search:"type:exact;column:name;table:sys_china_area_data" comment:"名称"`
-
-    
+	dto.Pagination `search:"-"`
+	PId            string `form:"pId" search:"type:exact;column:p_id;table:sys_china_area_data" comment:"上级编码"`
+	Name           string `form:"name" search:"type:exact;column:name;table:sys_china_area_data" comment:"名称"`
 }
 
 func (m *SysChinaAreaDataSearch) GetNeedSearch() interface{} {
@@ -24,57 +22,46 @@ func (m *SysChinaAreaDataSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysChinaAreaDataSearch) 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
+	log := logger.GetRequestLogger(ctx)
+	err := ctx.ShouldBind(m)
+	if err != nil {
+		log.Debugf("ShouldBind error: %s", err.Error())
+	}
+	return err
 }
 
 type SysChinaAreaDataControl struct {
-    
-    Id int `uri:"id" comment:"编码"` // 编码
-
-    PId string `json:"pId" comment:"上级编码"`
-    
-
-    Name string `json:"name" comment:"名称"`
-    
-
-    CreateTime time.Time `json:"createTime" comment:""`
-    
-
-    UpdateTime time.Time `json:"updateTime" comment:""`
-    
-
-    DeleteTime time.Time `json:"deleteTime" comment:""`
-    
+	Id         int       `uri:"id" comment:"编码"` // 编码
+	PId        string    `json:"pId" comment:"上级编码"`
+	Name       string    `json:"name" comment:"名称"`
+	CreateTime time.Time `json:"createTime" comment:""`
+	UpdateTime time.Time `json:"updateTime" comment:""`
+	DeleteTime time.Time `json:"deleteTime" comment:""`
 }
 
 func (s *SysChinaAreaDataControl) 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
+	log := logger.GetRequestLogger(ctx)
+	err := ctx.ShouldBindUri(s)
+	if err != nil {
+		log.Debugf("ShouldBindUri error: %s", err.Error())
+		return err
+	}
+	err = ctx.ShouldBind(s)
+	if err != nil {
+		log.Debugf("ShouldBind error: %s", err.Error())
+	}
+	return err
 }
 
 func (s *SysChinaAreaDataControl) Generate() (*models.SysChinaAreaData, error) {
 	return &models.SysChinaAreaData{
-	
-        Model:     common.Model{ Id: s.Id },
-        PId:  s.PId,
-        Name:  s.Name,
-        CreateTime:  s.CreateTime,
-        UpdateTime:  s.UpdateTime,
-        DeleteTime:  s.DeleteTime,
+
+		Model:      common.Model{Id: s.Id},
+		PId:        s.PId,
+		Name:       s.Name,
+		CreateTime: s.CreateTime,
+		UpdateTime: s.UpdateTime,
+		DeleteTime: s.DeleteTime,
 	}, nil
 }
 
@@ -96,19 +83,19 @@ func (s *SysChinaAreaDataById) GetId() interface{} {
 }
 
 func (s *SysChinaAreaDataById) 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
 }
 
 func (s *SysChinaAreaDataById) SetUpdateBy(id int) {
 
-}
\ No newline at end of file
+}