1.wechat

assets/material.txt

+[
+  "today mediaId is : chP-LBQxy9SVbAFjwZ4QEoZGbUZaNED2Mf9jJauKvGo",
+  "week mediaId is : chP-LBQxy9SVbAFjwZ4QEgcfOu5CZ67hiBgn5qnZ-Ac",
+  "month mediaId is : chP-LBQxy9SVbAFjwZ4QEnUyB6U-tpO49nJOac9ex8Q"
+]
+
+[
+  "fileName is: assets/1.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEuVWHxbZGVHMbAlAPXCMsBg ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9GdDuWIyqDdD2TV8Pd7Uy8Ibcd7AjRWAcKmL5hWGslNVRpKEXxuXW8w/0?wx_fmt=jpeg",
+  "fileName is: assets/2.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEqQQ46uREQeMghlH-GxC8HU ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9dRialK0TX26YtpZgW2N47VxnOBHdKVhbIlgy1tqW5YwVIGLO6P4uBcg/0?wx_fmt=jpeg",
+  "fileName is: assets/3.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEibPeGLrnPyQRAwfol_np5U ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9QRQryt1ZC2cAhnpw42k8exHEsqWke0Z7icwLjwwAdYibeqkzmvSv3s2w/0?wx_fmt=jpeg",
+  "fileName is: assets/4.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QElidQYJBxi-JviHz-e89w5M ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9g5KR2ppPE2q875pdxAvA4Uib9sibL7PicOqnhrIgksjDRfGSjEy9E1INA/0?wx_fmt=jpeg",
+  "fileName is: assets/5.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEpXfn8ShAn52EzP4-TrWvrM ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9UWrPuQV7ibicCLAzFVoYBSelFyk6xdeiaTNAedLSZmqLENljHDfUqYMFg/0?wx_fmt=jpeg",
+  "fileName is: assets/6.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEo81I0bHaY3YDYRwVGmf7o8 ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9RWeFtTngk1ZjdjGlCvDSU7r01qicQSLoy7Sqhm81WSL5u7u3RUQYbibg/0?wx_fmt=jpeg",
+  "fileName is: assets/7.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEmEjQNhcRlNZCM2b6YR_qVc ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9qhZI6catCwibXib6CRbIp7Krdqvoia6nCTfrXxGjc4eadibVQVicRhFsv1w/0?wx_fmt=jpeg",
+  "fileName is: assets/8.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEkzOy_14yNC4gTerThOJZH4 ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE91sYoyAyUicuib8KRv4u3dc8SibQZaF0Sw2NX6T25PYErAYdaqENo2wVmg/0?wx_fmt=jpeg",
+  "fileName is: assets/9.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEuUHkiK-GcRTxwssqvuXJW8 ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9HGwhXLgb8mhOiat6gtuMTWltiaC2xKOBDPeoGbRTXic0JtibHic7x6dDzMg/0?wx_fmt=jpeg"
+  "fileName is: assets/10.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEuxc8rI6Dy-bm5n3yZbsuJA ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9zzw8fulcibMcJVMtXZd6fNJBDibjMSuXzM1ib5YvM9vH0oOB0AeicrRCjQ/0?wx_fmt=jpeg",
+  "fileName is: assets/11.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEthz2PGUtpVZdZccay_qCi0 ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9fV7XugyNp5lOHjlvicEvh3vlXbtiaHuYXOXAHcXcHdaFg32n77mVOBoA/0?wx_fmt=jpeg",
+  "fileName is: assets/12.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEghuAPCr2lsdL6UHLFLEsN4 ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9eXY4rjXelokAxicfY9Ln9BfoMENuCZwIqDPILGiajU5D0cPqAqmKCMBA/0?wx_fmt=jpeg",
+  "fileName is: assets/13.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEm18YrRCov2p6j15D6-hbp8 ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9wCS56l4u27BtxsGQ53hJlO6XickXOicsN4oMCFFicPMibyEczklicacf0iaQ/0?wx_fmt=jpeg",
+  "fileName is: assets/14.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEjW_oeox9ZrJwT8G2wOwNjU ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9qZPFgKrUp3iaMvibvDhKolCibgYBPoKe4GS4AhaHbogzftHAiac8nrOeIA/0?wx_fmt=jpeg",
+  "fileName is: assets/15.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEvoLSb8Du39yuMAl46qY5hc ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9XYC25oe2mVLeguvo6Rd1j1D2ibRibfmpu8eDqs0lfXaEfXR2bhslrPKQ/0?wx_fmt=jpeg",
+  "fileName is: assets/16.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEgIU_dXnFnXHvYzocwCpkM4 ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE92y6PhGre05TwpWYaSj0cmyAxHVotQibURMHqwYqvR7c05ercY11K6FQ/0?wx_fmt=jpeg",
+  "fileName is: assets/17.jpg,mediaId is : chP-LBQxy9SVbAFjwZ4QEpOPdIm42ibP0pbNFt6VtAI ,url is : http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9ogvYdcdKGWkQbBWxxgHulRzunHdG6oJ1E82xcqqDk9wicjTYljZUtxA/0?wx_fmt=jpeg",
+]
+

