refactor: 优化代码结构和错误处理

dengmengmian · dengmengmian · commit 978648bfabec · 2025-11-01T22:55:04.000+08:00
- 移除不必要的return语句
- 简化布尔判断逻辑
- 使用fmt.Errorf替代errors.New
- 添加错误日志记录
- 优化字符串格式化
- 简化select语句为直接接收
diff --git a/gotribe-admin.go b/gotribe-admin.go
@@ -78,7 +78,11 @@ func main() {
 		common.Log.Errorf("Failed to start jobs: %v", err)
 		return
 	}
-	defer jobs.StopAllJobs()
+	defer func() {
+		if err := jobs.StopAllJobs(); err != nil {
+			common.Log.Errorf("Failed to stop jobs: %v", err)
+		}
+	}()
 
 	// 操作日志中间件处理日志时没有将日志发送到rabbitmq或者kafka中, 而是发送到了channel中
 	// 这里开启3个goroutine处理channel将日志记录到数据库
@@ -132,9 +136,7 @@ func main() {
 		common.Log.Fatal("Server Shutdown:", err)
 	}
 	// catching ctx.Done(). timeout of 5 seconds.
-	select {
-	case <-ctx.Done():
-		common.Log.Info("timeout of 5 seconds.")
-	}
+	<-ctx.Done()
+	common.Log.Info("timeout of 5 seconds.")
 	common.Log.Info("Server exiting")
 }
diff --git a/internal/app/controller/api_controller.go b/internal/app/controller/api_controller.go
@@ -138,7 +138,6 @@ func (ac ApiController) CreateApi(c *gin.Context) {
 	}
 
 	response.Success(c, nil, common.Msg(c, common.MsgCreateSuccess))
-	return
 }
 
 // UpdateApiByID 更新接口
diff --git a/internal/app/controller/post_controller.go b/internal/app/controller/post_controller.go
@@ -292,7 +292,11 @@ func (pc PostController) PushPostByID(c *gin.Context) {
 	} else if !gconvert.IsEmpty(projectInfo.PushToken) {
 		// 处理 url
 		postURLWithID := projectInfo.PostURL + oldPost.PostID
-		go util.SEOUtil.PushBaidu(projectInfo.Domain, projectInfo.PushToken, postURLWithID)
+		go func() {
+			if _, err := util.SEOUtil.PushBaidu(projectInfo.Domain, projectInfo.PushToken, postURLWithID); err != nil {
+				common.Log.Errorf("推送百度失败: %v", err)
+			}
+		}()
 	}
 
 	response.Success(c, nil, common.Msg(c, common.MsgUpdateSuccess))
diff --git a/internal/app/repository/product_spec_item_repository.go b/internal/app/repository/product_spec_item_repository.go
@@ -107,8 +107,5 @@ func (tr ProductSpecItemRepository) BatchDeleteProductSpecItemByIds(ids []string
 func isProductSpecItemExist(title string) bool {
 	var productSpecItem model.ProductSpecItem
 	result := common.DB.Where("title = ?", title).First(&productSpecItem)
-	if errors.Is(result.Error, gorm.ErrRecordNotFound) {
-		return false
-	}
-	return true
+	return !errors.Is(result.Error, gorm.ErrRecordNotFound)
 }
diff --git a/internal/app/repository/product_spec_repository.go b/internal/app/repository/product_spec_repository.go
@@ -108,10 +108,7 @@ func (tr ProductSpecRepository) BatchDeleteProductSpecByIds(ids []string) error
 func isProductSpecExist(title string) bool {
 	var productSpec model.ProductSpec
 	result := common.DB.Where("title = ?", title).First(&productSpec)
-	if errors.Is(result.Error, gorm.ErrRecordNotFound) {
-		return false
-	}
-	return true
+	return !errors.Is(result.Error, gorm.ErrRecordNotFound)
 }
 
 // 获取多个商品规格
diff --git a/internal/app/repository/product_type_repository.go b/internal/app/repository/product_type_repository.go
@@ -49,7 +49,7 @@ func (tr ProductTypeRepository) GetProductTypes(req *vo.ProductTypeListRequest)
 	}
 	productTypeID := strings.TrimSpace(req.ProductTypeID)
 	if req.ProductTypeID != "" {
-		db = db.Where("productType_id = ?", fmt.Sprintf("%s", productTypeID))
+		db = db.Where("productType_id = ?", productTypeID)
 	}
 	// 当pageNum > 0 且 pageSize > 0 才分页
 	//记录总条数
@@ -110,8 +110,5 @@ func (tr ProductTypeRepository) BatchDeleteProductTypeByIds(ids []string) error
 func isProductTypeExist(title string) bool {
 	var productType model.ProductType
 	result := common.DB.Where("title = ?", title).First(&productType)
-	if errors.Is(result.Error, gorm.ErrRecordNotFound) {
-		return false
-	}
-	return true
+	return !errors.Is(result.Error, gorm.ErrRecordNotFound)
 }
