From c19a268b7bb62bfc6fe5ac2a29b7ef9da244de26 Mon Sep 17 00:00:00 2001
From: 1 <1@72wo.cn>
Date: Mon, 22 Dec 2025 14:10:22 +0000
Subject: [PATCH] =?UTF-8?q?"refactor(service):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=AE=9E=E4=BE=8B=E5=8C=96=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8New=E6=96=B9=E6=B3=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/controller/fight_boss.go                           | 2 +-
 logic/controller/pet_fusion.go                           | 4 ++--
 .../controller/admin/pet_fusion_material_controller.go   | 2 +-
 modules/config/service/effect.go                         | 2 +-
 modules/config/service/item.go                           | 9 ++++++---
 modules/config/service/pet_fusion_material_service.go    | 2 +-
 modules/config/service/pet_fusion_service.go             | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/logic/controller/fight_boss.go b/logic/controller/fight_boss.go
index 9ee0421e3..1baee8846 100644
--- a/logic/controller/fight_boss.go
+++ b/logic/controller/fight_boss.go
@@ -97,7 +97,7 @@ func (h Controller) PlayerFightBoss(data *fight.ChallengeBossInboundInfo, c *pla
 						continue
 					}
 
-					EID, args := service.Effects.Args(uint32(idx))
+					EID, args := service.NewEffectService().Args(uint32(idx))
 					mo.EffectInfo = append(mo.EffectInfo, model.PetEffectInfo{
 						Idx:  idx,
 						EID:  gconv.Uint16(EID),
diff --git a/logic/controller/pet_fusion.go b/logic/controller/pet_fusion.go
index 276208440..b3ca56f01 100644
--- a/logic/controller/pet_fusion.go
+++ b/logic/controller/pet_fusion.go
@@ -45,14 +45,14 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result
 		natureId = int32(Auxpetinfo.Nature)
 	}
 
-	resid := int(service.PetFusionServiceS.Data(Mcatchpetinfo.ID, Auxpetinfo.ID, Mcatchpetinfo.Level+Auxpetinfo.Level))
+	resid := int(service.NewPetFusionService().Data(Mcatchpetinfo.ID, Auxpetinfo.ID, Mcatchpetinfo.Level+Auxpetinfo.Level))
 
 	if resid == 0 {
 		//todo失败降低等级
 
 		return &pet.PetFusionInfo{}, 0
 	}
-	effect := int(service.PetFusionMaterialServiceIns.Data(data.Item1))
+	effect := int(service.NewPetFusionMaterialService().Data(data.Item1))
 	if effect == 0 {
 		return &pet.PetFusionInfo{}, 0
 	}
diff --git a/modules/config/controller/admin/pet_fusion_material_controller.go b/modules/config/controller/admin/pet_fusion_material_controller.go
index caa5eeb16..a06b428b3 100644
--- a/modules/config/controller/admin/pet_fusion_material_controller.go
+++ b/modules/config/controller/admin/pet_fusion_material_controller.go
@@ -16,7 +16,7 @@ func init() {
 		&cool.Controller{
 			Prefix:  "/admin/pet/fusionmaterial",                                 // 路由前缀（主表路由+子表名，层级清晰）
 			Api:     []string{"Add", "Delete", "Update", "Info", "List", "Page"}, // 支持的基础CRUD接口
-			Service: service.PetFusionMaterialServiceIns,                         // 绑定子表Service
+			Service: service.NewPetFusionMaterialService(),                         // 绑定子表Service
 		},
 	}
 	// 注册控制器到框架
diff --git a/modules/config/service/effect.go b/modules/config/service/effect.go
index 7e20cf36a..5324b0899 100644
--- a/modules/config/service/effect.go
+++ b/modules/config/service/effect.go
@@ -32,4 +32,4 @@ func NewEffectService() *EffectService {
 	}
 }
 
-var Effects = NewEffectService()
+ 
diff --git a/modules/config/service/item.go b/modules/config/service/item.go
index 16753994c..a7a81cfc2 100644
--- a/modules/config/service/item.go
+++ b/modules/config/service/item.go
@@ -4,6 +4,7 @@ import (
 	"blazing/cool"
 	"blazing/modules/config/model"
 
+	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/util/grand"
 )
 
@@ -15,7 +16,11 @@ type ItemService struct {
 
 func (s *ItemService) GetItemCount(id uint32) uint32 {
 	var item model.ItemGift
-	cool.DBM(s.Model).Where("id", id).Scan(&item)
+	cool.DBM(s.Model).Where("id", id).Cache(gdb.CacheOption{
+		// Duration: time.Hour,
+
+		Force: false,
+	}).Scan(&item)
 
 	if item.ItemID == 0 {
 		return 0
@@ -35,5 +40,3 @@ func NewItemService() *ItemService {
 		},
 	}
 }
-
-var Items = NewItemService()
diff --git a/modules/config/service/pet_fusion_material_service.go b/modules/config/service/pet_fusion_material_service.go
index f82d98881..8ead48583 100644
--- a/modules/config/service/pet_fusion_material_service.go
+++ b/modules/config/service/pet_fusion_material_service.go
@@ -18,7 +18,7 @@ type PetFusionMaterialService struct {
 	*cool.Service // 嵌入通用Service（继承基础CRUD方法）
 }
 
-var PetFusionMaterialServiceIns = NewPetFusionMaterialService()
+ 
 
 // NewPetFusionMaterialService 创建PetFusionMaterialService实例
 func NewPetFusionMaterialService() *PetFusionMaterialService {
diff --git a/modules/config/service/pet_fusion_service.go b/modules/config/service/pet_fusion_service.go
index 3f57d710b..bfe925a91 100644
--- a/modules/config/service/pet_fusion_service.go
+++ b/modules/config/service/pet_fusion_service.go
@@ -15,7 +15,7 @@ type PetFusionService struct {
 	*cool.Service // 嵌入通用Service（继承基础CRUD方法）
 }
 
-var PetFusionServiceS = NewPetFusionService()
+ 
 
 // NewPetFusionService 创建PetFusionService实例
 func NewPetFusionService() *PetFusionService {