Merge branch 'dev/v1.2.6_zxl' of moapp/message into feature/v1.2.6

db/db.go

@@ -1,10 +1,11 @@
 package db
 
 import (
+	"log"
+
 	"app.yhyue.com/moapp/jybase/mysql"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gctx"
-	"log"
 
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/redis"
@@ -14,6 +15,7 @@ var (
 	Mgo_Log *mongodb.MongodbSim
 	Mgo     *mongodb.MongodbSim
 	Mysql   *mysql.Mysql
+	Tidb    *mysql.Mysql
 )
 
 type MgoConf struct {
@@ -81,4 +83,20 @@ func init() {
 			Mysql.Init()
 		}
 	}
+
+	var tidbConf MysqlConf
+	if err := gcfg.Instance().MustGet(gctx.New(), "databases.tidb").Scan(&tidbConf); err == nil {
+		if tidbConf.Address != "" {
+			log.Println("--初始化 tidb--")
+			Tidb = &mysql.Mysql{
+				Address:      tidbConf.Address,
+				UserName:     tidbConf.UserName,
+				PassWord:     tidbConf.PassWord,
+				DBName:       tidbConf.DbName,
+				MaxOpenConns: tidbConf.MaxOpenConns,
+				MaxIdleConns: tidbConf.MaxIdleConns,
+			}
+			Tidb.Init()
+		}
+	}
 }

etc/config.yaml

@@ -52,6 +52,13 @@ databases:
     passWord: Topnet123
     maxOpenConns: 5
     maxIdleConns: 5
+  tidb:
+    dbName: base_service
+    address: 192.168.3.217:4000
+    userName: root
+    passWord: "=PDT49#80Z!RVv52_z"
+    maxOpenConns: 5
+    maxIdleConns: 5
 
 rpc:
   payrpc: 192.168.3.206:8601

handler/activity/shareOpen.go

@@ -1,14 +1,15 @@
 package activity
 
 import (
+	"fmt"
+	"time"
+
 	"app.yhyue.com/moapp/jybase/go-logger/logger"
 	"app.yhyue.com/moapp/jybase/redis"
 	"app.yhyue.com/moapp/message/handler/award"
 	"app.yhyue.com/moapp/message/model"
-	"fmt"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gctx"
-	"time"
 )
 
 const (

handler/activity/task.go

@@ -0,0 +1,32 @@
+package activity
+
+import (
+	"app.yhyue.com/moapp/message/db"
+	"app.yhyue.com/moapp/message/model"
+	"app.yhyue.com/moapp/message/rpc"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+/*
+新手任务/限时任务
+*/
+
+// Task 完成任务
+func Task(msg *model.Message) {
+	num := gconv.Int64(msg.E_body["num"])
+	code := gconv.Int64(msg.E_body["code"]) //1005
+	types := gconv.Int64(msg.E_body["type"])
+	baseUserId := gconv.Int64(msg.E_body["baseUserId"])
+	positionId := gconv.Int64(msg.E_body["positionId"])
+	//增加积分
+	rpc.IntegralHarvest(msg.E_userId, num, code, msg.E_time)
+	//修改任务状态
+	db.Tidb.Update("integral_task_detail", map[string]interface{}{
+		"user_id":     baseUserId,
+		"position_id": positionId,
+		"type":        types,
+	}, map[string]interface{}{
+		"status": 1,
+	})
+
+}

handler/handler.go

@@ -1,11 +1,12 @@
 package handler
 
 import (
-	"app.yhyue.com/moapp/message/handler/activity"
 	"encoding/json"
 	"fmt"
 	"time"
 
+	"app.yhyue.com/moapp/message/handler/activity"
+
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/go-logger/logger"
 	. "app.yhyue.com/moapp/message/db"
@@ -30,6 +31,8 @@ var (
 		//其他
 		"jywx_activity_message":  VarPush.Jywx_activity_message,
 		"jywx_exhibition_active": activity.ExhibitionActive,
+		//任务
+		"bind_phone": activity.Task,
 	}
 )