1.处理待选池逻辑

build_linux.bat

@@ -6,6 +6,9 @@ set GOARCH=amd64
 
 if not exist %cd%\bin\conf\ md %cd%\bin\conf\
 xcopy /Y /S %cd%\conf %cd%\bin\conf\
+xcopy /Y /S %cd%\conf\app_prod.ini %cd%\bin\conf\app.ini
+xcopy /Y /S %cd%\conf\app_pord.conf %cd%\bin\conf\app.conf
+
 if not exist %cd%\bin\assets\ md %cd%\bin\assets\
 xcopy /Y /S %cd%\assets %cd%\bin\assets\
 

build_windows.bat

@@ -3,6 +3,9 @@ echo=
 
 if not exist %cd%\bin\conf\ md %cd%\bin\conf\
 xcopy /Y /S %cd%\conf %cd%\bin\conf\
+xcopy /Y /S %cd%\conf\app_prod.ini %cd%\bin\conf\app.ini
+xcopy /Y /S %cd%\conf\app_pord.conf %cd%\bin\conf\app.conf
+
 if not exist %cd%\bin\assets\ md %cd%\bin\assets\
 xcopy /Y /S %cd%\assets %cd%\bin\assets\
 

conf/app.ini

 [mysql]
-url=root:awe.FOG5188@tcp(39.108.212.245:3306)/foot?charset=utf8
+url=root:Meta.123@tcp(localhost:3306)/foot?charset=utf8
 maxIdle=10
 maxConn=50
 [cookies]

conf/app_pord.conf

+appname = foot
+httpport = 8080
+#应用的运行模式，可选值为 prod, dev 或者 test. 默认是 dev, 为开发模式，在开发模式下出错会提示友好的出错页面，如前面错误描述中所述。
+runmode = prod
+#是否允许在 HTTP 请求时，返回原始请求体数据字节，默认为 false （GET or HEAD or 上传文件请求除外）
+CopyRequestBody = true
+#是否异常恢复，默认值为 true，即当应用出现异常的情况，通过 recover 恢复回来，而不会导致应用异常退出。
+RecoverPanic = false
+#是否开启 gzip 支持，默认为 false 不支持 gzip，一旦开启了 gzip，那么在模板输出的内容会进行 gzip 或者 zlib 压缩，根据用户的 Accept-Encoding 来判断。
+EnableGzip = true
+#是否开启文档内置功能，默认是 false
+EnableDocs = false
+#是否开启热升级，默认是 false，关闭热升级
+Graceful = false
+#是否开启进程内监控模块，默认 false 关闭
+EnableAdmin = true
+#是否输出日志到 Log，默认在 prod 模式下不会输出日志，默认为 false 不输出日志。此参数不支持配置文件配置。
+AccessLogs = true
\ No newline at end of file

conf/app_prod.ini

