Merge branch 'feature/v2.3.32' of https://jygit.jydev.jianyu360.cn/jianyu/push into feature/v2.3.32

pushUnbinding/main.go

@@ -14,8 +14,8 @@ func init() {
 
 func main() {
 
-	t := &task.TaskInfo{}
-	t.Run()
+	//t := &task.TaskInfo{}
+	//t.Run()
 
 	c := cron.New()
 	_, _ = c.AddJob(config.Config.TaskTime, cron.NewChain(cron.DelayIfStillRunning(cron.DefaultLogger)).Then(&task.TaskInfo{}))

pushUnbinding/task/task.go

@@ -6,6 +6,7 @@ import (
 	"app.yhyue.com/moapp/jybase/encrypt"
 	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/logger"
+	"app.yhyue.com/moapp/jybase/mongodb"
 	qrpc "app.yhyue.com/moapp/jybase/rpc"
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	"fmt"
@@ -108,7 +109,7 @@ func sendWeixin(user map[string]interface{}) {
 		OpenId:   util.ObjToString(user["s_m_openid"]),
 		TplId:    config.Config.WxTplMsg.Id,
 		TmplData: tmplData,
-		Url: config.Config.WxDomain + "/front/sess/" + Se.EncodeString(util.ObjToString(Info["id"])+",_id,"+strconv.Itoa(int(time.Now().Unix()))+",") + "__" +
+		Url: config.Config.WxDomain + "/front/sess/" + Se.EncodeString(mongodb.BsonIdToSId(user["_id"])+",_id,"+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:      fmt.Sprintf(config.Config.WxDomain+config.Config.WxTplMsg.Url, encrypt.CommonEncodeArticle("content", util.ObjToString(Info["id"]))),
 	}