整理代码

pangdogs · Jan 18, 2025 · d08ce37 · d08ce37
1 parent 45757d5
commit d08ce37
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/runtime_generic.go b/runtime_generic.go
@@ -37,6 +37,7 @@ import (
 	"git.golaxy.org/framework/addins/rpcstack"
 	etcdv3 "go.etcd.io/etcd/client/v3"
 	"go.uber.org/zap"
+	"sync"
 )
 
 type _RuntimeSettings struct {
@@ -55,17 +56,20 @@ type iRuntimeGeneric interface {
 
 // RuntimeGeneric 运行时泛化类型
 type RuntimeGeneric struct {
+	once                                   sync.Once
 	svcInst                                IServiceInstance
 	instance                               any
 	handleEntityManagerAddEntity           runtime.EventEntityManagerAddEntityHandler
 	handleEntityManagerEntityAddComponents runtime.EventEntityManagerEntityAddComponentsHandler
 }
 
 func (r *RuntimeGeneric) init(svcCtx service.Context, instance any) {
-	r.svcInst = reinterpret.Cast[IServiceInstance](svcCtx)
-	r.instance = instance
-	r.handleEntityManagerAddEntity = runtime.HandleEventEntityManagerAddEntity(r.onEntityManagerAddEntity)
-	r.handleEntityManagerEntityAddComponents = runtime.HandleEventEntityManagerEntityAddComponents(r.onEntityManagerEntityAddComponents)
+	r.once.Do(func() {
+		r.svcInst = reinterpret.Cast[IServiceInstance](svcCtx)
+		r.instance = instance
+		r.handleEntityManagerAddEntity = runtime.HandleEventEntityManagerAddEntity(r.onEntityManagerAddEntity)
+		r.handleEntityManagerEntityAddComponents = runtime.HandleEventEntityManagerEntityAddComponents(r.onEntityManagerEntityAddComponents)
+	})
 }
 
 func (r *RuntimeGeneric) generate(settings _RuntimeSettings) core.Runtime {

diff --git a/service_generic.go b/service_generic.go
@@ -59,15 +59,18 @@ type iServiceGeneric interface {
 
 // ServiceGeneric 服务泛化类型
 type ServiceGeneric struct {
+	once        sync.Once
 	startupConf *viper.Viper
 	name        string
 	instance    any
 }
 
 func (s *ServiceGeneric) init(startupConf *viper.Viper, name string, instance any) {
-	s.startupConf = startupConf
-	s.name = name
-	s.instance = instance
+	s.once.Do(func() {
+		s.startupConf = startupConf
+		s.name = name
+		s.instance = instance
+	})
 }
 
 func (s *ServiceGeneric) generate(ctx context.Context, no int) core.Service {

diff --git a/service_instance.go b/service_instance.go
@@ -75,6 +75,7 @@ type IServiceInstance interface {
 // ServiceInstance 服务实例
 type ServiceInstance struct {
 	service.ContextBehavior
+	runtimeGeneric RuntimeGeneric
 }
 
 // GetConf 获取配置插件
@@ -141,7 +142,7 @@ func (inst *ServiceInstance) GetMemKV() *sync.Map {
 
 // CreateRuntime 创建运行时
 func (inst *ServiceInstance) CreateRuntime() RuntimeCreator {
-	return CreateRuntime(service.UnsafeContext(inst).GetOptions().InstanceFace.Iface)
+	return CreateRuntime(service.UnsafeContext(inst).GetOptions().InstanceFace.Iface).Setup(&inst.runtimeGeneric)
 }
 
 // CreateEntityPT 创建实体原型