+[mysql]
+url=root:awe.FOG5188@tcp(39.108.212.245:3306)/foot?charset=utf8
+maxIdle=10
+maxConn=50
+[cookies]
+acw_sc__v3=5ded2b7f3ca9e08a6c780b7cb00951915ba5b2fa
+acw_sc__v2=5ded2bbb69a003c830006ea6790726d3bbaa55d9
+acw_tc=2f61f27615749128339236126e4d79296e8377930295ed12ea7a883b6b8e6f
+Hm_lpvt_2fb6939e65e63cfbc1953f152ec2402e=1575815243
+Hm_lpvt_63b82ac6d9948bad5e14b1398610939a=1575748957
+Hm_lvt_2fb6939e65e63cfbc1953f152ec2402e=1574241711,1574912837,1575529353,1575748959
+Hm_lvt_63b82ac6d9948bad5e14b1398610939a=1574241706,1574912834,1575529351,1575748957
+LWT=KBjo3NZHBCcMfcnaZ1JXVula6ZKdmthk0DqnddpGOcwxb/d/nr2ULipCnjSsetvzCgwBKwkj7nBLrOAdTnObJULe9q6AAzwXSGYnfRLNE2U=
+SERVERID=f35c9b1c268fcc8b58043d36d0dddd26|1575817686|1575815177
+[spider]
+###matchLevel比赛级别 //0全部，1一级，2足彩，3竞猜，4单场
+match_level=4
+###执行周期间隔时间
+cycle_time=68
+[analy]
+###推送的主客队选项,
+#格式为:时间:选项,时间:选项,时间:选项
+#时间只支持设置小时数
+#3 只推送主队, 1 只推送平局, 0 只推送客队,-1 全部推送
+#示例0-3:-1,4-18:3,19-23:-1,未设置时间段为默认只推送3
+team_option=0-3:-1,4-18:-1,19-23:-1
+###使用的算法,如是推荐到雷速,使用Euro20191212Service,如是推荐到其他平台可暂不使用
+#al_flag=Euro20191212Service
+###确认命中次数
+hit_count=2
+[leisu]
+###执行周期间隔时间
+cycle_time=30
+###标题模板,为空则使用默认模板.支持格式如下:
+#联赛名称{leagueName}
+#比赛时间{matchDate}
+#主队{mainTeam}
+#客队{guestTeam}
+title_tpl="{leagueName} {matchDate} {mainTeam}VS{guestTeam}"
+###内容模板,为空则使用默认模板.支持格式如下:
+#联赛名称{leagueName}
+#比赛时间{matchDate}
+#主队{mainTeam}
+#客队{guestTeam}
+content_tpl="本次推荐为程序全自动处理,全程无人为参与干预.进而避免了人为分析的主观性及不稳定因素.程序根据各大波菜多维度数据,结合作者多年足球分析经验,十年程序员生涯,精雕细琢历经26个月得出的产物.程序执行流程包括且不仅限于(数据自动获取-->分析学习-->自动推送发布).经近三个月的实验准确率一直能维持在一个较高的水平.依据该项目为依托已经吸引了不少朋友,现目前通过雷速号再次验证程序的准确率,望大家长期关注校验."
+###收费设置,数字 为收费选项的下标(从0开始),free 免费 , min 最小收费原则 ,middle 中间价格, max 最大收费原则 , random 随机
+price_strategy=0
+[wechat]
+OriId=gh_a8328f3c25d2
+AppID=wx76e3dd0445aa0055
+AppSecret=4257a40eb6f59e50777fdcc2b47b31a4
+Token=cc9dfaa76d534c60bafa9fd947a049dd
+#EncodingAESKey=1upqonqsdMpQFP1ltHp5eBdCMvmVR26QBP8KJ60pM7D
+###文章作者
+author=AI球探
\ No newline at end of file

foot-api/module/suggest/vo/SuggestVO.go

@@ -25,8 +25,5 @@ type SuggestVO struct {
 	//是否倒序
 	IsDesc bool
 
-
-	MinHitCount int
-	MaxHitCount int
 	pojo.Suggest `xorm:"extends"`
 }

foot-core/module/suggest/service/SuggestService.go

@@ -15,6 +15,52 @@ type SuggestService struct {
 	mysql.BaseService
 }
 
