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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = services
 httpport = 8080
-runmode = dev
+runmode = prod
 autorender = false
 copyrequestbody = true
 EnableDocs = true

conf/db.conf

@@ -5,8 +5,8 @@ db_type      = mysql
 con_protocol = tcp
 
 ; 数据库地址，可以使用IP
-# db_addr      = 192.168.0.122
-db_addr      = localhost
+db_addr      = 192.168.0.122
+# db_addr      = localhost
 # db_addr      = rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com
 
 ; 端口

conf/wechat.conf

@@ -1 +1 @@
-messageTplID = EB1Bto8JmW-vC-A0NTe8NtxgMFm6s86l3g2Bc-1OP6U
+messageTplID = EB1Bto8JmW-vC-A0NTe8NtxgMFm6s86l3g2Bc-1OP6U

service/events/giveCoupon.go

@@ -16,12 +16,10 @@ import (
 var giveCoupon = func(e tinyevent.Event) error {
 	utils.LogInfo("开始卡券赠送操作...")
 
-	hasDBError := false
 	ctx := NewContext()
-	defer DestroyContext(ctx, hasDBError)
+	defer DestroyContext(ctx, false)
 
 	if e.Payload == nil {
-		hasDBError = true
 		utils.LogError("注册送券失败, 没有用户信息")
 		return errors.New("注册送券失败, 没有用户信息")
 	}
@@ -47,7 +45,6 @@ var giveCoupon = func(e tinyevent.Event) error {
 
 	var acts []model.SysActivityAction
 	if err := models.DBEngine.SQL(query, orgID, caseID, models.STATUS_NORMAL, e.Name).Find(&acts); err != nil {
-		hasDBError = true
 		utils.LogError("检查营销活动失败: " + err.Error())
 		return errors.New("检查营销活动失败")
 	}
@@ -76,14 +73,12 @@ var giveCoupon = func(e tinyevent.Event) error {
 			cp, err := cpServ.GetCouponByID(cpID.(string))
 			if err != nil {
 				utils.LogError("获取优惠券失败: " + err.Error())
-				hasDBError = true
-				return errors.New("校验优惠券失败")
+				continue
 			}
 
 			if err := cpServ.GiveCouponTo(&fromUser, &cust, cp, models.RECEIVEING_TYPE_EVENT); err != nil {
-				hasDBError = true
 				utils.LogError("送券失败: " + err.Error())
-				return err
+				continue
 			}
 		default:
 			utils.LogError("暂不支持的赠送类型")

utils/event.go

@@ -1,6 +1,8 @@
 package utils
 
-import "github.com/zjxpcyc/tinyevent"
+import (
+	"github.com/zjxpcyc/tinyevent"
+)
 
 // EventEngine Event Engine
 type EventEngine struct {
@@ -53,8 +55,6 @@ func ResetEventEngineBus(id string) *EventEngine {
 
 // EmitEvent 执行事件
 func (t EventEngine) EmitEvent(evt string, payload interface{}) {
-	LogInfo("触发事件: "+evt, payload)
-
 	e := tinyevent.Event{
 		Name:    evt,
 		Payload: payload,

utils/log.go

@@ -57,7 +57,7 @@ func LogError(v ...interface{}) error {
 	log := instances["common"]
 
 	preMsg := ""
-	_, file, line, ok := runtime.Caller(0)
+	_, file, line, ok := runtime.Caller(1)
 	if ok {
 		preMsg = fmt.Sprintf("file: %s    line=%d : ", file, line)
 	}
@@ -86,7 +86,7 @@ func LogInfo(v ...interface{}) {
 	log := instances["common"]
 
 	preMsg := ""
-	_, file, line, ok := runtime.Caller(0)
+	_, file, line, ok := runtime.Caller(1)
 	if ok {
 		preMsg = fmt.Sprintf("file: %s    line=%d : ", file, line)
 	}
@@ -97,6 +97,7 @@ func LogInfo(v ...interface{}) {
 // GetDefaultLogger 获取默认 logger
 func GetDefaultLogger() *logs.BeeLogger {
 	log := instances["common"]
+	log.SetLogFuncCallDepth(4)
 	return log
 }