diff --git a/internal/app/repository/project_repository.go b/internal/app/repository/project_repository.go
@@ -6,7 +6,6 @@
 package repository
 
 import (
-	"errors"
 	"fmt"
 	"gotribe-admin/internal/pkg/common"
 	"gotribe-admin/internal/pkg/model"
@@ -49,7 +48,7 @@ func (pr ProjectRepository) GetProjects(req *vo.ProjectListRequest) ([]*model.Pr
 	}
 	projectID := strings.TrimSpace(req.ProjectID)
 	if req.ProjectID != "" {
-		db = db.Where("project_id = ?", fmt.Sprintf("%s", projectID))
+		db = db.Where("project_id = ?", projectID)
 	}
 	// 当pageNum > 0 且 pageSize > 0 才分页
 	//记录总条数
@@ -91,7 +90,7 @@ func (pr ProjectRepository) BatchDeleteProjectByIds(ids []string) error {
 		// 根据ID获取标签
 		project, err := pr.GetProjectByProjectID(id)
 		if err != nil {
-			return errors.New(fmt.Sprintf("未获取到ID为%s的项目", id))
+			return fmt.Errorf("未获取到ID为%s的项目", id)
 		}
 		projects = append(projects, project)
 	}
diff --git a/internal/app/repository/resource_repository.go b/internal/app/repository/resource_repository.go
@@ -6,7 +6,6 @@
 package repository
 
 import (
-	"errors"
 	"fmt"
 	"gotribe-admin/config"
 	"gotribe-admin/internal/pkg/common"
@@ -50,7 +49,7 @@ func (rr ResourceRepository) GetResources(req *vo.ResourceListRequest) ([]*model
 
 	resourceID := strings.TrimSpace(req.ResourceID)
 	if req.ResourceID != "" {
-		db = db.Where("resource_id = ?", fmt.Sprintf("%s", resourceID))
+		db = db.Where("resource_id = ?", resourceID)
 	}
 	// 当pageNum > 0 且 pageSize > 0 才分页
 	//记录总条数
@@ -89,7 +88,7 @@ func (rr ResourceRepository) UpdateResource(resource *model.Resource) error {
 func (rr ResourceRepository) DeleteResourceByID(id string) error {
 	project, err := rr.GetResourceByResourceID(id)
 	if err != nil {
-		return errors.New(fmt.Sprintf("未获取到ID为%s的项目", id))
+		return fmt.Errorf("未获取到ID为%s的项目", id)
 	}
 
 	// 硬删除
diff --git a/internal/app/repository/tag_repository.go b/internal/app/repository/tag_repository.go
@@ -49,7 +49,7 @@ func (tr TagRepository) GetTags(req *vo.TagListRequest) ([]*model.Tag, int64, er
 	}
 	tagID := strings.TrimSpace(req.TagID)
 	if req.TagID != "" {
-		db = db.Where("tag_id = ?", fmt.Sprintf("%s", tagID))
+		db = db.Where("tag_id = ?", tagID)
 	}
 	// 当pageNum > 0 且 pageSize > 0 才分页
 	//记录总条数
@@ -71,7 +71,7 @@ func (tr TagRepository) GetTags(req *vo.TagListRequest) ([]*model.Tag, int64, er
 // 创建标签
 func (tr TagRepository) CreateTag(tag *model.Tag) (*model.Tag, error) {
 	if isTagExist(tag.Title) {
-		return nil, errors.New(fmt.Sprintf("%s标签已存在", tag.Title))
+		return nil, fmt.Errorf("%s标签已存在", tag.Title)
 	}
 	result := common.DB.Create(tag)
 	if result.Error != nil {
@@ -97,7 +97,7 @@ func (tr TagRepository) BatchDeleteTagByIds(ids []string) error {
 		// 根据ID获取标签
 		tag, err := tr.GetTagByTagID(id)
 		if err != nil {
-			return errors.New(fmt.Sprintf("未获取到ID为%s的标签", id))
+			return fmt.Errorf("未获取到ID为%s的标签", id)
 		}
 		tags = append(tags, tag)
 	}
@@ -110,8 +110,5 @@ func (tr TagRepository) BatchDeleteTagByIds(ids []string) error {
 func isTagExist(title string) bool {
 	var tag model.Tag
 	result := common.DB.Where("title = ?", title).First(&tag)
-	if errors.Is(result.Error, gorm.ErrRecordNotFound) {
-		return false
-	}
-	return true
+	return !errors.Is(result.Error, gorm.ErrRecordNotFound)
 }
diff --git a/internal/app/repository/user_repository.go b/internal/app/repository/user_repository.go
@@ -55,7 +55,7 @@ func (ur UserRepository) GetUsers(req *vo.UserListRequest) ([]*model.User, int64
 	}
 	userID := strings.TrimSpace(req.UserID)
 	if req.UserID != "" {
-		db = db.Where("user_id = ?", fmt.Sprintf("%s", userID))
+		db = db.Where("user_id = ?", userID)
 	}
 	// 当pageNum > 0 且 pageSize > 0 才分页
 	//记录总条数
@@ -124,7 +124,7 @@ func (ur UserRepository) BatchDeleteUserByIds(ids []string) error {
 		// 根据ID获取用户
 		user, err := ur.GetUserByUserID(id)
 		if err != nil {
-			return errors.New(fmt.Sprintf("未获取到ID为%s的用户", id))
+			return fmt.Errorf("未获取到ID为%s的用户", id)
 		}
 		users = append(users, user)
 	}
diff --git a/internal/pkg/common/seeder/seeder.go b/internal/pkg/common/seeder/seeder.go
@@ -84,9 +84,3 @@ func createIfNotExists(db *gorm.DB, model interface{}, id uint) error {
 	}
 	return err
 }
-
-// 批量创建函数
-func createBatchIfNotExists(db *gorm.DB, models interface{}, getID func(interface{}, int) uint) error {
-	// 这里可以根据具体需求实现批量检查逻辑
-	return db.Create(models).Error
-}
diff --git a/internal/pkg/middleware/AuthMiddleware.go b/internal/pkg/middleware/AuthMiddleware.go
@@ -50,7 +50,10 @@ func payloadFunc(data interface{}) jwt.MapClaims {
 	if v, ok := data.(map[string]interface{}); ok {
 		var user model.Admin
 		// 将用户json转为结构体
-		util.JSONUtil.JsonI2Struct(v["user"], &user)
+		if err := util.JSONUtil.JsonI2Struct(v["user"], &user); err != nil {
+			common.Log.Errorf("Failed to parse user data: %v", err)
+			return jwt.MapClaims{}
+		}
 		return jwt.MapClaims{
 			jwt.IdentityKey: user.ID,
 			"user":          v["user"],
@@ -112,7 +115,10 @@ func authorizator(data interface{}, c *gin.Context) bool {
 		userStr := v["user"].(string)
 		var user model.Admin
 		// 将用户json转为结构体
-		util.JSONUtil.Json2Struct(userStr, &user)
+		if err := util.JSONUtil.Json2Struct(userStr, &user); err != nil {
+			common.Log.Errorf("Failed to parse user data: %v", err)
+			return false
+		}
 		// 将用户保存到context, api调用时取数据方便
 		c.Set("user", user)
 		return true

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,6 @@ func (ac ApiController) CreateApi(c *gin.Context) {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`response.Success(c, nil, common.Msg(c, common.MsgCreateSuccess))`
`141`		`- return`
`142`	`141`	`}`
`143`	`142`
`144`	`143`	`// UpdateApiByID 更新接口`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func (tr ProductTypeRepository) GetProductTypes(req *vo.ProductTypeListRequest)`
`49`	`49`	`}`
`50`	`50`	`productTypeID := strings.TrimSpace(req.ProductTypeID)`
`51`	`51`	`if req.ProductTypeID != "" {`
`52`		`- db = db.Where("productType_id = ?", fmt.Sprintf("%s", productTypeID))`
	`52`	`+ db = db.Where("productType_id = ?", productTypeID)`
`53`	`53`	`}`
`54`	`54`	`// 当pageNum > 0 且 pageSize > 0 才分页`
`55`	`55`	`//记录总条数`
`@@ -110,8 +110,5 @@ func (tr ProductTypeRepository) BatchDeleteProductTypeByIds(ids []string) error`
`110`	`110`	`func isProductTypeExist(title string) bool {`
`111`	`111`	`var productType model.ProductType`
`112`	`112`	`result := common.DB.Where("title = ?", title).First(&productType)`
`113`		`- if errors.Is(result.Error, gorm.ErrRecordNotFound) {`
`114`		`- return false`
`115`		`- }`
`116`		`- return true`
	`113`	`+ return !errors.Is(result.Error, gorm.ErrRecordNotFound)`
`117`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`package repository`
`7`	`7`
`8`	`8`	`import (`
`9`		`- "errors"`
`10`	`9`	`"fmt"`
`11`	`10`	`"gotribe-admin/internal/pkg/common"`
`12`	`11`	`"gotribe-admin/internal/pkg/model"`
`@@ -49,7 +48,7 @@ func (pr ProjectRepository) GetProjects(req vo.ProjectListRequest) ([]model.Pr`
`49`	`48`	`}`
`50`	`49`	`projectID := strings.TrimSpace(req.ProjectID)`
`51`	`50`	`if req.ProjectID != "" {`
`52`		`- db = db.Where("project_id = ?", fmt.Sprintf("%s", projectID))`
	`51`	`+ db = db.Where("project_id = ?", projectID)`
`53`	`52`	`}`
`54`	`53`	`// 当pageNum > 0 且 pageSize > 0 才分页`
`55`	`54`	`//记录总条数`
`@@ -91,7 +90,7 @@ func (pr ProjectRepository) BatchDeleteProjectByIds(ids []string) error {`
`91`	`90`	`// 根据ID获取标签`
`92`	`91`	`project, err := pr.GetProjectByProjectID(id)`
`93`	`92`	`if err != nil {`
`94`		`- return errors.New(fmt.Sprintf("未获取到ID为%s的项目", id))`
	`93`	`+ return fmt.Errorf("未获取到ID为%s的项目", id)`
`95`	`94`	`}`
`96`	`95`	`projects = append(projects, project)`
`97`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func (tr TagRepository) GetTags(req vo.TagListRequest) ([]model.Tag, int64, er`
`49`	`49`	`}`
`50`	`50`	`tagID := strings.TrimSpace(req.TagID)`
`51`	`51`	`if req.TagID != "" {`
`52`		`- db = db.Where("tag_id = ?", fmt.Sprintf("%s", tagID))`
	`52`	`+ db = db.Where("tag_id = ?", tagID)`
`53`	`53`	`}`
`54`	`54`	`// 当pageNum > 0 且 pageSize > 0 才分页`
`55`	`55`	`//记录总条数`
`@@ -71,7 +71,7 @@ func (tr TagRepository) GetTags(req vo.TagListRequest) ([]model.Tag, int64, er`
`71`	`71`	`// 创建标签`
`72`	`72`	`func (tr TagRepository) CreateTag(tag model.Tag) (model.Tag, error) {`
`73`	`73`	`if isTagExist(tag.Title) {`
`74`		`- return nil, errors.New(fmt.Sprintf("%s标签已存在", tag.Title))`
	`74`	`+ return nil, fmt.Errorf("%s标签已存在", tag.Title)`
`75`	`75`	`}`
`76`	`76`	`result := common.DB.Create(tag)`
`77`	`77`	`if result.Error != nil {`
`@@ -97,7 +97,7 @@ func (tr TagRepository) BatchDeleteTagByIds(ids []string) error {`
`97`	`97`	`// 根据ID获取标签`
`98`	`98`	`tag, err := tr.GetTagByTagID(id)`
`99`	`99`	`if err != nil {`
`100`		`- return errors.New(fmt.Sprintf("未获取到ID为%s的标签", id))`
	`100`	`+ return fmt.Errorf("未获取到ID为%s的标签", id)`
`101`	`101`	`}`
`102`	`102`	`tags = append(tags, tag)`
`103`	`103`	`}`
`@@ -110,8 +110,5 @@ func (tr TagRepository) BatchDeleteTagByIds(ids []string) error {`
`110`	`110`	`func isTagExist(title string) bool {`
`111`	`111`	`var tag model.Tag`
`112`	`112`	`result := common.DB.Where("title = ?", title).First(&tag)`
`113`		`- if errors.Is(result.Error, gorm.ErrRecordNotFound) {`
`114`		`- return false`
`115`		`- }`
`116`		`- return true`
	`113`	`+ return !errors.Is(result.Error, gorm.ErrRecordNotFound)`
`117`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func (ur UserRepository) GetUsers(req vo.UserListRequest) ([]model.User, int64`
`55`	`55`	`}`
`56`	`56`	`userID := strings.TrimSpace(req.UserID)`
`57`	`57`	`if req.UserID != "" {`
`58`		`- db = db.Where("user_id = ?", fmt.Sprintf("%s", userID))`
	`58`	`+ db = db.Where("user_id = ?", userID)`
`59`	`59`	`}`
`60`	`60`	`// 当pageNum > 0 且 pageSize > 0 才分页`
`61`	`61`	`//记录总条数`
`@@ -124,7 +124,7 @@ func (ur UserRepository) BatchDeleteUserByIds(ids []string) error {`
`124`	`124`	`// 根据ID获取用户`
`125`	`125`	`user, err := ur.GetUserByUserID(id)`
`126`	`126`	`if err != nil {`
`127`		`- return errors.New(fmt.Sprintf("未获取到ID为%s的用户", id))`
	`127`	`+ return fmt.Errorf("未获取到ID为%s的用户", id)`
`128`	`128`	`}`
`129`	`129`	`users = append(users, user)`
`130`	`130`	`}`