+/**
+查询待选池中的比赛
+ */
+func (this *SuggestService) QueryTbs(param *vo2.SuggestVO) []*vo2.SuggestVO {
+	sql := `
+SELECT 
+  l.Name AS LeagueName,
+  mh.MainTeamId AS MainTeam,
+  mh.GuestTeamId AS GuestTeam,
+  mh.MainTeamGoals AS MainTeamGoal,
+  mh.GuestTeamGoals AS GuestTeamGoal,
+  ar.* 
+FROM
+  foot.t_league l,
+  foot.t_match_his mh,
+  foot.t_analy_result ar 
+WHERE mh.LeagueId = l.Id 
+  AND mh.Id = ar.MatchId
+  AND ar.HitCount < THitCount 
+	`
+
+	if len(param.AlFlag) > 0 {
+		sql += " AND ar.AlFlag = '" + param.AlFlag + "' "
+	}
+	if len(param.BeginDateStr) > 0 {
+		sql += " AND mh.`MatchDate` >= '" + param.BeginDateStr + "' "
+	}
+
+	if len(param.EndDateStr) > 0 {
+		sql += " AND mh.`MatchDate` <= '" + param.EndDateStr + "' "
+	}
+	if param.IsDesc {
+		sql += " ORDER BY ar.MatchDate DESC, l.id ASC, ar.PreResult DESC "
+	} else {
+		sql += " ORDER BY ar.MatchDate ASC,  l.id ASC,ar.PreResult DESC "
+	}
+	//结果值
+	entitys := make([]*vo2.SuggestVO, 0)
+	//执行查询
+	this.FindBySQL(sql, &entitys)
+
+	return entitys
+
+}
+
+
 func (this *SuggestService) Query(param *vo2.SuggestVO) []*vo2.SuggestVO {
 	sql := `
 SELECT 
@@ -33,13 +79,6 @@ WHERE mh.LeagueId = l.Id
 	`
 	if param.HitCount > 0 {
 		sql += "  AND ar.HitCount >= THitCount AND ar.HitCount >= '" + strconv.Itoa(param.HitCount) + "' "
-	} else if param.MinHitCount > 0 || param.MaxHitCount > 0 {
-		if param.MinHitCount > 0 {
-			sql += " AND ar.HitCount >= '" + strconv.Itoa(param.MinHitCount) + "' "
-		}
-		if param.MaxHitCount > 0 {
-			sql += " AND ar.HitCount <= '" + strconv.Itoa(param.MaxHitCount) + "' "
-		}
 	} else {
 		hit_count_str := utils.GetVal(constants.SECTION_NAME, "hit_count")
 		sql += " AND ar.HitCount >= THitCount AND ar.HitCount >= '" + hit_count_str + "' "

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

@@ -47,17 +47,17 @@ func (this *MaterialController) Images() {
 func (this *MaterialController) News() {
 	result := []string{}
 	//today
-	mediaId := this.MatchService.Today(wcClient)
+	mediaId := this.SuggestTodayService.Today(wcClient)
 	data := fmt.Sprintf("today mediaId is : %v", mediaId)
 	base.Log.Info(data)
 	result = append(result, data)
 	//week
-	mediaId = this.MatchService.Week(wcClient)
+	mediaId = this.SuggestWeekService.Week(wcClient)
 	data = fmt.Sprintf("week mediaId is : %v", mediaId)
 	base.Log.Info(data)
 	result = append(result, data)
 	//month
-	mediaId = this.MatchService.Month(wcClient)
+	mediaId = this.SuggestMonthService.Month(wcClient)
 	data = fmt.Sprintf("month mediaId is : %v", mediaId)
 	base.Log.Info(data)
 	result = append(result, data)

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

@@ -7,12 +7,10 @@ import (
 	"github.com/chanxuehong/wechat/mp/core"
 	"github.com/chanxuehong/wechat/mp/material"
 	"html/template"
-	"strconv"
 	"tesou.io/platform/foot-parent/foot-api/common/base"
 	"tesou.io/platform/foot-parent/foot-api/module/suggest/vo"
 	"tesou.io/platform/foot-parent/foot-core/common/base/service/mysql"
 	"tesou.io/platform/foot-parent/foot-core/common/utils"
-	"tesou.io/platform/foot-parent/foot-core/module/analy/constants"
 	"tesou.io/platform/foot-parent/foot-core/module/analy/service"
 	service2 "tesou.io/platform/foot-parent/foot-core/module/suggest/service"
 	"time"
@@ -192,12 +190,8 @@ func (this *SuggestTodayService) ModifyTodayTbs(wcClient *core.Client) {
 	h12, _ = time.ParseDuration("24h")
 	endDate := now.Add(h12)
 	param.EndDateStr = endDate.Format("2006-01-02 15:04:05")
-	param.MinHitCount = 1
-	hit_count_str := utils.GetVal(constants.SECTION_NAME, "hit_count")
-	hit_count, _ := strconv.Atoi(hit_count_str)
-	param.MaxHitCount = hit_count - 1
 	//今日推荐
-	tempList := this.SuggestService.Query(param)
+	tempList := this.SuggestService.QueryTbs(param)
 	//更新推送
 	first := material.Article{}
 	first.Title = fmt.Sprintf("待选池比赛")