Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

controllers/base.go

@@ -28,21 +28,21 @@ func (c *BaseController) Prepare() {
 
 // ResponseJSON 返回JSON数据
 func (c *BaseController) ResponseJSON(data interface{}) {
-	c.ResponseData(data, "")
+	c.ResponseData(data, "", http.StatusOK)
 }
 
 // ResponseError 返回错误
 func (c *BaseController) ResponseError(err error, code ...int) {
-	c.ResponseData(nil, err, code...)
-}
-
-// ResponseData 自定义的JSON返回
-func (c *BaseController) ResponseData(data interface{}, msg interface{}, code ...int) {
-	status := http.StatusOK
 	if len(code) > 0 {
-		status = code[0]
+		c.ResponseData(nil, err, code[0])
 	}
 
+	c.ResponseData(nil, err, http.StatusBadRequest)
+}
+
+// ResponseData 自定义的JSON返回
+func (c *BaseController) ResponseData(data interface{}, msg interface{}, code int) {
+	status := code
 	c.destroyContext(status < http.StatusMultipleChoices)
 
 	sendMessage := ""

models/models.go

@@ -1,7 +1,6 @@
 package models
 
 import (
-	"github.com/astaxie/beego/config"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/go-xorm/xorm"
 )
@@ -35,23 +34,24 @@ func NewDBEngine() *xorm.Engine {
 }
 
 func getMySQLDNS() string {
-	dbconf, _ := config.NewConfig("ini", "conf/db.conf")
+	// dbconf, _ := config.NewConfig("ini", "conf/db.conf")
 
-	conProt := dbconf.DefaultString("con_protocol", "tcp")
-	dbAddr := dbconf.DefaultString("db_addr", "localhost")
-	dbPort := dbconf.DefaultString("db_port", "3306")
-	userName := dbconf.DefaultString("username", "root")
-	password := dbconf.String("password")
-	database := dbconf.String("database")
-	charSet := dbconf.DefaultString("char_set", "utf8")
+	// conProt := dbconf.DefaultString("con_protocol", "tcp")
+	// dbAddr := dbconf.DefaultString("db_addr", "localhost")
+	// dbPort := dbconf.DefaultString("db_port", "3306")
+	// userName := dbconf.DefaultString("username", "root")
+	// password := dbconf.String("password")
+	// database := dbconf.String("database")
+	// charSet := dbconf.DefaultString("char_set", "utf8")
 
-	dns := userName
+	// dns := userName
 
-	if len(password) > 0 {
-		dns += ":" + password
-	}
+	// if len(password) > 0 {
+	// 	dns += ":" + password
+	// }
 
-	dns += "@" + conProt + "(" + dbAddr + ":" + dbPort + ")" + "/" + database + "?charset=" + charSet
+	// dns += "@" + conProt + "(" + dbAddr + ":" + dbPort + ")" + "/" + database + "?charset=" + charSet
 
-	return dns
+	// return dns
+	return ""
 }

service/events.go

@@ -1,4 +1,53 @@
 package service
 
+import (
+	"reflect"
+	"spaceofcheng/services/utils"
+
+	"github.com/zjxpcyc/tinyevent"
+)
+
+// 内置事件列表
+const (
+	EvtRegiste = "reigste"
+)
+
 // EventServ 事件 Serv
 type EventServ struct{}
+
+// ListenAllEvent 监听所有事件
+func (s *EventServ) ListenAllEvent() {
+	// 所有需要执行的事件
+	allEvts, err := s.getAllEvents()
+	if err != nil {
+		utils.LogError(err)
+	}
+
+	// 刷新中控中心
+	utils.ResetEvtBus()
+
+	for evt, mth := range allEvts {
+		act := func(e tinyevent.Event) error {
+			s.execAction(e, mth)
+			return nil
+		}
+
+		utils.ListenEvent(evt, act)
+	}
+}
+
+// ExecAction 反射执行动作
+func (s *EventServ) execAction(e tinyevent.Event, mth string) {
+	this := reflect.ValueOf(s)
+	v := this.MethodByName(mth)
+	if v.IsValid() {
+		v.Call([]reflect.Value{reflect.ValueOf(e)})
+	}
+}
+
+func (s *EventServ) getAllEvents() (map[string]string, error) {
+	// todo
+	return map[string]string{
+		"foo": "Foo",
+	}, nil
+}

utils/event.go

@@ -0,0 +1,27 @@
+package utils
+
+import (
+	"github.com/zjxpcyc/tinyevent"
+)
+
+var evtBus = &tinyevent.DefaultBus{}
+
+// EmitEvent 执行事件
+func EmitEvent(evt string, payload []byte) {
+	e := tinyevent.Event{
+		Name:    evt,
+		Payload: payload,
+	}
+
+	evtBus.Emit(e)
+}
+
+// ListenEvent 注册监听
+func ListenEvent(evt string, act tinyevent.Action) {
+	evtBus.On(evt, act)
+}
+
+// ResetEvtBus 重置一个事件中控中心
+func ResetEvtBus() {
+	evtBus = &tinyevent.DefaultBus{}
+}

utils/log.go

@@ -0,0 +1,25 @@
+package utils
+
+import (
+	"errors"
+
+	"github.com/astaxie/beego"
+)
+
+// LogError 错误日志
+func LogError(v ...interface{}) error {
+	beego.Error(v...)
+
+	if len(v) > 0 {
+		switch err := v[0].(type) {
+		case string:
+			return errors.New(err)
+		case error:
+			return err
+		default:
+			return errors.New("Unknown error type")
+		}
+	}
+
+	return nil
+}