账号合并

pushsubscribe/push/config.json

@@ -60,6 +60,7 @@
 			"color":"#44BEF3"
 		},
 		"keyword2":{
+			"value":"根据你当前订阅，剑鱼标讯为你推送%d条信息。如不想接收，可在招标订阅设置页面取消订阅。\n\n",
 			"color":"#44BEF3"
 		},
 		"keyword3":{
@@ -68,17 +69,6 @@
 		"keyword4":{
 			"color":"#44BEF3"
 		},
-		"keyword2_title":{
-			"value":"根据你当前订阅，剑鱼标讯为你推送%d条信息。如不想接收，可在招标订阅设置页面取消订阅。\n\n"
-		},
-<<<<<<< HEAD
-		"remark":{
-			"color":"#686868"
-=======
-		"vip_keyword2_title":{
-			"value":"亲爱的超级订阅用户，剑鱼标讯为你推送%d条信息。\n\n"
->>>>>>> master
-		},
 		"url":"/swordfish/newhistorypush?f=push&t=%s&pushtime=%d&advertcode=%s"
 	},
 	"appMsg":{

pushsubscribe/push/config/config.go

@@ -42,28 +42,13 @@ type config struct {
 	RpcPort                 string      `json:"rpcPort"`
 	TimeoutWarn             string      `json:"timeoutWarn"`
 	WxTplMsg                struct {
-<<<<<<< HEAD
-		Id           string
-		First        *qrpc.TmplItem
-		Keyword1     *qrpc.TmplItem
-		Keyword2     *qrpc.TmplItem
-		Keyword3     *qrpc.TmplItem
-		Keyword4     *qrpc.TmplItem
-		Remark_title *qrpc.TmplItem
-		Remark       *qrpc.TmplItem
-		Url          string
-=======
-		Id                 string
-		First              *qrpc.TmplItem
-		Vip_first          *qrpc.TmplItem
-		Keyword1           *qrpc.TmplItem
-		Keyword2           *qrpc.TmplItem
-		Keyword3           *qrpc.TmplItem
-		Keyword4           *qrpc.TmplItem
-		Keyword2_title     *qrpc.TmplItem
-		Vip_keyword2_title *qrpc.TmplItem
-		Url                string
->>>>>>> master
+		Id       string
+		First    *qrpc.TmplItem
+		Keyword1 *qrpc.TmplItem
+		Keyword2 *qrpc.TmplItem
+		Keyword3 *qrpc.TmplItem
+		Keyword4 *qrpc.TmplItem
+		Url      string
 	} `json:"wxTplMsg"`
 	AppMsg struct {
 		Title string `json:"title"`

pushsubscribe/push/job/pushjob.go

@@ -209,36 +209,14 @@ func (p *PushJob) doPush(pusher Pusher, taskType int, u *UserInfo, sl *SortList,
 
 //微信远程调用，实现模板发送消息
 func (p *PushJob) sendWeixin(k *UserInfo, pushParam *PushParam) (bool, string, string) {
-<<<<<<< HEAD
-	wtmc := putil.WTMCS.Get(Config.WxTplMsg.First.Value)
+	var wtmc *WxTplMsgCustom
+	wtmc = putil.WTMCS.Get(Config.WxTplMsg.First.Value)
 	if wtmc == nil {
 		logger.Error(k.Id, "没有找到模板消息", Config.WxTplMsg.First.Value)
 		return false, "", ""
 	}
 	first_color := Config.WxTplMsg.First.Color
-	remark_value := Config.WxTplMsg.Remark_title.Value
-	keyword2_value := fmt.Sprintf("%d条", pushParam.InfosLength)
-=======
-	var wtmc *WxTplMsgCustom
-	first_color, keyword2_value := "", ""
-	if IsVipUser(k.VipStatus) {
-		wtmc = putil.WTMCS.Get(Config.WxTplMsg.Vip_first.Value)
-		if wtmc == nil {
-			logger.Error(k.Id, "没有找到模板消息", Config.WxTplMsg.Vip_first.Value)
-			return false, "", ""
-		}
-		first_color = Config.WxTplMsg.Vip_first.Color
-		keyword2_value = fmt.Sprintf(Config.WxTplMsg.Vip_keyword2_title.Value, pushParam.InfosLength)
-	} else {
-		wtmc = putil.WTMCS.Get(Config.WxTplMsg.First.Value)
-		if wtmc == nil {
-			logger.Error(k.Id, "没有找到模板消息", Config.WxTplMsg.First.Value)
-			return false, "", ""
-		}
-		first_color = Config.WxTplMsg.First.Color
-		keyword2_value = fmt.Sprintf(Config.WxTplMsg.Keyword2_title.Value, pushParam.InfosLength)
-	}
->>>>>>> master
+	keyword2_value := fmt.Sprintf(Config.WxTplMsg.Keyword2.Value, pushParam.InfosLength)
 	keyword1_value, keyword3_value := "", ""
 	if k.WxTplMsg != nil {
 		keyword1_value = k.WxTplMsg.Key

pushsupersub/push/config.json

@@ -63,6 +63,7 @@
 			"color":"#44BEF3"
 		},
 		"keyword2":{
+			"value":"亲爱的超级订阅用户，剑鱼标讯为你推送%d条信息。\n\n",
 			"color":"#44BEF3"
 		},
 		"keyword3":{
@@ -71,12 +72,6 @@
 		"keyword4":{
 			"color":"#44BEF3"
 		},
-		"remark_title":{
-			"value":"亲爱的超级订阅用户，剑鱼标讯为你推送以下信息。\n\n"
-		},
-		"remark":{
-			"color":"#686868"
-		},
 		"url":"/swordfish/newhistorypush?f=push&t=%s&pushtime=%d&advertcode=%s"
 	},
 	"appMsg":{
@@ -105,9 +100,6 @@
 			"keyword4":{
 				"color":"#44BEF3"
 			},
-			"remark":{
-				"color":"#686868"
-			},
 			"url":"/front/vipsubscribe/toSubVipSetPage?vSwitch=%s&advertcode=%s"
 		},
 		"app":{

pushsupersub/push/config/config.go

@@ -48,15 +48,13 @@ type config struct {
 	RpcPort                 string      `json:"rpcPort"`
 	TimeoutWarn             string      `json:"timeoutWarn"`
 	WxTplMsg                struct {
-		Id           string
-		First        *qrpc.TmplItem
-		Keyword1     *qrpc.TmplItem
-		Keyword2     *qrpc.TmplItem
-		Keyword3     *qrpc.TmplItem
-		Keyword4     *qrpc.TmplItem
-		Remark_title *qrpc.TmplItem
-		Remark       *qrpc.TmplItem
-		Url          string
+		Id       string
+		First    *qrpc.TmplItem
+		Keyword1 *qrpc.TmplItem
+		Keyword2 *qrpc.TmplItem
+		Keyword3 *qrpc.TmplItem
+		Keyword4 *qrpc.TmplItem
+		Url      string
 	} `json:"wxTplMsg"`
 	AppMsg struct {
 		Title string `json:"title"`
@@ -72,7 +70,6 @@ type config struct {
 			Keyword2 *qrpc.TmplItem
 			Keyword3 *qrpc.TmplItem
 			Keyword4 *qrpc.TmplItem
-			Remark   *qrpc.TmplItem
 			Url      string
 		} `json:"wx"`
 		App struct {

pushsupersub/push/job/nomsgtipjob.go

@@ -219,10 +219,6 @@ func (n *NoMsgTipJob) sendWeixin(user *UserInfo, startEndMd, userType string) (b
 			Value: NowFormat(Date_Time_Layout),
 			Color: Config.NoMsgTip.Wx.Keyword4.Color,
 		},
-		"remark": &qrpc.TmplItem{
-			Value: "-",
-			Color: Config.NoMsgTip.Wx.Remark.Color,
-		},
 	}
 	ok := putil.SendWeixin(user, &qrpc.WxTmplMsg{
 		OpenId:   user.S_m_openid,

pushsupersub/push/job/pushjob.go

@@ -217,8 +217,7 @@ func (p *PushJob) sendWeixin(k *UserInfo, pushParam *PushParam) (bool, string, s
 		return false, "", ""
 	}
 	first_color := Config.WxTplMsg.First.Color
-	remark_value := Config.WxTplMsg.Remark_title.Value
-	keyword2_value := fmt.Sprintf("%d条", pushParam.InfosLength)
+	keyword2_value := fmt.Sprintf(Config.WxTplMsg.Keyword2.Value, pushParam.InfosLength)
 	keyword1_value, keyword3_value := "", ""
 	if k.WxTplMsg != nil {
 		keyword1_value = k.WxTplMsg.Key
@@ -228,7 +227,7 @@ func (p *PushJob) sendWeixin(k *UserInfo, pushParam *PushParam) (bool, string, s
 		}
 	}
 	keyword4_value := NowFormat(Date_Time_Layout)
-	remark_value += WxTplRemark(pushParam.TitleArray, pushParam.LastInfoDate, len([]rune(wtmc.FirstData))+len([]rune(keyword1_value))+len([]rune(keyword2_value))+len([]rune(keyword3_value))+len([]rune(keyword4_value))+len([]rune(remark_value)))
+	keyword2_value += WxTplRemark(pushParam.TitleArray, pushParam.LastInfoDate, len([]rune(wtmc.FirstData))+len([]rune(keyword1_value))+len([]rune(keyword2_value))+len([]rune(keyword3_value))+len([]rune(keyword4_value)))
 	tmplData := map[string]*qrpc.TmplItem{
 		"first": &qrpc.TmplItem{
 			Value: wtmc.FirstData,
@@ -250,10 +249,6 @@ func (p *PushJob) sendWeixin(k *UserInfo, pushParam *PushParam) (bool, string, s
 			Value: keyword4_value,
 			Color: Config.WxTplMsg.Keyword4.Color,
 		},
-		"remark": &qrpc.TmplItem{
-			Value: remark_value,
-			Color: Config.WxTplMsg.Remark.Color,
-		},
 	}
 	ok := putil.SendWeixin(k, &qrpc.WxTmplMsg{
 		OpenId:   k.S_m_openid,