bugs

service/events/events.go

@@ -2,9 +2,6 @@ package events
 
 import (
 	"fmt"
-	"spaceofcheng/services/models"
-	"spaceofcheng/services/models/model"
-	"spaceofcheng/services/utils"
 	"sync"
 
 	"github.com/zjxpcyc/tinyevent"
@@ -23,33 +20,36 @@ var EvtActions = map[string]tinyevent.Action{
 
 // ListenAllEvent 监听所有事件
 func ListenAllEvent() {
-	// 所有需要执行的事件
-	allEvts, err := getAllEvents()
-	if err != nil {
-		utils.LogError(err)
-	}
+	mtx.Lock()
+	defer mtx.Unlock()
 
-	// 刷新中控中心
-	utils.ResetEvtBus()
+	// // 所有需要执行的事件
+	// allEvts, err := getAllEvents()
+	// if err != nil {
+	// 	utils.LogError(err)
+	// }
 
-	for evt, acts := range allEvts {
-		for _, actKey := range acts {
-			act, ok := EvtActions[actKey]
-			if ok {
-				utils.ListenEvent(evt, act)
-			}
-		}
-	}
+	// // 刷新中控中心
+	// utils.ResetEvtBus()
+
+	// for evt, acts := range allEvts {
+	// 	for _, actKey := range acts {
+	// 		act, ok := EvtActions[actKey]
+	// 		if ok {
+	// 			utils.ListenEvent(evt, act)
+	// 		}
+	// 	}
+	// }
 }
 
 // getAllEvents 获取数据库配置
-func getAllEvents() (map[string]map[string][]string, error) {
-	db := models.DBEngine
+func getAllEvents() (map[string][]string, error) {
+	// db := models.DBEngine
 
-	var evts []model.SysActivity
-	if err := db.Where("status=?", models.STATUS_NORMAL).Find(&evts); err != nil {
-		return err
-	}
+	// var evts []model.SysActivity
+	// if err := db.Where("status=?", models.STATUS_NORMAL).Find(&evts); err != nil {
+	// 	return nil, err
+	// }
 
 	// TODO
 	return map[string][]string{

service/events/giveCoupon.go

@@ -1,10 +1,6 @@
 package events
 
 import (
-	"spaceofcheng/services/models"
-	"spaceofcheng/services/models/model"
-	"spaceofcheng/services/utils"
-
 	"github.com/zjxpcyc/tinyevent"
 )
 
@@ -12,15 +8,15 @@ import (
 // Event.Payload.customer  = model.TaCustomer
 // Event.Payload.caseId  = 案场ID
 var giveCoupon = func(e tinyevent.Event) error {
-	db := models.DBEngine
+	// db := models.DBEngine
 
-	if e.Payload == nil {
-		utils.LogError("注册送券失败, 没有用户信息")
-	}
-	dtRaw := e.Payload.(map[string]interface{})
+	// if e.Payload == nil {
+	// 	utils.LogError("注册送券失败, 没有用户信息")
+	// }
+	// dtRaw := e.Payload.(map[string]interface{})
 
-	cust := dtRaw["customer"].(model.TaCustomer)
-	caseID := dtRaw["caseId"].(string)
+	// cust := dtRaw["customer"].(model.TaCustomer)
+	// caseID := dtRaw["caseId"].(string)
 
 	return nil
 }

utils/event.go

@@ -1,51 +1,49 @@
 package utils
 
-import (
-	"github.com/zjxpcyc/tinyevent"
-)
-
-type EventEngine struct {
-	ID     string
-	engine *tinyevent.DefaultBus
-}
-
-var evtBus map[string]*EventEngine
-
-func NewEventEngineBus(id string) *EventEngine {
-	if evtBus == nil {
-		evtBus = make(map[string]*EventEngine)
-	}
-
-	if id == "" {
-		return nil
-	}
-
-	evtEngine := &EventEngine{
-		ID:     id,
-		engine: new(tinyevent.DefaultBus),
-	}
-
-	evtBus[id] = evtEngine
-
-	return evtEngine
-}
-
-// EmitEvent 执行事件
-func (t EventEngine) EmitEvent(evt string, payload interface{}) {
-	e := tinyevent.Event{
-		Name:    evt,
-		Payload: payload,
-	}
-
-	t.engine.Emit(e)
-}
-
-// ListenEvent 注册监听
-func (t EventEngine) ListenEvent(evt string, act tinyevent.Action) string {
-	return t.engine.On(evt, act)
-}
-
-// UnListenEvt 取消监听
-func (t EventEngine) UnListenEvt(id string) {
-	t.engine.Off(id)
-}
+// type EventEngine struct {
+// 	ID     string
+// 	engine *tinyevent.DefaultBus
+// }
+
+// var evtBus map[string]*EventEngine
+
+// func NewEventEngineBus(id string) *EventEngine {
+// 	if evtBus == nil {
+// 		evtBus = make(map[string]*EventEngine)
+// 	}
+
+// 	if id == "" {
+// 		return nil
+// 	}
+
+// 	evtEngine := &EventEngine{
+// 		ID:     id,
+// 		engine: new(tinyevent.DefaultBus),
+// 	}
+
+// 	evtBus[id] = evtEngine
+
+// 	return evtEngine
+// }
+
+// // EmitEvent 执行事件
+// func (t EventEngine) EmitEvent(evt string, payload interface{}) {
+// 	e := tinyevent.Event{
+// 		Name:    evt,
+// 		Payload: payload,
+// 	}
+
+// 	t.engine.Emit(e)
+// }
+
+// // ListenEvent 注册监听
+// func (t EventEngine) ListenEvent(evt string, act tinyevent.Action) string {
+// 	return t.engine.On(evt, act)
+// }
+
+// // UnListenEvt 取消监听
+// func (t EventEngine) UnListenEvt(id string) {
+// 	t.engine.Off(id)
+// }
+
+func EmitEvent(evt string, payload interface{}) {}