conf/app.ini

@@ -23,11 +23,11 @@ cycle_time=68
 #时间只支持设置小时数
 #3 只推送主队, 1 只推送平局, 0 只推送客队,-1 全部推送
 #示例0-3:-1,4-18:3,19-23:-1,未设置时间段为默认只推送3
-team_option=0-3:-1,4-18:3,19-23:3
+team_option=0-3:-1,4-18:-1,19-23:-1
 ###使用的算法,如是推荐到雷速,使用Euro20191212Service,如是推荐到其他平台可暂不使用
-al_flag=Euro20191212Service
+#al_flag=Euro20191212Service
 ###处法命中次数
-hit_count=3
+hit_count=1
 [leisu]
 ###执行周期间隔时间
 cycle_time=30

foot-core/common/routers/FootRouter.go

@@ -20,6 +20,7 @@ func init() {
 
 	//wechat
 	beego.AutoRouter(&controller3.WechatController{})
+	beego.AutoRouter(&controller3.MaterialController{})
 }
 
 func (this *FootRouter) Hello(){

foot-core/module/wechat/controller/MaterialController.go

 package controller
 
 import (
-	"encoding/json"
 	"fmt"
 	_ "github.com/astaxie/beego"
 	material2 "github.com/silenceper/wechat/material"
+	"io/ioutil"
+	"strings"
 	"tesou.io/platform/foot-parent/foot-api/common/base"
 	"tesou.io/platform/foot-parent/foot-core/common/base/controller"
-	"tesou.io/platform/foot-parent/foot-core/module/analy/service"
+	"tesou.io/platform/foot-parent/foot-core/module/wechat/service"
 )
 
 type MaterialController struct {
 	controller.BaseController
-	service.RecommendService
+	service.MatchService
 }
 
-func (this *MaterialController) AddImages() {
+func (this *MaterialController) Images() {
 	material := wc.GetMaterial()
-	mediaId, url, err := material.AddMaterial(material2.MediaTypeImage, "")
+	infos, err := ioutil.ReadDir("assets")
 	if err != nil {
 		base.Log.Error(err)
 		return
 	}
-	base.Log.Info(fmt.Sprintf("mediaId is : %v ,url is : %v", mediaId, url))
+	result := []string{}
+	for _, e := range infos {
+		name := e.Name()
+		if !strings.HasSuffix(name,".jpg"){
+			continue
+		}
+		fileName := "assets/" + name
+		mediaId, url, err := material.AddMaterial(material2.MediaTypeImage, fileName)
+		if err != nil {
+			base.Log.Error(err)
+			return
+		}
+		data := fmt.Sprintf("fileName is: %v,mediaId is : %v ,url is : %v", fileName, mediaId, url)
+		base.Log.Info(data)
+		result = append(result, data)
+	}
+
+	this.Data["json"] = result
+	this.ServeJSON()
 }
 
-func (this *MaterialController) AddNews() {
-	listData := this.RecommendService.ListData()
-	articles := make([]*material2.Article, len(listData))
-	for _, e := range listData {
-		bytes, _ := json.Marshal(e)
-		base.Log.Warn("比赛信息:" + string(bytes))
-		matchDateStr := e.MatchDate.Format("01月02日15点04分")
-		article := new(material2.Article)
-		article.Title = fmt.Sprintf("%v", matchDateStr)
-		article.Digest = fmt.Sprintf("%v %v vs %v", e.LeagueName, e.MainTeamId, e.GuestTeamId)
-		//-----
-		article.ThumbMediaID = ""
-		//-----
-		article.ShowCoverPic = 1
-		//图文消息的原文地址，即点击“阅读原文”后的URL
-		article.ContentSourceURL = ""
-		article.Content = string(bytes)
-		articles = append(articles, article)
-	}
+func (this *MaterialController) News() {
+	result := []string{}
+	//today
+	mediaId := this.MatchService.Today(wc)
+	data := fmt.Sprintf("today mediaId is : %v", mediaId)
+	base.Log.Info(data)
+	result = append(result, data)
+	//week
+	mediaId = this.MatchService.Week(wc)
+	data = fmt.Sprintf("week mediaId is : %v", mediaId)
+	base.Log.Info(data)
+	result = append(result, data)
+	//month
+	mediaId = this.MatchService.Month(wc)
+	data = fmt.Sprintf("month mediaId is : %v", mediaId)
+	base.Log.Info(data)
+	result = append(result, data)
+
+	this.Data["json"] = result
+	this.ServeJSON()
+}
+
+
+func (this *MaterialController) ModifyNews() {
 
-	material := wc.GetMaterial()
-	mediaId, err := material.AddNews(articles)
-	if err != nil {
-		base.Log.Error(err)
-		return
-	}
-	base.Log.Info("mediaId is : ", mediaId)
 }

foot-core/module/wechat/controller/WechatController.go

@@ -35,7 +35,7 @@ func init() {
 
 /**
 消息接收处理
- */
+*/
 func (this *WechatController) Portable() {
 	// 传入request和responseWriter
 	server := wc.GetServer(this.Ctx.Request, this.Ctx.ResponseWriter)

foot-core/module/wechat/service/MatchService.go

+package service
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/silenceper/wechat"
+	"github.com/silenceper/wechat/material"
+	"tesou.io/platform/foot-parent/foot-api/common/base"
+	"tesou.io/platform/foot-parent/foot-core/common/base/service/mysql"
+	"tesou.io/platform/foot-parent/foot-core/module/analy/service"
+	"time"
+)
+
+type MatchService struct {
+	mysql.BaseService
+	service.RecommendService
+}
+
+func (this *MatchService) Today(wc *wechat.Wechat) string {
+	listData := this.RecommendService.ListData()
+	articles := make([]*material.Article, len(listData)+1)
+	first := new(material.Article)
+	first.Title = "今日推荐"
+	matchDateStr := time.Now().Format("01月02日")
+	first.Digest = matchDateStr
+	first.ThumbMediaID = "chP-LBQxy9SVbAFjwZ4QEo81I0bHaY3YDYRwVGmf7o8"
+	first.ShowCoverPic = 1
+	//图文消息的原文地址，即点击“阅读原文”后的URL
+	first.ContentSourceURL = "https://gitee.com/aoe5188/poem-parent"
+	var first_content string
+
+	for i, e := range listData {
+		bytes, _ := json.Marshal(e)
+		base.Log.Warn("比赛信息:" + string(bytes))
+		matchDateStr := e.MatchDate.Format("15点04分")
+		article := new(material.Article)
+		article.Title = fmt.Sprintf("%v %v %v vs %v", matchDateStr, e.LeagueName, e.MainTeamId, e.GuestTeamId)
+		article.Digest = article.Title
+		article.ThumbMediaID = "chP-LBQxy9SVbAFjwZ4QEmEjQNhcRlNZCM2b6YR_qVc"
+		article.ShowCoverPic = 1
+		article.ContentSourceURL = ""
+		article.Content = string(bytes)
+		articles[i+1] = article
+
+		first_content += fmt.Sprintf("%v %v %v vs %v 推荐:\r\n", matchDateStr, e.LeagueName, e.MainTeamId, e.GuestTeamId, e.PreResult)
+	}
+	first.Content = first_content
+	articles[0] = first
+
+	material := wc.GetMaterial()
+	mediaId, err := material.AddNews(articles)
+	if err != nil {
+		base.Log.Error(err)
+		return ""
+	}
+	return mediaId
+}
+
+
+func (this *MatchService) Week(wc *wechat.Wechat) string {
+	listData := this.RecommendService.ListData()
+	articles := make([]*material.Article, 1)
+	first := new(material.Article)
+	first.Title = "本周战绩"
+	first.Digest = "20191216-20191219"
+	first.ThumbMediaID = "chP-LBQxy9SVbAFjwZ4QEpXfn8ShAn52EzP4-TrWvrM"
+	first.ShowCoverPic = 1
+	//图文消息的原文地址，即点击“阅读原文”后的URL
+	first.ContentSourceURL = "https://gitee.com/aoe5188/poem-parent"
+	var first_content string
+
+	for _, e := range listData {
+		matchDateStr := e.MatchDate.Format("15点04分")
+		first_content += fmt.Sprintf("%v %v %v vs %v 推荐:\r\n", matchDateStr, e.LeagueName, e.MainTeamId, e.GuestTeamId, e.PreResult)
+	}
+	first.Content = first_content
+	articles[0] = first
+
+	material := wc.GetMaterial()
+	mediaId, err := material.AddNews(articles)
+	if err != nil {
+		base.Log.Error(err)
+		return ""
+	}
+	return mediaId
+}
+
+
+
+func (this *MatchService) Month(wc *wechat.Wechat) string {
+	listData := this.RecommendService.ListData()
+	articles := make([]*material.Article, 1)
+	first := new(material.Article)
+	first.Title = "本月战绩"
+	first.Digest = "20191201-20191231"
+	first.ThumbMediaID = "chP-LBQxy9SVbAFjwZ4QEpXfn8ShAn52EzP4-TrWvrM"
+	first.ShowCoverPic = 1
+	//图文消息的原文地址，即点击“阅读原文”后的URL
+	first.ContentSourceURL = "https://gitee.com/aoe5188/poem-parent"
+	var first_content string
+
+	for _, e := range listData {
+		matchDateStr := e.MatchDate.Format("15点04分")
+		first_content += fmt.Sprintf("%v %v %v vs %v 推荐:\r\n", matchDateStr, e.LeagueName, e.MainTeamId, e.GuestTeamId, e.PreResult)
+	}
+	first.Content = first_content
+	articles[0] = first
+
+	material := wc.GetMaterial()
+	material.GetNews("")
+	mediaId, err := material.AddNews(articles)
+	if err != nil {
+		base.Log.Error(err)
+		return ""
+	}
+	return mediaId
+}
\ No newline at end of file

foot-core/module/wechat/service/MessageService.go

@@ -3,7 +3,6 @@ package service
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/silenceper/wechat/material"
 	"github.com/silenceper/wechat/message"
 	"strings"
 	"tesou.io/platform/foot-parent/foot-api/common/base"
@@ -66,22 +65,18 @@ func (this *MessageService) Handle(v message.MixMessage) *message.Reply {
 
 func (this *MessageService) Today() *message.Reply {
 	listData := this.RecommendService.ListData()
-	articles := make([]*material.Article, len(listData))
-	for _, e := range listData {
+	articles := make([]*message.Article, len(listData))
+	for i, e := range listData {
 		bytes, _ := json.Marshal(e)
 		base.Log.Warn("比赛信息:" + string(bytes))
 		matchDateStr := e.MatchDate.Format("01月02日15点04分")
-		article := new(material.Article)
+		article := new(message.Article)
 		article.Title = fmt.Sprintf("%v", matchDateStr)
-		article.Digest = fmt.Sprintf("%v %v vs %v", e.LeagueName, e.MainTeamId, e.GuestTeamId)
-		//-----
-		article.ThumbMediaID = ""
-		//-----
-		article.ShowCoverPic = 1
-		//图文消息的原文地址，即点击“阅读原文”后的URL
-		article.ContentSourceURL = ""
-		article.Content = string(bytes)
-		articles = append(articles, article)
+		article.Description = fmt.Sprintf("%v %v vs %v", e.LeagueName, e.MainTeamId, e.GuestTeamId)
+		article.PicURL = "http://mmbiz.qpic.cn/sz_mmbiz_jpg/BePaFicK2B5QZuw0bf1HsiarnqQXzuWxE9XYC25oe2mVLeguvo6Rd1j1D2ibRibfmpu8eDqs0lfXaEfXR2bhslrPKQ/0?wx_fmt=jpeg"
+		article.URL = "https://gitee.com/aoe5188/foot-parent"
+		articles[i] = article
 	}
-	return &message.Reply{MsgType: message.MsgTypeNews, MsgData: articles}
+	news := message.NewNews(articles)
+	return &message.Reply{MsgType: message.MsgTypeNews, MsgData: news}
 }

foot-spider/launch/FS401EuroHisApplication.go

 package launch
 
 import (
-	"tesou.io/platform/foot-parent/foot-core/common/base/service/mysql"
 	service2 "tesou.io/platform/foot-parent/foot-core/module/match/service"
 	"tesou.io/platform/foot-parent/foot-spider/module/win007/proc"
 )
@@ -14,12 +13,12 @@ import (
 	}
 }
 */
-func Before_spider_euroHis() {
-	//抓取前清空当前比较表
-	opsService := new(mysql.DBOpsService)
-	//指定需要清空的数据表
-	opsService.TruncateTable([]string{"t_euro_his"})
-}
+//func Before_spider_euroHis() {
+//	//抓取前清空当前比较表
+//	opsService := new(mysql.DBOpsService)
+//	//指定需要清空的数据表
+//	opsService.TruncateTable([]string{"t_euro_his"})
+//}
 
 //查询标识为win007,且欧赔未抓取的配置数据,指定菠菜公司
 func Spider_euroHis() {