feat:es升级

go.mod

@@ -2,7 +2,7 @@ module bp.jydev.jianyu360.cn/BaseService/pushpkg
 
 go 1.18
 
-require app.yhyue.com/moapp/jybase v0.0.0-20230405040249-a36a23595798
+require app.yhyue.com/moapp/jybase v0.0.0-20230417095507-cf35f190347e
 
 require (
 	app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d // indirect
@@ -14,8 +14,11 @@ require (
 	github.com/gomodule/redigo v1.8.9 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/klauspost/compress v1.13.6 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/olivere/elastic v6.2.37+incompatible // indirect
+	github.com/olivere/elastic/v7 v7.0.22 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.0.2 // indirect

go.sum

@@ -1,7 +1,7 @@
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d h1:WPsYuuptAd3UEgN+jPzpnsDe/OvcshDUUtOTZPYGSJ8=
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
-app.yhyue.com/moapp/jybase v0.0.0-20230405040249-a36a23595798 h1:seczpucZNVIcwMpHN/tr1t9l7Qf533nm69FqJLq24qs=
-app.yhyue.com/moapp/jybase v0.0.0-20230405040249-a36a23595798/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
+app.yhyue.com/moapp/jybase v0.0.0-20230417095507-cf35f190347e h1:BZEMetT36NokzQwEDRGHbQ5c/2A3cRQ12Z+rw0I5xhQ=
+app.yhyue.com/moapp/jybase v0.0.0-20230417095507-cf35f190347e/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -114,6 +114,7 @@ github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
+github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -317,6 +318,7 @@ github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/olivere/elastic v6.2.37+incompatible h1:UfSGJem5czY+x/LqxgeCBgjDn6St+z8OnsCuxwD3L0U=
 github.com/olivere/elastic v6.2.37+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8=
+github.com/olivere/elastic/v7 v7.0.22 h1:esBA6JJwvYgfms0EVlH7Z+9J4oQ/WUADF2y/nCNDw7s=
 github.com/olivere/elastic/v7 v7.0.22/go.mod h1:VDexNy9NjmtAkrjNoI7tImv7FR4tf5zUA3ickqu5Pc8=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

main.go

@@ -2,16 +2,21 @@ package main
 
 import (
 	"log"
-	"time"
 
+	. "app.yhyue.com/moapp/jybase/mysql"
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 )
 
 func main() {
-	VarTimeTask.RunEveryHour(true, func() {
-		hour := time.Now().Hour()
-		VarTimeTask.RunInTimeLoop("执行每小时任务", HourFormat(hour), HourFormat(hour+1), 1, true, false, nil, func() {
-			log.Println("---------")
-		})
-	})
+	base := &Mysql{
+		Address:      "192.168.3.11:3366",
+		UserName:     "root",
+		PassWord:     "Topnet123",
+		DBName:       "jianyu",
+		MaxOpenConns: 2, //用于设置最大打开的连接数，默认值为0表示不限制。
+		MaxIdleConns: 2, //用于设置闲置的连接数。
+	}
+	base.Init()
+	cc := HasService(base, "642ea6178b4de9bf1b012342", Bigmember_Service_Entchange, Bigmember_Service_Entchange_Followent).IsBuy
+	log.Println(cc)
 }

p/constant.go

@@ -28,8 +28,7 @@ const (
 	Pushcache_2_a                         = "pushcache_2_a"
 	Pushcache_2_b                         = "pushcache_2_b"
 	Pushcache_2_c                         = "pushcache_2_c"
-	Es_MaxId                              = `{"query":{"filtered":{"filter":{"bool":{"must":{"range":{"id":{"gt":"%s"}}}}}}},"_source":["_id","comeintime"],"sort":{"id":"desc"},"from":0,"size":1}`
-	Es_ProjectQuery                       = `{"query":{"filtered":{"filter":{"terms":{"list.infoid":[%s]}}}},"_source":["_id","list.infoid","list.publishtime"],"sort":{"id":"desc"},"from":0,"size":%d}`
+	Es_ProjectQuery                       = `{"query":{"bool":{"filter":{"terms":{"list.infoid":[%s]}}}},"_source":["_id","list.infoid","list.publishtime"],"sort":{"id":"desc"},"from":0,"size":%d}`
 	Ent_EmpowerVip                        = "VIP订阅"
 	Ent_EmpowerMember                     = "大会员"
 	MatchWay_Title                        = "1"

projecter/match.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	util "app.yhyue.com/moapp/jybase/common"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	. "app.yhyue.com/moapp/jybase/mongodb"
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 

projecter/push.go

@@ -9,11 +9,11 @@ import (
 
 	util "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/date"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
+	"app.yhyue.com/moapp/jybase/logger"
 	. "app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/redis"
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
-	"app.yhyue.com/moapp/jybase/logger"
 )
 
 type Pusher interface {
@@ -25,7 +25,7 @@ type Pusher interface {
 }
 
 const (
-	projectQuery       = `{"query":{"filtered":{"filter":{"bool":{"must":[{"range":{"pici":{"gt":%d,"lte":%d}}}]}}}}%s}`
+	projectQuery       = `{"query":{"bool":{"filter":{"range":{"pici":{"gt":%d,"lte":%d}}}}}%s}`
 	projectPagingQuery = `,"_source":["_id","list"],"from":%d,"size":%d`
 )