Browse Source

添加日志

Jianghan 8 months ago
parent
commit
7d0ea8bd00

+ 8 - 1
pushUnbinding/config.json

@@ -6,6 +6,13 @@
       "size": 5,
       "size": 5,
       "dbName": "qfw",
       "dbName": "qfw",
       "replSet": ""
       "replSet": ""
+    },
+    "jylog": {
+      "address": "192.168.3.149:27190",
+      "size": 5,
+      "dbName": "push",
+      "userName": "admin",
+      "password": "123456"
     }
     }
   },
   },
   "elasticsearch": {
   "elasticsearch": {
@@ -16,7 +23,7 @@
   "wxDomain":"https://wcj.jydev.jianyu360.com",
   "wxDomain":"https://wcj.jydev.jianyu360.com",
   "wxTplMsg":{
   "wxTplMsg":{
     "id":"tIy2_aB5Mw46e26T_Gj0BjXMFcPxkgLX_tareQMg1bQ",
     "id":"tIy2_aB5Mw46e26T_Gj0BjXMFcPxkgLX_tareQMg1bQ",
-    "url":"/article/content/%s.html?wxpush=bind",
+    "url":"/article/content/%s.html?wxpush=bind&pushdate=%d",
     "keyword1":{
     "keyword1":{
       "color":"#44BEF3"
       "color":"#44BEF3"
     },
     },

+ 14 - 0
pushUnbinding/config/config.go

@@ -11,6 +11,7 @@ type config struct {
 	TaskTime string `json:"taskTime"`
 	TaskTime string `json:"taskTime"`
 	MongoDb  struct {
 	MongoDb  struct {
 		JianYu *MgoConf `json:"jianyu"`
 		JianYu *MgoConf `json:"jianyu"`
+		JyLog  *MgoConf `json:"jylog"`
 	} `json:"mongodb"`
 	} `json:"mongodb"`
 	WxRpcServer string `json:"wxRpcServer"`
 	WxRpcServer string `json:"wxRpcServer"`
 	WxDomain    string `json:"wxDomain"`
 	WxDomain    string `json:"wxDomain"`
@@ -47,6 +48,7 @@ var (
 	Config     *config
 	Config     *config
 	TaskConfig *taskConfig
 	TaskConfig *taskConfig
 	MgoJy      *mongodb.MongodbSim
 	MgoJy      *mongodb.MongodbSim
+	JyLog      *mongodb.MongodbSim
 )
 )
 
 
 func init() {
 func init() {
@@ -65,6 +67,18 @@ func init() {
 		}
 		}
 		MgoJy.InitPool()
 		MgoJy.InitPool()
 	}
 	}
+	if Config.MongoDb.JyLog != nil {
+		logger.Info("初始化 mongodb jianyu")
+		JyLog = &mongodb.MongodbSim{
+			MongodbAddr: Config.MongoDb.JyLog.Address,
+			Size:        Config.MongoDb.JyLog.Size,
+			DbName:      Config.MongoDb.JyLog.DbName,
+			ReplSet:     Config.MongoDb.JyLog.ReplSet,
+			UserName:    Config.MongoDb.JyLog.UserName,
+			Password:    Config.MongoDb.JyLog.Password,
+		}
+		JyLog.InitPool()
+	}
 
 
 	elastic.NewEs("v7", Config.Es.Address, Config.Es.Size, Config.Es.UserName, Config.Es.Password)
 	elastic.NewEs("v7", Config.Es.Address, Config.Es.Size, Config.Es.UserName, Config.Es.Password)
 	logger.Info("初始化 elasticsearch")
 	logger.Info("初始化 elasticsearch")

+ 1 - 1
pushUnbinding/task.json

@@ -1 +1 @@
-{"pici":1701076288}
+{"pici":1730918718}

+ 10 - 2
pushUnbinding/task/task.go

@@ -6,6 +6,7 @@ import (
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	elastic "app.yhyue.com/moapp/jybase/es"
 	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/logger"
 	"app.yhyue.com/moapp/jybase/logger"
+	"app.yhyue.com/moapp/jybase/mongodb"
 	qrpc "app.yhyue.com/moapp/jybase/rpc"
 	qrpc "app.yhyue.com/moapp/jybase/rpc"
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	"fmt"
 	"fmt"
@@ -86,6 +87,7 @@ func sendWeixin(user map[string]interface{}) {
 	pb := util.Int64All(Info["publishtime"])
 	pb := util.Int64All(Info["publishtime"])
 	pname := util.ObjToString(Info["projectname"])
 	pname := util.ObjToString(Info["projectname"])
 	buyer := util.ObjToString(Info["buyer"])
 	buyer := util.ObjToString(Info["buyer"])
+	now := time.Now().Unix()
 	tmplData := map[string]*qrpc.TmplItem{
 	tmplData := map[string]*qrpc.TmplItem{
 		"thing1": { //
 		"thing1": { //
 			Value: strings.ReplaceAll(pname, buyer, ""),
 			Value: strings.ReplaceAll(pname, buyer, ""),
@@ -108,12 +110,18 @@ func sendWeixin(user map[string]interface{}) {
 		OpenId:   util.ObjToString(user["s_m_openid"]),
 		OpenId:   util.ObjToString(user["s_m_openid"]),
 		TplId:    config.Config.WxTplMsg.Id,
 		TplId:    config.Config.WxTplMsg.Id,
 		TmplData: tmplData,
 		TmplData: tmplData,
-		Url: config.Config.WxDomain + "/front/sess/" + Se.EncodeString(util.ObjToString(user["s_m_openid"])+",s_m_openid,"+strconv.Itoa(int(time.Now().Unix()))+",") + "__" +
-			Se.EncodeString(fmt.Sprintf(config.Config.WxDomain+config.Config.WxTplMsg.Url, encrypt.CommonEncodeArticle("content", util.ObjToString(Info["id"])))),
+		Url: config.Config.WxDomain + "/front/sess/" + Se.EncodeString(util.ObjToString(user["s_m_openid"])+",s_m_openid,"+strconv.Itoa(int(now))+",") + "__" +
+			Se.EncodeString(fmt.Sprintf(config.Config.WxDomain+config.Config.WxTplMsg.Url, encrypt.CommonEncodeArticle("content", util.ObjToString(Info["id"])), now)),
 		//Url:      fmt.Sprintf(config.Config.WxDomain+config.Config.WxTplMsg.Url, encrypt.CommonEncodeArticle("content", util.ObjToString(Info["id"]))),
 		//Url:      fmt.Sprintf(config.Config.WxDomain+config.Config.WxTplMsg.Url, encrypt.CommonEncodeArticle("content", util.ObjToString(Info["id"]))),
 	}
 	}
 	_, err := qrpc.WxSendTmplMsg(config.Config.WxRpcServer, wxTmplMsg)
 	_, err := qrpc.WxSendTmplMsg(config.Config.WxRpcServer, wxTmplMsg)
 	if err != nil {
 	if err != nil {
 		logger.Info("wx模版消息发送失败", err)
 		logger.Info("wx模版消息发送失败", err)
+	} else {
+		config.MgoJy.Save("push_unbind_log", map[string]interface{}{
+			"userid":     mongodb.BsonIdToSId(user["_id"]),
+			"infoid":     util.ObjToString(Info["id"]),
+			"createtime": now,
+		})
 	}
 	}
 }
 }