升级

public/src/cache/cache.go

@@ -1,227 +0,0 @@
-package cache
-
-import (
-	"encoding/json"
-	"fmt"
-	. "qfw/util"
-	"qfw/util/redis"
-	"strings"
-)
-
-const (
-	threeDay            = 172800
-	oneDay              = 86400
-	AllSubPushCacheSize = 200
-)
-
-type SubPushList struct {
-	Id            string      `json:"_id"`
-	Title         string      `json:"title"`
-	Area          string      `json:"area"`
-	BuyerClass    string      `json:"buyerClass"`
-	Subtype       string      `json:"subtype"`
-	Industry      string      `json:"industry"`
-	PublishTime   int64       `json:"publishTime"`
-	Ca_index      int64       `json:"ca_index"`
-	Ca_date       int64       `json:"ca_date"`
-	Ca_isvisit    int         `json:"ca_isvisit"`
-	Ca_isvip      int         `json:"ca_isvip"`
-	Ca_type       int         `json:"ca_type"`
-	Ca_fileExists bool        `json:"ca_fileExists"`
-	MatchKeys     []string    `json:"matchKeys"`
-	Budget        interface{} `json:"budget"`
-	BidAmount     interface{} `json:"bidAmount"`
-	Collection    int         `json:"collection"`
-	Buyer         string      `json:"buyer"`
-	ProjectName   string      `json:"projectName"`
-	Winner        string      `json:"winner"`
-	BidOpenTime   int64       `json:"bidOpenTime"`
-	Source        int64       `json:"source"`
-}
-
-type SubPush struct {
-	Date  string
-	Datas []*SubPushList
-	Count int64
-}
-
-type PushCa struct {
-	Date       int64
-	InfoId     string
-	Visit      int
-	Keys       []string
-	Type       int
-	Isvip      int
-	FileExists bool
-	Source     int64
-	Info       *map[string]interface{}
-}
-
-type Cache struct {
-	Prefix string
-	UserId string
-	Ymd    string
-}
-
-func NewEntnicheCache(userId, ymd string) *Cache {
-	return &Cache{
-		Prefix: "entnichepush",
-		UserId: userId,
-		Ymd:    ymd,
-	}
-}
-
-func NewSubscribeCache(userId, ymd string) *Cache {
-	return &Cache{
-		Prefix: "subpush",
-		UserId: userId,
-		Ymd:    ymd,
-	}
-}
-
-func NewMemberCache(userId, ymd string) *Cache {
-	return &Cache{
-		Prefix: "memberpush",
-		UserId: userId,
-		Ymd:    ymd,
-	}
-}
-
-//
-func NewSubPushList(pushCas []*PushCa) []*SubPushList {
-	subPushList := []*SubPushList{}
-	for _, p := range pushCas {
-		info := p.Info
-		area := ObjToString((*info)["area"])
-		if area == "A" {
-			area = "全国"
-		}
-		industry := ObjToString((*info)["s_subscopeclass"])
-		scs := strings.Split(industry, ",")
-		if len(scs) > 0 {
-			industry = scs[0]
-			if industry != "" {
-				iss := strings.Split(industry, "_")
-				if len(iss) > 0 {
-					industry = iss[0]
-				}
-			}
-		}
-		infotype := ObjToString((*info)["subtype"])
-		if infotype == "" {
-			infotype = ObjToString((*info)["toptype"])
-		}
-		_id := p.InfoId
-		if _id == "" {
-			_id = ObjToString((*info)["_id"])
-		}
-		subPushList = append(subPushList, &SubPushList{
-			Id:            EncodeArticleId2ByCheck(_id),
-			Title:         ObjToString((*info)["title"]),
-			Area:          area,
-			BuyerClass:    ObjToString((*info)["buyerclass"]),
-			Subtype:       infotype,
-			Industry:      industry,
-			PublishTime:   Int64All((*info)["publishtime"]),
-			Ca_date:       p.Date,
-			Ca_isvisit:    p.Visit,
-			Ca_isvip:      p.Isvip,
-			Ca_type:       p.Type,
-			Ca_fileExists: p.FileExists,
-			MatchKeys:     p.Keys,
-			Budget:        (*info)["budget"],
-			BidAmount:     (*info)["bidamount"],
-			Buyer:         ObjToString((*info)["buyer"]),
-			ProjectName:   ObjToString((*info)["projectname"]),
-			Winner:        ObjToString((*info)["s_winner"]),
-			BidOpenTime:   Int64All((*info)["bidopentime"]),
-			Source:        p.Source,
-		})
-	}
-	return subPushList
-}
-
-//从pushcache_2_b中取
-func (c *Cache) GetTodayCache(userId string) (*SubPush, error) {
-	pc_a, err := redis.GetNewBytes("pushcache_2_b", c.todayKey(userId))
-	if err != nil {
-		return nil, err
-	}
-	if pc_a == nil {
-		return nil, nil
-	}
-	var p *SubPush
-	if err := json.Unmarshal(*pc_a, &p); err != nil {
-		return nil, err
-	}
-	return p, nil
-}
-
-//往pushcache_2_b中放
-func (c *Cache) PutTodayCache(userId string, pc_a *SubPush) {
-	redis.Put("pushcache_2_b", c.todayKey(userId), pc_a, oneDay)
-}
-
-//获取redis key
-func (c *Cache) todayKey(userId string) string {
-	return fmt.Sprintf("%s_%s", c.Prefix, userId)
-}
-func (c *Cache) allKey(userId string) string {
-	return fmt.Sprintf("all_%s_%s", c.Prefix, userId)
-}
-
-//查看全部列表缓存
-func (c *Cache) PutAllCache(userId string, datas *SubPush) {
-	redis.Put("pushcache_2_a", c.allKey(userId), datas, oneDay)
-}
-
-func (c *Cache) GetAllCache(userId string) (*SubPush, error) {
-	return c.GetCache("pushcache_2_a", c.allKey(userId))
-}
-
-func (c *Cache) GetCache(code, key string) (*SubPush, error) {
-	pc_a, err := redis.GetNewBytes(code, key)
-	if err != nil {
-		return nil, err
-	}
-	if pc_a == nil {
-		return nil, nil
-	}
-	var p *SubPush
-	if err := json.Unmarshal(*pc_a, &p); err != nil {
-		return nil, err
-	}
-	return p, nil
-}
-
-func (c *Cache) DoCache(subPushList []*SubPushList) {
-	subPush_datas := []*SubPushList{}
-	for i := len(subPushList) - 1; i >= 0; i-- {
-		subPush_datas = append(subPush_datas, subPushList[i])
-	}
-	//更新redis
-	subPush, err := c.GetTodayCache(c.UserId)
-	if err == nil && subPush != nil && len(subPush.Datas) > 0 {
-		if subPush.Date != c.Ymd {
-			subPush = &SubPush{
-				Date:  c.Ymd,
-				Datas: subPush_datas,
-				Count: int64(len(subPush_datas)),
-			}
-		} else {
-			subPush.Datas = append(subPush_datas, subPush.Datas...)
-			subPush.Count = subPush.Count + int64(len(subPush_datas))
-		}
-		c.PutTodayCache(c.UserId, subPush)
-	}
-	//全部列表缓存
-	allCache, err := c.GetAllCache(c.UserId)
-	if err == nil && allCache != nil && len(allCache.Datas) > 0 {
-		allCache.Datas = append(subPush_datas, allCache.Datas...)
-		if len(allCache.Datas) > AllSubPushCacheSize {
-			allCache.Datas = allCache.Datas[:AllSubPushCacheSize]
-		}
-		allCache.Count = allCache.Count + int64(len(subPush_datas))
-		c.PutAllCache(c.UserId, allCache)
-	}
-}

public/src/db/mongodb.go

@@ -1,45 +0,0 @@
-package db
-
-import (
-	. "mongodb"
-
-	"github.com/donnie4w/go-logger/logger"
-)
-
-var MyMgo = &myMgo{}
-
-type myMgo struct {
-}
-
-func (m *myMgo) SaveBulk(mgo *MongodbSim, sess *MgoSess, dbName, collName string, array *[]map[string]interface{}) error {
-	if sess == nil {
-		sess = mgo.GetMgoConn()
-		defer mgo.DestoryMongoConn(sess)
-	}
-	bulk := sess.DB(dbName).C(collName).Bulk()
-	for _, v := range *array {
-		bulk.Insert(v)
-	}
-	_, err := bulk.Run()
-	if nil != err {
-		logger.Info("SaveBulkError", err)
-	}
-	*array = []map[string]interface{}{}
-	return err
-}
-func (m *myMgo) DelBulk(mgo *MongodbSim, sess *MgoSess, dbName, collName string, array *[]interface{}) error {
-	if sess == nil {
-		sess = mgo.GetMgoConn()
-		defer mgo.DestoryMongoConn(sess)
-	}
-	bulk := sess.DB(dbName).C(collName).Bulk()
-	for _, v := range *array {
-		bulk.Remove(map[string]interface{}{"_id": v})
-	}
-	_, err := bulk.Run()
-	if nil != err {
-		logger.Info("DelBulkError", err)
-	}
-	*array = []interface{}{}
-	return err
-}

public/src/dfa/dfa.go

@@ -1,142 +0,0 @@
-/**
- *兴趣分析
- *
- */
-package dfa
-
-import (
-	"log"
-	"strings"
-)
-
-//DFA实现
-type DFA struct {
-	link        map[string]interface{} //存放or
-	linkAnd     map[string]int         //存放and
-	linkAndWord map[string]interface{} //存放and中的拆分词
-
-}
-
-//添加词组，用于初始化,该方法是可以调用多次的
-func (d *DFA) AddWord(words ...string) {
-	if d.link == nil {
-		d.link = make(map[string]interface{})
-		d.linkAnd = make(map[string]int)
-		d.linkAndWord = make(map[string]interface{})
-	}
-	var nowMap *map[string]interface{}
-	for _, key := range words {
-		keys := strings.Split(key, "+")
-		lenkeys := len(keys)
-		if lenkeys > 1 {
-			d.linkAnd[key] = lenkeys
-			for k := 0; k < lenkeys; k++ {
-				minKey := keys[k]
-				nowMap = &d.linkAndWord
-				for i := 0; i < len(minKey); i++ {
-					kc := minKey[i : i+1]
-					if v, ok := (*nowMap)[kc]; ok {
-						nowMap, _ = v.(*map[string]interface{})
-					} else {
-						newMap := map[string]interface{}{}
-						newMap["YN"] = "N"
-						(*nowMap)[kc] = &newMap
-						nowMap = &newMap
-					}
-					if i == len(minKey)-1 {
-						(*nowMap)["YN"] = "Y"
-						if (*nowMap)["key"] == nil {
-							(*nowMap)["key"] = make(map[string]int)
-						}
-						(*nowMap)["key"].(map[string]int)[key] = k
-					}
-				}
-			}
-		} else {
-			nowMap = &d.link
-			for i := 0; i < len(key); i++ {
-				kc := key[i : i+1]
-				if v, ok := (*nowMap)[kc]; ok {
-					nowMap, _ = v.(*map[string]interface{})
-				} else {
-					newMap := map[string]interface{}{}
-					newMap["YN"] = "N"
-					(*nowMap)[kc] = &newMap
-					nowMap = &newMap
-				}
-
-				if i == len(key)-1 {
-					(*nowMap)["YN"] = "Y"
-				}
-			}
-		}
-	}
-}
-func (d *DFA) Clear() {
-	d.link = nil
-}
-
-//从给定的内容中找出匹配上的关键词
-func (d *DFA) Analy(src string) []string {
-	if d.link == nil {
-		log.Println("请先添加词组")
-		return []string{}
-	}
-	keywords := []string{}
-	tempMap := make(map[string][]bool)
-	for i := 0; i < len(src); i++ {
-		nowMap := &d.link
-		length := 0 // 匹配标识数默认为0
-		//flag := false // 敏感词结束标识位：用于敏感词只有1位的情况
-		for j := i; j < len(src); j++ {
-			word := src[j : j+1]
-			nowMap, _ = (*nowMap)[word].(*map[string]interface{})
-			if nowMap != nil {
-				length = length + 1
-				tag, _ := (*nowMap)["YN"].(string)
-				if "Y" == tag {
-					//flag = true
-					keywords = append(keywords, src[i:i+length])
-				}
-			} else {
-				break
-			}
-		}
-		nowMap = &d.linkAndWord
-		length = 0
-		for j := i; j < len(src); j++ {
-			word := src[j : j+1]
-			nowMap, _ = (*nowMap)[word].(*map[string]interface{})
-			if nowMap != nil {
-				length = length + 1
-				tag, _ := (*nowMap)["YN"].(string)
-				if "Y" == tag {
-					mkeys := (*nowMap)["key"].(map[string]int)
-					for k, v := range mkeys {
-						tempBool := tempMap[k]
-						if tempBool == nil {
-							tempBool = make([]bool, d.linkAnd[k])
-							tempMap[k] = tempBool
-						}
-						tempBool[v] = true
-					}
-				}
-			} else {
-				break
-			}
-		}
-	}
-	for k, v := range tempMap {
-		ball := true
-		for _, m := range v {
-			if !m {
-				ball = false
-				break
-			}
-		}
-		if ball {
-			keywords = append(keywords, k)
-		}
-	}
-	return keywords
-}

public/src/dfa/dfa_test.go

@@ -1,45 +0,0 @@
-package dfa
-
-import (
-	"log"
-	"strings"
-	"testing"
-	"time"
-)
-
-var d *DFA = &DFA{}
-
-func copyMap(m map[string]int) (m2 map[string]int) {
-	m2 = make(map[string]int)
-	for k, v := range m {
-		m2[k] = v
-	}
-	return m2
-}
-
-func TestAnaly(t *testing.T) {
-	d.AddWord("办公", "办+楼", "河+省", "完+你们8")
-	log.Println(strings.Split("河+南+", "+")[2])
-	t1 := time.Now()
-	log.Println(d.Analy("这胡省锦河涛写给江泽民的信我们你们于办公楼上你完就是啊。"), "=====")
-	log.Println(time.Now().Sub(t1).Seconds())
-	d.Clear()
-	//log.Println(d.Analy("这是胡锦涛写给江泽民的信啊。"))
-
-}
-
-func Test_Label(t *testing.T) {
-	log.Println("000----")
-
-	for _, v := range []int{1, 2, 3, 4, 5} {
-		log.Println(v)
-	L1:
-		for _, vv := range []string{"a", "b", "c", "d"} {
-			log.Println(vv)
-			if vv == "add" {
-				break L1
-			}
-		}
-	}
-	log.Println("111----")
-}

public/src/main.go

@@ -1,18 +0,0 @@
-package main
-
-import (
-	"log"
-	. "p"
-	. "qfw/util/mysql"
-)
-
-func main() {
-	m := &Mysql{
-		Address:  "192.168.3.11:3366",
-		UserName: "root",      //用户名
-		PassWord: "Topnet123", //密码
-		DBName:   "jianyu",    //数据库名
-	}
-	m.Init()
-	log.Println(HasService(m, "5d6378301c298a5aac7b5402", Bigmember_Service_Report))
-}

public/src/matcher/matcher.go

@@ -1,9 +0,0 @@
-package matcher
-
-import (
-	. "p"
-)
-
-type Matcher interface {
-	Match(info *map[string]interface{}) (*map[*UserInfo]*MatchUser, *[]*UserInfo)
-}

public/src/matcher/paymatch.go

@@ -1,144 +0,0 @@
-package matcher
-
-import (
-	. "p"
-	"strings"
-)
-
-//付费用户
-type PayUser struct {
-	Users           map[*UserInfo]bool
-	Title_KeyDfa    *KeyDfa
-	Detail_KeyDfa   *KeyDfa
-	BuyerclassUsers map[string]map[*UserInfo]bool
-	AreaUsers       map[string]map[*UserInfo]bool
-	CityUsers       map[string]map[*UserInfo]bool
-	SubtypeUsers    map[string]map[*UserInfo]bool
-}
-
-//
-func NewPayUser() *PayUser {
-	return &PayUser{
-		Users:           map[*UserInfo]bool{},
-		BuyerclassUsers: map[string]map[*UserInfo]bool{},
-		AreaUsers:       map[string]map[*UserInfo]bool{},
-		CityUsers:       map[string]map[*UserInfo]bool{},
-		SubtypeUsers:    map[string]map[*UserInfo]bool{},
-	}
-}
-
-//
-func (p *PayUser) Match(info *map[string]interface{}) (*map[*UserInfo]*MatchUser, *[]*UserInfo) {
-	buyerclass, _ := (*info)["buyerclass"].(string)
-	area, _ := (*info)["area"].(string)
-	if area == "全国" {
-		area = ""
-	}
-	city, _ := (*info)["city"].(string)
-	subtype, _ := (*info)["subtype"].(string)
-	title := GetInfoTitle(info)
-	//订阅词
-	keys := p.Title_KeyDfa.Key.Analy(title)
-	//排除词
-	notkeys := p.Title_KeyDfa.NotKey.Analy(title)
-	notUsers := map[*UserInfo]bool{}
-	title_users := p.GetFinalUser(MatchWay_Title, keys, notkeys, p.Title_KeyDfa.Key_user, &notUsers)
-	//开启智能匹配的用户，匹配projectscope
-	detail_users := &map[*UserInfo]*MatchUser{}
-	if p.Detail_KeyDfa != nil {
-		//detail, _ := (*info)["projectscope"].(string)
-		//if detail == "" {
-		detail, _ := (*info)["detail"].(string)
-		//}
-		if detail != "" {
-			detail = strings.ToUpper(detail)
-			keys = p.Detail_KeyDfa.Key.Analy(detail)
-			notkeys = p.Detail_KeyDfa.NotKey.Analy(detail)
-			detail_users = p.GetFinalUser(MatchWay_Detail, keys, notkeys, p.Detail_KeyDfa.Key_user, &notUsers)
-			for d_k, d_u := range *detail_users {
-				if (*title_users)[d_k] != nil {
-					continue
-				}
-				(*title_users)[d_k] = d_u
-			}
-		}
-	}
-	users := map[*UserInfo]*MatchUser{}
-	var projectUsers []*UserInfo
-	for k, _ := range p.Users {
-		if notUsers[k] {
-			continue
-		}
-		if (!p.BuyerclassUsers[""][k] && !p.BuyerclassUsers[buyerclass][k]) ||
-			(!p.AreaUsers[""][k] && !p.AreaUsers[area][k] && !p.CityUsers[city][k]) {
-			continue
-		}
-		//关联项目不需要匹配信息类型
-		if k.SubSet.ProjectMatch == 1 {
-			projectUsers = append(projectUsers, k)
-		}
-		if !p.SubtypeUsers[""][k] && !p.SubtypeUsers[subtype][k] {
-			continue
-		}
-		var matchUser *MatchUser
-		if len(k.SubSet.Keys) > 0 {
-			matchUser = (*title_users)[k]
-			if matchUser == nil {
-				matchUser = (*detail_users)[k]
-			}
-			if matchUser == nil {
-				continue
-			}
-		} else {
-			matchUser = &MatchUser{}
-		}
-		users[k] = matchUser
-	}
-	return &users, &projectUsers
-}
-
-//获取最终的用户，排除词、信息范围、信息类型之后的
-//返回匹配上的用户和没有匹配到的用户
-func (p *PayUser) GetFinalUser(matchWay string, keys, notkeys []string, key_user *map[string]*[]*UserInfo, notUsers *map[*UserInfo]bool) *map[*UserInfo]*MatchUser {
-	keyMap := map[string]bool{}
-	for _, v := range keys {
-		keyMap[v] = true
-	}
-	users := map[*UserInfo]*MatchUser{} //匹配到用户
-	//遍历所有用户
-	for k, us := range *key_user {
-		if !keyMap[k] { //该关键词没有匹配到的用户
-			continue
-		}
-		for _, u := range *us {
-			//获取该词下面所有的用户
-			//遍历我的排除词，如果存在的话，排除自己
-			isContinue := false
-			for _, notkey := range notkeys {
-				if u.SubSet.Key_notkey[k][notkey] {
-					isContinue = true
-					break
-				}
-			}
-			if isContinue {
-				(*notUsers)[u] = true
-				continue
-			}
-			matchUser := users[u]
-			if matchUser == nil {
-				matchUser = &MatchUser{
-					Keys:      []string{},
-					MatchWays: []string{},
-					MatchWay:  map[string]bool{},
-				}
-			}
-			matchUser.Keys = append(matchUser.Keys, k)
-			if !matchUser.MatchWay[matchWay] {
-				matchUser.MatchWays = append(matchUser.MatchWays, matchWay)
-			}
-			matchUser.MatchWay[matchWay] = true
-			users[u] = matchUser
-		}
-	}
-	return &users
-}

public/src/mover/move.go

@@ -1,177 +0,0 @@
-//数据迁移
-package mover
-
-import (
-	. "db"
-	. "mongodb"
-	. "p"
-	"qfw/util"
-	"sync"
-	"time"
-
-	"github.com/donnie4w/go-logger/logger"
-)
-
-type Mover interface {
-	MaxPushSize(temp map[string]interface{}) int
-	MergeList(o, n interface{}, maxPushSize int) interface{}
-	ToList(list interface{}) interface{}
-	Unique(temp map[string]interface{}) string
-	Query(unique string) map[string]interface{}
-	SortListSplit(list interface{}, f func(v interface{}))
-}
-
-type MoveUser struct {
-	info        map[string]interface{}
-	ids         []interface{}
-	maxPushSize int
-}
-
-type Move struct {
-	Mgo_Log        *MongodbSim
-	Pushspace_temp string
-	Mgo_Log_DbName string
-	Pushspace      string
-	MoveBatch      int
-	MergePoolSize  int
-	SortFields     []string
-	TestQuery      map[string]interface{}
-	Mover          Mover
-}
-
-func (m *Move) Execute() int {
-	defer util.Catch()
-	nowUnix := time.Now().Unix()
-	sess := m.Mgo_Log.GetMgoConn()
-	defer m.Mgo_Log.DestoryMongoConn(sess)
-	query := map[string]interface{}{
-		"timestamp": map[string]interface{}{
-			"$lt": nowUnix,
-		},
-	}
-	if m.TestQuery != nil {
-		for k, v := range m.TestQuery {
-			query[k] = v
-		}
-	}
-	logger.Info("迁移数据query", query)
-	it := sess.DB(m.Mgo_Log_DbName).C(m.Pushspace_temp).Find(query).Sort(m.SortFields...).Iter()
-	moveUsers := map[string]*MoveUser{}
-	index, number, length := 0, 0, 0
-	for temp := make(map[string]interface{}); it.Next(&temp); {
-		index++
-		unique := m.Mover.Unique(temp)
-		maxPushSize := util.IntAll(temp["maxpushsize"])
-		if maxPushSize <= 0 {
-			maxPushSize = m.Mover.MaxPushSize(temp)
-		}
-		moveUser := moveUsers[unique]
-		if moveUser != nil {
-			temp["list"] = m.Mover.MergeList(moveUser.info["list"], temp["list"], maxPushSize)
-			moveUser.info = temp
-			moveUser.maxPushSize = maxPushSize
-			moveUser.ids = append(moveUser.ids, temp["_id"])
-		} else {
-			temp["list"] = m.Mover.ToList(temp["list"])
-			moveUser = &MoveUser{
-				info:        temp,
-				ids:         []interface{}{temp["_id"]},
-				maxPushSize: maxPushSize,
-			}
-		}
-		moveUsers[unique] = moveUser
-		length++
-		if length == m.MoveBatch {
-			m.merge(&number, nowUnix, moveUsers)
-			length = 0
-			moveUsers = map[string]*MoveUser{}
-		}
-		temp = make(map[string]interface{})
-		if index%500 == 0 {
-			logger.Info("迁移数据：", index)
-		}
-	}
-	if length > 0 {
-		m.merge(&number, nowUnix, moveUsers)
-		length = 0
-		moveUsers = map[string]*MoveUser{}
-	}
-	return index
-}
-func (m *Move) merge(number *int, nowUnix int64, moveUsers map[string]*MoveUser) {
-	*number++
-	logger.Info("第", *number, "次开始合并数据")
-	index := 0
-	saveArray := []map[string]interface{}{}
-	newDelArray, oldDelArray := []interface{}{}, []interface{}{}
-	//
-	mergeLock := &sync.Mutex{}
-	mergeWait := &sync.WaitGroup{}
-	mergePool := make(chan bool, m.MergePoolSize)
-	for k, v := range moveUsers {
-		mergePool <- true
-		mergeWait.Add(1)
-		go func(unique string, moveUser *MoveUser) {
-			defer util.Catch()
-			defer func() {
-				<-mergePool
-				mergeWait.Done()
-			}()
-			sess := m.Mgo_Log.GetMgoConn()
-			defer m.Mgo_Log.DestoryMongoConn(sess)
-			var datas []map[string]interface{}
-			sess.DB(m.Mgo_Log_DbName).C(m.Pushspace).Find(m.Mover.Query(unique)).Select(map[string]interface{}{"_id": 1, "list": 1}).All(&datas)
-			mergeLock.Lock()
-			defer mergeLock.Unlock()
-			var newList interface{}
-			if datas == nil { //批量新增
-				newList = moveUser.info["list"]
-			} else {
-				array := []interface{}{}
-				for _, v := range datas {
-					oldList, _ := v["list"].([]interface{})
-					array = append(array, oldList...)
-					newDelArray = append(newDelArray, v["_id"])
-					if len(newDelArray) >= Mgo_BulkSize {
-						MyMgo.DelBulk(m.Mgo_Log, sess, m.Mgo_Log_DbName, m.Pushspace, &newDelArray)
-					}
-				}
-				newList = m.Mover.MergeList(m.Mover.ToList(array), moveUser.info["list"], moveUser.maxPushSize)
-			}
-			oldDelArray = append(oldDelArray, moveUser.ids...)
-			if len(oldDelArray) >= Mgo_BulkSize {
-				MyMgo.DelBulk(m.Mgo_Log, sess, m.Mgo_Log_DbName, m.Pushspace_temp, &oldDelArray)
-			}
-			m.Mover.SortListSplit(newList, func(v interface{}) {
-				info := map[string]interface{}{
-					"list": v,
-				}
-				for ik, iv := range moveUser.info {
-					if ik == "_id" || ik == "list" {
-						continue
-					}
-					info[ik] = iv
-				}
-				saveArray = append(saveArray, info)
-				if len(saveArray) == Mgo_BulkSize {
-					MyMgo.SaveBulk(m.Mgo_Log, sess, m.Mgo_Log_DbName, m.Pushspace, &saveArray)
-				}
-			})
-		}(k, v)
-		index++
-		if index%500 == 0 {
-			logger.Info("第", *number, "次合并数据：", index)
-		}
-	}
-	mergeWait.Wait()
-	if len(saveArray) > 0 {
-		MyMgo.SaveBulk(m.Mgo_Log, nil, m.Mgo_Log_DbName, m.Pushspace, &saveArray)
-	}
-	if len(newDelArray) > 0 {
-		MyMgo.DelBulk(m.Mgo_Log, nil, m.Mgo_Log_DbName, m.Pushspace, &newDelArray)
-	}
-	if len(oldDelArray) > 0 {
-		MyMgo.DelBulk(m.Mgo_Log, nil, m.Mgo_Log_DbName, m.Pushspace_temp, &oldDelArray)
-	}
-	logger.Info("第", *number, "次合并数据结束。。。", index)
-}

public/src/p/constant.go

@@ -1,55 +0,0 @@
-package p
-
-import (
-	. "qfw/util"
-	"regexp"
-)
-
-const (
-	Mgo_BulkSize                          = 100
-	Mgo_ListSize                          = 200
-	Mysql_BulkSize                        = 200
-	Bigmember_Service_Entchange           = 12
-	Bigmember_Service_Followent           = 13
-	Bigmember_Service_Followproject       = 14
-	Bigmember_Service_Entchange_Followent = 16
-	Bigmember_Service_Report              = 10
-	Bigmember_Service_Projectforecast     = 9
-	OneDaySecond                          = 86400
-	ThreeDay                              = 259200
-	SevenDay                              = 604800
-	RelationProjectLimit                  = 50
-	Mgo_User                              = "user"
-	Es_Bidding                            = "bidding"
-	Es_Projectset                         = "projectset"
-	Pushcache_1                           = "pushcache_1"
-	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}`
-	Ent_EmpowerVip                        = "VIP订阅"
-	Ent_EmpowerMember                     = "大会员"
-	MatchWay_Title                        = "1"
-	MatchWay_Detail                       = "2"
-	MatchWay_Attachment                   = "3"
-	MatchWay_SubjectMatter                = "4"
-)
-
-var (
-	Se           = SimpleEncrypt{Key: "topnet"}
-	MailReg      = regexp.MustCompile("^.+@.+$")
-	TitleClearRe = regexp.MustCompile("<[^>]+>([^<]+)?<[^>]+>")
-	WeekNum      = map[string]int{
-		"Monday":    1,
-		"Tuesday":   2,
-		"Wednesday": 3,
-		"Thursday":  4,
-		"Friday":    5,
-		"Saturday":  6,
-		"Sunday":    7,
-	}
-	KeyFilterReg     = regexp.MustCompile("^(项目|中标|公告)$")
-	KeyRetainReg     = regexp.MustCompile("[\\p{Han}a-zA-Z0-9]")
-	SaveBiddingField = []string{"_id", "area", "city", "buyerclass", "publishtime", "s_subscopeclass", "subtype", "title", "toptype", "buyer", "bidamount", "budget", "projectname", "projectcode", "s_winner", "agency", "bidopentime", "attachment_count"}
-)

public/src/p/lock.go

@@ -1,56 +0,0 @@
-package p
-
-import (
-	"qfw/util/redis"
-	"sync/atomic"
-	"time"
-
-	"github.com/donnie4w/go-logger/logger"
-)
-
-type Lock struct {
-	Key   string
-	Push  string
-	Match string
-	E_C   int64
-	E_I   bool
-}
-
-//
-func (l *Lock) Lock(key string) {
-	atomic.AddInt64(&l.E_C, 1)
-	for {
-		if l.E_I {
-			break
-		}
-		v, err := redis.IncrByErr(l.Key, key)
-		if err == nil {
-			if v == 1 {
-				if key == l.Match {
-					redis.PutCKV(l.Key, l.Push, 1)
-				} else if key == l.Push {
-					redis.PutCKV(l.Key, l.Match, 1)
-				}
-				break
-			}
-		} else {
-			logger.Error("lock redis inc error", err)
-		}
-		logger.Info("目前处于锁住状态，等待", key, "执行完成")
-		time.Sleep(1 * time.Minute)
-	}
-	l.E_I = true
-}
-
-//
-func (l *Lock) UnLock() {
-	if atomic.AddInt64(&l.E_C, -1) <= 0 {
-		l.E_I = false
-		l.Clear(l.Push, l.Match)
-	}
-}
-
-//
-func (l *Lock) Clear(keys ...interface{}) {
-	redis.Del(l.Key, keys...)
-}

public/src/p/public.go

@@ -1,719 +0,0 @@
-package p
-
-import (
-	"encoding/json"
-	"fmt"
-	. "mongodb"
-	"qfw/util"
-	. "qfw/util"
-	. "qfw/util/mysql"
-	"qfw/util/redis"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/donnie4w/go-logger/logger"
-)
-
-//金额转化   金额：0-万元以下单位为元  ，万元以上至亿元以下单位为万元 ，亿元以上单位为亿元。保留 小数点后 2 位，不进行四舍五入。
-func ConversionMoney(i_money interface{}) string {
-	m := ""
-	if reflect.TypeOf(i_money).Name() == "float64" {
-		m = strconv.FormatFloat(Float64All(i_money), 'f', -1, 64)
-	} else {
-		m = ObjToString(i_money)
-	}
-	if m == "" {
-		return m
-	}
-	m_arr := strings.Split(m, ".")
-	m_1 := m_arr[0]
-	len_m1 := len([]rune(m_1))
-	if len_m1 >= 9 {
-		m = m_1[0:len_m1-8] + "." + m_1[len_m1-8:len_m1-6] + "亿元"
-	} else if len_m1 >= 5 {
-		m = m_1[0:len_m1-4] + "." + m_1[len_m1-4:len_m1-2] + "万元"
-	} else {
-		if len(m_arr) == 1 {
-			return m + ".00元"
-		}
-		m_2 := m_arr[1]
-		if len([]rune(m_2)) > 1 {
-			m_2 = m_2[0:2]
-		} else {
-			m_2 = m_2[0:1] + "0"
-		}
-		m = m_1 + "." + m_2 + "元"
-	}
-	return m
-}
-
-//微信模板消息 remark
-func WxTplRemark(titles []string, lastTime int64, hasLen int) string {
-	tip := ""
-	second := time.Now().Unix() - lastTime
-	if second > 0 {
-		if second < 61 {
-			tip = fmt.Sprintf("%d秒前发布的:\n", second)
-		} else {
-			second = second / 60
-			if second < 121 {
-				if second < 1 {
-					second = 1
-				}
-				tip = fmt.Sprintf("%d分钟前发布的:\n", second)
-			}
-		}
-	}
-	lastTip := ""
-	if len(titles) > 1 {
-		lastTip = fmt.Sprintf("...(共%d条)", len(titles))
-	}
-	reLen := 199 - hasLen - len([]rune(tip))
-	lastTipLen := len([]rune(lastTip))
-	wxTplMsgTitle := ""
-	bshow := false
-	for n := 1; n < len(titles)+1; n++ {
-		curTitle := titles[n-1]
-		tmptitle := wxTplMsgTitle + fmt.Sprintf("%d %s\n", n, curTitle)
-		ch := reLen - len([]rune(tmptitle))
-		if ch < lastTipLen { //加上后大于后辍，则没有完全显示
-			if ch == 0 && n == len(titles) {
-				wxTplMsgTitle = tmptitle
-				bshow = true
-			} else {
-				ch_1 := reLen - len([]rune(wxTplMsgTitle)) - lastTipLen
-				if ch_1 > 8 {
-					curLen := len([]rune(curTitle))
-					if ch_1 > curLen {
-						ch_1 = curLen
-					}
-					wxTplMsgTitle += fmt.Sprintf("%d %s\n", n, string([]rune(curTitle)[:ch_1-3]))
-				}
-			}
-		} else {
-			wxTplMsgTitle = tmptitle
-			if n == len(titles) {
-				bshow = true
-			}
-		}
-	}
-	if bshow {
-		lastTip = ""
-	}
-	return tip + wxTplMsgTitle + lastTip
-}
-
-//获取信息行业
-func GetSubScopeClass(subscopeclass interface{}) string {
-	industry := ""
-	if subscopeclass != nil {
-		k2sub := strings.Split(ObjToString(subscopeclass), ",")
-		if len(k2sub) > 0 {
-			industry = k2sub[0]
-			if industry != "" {
-				ss := strings.Split(industry, "_")
-				if len(ss) > 1 {
-					industry = ss[0]
-				}
-			}
-		}
-	}
-	return industry
-}
-
-//控制一分钟最大推送数，均匀调度
-func LimitMaxOneMinutePush(pushPoll *chan bool, maxOneMinute int) {
-	max := int(maxOneMinute / 60)
-	*pushPoll = make(chan bool, max)
-	go func() {
-		for {
-			time.Sleep(time.Second)
-			for i := 0; i < max; i++ {
-				select {
-				case *pushPoll <- true:
-				default:
-					continue
-				}
-			}
-		}
-	}()
-}
-
-//
-func UpdateUserIsPush(Mgo *MongodbSim, userId string, err error) {
-	if err == nil {
-		return
-	}
-	if strings.Contains(err.Error(), "[43004]") {
-		Mgo.UpdateById("user", userId, map[string]interface{}{
-			"$set": map[string]interface{}{
-				"i_ispush": 0,
-			},
-		})
-	}
-}
-
-//查找我的子账号
-func MySonAccounts(Mgo *MongodbSim, coll, userId string, field map[string]interface{}) *[]map[string]interface{} {
-	users, _ := Mgo.Find(coll, map[string]interface{}{
-		"i_member_sub_status": 1,
-		"s_member_mainid":     userId,
-		"i_member_status":     map[string]interface{}{"$gt": 0},
-	}, nil, field, false, -1, -1)
-	if users == nil {
-		users = &[]map[string]interface{}{}
-	}
-	return users
-}
-
-//是否购买此服务
-func HasService(mysql *Mysql, userId string, params ...int) *MemberService {
-	args := []interface{}{}
-	ws := []string{}
-	for _, v := range params {
-		args = append(args, v)
-		ws = append(ws, "?")
-	}
-	args = append(args, args...)
-	args = append(args, userId, util.NowFormat(util.Date_Full_Layout))
-	list := mysql.SelectBySql(`SELECT a.l_starttime,b.id from bigmember_service_user a 
-		INNER JOIN bigmember_service b on (((b.id in (`+strings.Join(ws, ",")+`) and a.s_serviceid=b.id) or (b.i_pid in (`+strings.Join(ws, ",")+`) and a.s_serviceid=b.i_pid)) and b.i_status=0 and a.s_userid=? and a.i_status=0 and a.l_endtime>?)`, args...)
-	ms := &MemberService{
-		Services: map[int]*memberService{},
-	}
-	if list != nil {
-		for _, v := range *list {
-			ms.IsBuy = true
-			id := util.IntAll(v["id"])
-			ms.Services[id] = &memberService{
-				Id:        id,
-				StartTime: util.ObjToString(v["l_starttime"]),
-			}
-		}
-	}
-	return ms
-}
-
-//
-func GetInfoTitle(info *map[string]interface{}) string {
-	title, _ := (*info)["title"].(string)
-	jsondata, _ := (*info)["jsondata"].(map[string]interface{})
-	if jsondata != nil {
-		goods, _ := jsondata["goods"].(string)
-		title += goods
-	}
-	title = strings.ToUpper(title)
-	return title
-}
-
-//得到用户的关键词
-func GetKeySets(a_key interface{}) ([]*KeySet, error) {
-	var keySets []*KeySet
-	if a_key == nil {
-		return keySets, nil
-	}
-	_bs, err := json.Marshal(a_key)
-	if err == nil {
-		err = json.Unmarshal(_bs, &keySets)
-	}
-	return keySets, err
-}
-
-//解析用户的订阅词
-func GetSubSet(isFreeUser bool, userId string, obj map[string]interface{}) *SubSet {
-	mailpush := util.IntAll(obj["i_mailpush"])
-	email := strings.TrimSpace(util.ObjToString(obj["s_email"]))
-	if mailpush == 1 && !MailReg.MatchString(email) {
-		mailpush = -1
-	}
-	subSet := &SubSet{
-		Keys:                  []string{},
-		Notkeys:               []string{},
-		Key_item:              map[string]string{},
-		Key_notkey:            map[string]map[string]bool{},
-		Key_area:              map[string]map[string]bool{},
-		Key_subtype:           map[string]map[string]bool{},
-		OriginalKeys:          []string{},
-		Areas:                 []string{},
-		Subtypes:              []string{},
-		Buyerclasss:           []string{},
-		WxPush:                util.IntAllDef(obj["i_wxpush"], 1),
-		AppPush:               util.IntAllDef(obj["i_apppush"], 1),
-		MailPush:              mailpush,
-		Email:                 email,
-		MatchWay:              util.IntAllDef(obj["i_matchway"], 1),
-		Matchbuyerclass_other: util.IntAllDef(obj["i_matchbuyerclass_other"], 1),
-		ProjectMatch:          util.IntAll(obj["i_projectmatch"]),
-		RateMode:              util.IntAllDef(obj["i_ratemode"], 2),
-		MaxPushSize:           util.IntAll(obj["i_maxpushsize"]),
-		MaxMailSize:           util.IntAll(obj["i_maxmailsize"]),
-	}
-	var keySets []*KeySet
-	if isFreeUser {
-		var err error
-		keySets, err = GetKeySets(obj["a_key"])
-		if err != nil {
-			logger.Error("获取用户关键词错误！", userId, obj["a_key"], err)
-			return subSet
-		}
-		area := obj["o_area"]
-		if ppStatus := util.IntAll(obj["i_ppstatus"]); ppStatus == 1 {
-			area = obj["o_area_p"]
-		}
-		if newFree := util.IntAll(obj["i_newfree"]); newFree == 1 && area != nil {
-			subSet.IsUpgrade = true
-			subSet.Subtype, _ = obj["a_infotype"].([]interface{})
-			subSet.Area, _ = area.(map[string]interface{})
-		}
-	} else {
-		items, _ := obj["a_items"].([]interface{})
-		for _, v := range items {
-			item, _ := v.(map[string]interface{})
-			itemName := strings.TrimSpace(util.ObjToString(item["s_item"]))
-			subSet.Items = append(subSet.Items, itemName)
-			kss, err := GetKeySets(item["a_key"])
-			if err != nil {
-				logger.Error("获取用户关键词错误！", userId, item["a_key"], err)
-				continue
-			}
-			for _, vv := range kss {
-				if vv == nil {
-					continue
-				}
-				if vv.MatchWay == 1 {
-					for _, vvv := range vv.Keys {
-						keySets = append(keySets, &KeySet{
-							Item:    itemName,
-							Keys:    []string{vvv},
-							NotKeys: vv.NotKeys,
-						})
-					}
-					for _, vvv := range vv.AppendKeys {
-						keySets = append(keySets, &KeySet{
-							Item:    itemName,
-							Keys:    []string{vvv},
-							NotKeys: vv.NotKeys,
-						})
-					}
-				} else {
-					vv.Item = itemName
-					keySets = append(keySets, vv)
-				}
-			}
-		}
-		subSet.Buyerclass, _ = obj["a_buyerclass"].([]interface{})
-		subSet.Subtype, _ = obj["a_infotype"].([]interface{})
-		subSet.Area, _ = obj["o_area"].(map[string]interface{})
-	}
-	for _, v := range subSet.Buyerclass {
-		s_v, _ := v.(string)
-		if s_v == "" {
-			continue
-		}
-		subSet.Buyerclasss = append(subSet.Buyerclasss, s_v)
-	}
-	for _, v := range subSet.Subtype {
-		s_v, _ := v.(string)
-		if s_v == "" {
-			continue
-		}
-		subSet.Subtypes = append(subSet.Subtypes, s_v)
-	}
-	for area, _ := range subSet.Area {
-		if area == "" {
-			continue
-		}
-		subSet.Areas = append(subSet.Areas, area)
-	}
-	////////////////
-	for _, vs := range keySets {
-		if vs == nil {
-			logger.Error(userId, "关键词设置异常")
-			continue
-		}
-		var vs_keys []string
-		for _, vs_v := range [][]string{vs.Keys, vs.AppendKeys} {
-			for _, vs_vv := range vs_v {
-				vs_vv = strings.TrimSpace(vs_vv)
-				if vs_vv == "" {
-					continue
-				}
-				vs_keys = append(vs_keys, vs_vv)
-			}
-		}
-		if len(vs_keys) == 0 {
-			continue
-		}
-		key := strings.Join(vs_keys, "+")
-		subSet.OriginalKeys = append(subSet.OriginalKeys, key)
-		if KeyFilterReg.MatchString(key) {
-			continue
-		} else if !KeyRetainReg.MatchString(key) {
-			continue
-		}
-		subSet.Keys = append(subSet.Keys, key)
-		subSet.Notkeys = append(subSet.Notkeys, vs.NotKeys...)
-		//转大写
-		upperKey := strings.ToUpper(key)
-		subSet.Key_item[upperKey] = vs.Item
-		//建立与排除词的对应关系
-		for _, notkey := range vs.NotKeys {
-			upperNotkey := strings.ToUpper(notkey)
-			if subSet.Key_notkey[upperKey] == nil {
-				subSet.Key_notkey[upperKey] = map[string]bool{}
-			}
-			subSet.Key_notkey[upperKey][upperNotkey] = true
-		}
-		//免费用户需要进行映射
-		if isFreeUser {
-			//建立与信息范围的对应关系
-			for _, area := range vs.Areas {
-				if subSet.Key_area[upperKey] == nil {
-					subSet.Key_area[upperKey] = map[string]bool{}
-				}
-				subSet.Key_area[upperKey][area] = true
-			}
-			//建立与信息类型的对应关系
-			for _, subtype := range vs.SubTypes {
-				if subSet.Key_subtype[upperKey] == nil {
-					subSet.Key_subtype[upperKey] = map[string]bool{}
-				}
-				subSet.Key_subtype[upperKey][subtype] = true
-			}
-		}
-	}
-	return subSet
-}
-
-//加载数据到内存中
-func LoadBidding(mgo *MongodbSim, dbName, coll string, startTime int64, redisCache bool) (*[]map[string]interface{}, int64) {
-	defer util.Catch()
-	endTime := time.Now().Unix()
-	query := map[string]interface{}{
-		"pici": map[string]interface{}{
-			"$gte": startTime,
-			"$lt":  endTime,
-		},
-	}
-	// query = map[string]interface{}{
-	// 	"_id": map[string]interface{}{
-	// 		"$in": ToObjectIds([]string{"5b7bd6b9a5cb26b9b7449fd7", "5b7bd6b9a5cb26b9b7449fe4", "626c4b63923488e172579d81", "5b7bd6b9a5cb26b9b7449fde"}),
-	// 	},
-	// }
-	logger.Info("开始加载", coll, "数据", query)
-	var res []map[string]interface{}
-	sess := mgo.GetMgoConn()
-	defer mgo.DestoryMongoConn(sess)
-	it := sess.DB(dbName).C(coll).Find(query).Select(map[string]interface{}{
-		"title":           1,
-		"detail":          1,
-		"projectname":     1,
-		"projectcode":     1,
-		"buyer":           1,
-		"buyerperson":     1,
-		"buyertel":        1,
-		"s_winner":        1,
-		"agency":          1,
-		"bidopentime":     1,
-		"projectscope":    1,
-		"publishtime":     1,
-		"toptype":         1,
-		"subtype":         1,
-		"area":            1,
-		"s_subscopeclass": 1,
-		"city":            1,
-		"buyerclass":      1,
-		"jsondata":        1,
-		"budget":          1,
-		"bidamount":       1,
-		"isValidFile":     1,
-	}).Iter()
-	index := 0
-	for temp := make(map[string]interface{}); it.Next(&temp); {
-		_id := BsonIdToSId(temp["_id"])
-		if publishtime := util.Int64All(temp["publishtime"]); startTime-publishtime > 7*86400 {
-			logger.Info(_id, "发布时间大于7天，不参与匹配", startTime, publishtime)
-			continue
-		}
-		temp["_id"] = _id
-		title, _ := temp["title"].(string)
-		title = strings.ReplaceAll(title, "\n", "")
-		temp["title"] = title
-		if util.ObjToString(temp["area"]) == "A" {
-			temp["area"] = "全国"
-		}
-		temp["attachment_count"] = GetAttachmentCount(temp)
-		delete(temp, "projectinfo")
-		res = append(res, temp)
-		if redisCache {
-			//信息缓存3天
-			info := map[string]interface{}{}
-			for _, v := range SaveBiddingField {
-				if v == "_id" || temp[v] == nil {
-					continue
-				}
-				info[v] = temp[v]
-			}
-			redis.Put(Pushcache_1, "info_"+_id, info, 259200)
-		}
-		temp = make(map[string]interface{})
-		index++
-		if index%500 == 0 {
-			logger.Info("加载", coll, "数据：", index)
-		}
-	}
-	logger.Info(coll, "数据已经加载结束。。。", index)
-	return &res, endTime
-}
-
-//
-func IsVipUser(vipStatus int) bool {
-	if vipStatus == 1 || vipStatus == 2 {
-		return true
-	}
-	return false
-}
-
-//
-func ToSortList(list interface{}) *SortList {
-	sl := make(SortList, 0)
-	if list == nil {
-		return &sl
-	}
-	b, err := json.Marshal(list)
-	if err != nil {
-		return &sl
-	}
-	err = json.Unmarshal(b, &sl)
-	if err != nil {
-		return &sl
-	}
-	sort.Sort(sl)
-	return &sl
-}
-
-//第一个参数是老数据，第二个参数是新进数据
-func MergeSortList(o, n interface{}, maxPushSize int) *SortList {
-	of, oo := o.(*SortList)
-	if !oo {
-		of = ToSortList(o)
-	}
-	nf, no := n.(*SortList)
-	if !no {
-		nf = ToSortList(n)
-	}
-	idMap := map[string]bool{}
-	for _, v := range *nf {
-		idMap[util.ObjToString((*v.Info)["_id"])] = true
-	}
-	for _, v := range *of {
-		if idMap[util.ObjToString((*v.Info)["_id"])] {
-			continue
-		}
-		*nf = append(*nf, v)
-	}
-	sort.Sort(nf)
-	if len(*nf) > maxPushSize {
-		*nf = (*nf)[:maxPushSize]
-	}
-	return nf
-}
-
-//获取招标信息附件数量
-func GetAttachmentCount(temp map[string]interface{}) int {
-	isValidFile, _ := temp["isValidFile"].(bool)
-	if isValidFile {
-		return 1
-	}
-	return 0
-}
-
-//获取招标信息附件数量
-func GetAttachmentCountById(mgo *MongodbSim, dbName, coll, _id string) int {
-	sess := mgo.GetMgoConn()
-	defer mgo.DestoryMongoConn(sess)
-	temp := map[string]interface{}{}
-	sess.DB(dbName).C(coll).Find(map[string]interface{}{
-		"_id": StringTOBsonId(_id),
-	}).Select(map[string]interface{}{
-		"isValidFile": 1,
-	}).One(&temp)
-	if temp != nil {
-		return GetAttachmentCount(temp)
-	}
-	return -1
-}
-
-//
-func NewBiddingInfo(info *map[string]interface{}, keys []string) *BiddingInfo {
-	bi := &BiddingInfo{}
-	bi.Title, _ = (*info)["title"].(string)
-	bi.ClearTitle = TitleClearRe.ReplaceAllString(strings.Replace(bi.Title, "\n", "", -1), "$1")
-	bi.Area, _ = (*info)["area"].(string)
-	bi.AreaTitle = fmt.Sprintf("[%s]%s", bi.Area, bi.ClearTitle)
-	bi.Publishtime = util.Int64All((*info)["publishtime"])
-	bi.PublishtimeYMD = util.FormatDateByInt64(&bi.Publishtime, util.Date_Short_Layout)
-	bi.PublishtimeDiff = util.TimeDiff(time.Unix(bi.Publishtime, 0))
-	bi.Buyerclass, _ = (*info)["buyerclass"].(string)
-	bi.Subscopeclass = GetSubScopeClass((*info)["s_subscopeclass"])
-	bi.Bidamount = (*info)["bidamount"]
-	bi.Budget = (*info)["budget"]
-	if bi.Bidamount != nil {
-		bi.Acount = ConversionMoney(bi.Bidamount)
-	} else if bi.Budget != nil {
-		bi.Acount = ConversionMoney(bi.Budget)
-	}
-	bi.Id, _ = (*info)["_id"].(string)
-	bi.Subtype, _ = (*info)["subtype"].(string)
-	bi.Toptype, _ = (*info)["toptype"].(string)
-	bi.Infotype = bi.Subtype
-	if bi.Infotype == "" {
-		bi.Infotype = bi.Toptype
-	}
-	bi.HighlightTitle = bi.ClearTitle
-	for _, kw := range keys {
-		kws := strings.Split(kw, "+")
-		n := 0
-		otitle := bi.HighlightTitle
-		for _, kwn := range kws {
-			ot := strings.Replace(otitle, kwn, "<span class='keys'>"+kwn+"</span>", 1)
-			if ot != bi.HighlightTitle {
-				n++
-				otitle = ot
-			} else {
-				break
-			}
-		}
-		if n == len(kws) {
-			bi.HighlightTitle = otitle
-			break
-		}
-	}
-	return bi
-}
-
-//
-func SortListSplit(list *SortList, f func(v interface{})) {
-	l := len(*list)
-	if l == 0 {
-		return
-	}
-	i := Mgo_ListSize
-	for {
-		if l > i {
-			arr := (*list)[i-Mgo_ListSize : i]
-			f(&arr)
-		} else if l > i-Mgo_ListSize {
-			arr := (*list)[i-Mgo_ListSize:]
-			f(&arr)
-			break
-		}
-		i += Mgo_ListSize
-	}
-}
-
-//获取企业授权超级订阅/大会员的用户
-func LoadEntProductUsers(m *Mysql, testUserIds []int) (map[string]*UserInfo, map[int]*UserInfo, map[int]*UserInfo, []*UserInfo) {
-	logger.Info("开始加载企业授权用户。。。")
-	phoneMap := map[string]*UserInfo{}
-	userMap := map[int]*UserInfo{}
-	entMap := map[int]*UserInfo{}
-	all := []*UserInfo{}
-	query := `SELECT DISTINCT a.ent_id,IF(instr(a.product_type,'` + Ent_EmpowerMember + `')>0,'` + Ent_EmpowerMember + `','` + Ent_EmpowerVip + `') as product_type,c.phone,b.ent_user_id,d.name as ent_name,d.power_source,d.isNew from entniche_wait_empower a 
-		inner join entniche_power b on (a.end_time>? and b.status=1 and (a.product_type like '%` + Ent_EmpowerVip + `%' or a.product_type like '%` + Ent_EmpowerMember + `%') and a.id=b.wait_empower_id)
-		inner join entniche_user c on (`
-	if len(testUserIds) > 0 {
-		array := []string{}
-		for _, v := range testUserIds {
-			array = append(array, fmt.Sprint(v))
-		}
-		query += `c.id in (` + strings.Join(array, ",") + `) and `
-	}
-	query += `b.ent_user_id=c.id)
-		inner join entniche_info d on (d.id=a.ent_id)`
-	m.SelectByBath(200, func(l *[]map[string]interface{}) bool {
-		for _, v := range *l {
-			phone, _ := v["phone"].(string)
-			if phone == "" {
-				continue
-			}
-			u := &UserInfo{
-				Entniche: &Entniche{
-					EntId:       util.IntAll(v["ent_id"]),
-					EntName:     util.ObjToString(v["ent_name"]),
-					UserId:      util.IntAll(v["ent_user_id"]),
-					ProductType: util.ObjToString(v["product_type"]),
-					PowerSource: util.IntAll(v["power_source"]),
-					IsNew:       util.IntAll(v["isNew"]),
-				},
-				Phone: phone,
-			}
-			if strings.Contains(u.Entniche.ProductType, Ent_EmpowerMember) {
-				u.MemberStatus = 1
-			} else if strings.Contains(u.Entniche.ProductType, Ent_EmpowerVip) {
-				u.VipStatus = 1
-			} else {
-				continue
-			}
-			phoneMap[phone] = u
-			userMap[u.Entniche.UserId] = u
-			all = append(all, u)
-			entMap[u.Entniche.EntId] = u
-			logger.Info("加载企业授权用户", u.Entniche.EntName, u.Entniche.EntId, u.Entniche.UserId, u.Entniche.ProductType, u.Phone)
-		}
-		return true
-	}, query, NowFormat(Date_Full_Layout))
-	logger.Info("企业授权用户加载结束。。。", len(phoneMap), len(userMap), len(entMap), len(all))
-	return phoneMap, userMap, entMap, all
-}
-
-//加载商机管理用户
-func LoadEntnicheUsers(m *Mysql) map[string]bool {
-	logger.Info("开始加载新版商机管理用户。。。")
-	r := map[string]bool{}
-	m.SelectByBath(200, func(l *[]map[string]interface{}) bool {
-		for _, v := range *l {
-			phone := util.ObjToString(v["phone"])
-			if phone != "" {
-				r[phone] = true
-				logger.Info("加载商机管理用户", phone)
-			}
-		}
-		return true
-	}, `SELECT b.phone from entniche_info a INNER JOIN entniche_user b on (a.status=1 and a.power_source is null and b.power=1 and a.id=b.ent_id)`)
-	logger.Info("商机管理用户加载结束。。。", len(r))
-	return r
-}
-
-//
-func GetWxTplMsg(subSet *SubSet) (string, string) {
-	keyword := strings.Join(subSet.Keys, " ")
-	if len([]rune(keyword)) > 10 {
-		keyword = string([]rune(keyword)[:10]) + "..."
-	}
-	area := strings.Join(subSet.Areas, " ")
-	if len([]rune(area)) > 10 {
-		area = string([]rune(area)[:10]) + "..."
-	}
-	return keyword, area
-}
-
-//
-func GetPhone(u map[string]interface{}) string {
-	phone := util.ObjToString(u["s_phone"])
-	if phone == "" {
-		phone = util.ObjToString(u["s_m_phone"])
-	}
-	return phone
-}
-
-//
-func PushUrlEntIdentity(entId, entUserId int, entName string) string {
-	if entId > 0 && entUserId > 0 {
-		return "__" + "V20221215-" + Se.Encode2HexByCheck(fmt.Sprintf("%d_%d_%s", entId, entUserId, entName))
-	}
-	return ""
-}

public/src/p/struct.go

@@ -1,365 +0,0 @@
-package p
-
-import (
-	"dfa"
-	"qfw/util"
-	"strings"
-)
-
-//
-type MgoConf struct {
-	Address          string
-	Size             int
-	DbName           string
-	ReplSet          string
-	UserName         string
-	Password         string
-	Collection       string
-	ExperienceDbName string
-}
-
-//
-type RedisConf struct {
-	Address string
-}
-
-//
-type MysqlConf struct {
-	DbName       string
-	Address      string
-	UserName     string
-	PassWord     string
-	MaxOpenConns int
-	MaxIdleConns int
-}
-
-//
-type EsConf struct {
-	Address string
-	Size    int
-}
-
-//
-type MemberService struct {
-	IsBuy    bool
-	Services map[int]*memberService
-}
-
-//
-type memberService struct {
-	Id        int
-	StartTime string
-}
-
-//关键词
-type KeySet struct {
-	Item       string   `json:"item"`      //分类名称
-	Keys       []string `json:"key"`       //关键词
-	NotKeys    []string `json:"notkey"`    //排除词
-	SubTypes   []string `json:"infotype"`  //信息类型
-	Areas      []string `json:"area"`      //地区
-	AppendKeys []string `json:"appendkey"` //附加词
-	MatchWay   int      `json:"matchway"`  //匹配模式 0:精准匹配 1:模糊匹配
-}
-
-//解析订阅词
-type SubSet struct {
-	WxPush                int                        //是否开启微信推送
-	AppPush               int                        //是否开启app推送
-	MailPush              int                        //是否开启邮箱推送
-	RateMode              int                        //推送时间
-	Email                 string                     //邮箱
-	MatchWay              int                        //匹配方式 1-标题 2-正文
-	Matchbuyerclass_other int                        //是否开启其他按钮
-	ProjectMatch          int                        //项目关联推送
-	Items                 []string                   //关键词分类
-	Keys                  []string                   //过滤后的关键词
-	Notkeys               []string                   //排除词
-	Key_item              map[string]string          //关键词对应的分类名称
-	Key_notkey            map[string]map[string]bool //关键词所对应的排除词
-	Key_area              map[string]map[string]bool //关键词所对应的信息范围
-	Key_subtype           map[string]map[string]bool //关键词所对应的信息类型
-	OriginalKeys          []string                   //原始关键词
-	Areas                 []string                   //区域-省份
-	Area                  map[string]interface{}     //区域-省份
-	Subtype               []interface{}              //信息类型-二级分类
-	Subtypes              []string                   //信息类型-二级分类
-	Buyerclass            []interface{}              //采购单位行业
-	Buyerclasss           []string                   //采购单位行业
-	IsUpgrade             bool                       //免费用户是否订阅升级
-	MaxPushSize           int                        //推送最大条数
-	MaxMailSize           int                        //邮件最大条数
-}
-
-//用户基本信息
-type UserInfo struct {
-	Id               string //mongoid
-	BaseUserId       int64  //mysql用户id
-	S_m_openid       string //公众号openid
-	A_m_openid       string //app微信登录openid
-	Phone            string //app手机号登录
-	Jpushid          string //极光推送id
-	Opushid          string //厂商推送id
-	AppPhoneType     string //手机型号
-	ApplyStatus      int    //是否申请打开订阅推送
-	Subscribe        int    //是否关注
-	UserType         int    //用户类型
-	VipStatus        int    // 1--试用 2--正式
-	MemberStatus     int    //
-	IsMainAccount    bool   //是否是主账号
-	SonAccountStatus int    //子账号状态 0-禁用 1-启用
-	MainId           string //主账号id
-	Entniche         *Entniche
-	MemberMainid     string
-	WxTplMsg         *WxTplMsg
-	SubSet           *SubSet
-	Extend           *UserInfoExtend
-}
-
-//
-type Entniche struct {
-	EntId   int    //企业id
-	EntName string //企业名称
-	DeptId  int    //部门id
-	//DeptName     string //部门名称
-	DisId       string //分发id
-	UserId      int
-	Unique      string
-	OnlyPush    int
-	IsNew       int
-	PowerSource int    //权益来源
-	ProductType string //产品类型
-	Mail        string //邮箱
-	IsDis       int    //是否是分发
-	DisMember   int    //分发-超级订阅
-	DisVip      int    //分发-大会员
-}
-
-//用户基本信息-扩展
-type UserInfoExtend struct {
-	CreateTime int64 //
-	Size       int
-}
-
-func (u *UserInfo) Add(k string, m *map[string]map[*UserInfo]bool) {
-	mk := (*m)[k]
-	if mk == nil {
-		mk = map[*UserInfo]bool{}
-	}
-	mk[u] = true
-	(*m)[k] = mk
-}
-
-//添加信息类型映射关系
-func (u *UserInfo) AddSbuype(m *map[string]map[*UserInfo]bool) {
-	if len(u.SubSet.Subtypes) == 0 {
-		u.Add("", m)
-	} else {
-		for _, v := range u.SubSet.Subtypes {
-			u.Add(v, m)
-		}
-	}
-}
-
-//添加采购单位类型映射关系
-func (u *UserInfo) AddBuyerclass(m *map[string]map[*UserInfo]bool) {
-	//如果有关键词 有采购单位行业，行业加上“其它”
-	if len(u.SubSet.Buyerclasss) == 0 {
-		u.Add("", m)
-	} else {
-		if u.SubSet.Matchbuyerclass_other == 1 && len(u.SubSet.Keys) > 0 {
-			u.Add("其它", m)
-		}
-		for _, v := range u.SubSet.Buyerclasss {
-			u.Add(v, m)
-		}
-	}
-}
-
-//添加区域映射关系
-func (u *UserInfo) AddArea(m *map[string]map[*UserInfo]bool) {
-	if len(u.SubSet.Areas) == 0 {
-		u.Add("", m)
-	} else {
-		for _, v := range u.SubSet.Areas {
-			u.Add(v, m)
-		}
-	}
-}
-
-//添加区域城市映射关系
-func (u *UserInfo) AddAreaCity(area, city *map[string]map[*UserInfo]bool) {
-	if len(u.SubSet.Area) == 0 {
-		u.Add("", area)
-	} else {
-		for k, v := range u.SubSet.Area {
-			if k == "" {
-				continue
-			}
-			vs, _ := v.([]interface{})
-			if len(vs) == 0 {
-				u.Add(k, area)
-			} else {
-				for _, vv := range vs {
-					s_vv, _ := vv.(string)
-					if s_vv == "" {
-						continue
-					}
-					u.Add(s_vv, city)
-				}
-			}
-		}
-	}
-}
-
-//把用户挂在词下面
-func (u *UserInfo) MakeKeyUser(keys []string, key_user *map[string]*[]*UserInfo) {
-	mp := map[string]bool{}
-	for _, key := range keys {
-		v := strings.ToUpper(key)
-		if v == "" || mp[v] {
-			continue
-		}
-		mp[v] = true
-		arr := (*key_user)[v]
-		if arr == nil {
-			arr = &[]*UserInfo{}
-		}
-		*arr = append(*arr, u)
-		(*key_user)[v] = arr
-	}
-}
-
-type WxTplMsg struct {
-	Key  string
-	Area string
-}
-
-type SortList []*MatchInfo
-
-func (s SortList) Len() int {
-	return len(s)
-}
-
-func (s SortList) Less(i, j int) bool {
-	return util.Int64All((*s[i].Info)["publishtime"]) > util.Int64All((*s[j].Info)["publishtime"])
-}
-
-func (s SortList) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-type CSortList []map[string]interface{}
-
-func (s CSortList) Len() int {
-	return len(s)
-}
-
-func (s CSortList) Less(i, j int) bool {
-	return util.Int64All(s[i]["publishtime"]) > util.Int64All(s[j]["publishtime"])
-}
-
-func (s CSortList) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-type MatchInfo struct {
-	Info      *map[string]interface{}
-	Keys      []string
-	Items     []string
-	MatchWays []string
-	DisId     string
-}
-
-type KeyDfa struct {
-	Key         *dfa.DFA
-	NotKey      *dfa.DFA
-	Key_user    *map[string]*[]*UserInfo
-	Notkey_user *map[string]*[]*UserInfo
-}
-
-//所有用户的关键词和排除词
-func (p *KeyDfa) CreateDaf() {
-	//关键词
-	p.Key = &dfa.DFA{}
-	keys := make([]string, 0)
-	for k, _ := range *p.Key_user {
-		keys = append(keys, k)
-	}
-	p.Key.AddWord(keys...)
-	//排除关键词
-	p.NotKey = &dfa.DFA{}
-	notKeys := make([]string, 0)
-	for k, _ := range *p.Notkey_user {
-		notKeys = append(notKeys, k)
-	}
-	p.NotKey.AddWord(notKeys...)
-}
-
-//
-type MatchUser struct {
-	Keys      []string
-	MatchWays []string
-	MatchWay  map[string]bool
-}
-
-//
-type RelationProjectUser struct {
-	TopTypes []string
-}
-
-//
-type PushInfo struct {
-	Ids  []interface{}
-	Info map[string]interface{}
-}
-
-//推送返回结果
-type PushResult struct {
-	WxStatus   int
-	AppStatus  int
-	MailStatus int
-	PushDate   int64
-	Infos      *SortList
-}
-
-//
-type PushWay struct {
-	WxPush   bool
-	AppPush  bool
-	MailPush bool
-}
-
-//
-type PushParam struct {
-	JpushTitle   string
-	LastInfoDate int64
-	TitleArray   []string
-	Infos        *SortList
-	InfosLength  int
-	MailHtml     string
-	PushDate     int64
-	PushCount    int
-	IsPush       bool
-}
-
-//
-type BiddingInfo struct {
-	Id              string
-	Title           string
-	ClearTitle      string
-	HighlightTitle  string
-	AreaTitle       string
-	Area            string
-	Publishtime     int64
-	PublishtimeDiff string
-	PublishtimeYMD  string
-	Buyerclass      string
-	Subscopeclass   string
-	Bidamount       interface{}
-	Budget          interface{}
-	Acount          string
-	Subtype         string
-	Toptype         string
-	Infotype        string
-}

public/src/p/timetask.go

@@ -1,131 +0,0 @@
-package p
-
-import (
-	"qfw/util"
-	"strings"
-	"time"
-
-	"github.com/donnie4w/go-logger/logger"
-)
-
-var VarTimeTask = &timeTask{}
-
-type timeTask struct {
-}
-
-/* 定时任务，一轮一轮执行，不停歇
- * @param msg 打印输出的信息
- * @param start 开始时间
- * @param end 结束时间
- * @param duration 定时任务时间间隔
- * @param runRightNow 是否立即执行
- * @param dayFirst 是否是今天第一次执行
- * @param nowRunHours 这些小时，任务不执行
- * @param f 需要执行的方法逻辑
- */
-func (t *timeTask) RunInTimeLoop(msg, start, end string, duration int64, runRightNow, dayFirst bool, nowRunHours []int, f func()) {
-	if !dayFirst && !t.IsInTimeSection(start, end) {
-		logger.Info(msg, "当前时间不在", start, end, "范围内，不执行")
-		return
-	}
-	if runRightNow {
-		isRun := true
-		hour := time.Now().Hour()
-		for _, v := range nowRunHours {
-			if v == hour {
-				isRun = false
-				break
-			}
-		}
-		if isRun {
-			f()
-		}
-	}
-	d := time.Duration(duration) * time.Minute
-	logger.Info(msg, "start runInTimeLoop after", d)
-	time.AfterFunc(d, func() {
-		t.RunInTimeLoop(msg, start, end, duration, true, false, nowRunHours, f)
-	})
-}
-
-/* 定时任务，在时间区间内一轮一轮执行
- * @param msg 打印输出的信息
- * @param start 开始时间
- * @param end 结束时间
- * @param f 需要执行的方法逻辑
- */
-func (t *timeTask) RunInTimeSection(msg, start, end string, duration int64, f func(dayFirst bool)) {
-	now := time.Now()
-	//开始时间
-	startArr := strings.Split(start, ":")
-	starttime := time.Date(now.Year(), now.Month(), now.Day(), util.IntAll(startArr[0]), util.IntAll(startArr[1]), 0, 0, time.Local)
-	var sub time.Duration
-	if now.Before(starttime) {
-		sub = starttime.Sub(time.Now())
-	} else {
-		if t.IsInTimeSection(start, end) {
-			if duration > 0 {
-				go t.RunInTimeLoop(msg, start, end, duration, true, false, nil, func() {
-					f(false)
-				})
-			} else {
-				go f(false)
-			}
-		} else {
-			logger.Info(msg, "当前时间不在", start, end, "范围内，不执行")
-		}
-		sub = starttime.AddDate(0, 0, 1).Sub(time.Now())
-	}
-	logger.Info("start runInTimeSection after", sub)
-	timer := time.NewTimer(sub)
-	for {
-		select {
-		case <-timer.C:
-			timer.Reset(time.Hour * 24)
-			if t.IsInTimeSection(start, end) {
-				if duration > 0 {
-					go t.RunInTimeLoop(msg, start, end, duration, true, false, nil, func() {
-						f(true)
-					})
-				} else {
-					go f(true)
-				}
-			} else {
-				logger.Info(msg, "当前时间不在", start, end, "范围内，不执行")
-			}
-		}
-	}
-}
-
-/* 是否在时间区间内
- * @param start 开始时间
- * @param end 结束时间
- */
-func (t *timeTask) IsInTimeSection(start, end string) bool {
-	if start == "" || end == "" {
-		return true
-	}
-	now := time.Now()
-	start_time := strings.Split(start, ":")
-	starttime := time.Date(now.Year(), now.Month(), now.Day(), util.IntAll(start_time[0]), util.IntAll(start_time[1]), 0, 0, time.Local)
-	//
-	end_time := strings.Split(end, ":")
-	endtime := time.Date(now.Year(), now.Month(), now.Day(), util.IntAll(end_time[0]), util.IntAll(end_time[1]), 0, 0, time.Local)
-	return now.After(starttime) && now.Before(endtime)
-}
-
-//
-func (t *timeTask) Week() (int64, int64) {
-	endDate := time.Now().AddDate(0, 0, -WeekNum[time.Now().Weekday().String()])
-	endDate = time.Date(endDate.Year(), endDate.Month(), endDate.Day(), 0, 0, 0, 0, time.Local)
-	startDate := endDate.AddDate(0, 0, -6)
-	return startDate.Unix(), endDate.Unix()
-}
-
-//
-func (t *timeTask) Month() (int64, int64) {
-	now := time.Now().AddDate(0, -1, 0)
-	startDate := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, time.Local)
-	endDate := startDate.AddDate(0, 1, -1)
-	return startDate.Unix(), endDate.Unix()
-}

public/src/p/wxtplmsgcustom.go

@@ -1,121 +0,0 @@
-package p
-
-import (
-	"fmt"
-	"log"
-	"math/rand"
-	"qfw/util/mysql"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/donnie4w/go-logger/logger"
-)
-
-type WxTplMsgCustom struct {
-	FirstData  string
-	AdvertCode string
-}
-
-//
-type WxTplMsgCustoms struct {
-	All       *sync.Map
-	Mysql     *mysql.Mysql
-	TplId     string
-	SceneCode []string
-}
-
-/* 新建结构体
- * @Param mysql 数据库实例
- * @Param tplId 模板消息id
- * @Param sceneCode 场景代码
- * @Return error
- */
-func NewWxTplMsgCustoms(m *mysql.Mysql, tplId string, sceneCode ...string) *WxTplMsgCustoms {
-	return &WxTplMsgCustoms{
-		All:       &sync.Map{},
-		Mysql:     m,
-		TplId:     tplId,
-		SceneCode: sceneCode,
-	}
-}
-
-//初始化自定义模板消息，如果有异常，程序终止
-func (w *WxTplMsgCustoms) ForceVerify() {
-	w.init(true)
-}
-
-//重新加载自定义模板消息
-func (w *WxTplMsgCustoms) Reload() {
-	w.init(false)
-}
-
-//初始化自定义模板消息
-func (w *WxTplMsgCustoms) init(isVerify bool) {
-	param := []interface{}{w.TplId}
-	wh := []string{}
-	for _, v := range w.SceneCode {
-		param = append(param, v)
-		wh = append(wh, "?")
-	}
-	list := w.Mysql.SelectBySql(`select a.sceneCode,c.firstdata,c.advertCode from scene a 
-	inner join template_message b on (a.templateId=b.id and b.templateId=? and a.sceneCode in (`+strings.Join(wh, ",")+`)) 
-	inner join template_config c on (a.id=c.sceneId and c.state=1 and c.isTest=1)`, param...)
-	all := map[string][]*WxTplMsgCustom{}
-	if list != nil {
-		for _, v := range *list {
-			sceneCode, _ := v["sceneCode"].(string)
-			sceneCode = strings.TrimSpace(sceneCode)
-			firstdata, _ := v["firstdata"].(string)
-			firstdata = strings.TrimSpace(firstdata)
-			advertCode, _ := v["advertCode"].(string)
-			advertCode = strings.TrimSpace(advertCode)
-			if sceneCode == "" || firstdata == "" {
-				continue
-			}
-			all[sceneCode] = append(all[sceneCode], &WxTplMsgCustom{
-				FirstData:  firstdata,
-				AdvertCode: advertCode,
-			})
-		}
-	}
-	for k, v := range all {
-		if len(v) > 0 {
-			w.All.Store(k, v)
-		}
-	}
-	w.All.Range(func(key, value interface{}) bool {
-		v, _ := value.([]*WxTplMsgCustom)
-		for _, vv := range v {
-			logger.Info("微信自定义模板消息 id", w.TplId, "场景代码", key, "广告位代码", vv.AdvertCode, "firstData", vv.FirstData)
-		}
-		return true
-	})
-	for _, v := range w.SceneCode {
-		if len(all[v]) == 0 {
-			msg := fmt.Sprintf("微信自定义模板消息 id %s 场景代码 %s 配置异常", w.TplId, v)
-			if isVerify {
-				log.Fatalln(msg)
-			} else {
-				logger.Error(msg)
-			}
-		}
-	}
-
-}
-
-/* 随机获取自定义模板消息
- * @Param sceneCode 场景代码
- */
-func (w *WxTplMsgCustoms) Get(sceneCode string) *WxTplMsgCustom {
-	value, ok := w.All.Load(sceneCode)
-	if !ok {
-		return nil
-	}
-	values, _ := value.([]*WxTplMsgCustom)
-	if len(values) == 0 {
-		return nil
-	}
-	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	return values[r.Intn(len(values))]
-}

public/src/projecter/match.go

@@ -1,169 +0,0 @@
-package projecter
-
-import (
-	"fmt"
-	. "mongodb"
-	. "p"
-	"qfw/util"
-	"qfw/util/elastic"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/donnie4w/go-logger/logger"
-)
-
-type ProjectMatcher interface {
-	Unique(u *UserInfo) string
-	UpSetAppend(u *UserInfo) map[string]interface{}
-}
-
-type Project struct {
-	Id                    string
-	List_last_publishtime int64
-}
-
-type Match struct {
-	Pushspace_project       string
-	RelationProjectPoolSize int
-	LoadProjectPoolSize     int
-	ProjectBatch            int
-	Mgo_Log                 *MongodbSim
-	AllProject              *sync.Map
-	Unique                  string
-}
-
-//关联项目
-func (m *Match) Execute(projectMatcher ProjectMatcher, projectUser *map[*UserInfo]*[]string, myMatchId *map[string]map[string]bool) {
-	logger.Info("开始关联项目。。。")
-	index := 0
-	var updateproject [][]map[string]interface{}
-	//
-	userPool := make(chan bool, m.RelationProjectPoolSize)
-	searchPool := make(chan bool, m.LoadProjectPoolSize)
-	userWaitGroup := &sync.WaitGroup{}
-	lock := &sync.Mutex{}
-	for k, v := range *projectUser {
-		userPool <- true
-		userWaitGroup.Add(1)
-		go func(u *UserInfo, _ids *[]string) {
-			defer util.Catch()
-			defer func() {
-				<-userPool
-				userWaitGroup.Done()
-			}()
-			newIds := []string{}
-			unique := projectMatcher.Unique(u)
-			needLength := int64(RelationProjectLimit - len((*myMatchId)[unique]))
-			searchWaitGroup := &sync.WaitGroup{}
-			for _, _id := range *_ids {
-				if (*myMatchId)[unique] == nil || !(*myMatchId)[unique][_id] {
-					if surplus := atomic.AddInt64(&needLength, -1); surplus <= 0 {
-						continue
-					}
-				}
-				if _, ok := m.AllProject.Load(_id); ok {
-					continue
-				}
-				newIds = append(newIds, _id)
-				if len(newIds) == m.ProjectBatch {
-					searchPool <- true
-					searchWaitGroup.Add(1)
-					go func(searchIds []string) {
-						defer util.Catch()
-						defer func() {
-							<-searchPool
-							searchWaitGroup.Done()
-						}()
-						m.searchProjectBatch(searchIds)
-					}(newIds)
-					newIds = []string{}
-				}
-			}
-			searchWaitGroup.Wait()
-			if len(newIds) > 0 {
-				m.searchProjectBatch(newIds)
-				newIds = []string{}
-			}
-			for _, _id := range *_ids {
-				var list_last_publishtime int64
-				projectId := ""
-				if value, ok := m.AllProject.Load(_id); ok {
-					project, _ := value.(*Project)
-					projectId = project.Id
-					list_last_publishtime = project.List_last_publishtime
-				} else {
-					continue
-				}
-				if projectId == "" || list_last_publishtime <= 0 {
-					continue
-				}
-				lock.Lock()
-				upSet := map[string]interface{}{
-					"projectid":      projectId,
-					"infoid":         _id,
-					"maxpublishtime": list_last_publishtime,
-					"subtypes":       u.SubSet.Subtypes,
-					"createtime":     time.Now().Unix(),
-				}
-				for uk, uv := range projectMatcher.UpSetAppend(u) {
-					upSet[uk] = uv
-				}
-				updateproject = append(updateproject, []map[string]interface{}{
-					map[string]interface{}{
-						"projectid": projectId,
-						m.Unique:    unique,
-					},
-					map[string]interface{}{
-						"$set": upSet,
-					},
-				})
-				if len(updateproject) == Mgo_BulkSize {
-					m.Mgo_Log.UpSertMultiBulk(m.Pushspace_project, true, true, updateproject...)
-					updateproject = [][]map[string]interface{}{}
-				}
-				lock.Unlock()
-			}
-		}(k, v)
-		userWaitGroup.Wait()
-		index++
-		if index%500 == 0 {
-			logger.Info("关联项目：", index)
-		}
-	}
-	if len(updateproject) > 0 {
-		m.Mgo_Log.UpSertMultiBulk(m.Pushspace_project, true, true, updateproject...)
-		updateproject = [][]map[string]interface{}{}
-	}
-	logger.Info("关联项目结束。。。", index)
-}
-
-//
-func (m *Match) searchProjectBatch(_ids []string) {
-	_idMap := map[string]bool{}
-	for _, v := range _ids {
-		_idMap[v] = true
-	}
-	projects := elastic.Get(Es_Projectset, Es_Projectset, fmt.Sprintf(Es_ProjectQuery, `"`+strings.Join(_ids, `","`)+`"`, len(_ids)))
-	if projects == nil || len(*projects) == 0 {
-		return
-	}
-	for _, v := range *projects {
-		list, _ := v["list"].([]interface{})
-		if len(list) == 0 {
-			continue
-		}
-		list_last, _ := list[len(list)-1].(map[string]interface{})
-		for _, vv := range list {
-			vvMap, _ := vv.(map[string]interface{})
-			if infoid := util.ObjToString(vvMap["infoid"]); _idMap[infoid] {
-				m.AllProject.Store(infoid, &Project{
-					Id:                    util.ObjToString(v["_id"]),
-					List_last_publishtime: util.Int64All(list_last["publishtime"]),
-				})
-				break
-			}
-		}
-	}
-}

public/src/projecter/push.go

@@ -1,360 +0,0 @@
-package projecter
-
-import (
-	"fmt"
-	. "mongodb"
-	. "p"
-	"qfw/util"
-	"qfw/util/elastic"
-	"qfw/util/redis"
-	"sort"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/donnie4w/go-logger/logger"
-)
-
-type Pusher interface {
-	Filter(unique string) (bool, []interface{}, *UserInfo)
-	SaveToMysql(u *UserInfo, matchInfos *SortList, jobTime *time.Time) int64
-	PushInfoKey(u *UserInfo, infoId string) string
-	DayCountKey(u *UserInfo, ymd string) string
-	ChildUserInfo(unique interface{}, parent *UserInfo) (*UserInfo, bool)
-}
-
-const (
-	projectQuery       = `{"query":{"filtered":{"filter":{"bool":{"must":[{"range":{"pici":{"gt":%d,"lte":%d}}}]}}}}%s}`
-	projectPagingQuery = `,"_source":["_id","list"],"from":%d,"size":%d`
-)
-
-type Push struct {
-	Mgo_Bidding             *MongodbSim
-	Mgo_Log                 *MongodbSim
-	ProjectPushPoolSize     int
-	ProjectPublishTimeLimit int64
-	Mgo_Log_DbName          string
-	Mgo_Bidding_DbName      string
-	Mgo_Bidding_Collection  string
-	MaxPushSize             int
-	MaxLoadProjectCount     int
-	ProjectPagingSize       int
-	Pici                    int64
-	LoadProjectPoolSize     int
-	ProjectRetainDay        int
-	ProjectBatch            int
-	TestQuery               map[string]interface{}
-	MaxRelationProject      int
-	Pushspace_project       string
-	Unique                  string
-	SelectField             map[string]interface{}
-	ProjectCount            map[string]int
-}
-
-func (p *Push) Execute(pusher Pusher) int64 {
-	defer util.Catch()
-	now := time.Now()
-	todayEnd := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, time.Local)
-	unix := now.Unix()
-	projectLength, projects := p.loadProject(unix)
-	if projectLength > 0 {
-		startId := ""
-		batchIndex := 0
-		//
-		pushPool := make(chan bool, p.ProjectPushPoolSize)
-		pushWait := &sync.WaitGroup{}
-		ymd := util.NowFormat(util.Date_yyyyMMdd)
-		for {
-			p.ProjectCount = map[string]int{}
-			batchIndex++
-			batchCount, datas := p.loadPushspace_project(batchIndex, &startId)
-			logger.Info("开始第", batchIndex, "次关联项目匹配。。。")
-			index := 0
-			for k, v := range *datas {
-				pushPool <- true
-				pushWait.Add(1)
-				go func(ue string, list []map[string]interface{}) {
-					defer util.Catch()
-					defer func() {
-						<-pushPool
-						pushWait.Done()
-					}()
-					isFilter, uniques, parent := pusher.Filter(ue)
-					if isFilter {
-						p.Delete(ue)
-						return
-					}
-					hasUpdate := false
-					for _, unique := range uniques {
-						sortList := &SortList{}
-						length := 0
-						i := len(list)
-						oneHasUpdate := false
-						userInfo, isMain := pusher.ChildUserInfo(unique, parent)
-						for {
-							var updateProject [][]map[string]interface{}
-							for i > 0 {
-								i--
-								myInfoId := util.ObjToString(list[i]["infoid"])
-								pi, ok := projects.Load(myInfoId)
-								if !ok {
-									continue
-								}
-								subtypes, _ := list[i]["subtypes"].([]interface{})
-								maxPublishTime := util.Int64All(list[i]["maxpublishtime"])
-								userSubtype := map[string]bool{}
-								for _, t := range subtypes {
-									userSubtype[util.ObjToString(t)] = true
-								}
-								//
-								project, _ := pi.(map[string]interface{})
-								project_list, _ := project["list"].([]interface{})
-								var publishTime int64
-								for _, pl := range project_list {
-									plm, _ := pl.(map[string]interface{})
-									publishTime = util.Int64All(plm["publishtime"])
-									infoId, _ := plm["infoid"].(string)
-									if publishTime <= maxPublishTime {
-										continue
-									} else if unix-publishTime > p.ProjectPublishTimeLimit { //发布时间7天之内
-										continue
-									} else if subtype, _ := plm["subtype"].(string); len(userSubtype) > 0 && !userSubtype[subtype] {
-										continue
-									} else if infoId == myInfoId {
-										continue
-									}
-									isExists, err := redis.Exists(Pushcache_2_a, pusher.PushInfoKey(userInfo, infoId))
-									if err != nil {
-										logger.Error("推送信息判重出错", err)
-										continue
-									} else if isExists {
-										continue
-									}
-									length++
-									//满足条件，可以推送
-									info := map[string]interface{}{}
-									for _, field := range SaveBiddingField {
-										if field == "_id" || plm[field] == nil {
-											continue
-										}
-										info[field] = plm[field]
-									}
-									info["_id"] = infoId
-									info["attachment_count"] = GetAttachmentCountById(p.Mgo_Bidding, p.Mgo_Bidding_DbName, p.Mgo_Bidding_Collection, infoId)
-									*sortList = append(*sortList, &MatchInfo{Info: &info})
-								}
-								if !hasUpdate && isMain && publishTime > maxPublishTime {
-									updateProject = append(updateProject, []map[string]interface{}{
-										map[string]interface{}{
-											"_id": list[i]["_id"],
-										},
-										map[string]interface{}{
-											"$set": map[string]interface{}{
-												"maxpublishtime": publishTime,
-											},
-										},
-									})
-									if len(updateProject) == Mgo_BulkSize {
-										break
-									}
-								}
-							}
-							if len(updateProject) > 0 {
-								if p.Mgo_Log.UpSertMultiBulk(p.Pushspace_project, true, true, updateProject...) {
-									oneHasUpdate = true
-								}
-							}
-							if len(updateProject) < Mgo_BulkSize {
-								break
-							}
-						}
-						if oneHasUpdate {
-							hasUpdate = true
-						}
-						if length == 0 {
-							continue
-						}
-						sort.Sort(*sortList)
-						dayCountKey := pusher.DayCountKey(userInfo, ymd)
-						dayCount, err := redis.GetNewInt(Pushcache_2_a, dayCountKey)
-						maxPushSize := userInfo.SubSet.MaxPushSize
-						if maxPushSize <= 0 {
-							maxPushSize = p.MaxPushSize
-						}
-						if err != nil {
-							logger.Error(unique, "redis中获取当天推送总数出错", err)
-							continue
-						} else if dayCount >= maxPushSize {
-							continue
-						}
-						needCount := maxPushSize - dayCount
-						if length > needCount {
-							length = needCount
-						}
-						saveArray := make(SortList, length)
-						for sk, sl := range *sortList {
-							saveArray[length-1-sk] = sl
-							if sk == length-1 {
-								break
-							}
-						}
-						jobTime := time.Now()
-						if jobTime.After(todayEnd) {
-							jobTime = todayEnd
-						}
-						if pushDate := pusher.SaveToMysql(userInfo, &saveArray, &jobTime); pushDate > 0 {
-							redis.Put(Pushcache_2_a, dayCountKey, dayCount+length, OneDaySecond)
-							for _, v := range saveArray {
-								redis.Put(Pushcache_2_a, pusher.PushInfoKey(userInfo, util.ObjToString((*v.Info)["_id"])), 1, OneDaySecond)
-							}
-						}
-					}
-				}(k, v)
-				index++
-				if index%500 == 0 {
-					logger.Info("第", batchIndex, "次关联项目匹配：", index)
-				}
-			}
-			pushWait.Wait()
-			logger.Info("第", batchIndex, "次关联项目匹配结束", index)
-			if batchCount < p.ProjectBatch {
-				p.ProjectCount = map[string]int{}
-				break
-			}
-		}
-	}
-	p.Clear()
-	return unix
-}
-
-//分批次加载pushspace_project表数据
-func (p *Push) loadPushspace_project(batchIndex int, startId *string) (int, *map[string][]map[string]interface{}) {
-	query := map[string]interface{}{}
-	if *startId != "" {
-		query["_id"] = map[string]interface{}{
-			"$lt": StringTOBsonId(*startId),
-		}
-	}
-	if p.TestQuery != nil {
-		for k, v := range p.TestQuery {
-			query[k] = v
-		}
-	}
-	// query = map[string]interface{}{
-	// 	"_id": StringTOBsonId("628602aff1583c11b8cab58b"),
-	// }
-	logger.Info("开始加载第", batchIndex, "批关联项目", query)
-	index := 0
-	//一个用户最多加载最新的一万个关联项目
-	datas := map[string][]map[string]interface{}{}
-	sess := p.Mgo_Log.GetMgoConn()
-	defer p.Mgo_Log.DestoryMongoConn(sess)
-	it := sess.DB(p.Mgo_Log_DbName).C(p.Pushspace_project).Find(query).Select(p.SelectField).Sort("-_id").Iter()
-	for temp := make(map[string]interface{}); it.Next(&temp); {
-		unique, _ := temp[p.Unique].(string)
-		*startId = BsonIdToSId(temp["_id"])
-		if p.ProjectCount[unique] < p.MaxRelationProject {
-			datas[unique] = append(datas[unique], temp)
-		}
-		p.ProjectCount[unique] = p.ProjectCount[unique] + 1
-		index++
-		if index == p.ProjectBatch {
-			break
-		}
-		temp = make(map[string]interface{})
-	}
-	logger.Info("第", batchIndex, "批关联项目加载结束", index, *startId)
-	return index, &datas
-}
-
-//加载项目数据
-func (p *Push) loadProject(unix int64) (int64, *sync.Map) {
-	defer util.Catch()
-	projectMap := &sync.Map{}
-	query := fmt.Sprintf(projectQuery, p.Pici, unix, "")
-	//query = `{"query":{"filtered":{"filter":{"bool":{"must":[{"term": {"id": "5cef4c36a5cb26b9b7498a4c"}}]}}}}}`
-	logger.Info("开始加载项目。。。", query)
-	count := int(elastic.Count(Es_Projectset, Es_Projectset, query))
-	logger.Info("需要加载项目", count, "条")
-	if count == 0 {
-		return 0, projectMap
-	} else if count > p.MaxLoadProjectCount {
-		count = p.MaxLoadProjectCount
-		logger.Info("需要加载的项目数超过限制，只加载", p.MaxLoadProjectCount, "条")
-	}
-	onceSize := p.ProjectPagingSize //ES一次查询这么多条
-	if onceSize > count {
-		onceSize = count
-	}
-	totalPage := int((count + onceSize - 1) / onceSize)
-	logger.Info("加载项目一共", totalPage, "页")
-	loadPool := make(chan bool, p.LoadProjectPoolSize)
-	loadWait := &sync.WaitGroup{}
-	var length int64
-	for t := 0; t < 3; t++ {
-		projectMap = &sync.Map{}
-		for i := 0; i < totalPage; i++ {
-			loadPool <- true
-			loadWait.Add(1)
-			go func(start int) {
-				defer util.Catch()
-				defer func() {
-					<-loadPool
-					loadWait.Done()
-				}()
-				size := onceSize
-				if start == totalPage-1 && count%onceSize != 0 {
-					size = count % onceSize
-				}
-				pagingQuery := fmt.Sprintf(projectQuery, p.Pici, unix, fmt.Sprintf(projectPagingQuery, start*onceSize, size))
-				//pagingQuery = `{"query":{"filtered":{"filter":{"bool":{"must":[{"term": {"id": "5cef4c36a5cb26b9b7498a4c"}}]}}}}` + fmt.Sprintf(projectPagingQuery, start*onceSize, size) + `}`
-				logger.Info("加载项目", "开始加载第", start+1, "页数据", pagingQuery)
-				r := elastic.Get(Es_Projectset, Es_Projectset, pagingQuery)
-				if r == nil {
-					return
-				}
-				for _, v := range *r {
-					length = atomic.AddInt64(&length, 1)
-					list, _ := v["list"].([]interface{})
-					for _, vv := range list {
-						vv_map, _ := vv.(map[string]interface{})
-						infoid, _ := vv_map["infoid"].(string)
-						projectMap.Store(infoid, v)
-					}
-				}
-				logger.Info("加载项目", "第", start+1, "页数据加载完成")
-			}(i)
-		}
-		loadWait.Wait()
-		if int(length) >= count-5 {
-			break
-		}
-		logger.Info("加载项目", "第", t, "次加载数据完成，数据总数", length, "，由于数据量不够，重新加载")
-	}
-	logger.Info("加载项目结束。。。", length)
-	return length, projectMap
-}
-
-//清理三个月前的数据
-func (p *Push) Clear() {
-	logger.Info("开始清理过期的关联项目数据。。。")
-	sess := p.Mgo_Log.GetMgoConn()
-	defer p.Mgo_Log.DestoryMongoConn(sess)
-	_, err := sess.DB(p.Mgo_Log_DbName).C(p.Pushspace_project).RemoveAll(map[string]interface{}{
-		"createtime": map[string]interface{}{
-			"$lt": time.Now().AddDate(0, 0, -p.ProjectRetainDay).Unix(),
-		},
-	})
-	if err != nil {
-		logger.Error("清理过期的关联项目数据错误", err)
-	} else {
-		logger.Info("清理过期的关联项目数据结束。。。")
-	}
-}
-
-//删除
-func (p *Push) Delete(unique string) {
-	sess := p.Mgo_Log.GetMgoConn()
-	defer p.Mgo_Log.DestoryMongoConn(sess)
-	sess.DB(p.Mgo_Log_DbName).C(p.Pushspace_project).RemoveAll(map[string]interface{}{p.Unique: unique})
-}

public/src/pusher/push.go

@@ -1,91 +0,0 @@
-package pusher
-
-import (
-	. "db"
-	"fmt"
-	. "mongodb"
-	. "p"
-	"qfw/util"
-	"qfw/util/mail"
-	"strings"
-	"time"
-
-	"github.com/donnie4w/go-logger/logger"
-)
-
-var VarPush = &Push{}
-
-type Push struct {
-	Mgo      *MongodbSim
-	DbName   string
-	CollName string
-}
-
-func (p *Push) AfterPush(ids []interface{}) {
-	if err := MyMgo.DelBulk(p.Mgo, nil, p.DbName, p.CollName, &ids); err != nil {
-		logger.Error("推送任务", ids, "删除出错", err)
-	}
-}
-
-/*获取一批次推送的数据
- *batchIndex < 0 不走分批次加载
- */
-func (p *Push) GetPushDatas(taskType, batchIndex, pushBatch int, startId *string, unique string, query map[string]interface{}) (bool, *map[string]*PushInfo) {
-	logger.Info(taskType, p.CollName, "开始加载第", batchIndex, "批用户", query)
-	users := map[string]*PushInfo{}
-	i := 0
-	sess := p.Mgo.GetMgoConn()
-	defer p.Mgo.DestoryMongoConn(sess)
-	it := sess.DB(p.DbName).C(p.CollName).Find(query).Sort(unique).Iter()
-	prevUnique := ""
-	for temp := make(map[string]interface{}); it.Next(&temp); {
-		thisUnique := fmt.Sprint(temp[unique])
-		if batchIndex > 0 && i >= pushBatch && prevUnique != thisUnique {
-			break
-		}
-		i++
-		*startId = thisUnique
-		pushInfo := users[thisUnique]
-		if pushInfo == nil {
-			pushInfo = &PushInfo{Info: temp}
-		} else {
-			oldList, _ := pushInfo.Info["list"].([]interface{})
-			newList, _ := temp["list"].([]interface{})
-			newList = append(newList, oldList...)
-			pushInfo.Info["list"] = newList
-		}
-		pushInfo.Ids = append(pushInfo.Ids, temp["_id"])
-		users[thisUnique] = pushInfo
-		prevUnique = thisUnique
-		temp = make(map[string]interface{})
-	}
-	logger.Info(taskType, p.CollName, "第", batchIndex, "批用户加载结束", *startId)
-	return batchIndex < 0 || i < pushBatch, &users
-}
-
-//获取当前有效的推送模式
-func (p *Push) ValieRateModes(pushWeek string, pushDay int) []int {
-	now := time.Now()
-	rateMode := []int{}
-	if strings.ToLower(now.Weekday().String()) == strings.ToLower(pushWeek) {
-		rateMode = append(rateMode, 3)
-	}
-	if now.Day() == pushDay {
-		rateMode = append(rateMode, 4)
-	}
-	return rateMode
-}
-
-//推送邮件
-func (p *Push) SendMail(isPushMail bool, mailSleep int, gmails []*mail.GmailAuth, email, title, html string) bool {
-	defer util.Catch()
-	if !isPushMail || len(gmails) == 0 {
-		return true
-	}
-	if mailSleep > 0 {
-		time.Sleep(time.Duration(mailSleep) * time.Millisecond)
-	}
-	return mail.PollingMail(email, gmails, func(gmail *mail.GmailAuth) bool {
-		return mail.GSendMail("剑鱼标讯", email, "", "", title, html, "", "", gmail)
-	})
-}

pushNicheinsight/src/config/config.go

@@ -2,11 +2,11 @@ package config
 
 import (
 	"log"
-	m "mongodb"
-	"qfw/util"
-	qu "qfw/util"
-	"qfw/util/mysql"
-	qrpc "qfw/util/rpc"
+	m "app.yhyue.com/moapp/jybase/mongodb"
+	util "app.yhyue.com/moapp/jybase/common"
+	qu util "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/mysql"
+	qrpc "app.yhyue.com/moapp/jybase/rpc"
 )
 
 var Conf SysConfig

pushNicheinsight/src/push/push.go

@@ -4,9 +4,9 @@ package push
 import (
 	"config"
 	"log"
-	"mongodb"
-	qu "qfw/util"
-	qrpc "qfw/util/rpc"
+	"app.yhyue.com/moapp/jybase/mongodb"
+	qu "app.yhyue.com/moapp/jybase/common"
+	qrpc "app.yhyue.com/moapp/jybase/rpc"
 	"regexp"
 )
 

pushRemind/src/conf/conf.go

@@ -1,7 +1,7 @@
 package conf
 
 import (
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 )
 
 var MSysConfig SysConfig

pushRemind/src/main.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"push"
 	"qfw/util/mongodb"
-	"qfw/util/redis"
+	"app.yhyue.com/moapp/jybase/redis"
 	"time"
 )
 

pushRemind/src/push/push.go

@@ -7,9 +7,9 @@ import (
 	"log"
 	"math/rand"
 	"net/rpc"
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 	"qfw/util/mongodb"
-	"qfw/util/redis"
+	"app.yhyue.com/moapp/jybase/redis"
 	"strconv"
 	"strings"
 	"time"

pushUserTag/src/config/config.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	qutil "qfw/util"
+	qutil "app.yhyue.com/moapp/jybase/common"
 )
 
 type config struct {

pushUserTag/src/db/db.go

@@ -2,9 +2,9 @@ package db
 
 import (
 	"log"
-	m "mongodb"
-	"qfw/util"
-	"qfw/util/redis"
+	m "app.yhyue.com/moapp/jybase/mongodb"
+	util "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/redis"
 )
 
 type dbConf struct {

pushUserTag/src/service/service.go

@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
-	qu "qfw/util"
-	"qfw/util/redis"
+	qu "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/redis"
 	"time"
 	"util"
 )

pushentchange/src/match/config/config.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 )
 
 type config struct {

pushentchange/src/match/db/db.go

@@ -2,11 +2,11 @@ package db
 
 import (
 	"log"
-	m "mongodb"
-	. "p"
-	"qfw/util"
-	"qfw/util/mysql"
-	"qfw/util/redis"
+	m "app.yhyue.com/moapp/jybase/mongodb"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	util "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/mysql"
+	"app.yhyue.com/moapp/jybase/redis"
 )
 
 var (

pushentchange/src/match/job/matchjob.go

@@ -4,10 +4,10 @@ import (
 	. "match/config"
 	. "match/db"
 	. "match/matcher"
-	. "mongodb"
-	. "p"
+	. "app.yhyue.com/moapp/jybase/mongodb"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 	"sync"
 	"time"
 

pushentchange/src/match/job/movejob.go

@@ -6,7 +6,7 @@ import (
 	. "match/db"
 	. "mover"
 	. "public"
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 
 	"github.com/donnie4w/go-logger/logger"
 )

pushentchange/src/match/job/timetask.go

@@ -2,7 +2,7 @@ package job
 
 import (
 	. "match/config"
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 	"time"
 
 	"github.com/donnie4w/go-logger/logger"

pushentchange/src/match/matcher/membermatch.go

@@ -3,9 +3,9 @@ package matcher
 import (
 	. "match/config"
 	. "match/db"
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 	"strings"
 	"sync"
 	"time"

pushentchange/src/public/entity.go

@@ -1,9 +1,9 @@
 package public
 
 import (
-	. "mongodb"
-	. "p"
-	"qfw/util"
+	. "app.yhyue.com/moapp/jybase/mongodb"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	util "app.yhyue.com/moapp/jybase/common"
 	"strings"
 
 	"github.com/donnie4w/go-logger/logger"

pushentchange/src/public/util.go

@@ -3,9 +3,9 @@ package public
 import (
 	"encoding/json"
 	"fmt"
-	. "mongodb"
-	. "p"
-	"qfw/util"
+	. "app.yhyue.com/moapp/jybase/mongodb"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	util "app.yhyue.com/moapp/jybase/common"
 	"sort"
 )
 

pushentchange/src/push/config/config.go

@@ -1,8 +1,8 @@
 package config
 
 import (
-	"qfw/util"
-	"qfw/util/mail"
+	util "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/mail"
 	"strings"
 )
 

pushentchange/src/push/db/db.go

@@ -2,11 +2,11 @@ package public
 
 import (
 	"log"
-	m "mongodb"
-	. "p"
-	"qfw/util"
-	"qfw/util/mysql"
-	"qfw/util/redis"
+	m "app.yhyue.com/moapp/jybase/mongodb"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	util "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/mysql"
+	"app.yhyue.com/moapp/jybase/redis"
 )
 
 type dbConf struct {

pushentchange/src/push/job/pushjob.go

@@ -4,13 +4,13 @@ package job
 import (
 	"fmt"
 	"net/http"
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
 	. "push/config"
 	. "push/pusher"
 	putil "push/util"
-	. "pusher"
-	"qfw/util"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/pusher"
+	util "app.yhyue.com/moapp/jybase/common"
 	"strconv"
 	"strings"
 	"sync"

pushentchange/src/push/job/timetask.go

@@ -1,7 +1,7 @@
 package job
 
 import (
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "push/config"
 )
 

pushentchange/src/push/pusher/normalpush.go

@@ -1,12 +1,12 @@
 package pusher
 
 import (
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
 	. "push/config"
 	. "push/db"
 	putil "push/util"
-	. "pusher"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/pusher"
 	"time"
 
 	"github.com/donnie4w/go-logger/logger"

pushentchange/src/push/pusher/pusher.go

@@ -1,7 +1,7 @@
 package pusher
 
 import (
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
 )
 

pushentchange/src/push/util/entity.go

@@ -2,7 +2,7 @@ package util
 
 import (
 	"fmt"
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
 	. "push/config"
 

pushentchange/src/push/util/rpccall.go

@@ -2,7 +2,7 @@ package util
 
 import (
 	. "push/config"
-	qrpc "qfw/util/rpc"
+	qrpc "app.yhyue.com/moapp/jybase/rpc"
 	"time"
 )
 

pushentchange/src/push/util/util.go

@@ -1,9 +1,9 @@
 package util
 
 import (
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 )
 
 //根据pushspace表中的数据，生成FollowInfo

pushentniche/go.mod

@@ -0,0 +1,35 @@
+module pushentniche
+
+go 1.18
+
+require (
+	app.yhyue.com/moapp/jybase v0.0.0-20221229074840-790b25997170
+	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230112093611-b3e540c58c8b
+	github.com/donnie4w/go-logger v0.0.0-20170827050443-4740c51383f4
+)
+
+require (
+	app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d // indirect
+	github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f // indirect
+	github.com/garyburd/redigo v1.6.2 // indirect
+	github.com/go-sql-driver/mysql v1.6.0 // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	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/klauspost/compress v1.13.6 // indirect
+	github.com/olivere/elastic v6.2.37+incompatible // 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
+	github.com/xdg-go/stringprep v1.0.2 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
+	go.mongodb.org/mongo-driver v1.9.1 // indirect
+	golang.org/x/crypto v0.0.0-20210920023735-84f357641f63 // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+	gorm.io/driver/mysql v1.0.5 // indirect
+	gorm.io/gorm v1.21.3 // indirect
+)

pushentniche/go.sum

@@ -0,0 +1,830 @@
+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-20221229074840-790b25997170 h1:gjx6+x7P1Vp/++OyfuEdR3Bcjj4/HrgIaRnE1cMTP3k=
+app.yhyue.com/moapp/jybase v0.0.0-20221229074840-790b25997170/go.mod h1:efAeRPDpJ13JuNODuqtfLlKQSQgCbnUcwGPzhFU5krY=
+bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230112093611-b3e540c58c8b h1:xsAIY4AT8h1OtAi0c90zHlhq8L2dLKpB3O9fHhoPu/0=
+bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230112093611-b3e540c58c8b/go.mod h1:UKLwPLx9be595yaiIwqqdKSloKK/Kdf/wTLr4XUClV0=
+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=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
+github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
+github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M=
+github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
+github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
+github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
+github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
+github.com/ClickHouse/clickhouse-go/v2 v2.2.0/go.mod h1:8f2XZUi7XoeU+uPIytSi1cvx8fmJxi7vIgqpvYTF1+o=
+github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/Shopify/sarama v1.30.0/go.mod h1:zujlQQx1kzHsh4jfV1USnptCQrHAEZ2Hk8fTKCulPVs=
+github.com/Shopify/toxiproxy/v2 v2.1.6-0.20210914104332-15ea381dcdae/go.mod h1:/cvHQkZ1fst0EmZnA5dFtiQdWCNCFYzb+uE2vqVgvx0=
+github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
+github.com/alicebob/miniredis/v2 v2.22.0/go.mod h1:XNqvJdQJv5mSuVMc0ynneafpnL/zv52acZ6kqeS0t88=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/aws/aws-sdk-go v1.35.20/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/coscms/tagfast v0.0.0-20150925144250-2b69b2496250/go.mod h1:zX8vynptAghuV/KG8BOZlDeo4DsTKWfBQ154RWlkay0=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f h1:q/DpyjJjZs94bziQ7YkBmIlpqbVP7yw179rnzoNVX1M=
+github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f/go.mod h1:QGrK8vMWWHQYQ3QU9bw9Y9OPNfxccGzfb41qjvVeXtY=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
+github.com/donnie4w/go-logger v0.0.0-20170827050443-4740c51383f4 h1:T9PR91sjTtrA1HmZB4G+M7OLCelch0f6rIEY7Mm1T4U=
+github.com/donnie4w/go-logger v0.0.0-20170827050443-4740c51383f4/go.mod h1:L7S4x0R7vv3xoOhGuyAJyCO2MYzWOpccM4Isn8jIUgY=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
+github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
+github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
+github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+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/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=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/garyburd/redigo v1.6.2 h1:yE/pwKCrbLpLpQICzYTeZ7JsTA/C53wFTJHaEtRqniM=
+github.com/garyburd/redigo v1.6.2/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
+github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
+github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
+github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/gomodule/redigo v1.8.9 h1:Sl3u+2BI/kk+VEatbj0scLdrFhjPmbxOc1myhDP41ws=
+github.com/gomodule/redigo v1.8.9/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
+github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
+github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/howeyc/fsnotify v0.9.0/go.mod h1:41HzSPxBGeFRQKEEwgh49TRw/nKBsYZ2cF1OzPjSJsA=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
+github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
+github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
+github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
+github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc=
+github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E=
+github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
+github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/justinas/alice v1.2.0/go.mod h1:fN5HRH/reO/zrUflLfTN43t3vXvKzvZIENsNEe7i7qA=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mkevac/debugcharts v0.0.0-20191222103121-ae1c48aa8615/go.mod h1:Ad7oeElCZqA1Ufj0U9/liOF4BtVepxRcTvr2ey7zTvM=
+github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+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/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=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
+github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
+github.com/openzipkin/zipkin-go v0.4.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ=
+github.com/paulmach/orb v0.7.1/go.mod h1:FWRlTgl88VI1RBx/MkrwWDRhQ96ctqMCh8boXhmqB/A=
+github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY=
+github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI=
+github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
+github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
+github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/rabbitmq/amqp091-go v1.1.0/go.mod h1:ogQDLSOACsLPsIq0NpbtiifNZi2YOz0VTJ0kHRghqbM=
+github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shirou/gopsutil v2.19.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
+github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/smartystreets/assertions v1.1.1/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
+github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
+github.com/smartystreets/gunit v1.4.2/go.mod h1:ZjM1ozSIMJlAz/ay4SG8PeKF00ckUp+zMHZXV9/bvak=
+github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
+github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
+github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
+github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
+github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
+github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
+github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
+github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w=
+github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
+github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc=
+github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
+github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+github.com/zeromicro/go-zero v1.3.5/go.mod h1:wh4o794b7Ul3W0k35Pw9nc3iB4O0OpaQTMQz/PJc1bc=
+go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
+go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
+go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
+go.mongodb.org/mongo-driver v1.9.1 h1:m078y9v7sBItkt1aaoe2YlvWEXcD263e1a4E1fBrJ1c=
+go.mongodb.org/mongo-driver v1.9.1/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
+go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM=
+go.opentelemetry.io/otel/exporters/jaeger v1.8.0/go.mod h1:GbWg+ng88rDtx+id26C34QLqw2erqJeAjsCx9AFeHfE=
+go.opentelemetry.io/otel/exporters/zipkin v1.8.0/go.mod h1:0uYAyCuGT67MFV9Z/Mmx93wGuugHw0FbxMc74fs3LNo=
+go.opentelemetry.io/otel/sdk v1.8.0/go.mod h1:uPSfc+yfDH2StDM/Rm35WE8gXSNdvCg023J6HeGNO0c=
+go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU=
+go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/automaxprocs v1.5.1/go.mod h1:BF4eumQw0P9GtnuxxovUd06vwm1o18oMzFtK66vU6XU=
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
+go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
+go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20210920023735-84f357641f63 h1:kETrAMYZq6WVGPa8IIixL0CaEcIUNi+1WX7grUoi3y8=
+golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191220220014-0732a990476f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220411224347-583f2d630306/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20220602131408-e326c6e8e9c8/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
+google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
+gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
+gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/mysql v1.0.5 h1:WAAmvLK2rG0tCOqrf5XcLi2QUwugd4rcVJ/W3aoon9o=
+gorm.io/driver/mysql v1.0.5/go.mod h1:N1OIhHAIhx5SunkMGqWbGFVeh4yTNWKmMo1GOAsohLI=
+gorm.io/gorm v1.21.3 h1:qDFi55ZOsjZTwk5eN+uhAmHi8GysJ/qCTichM/yO7ME=
+gorm.io/gorm v1.21.3/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+k8s.io/api v0.22.9/go.mod h1:rcjO/FPOuvc3x7nQWx29UcDrFJMx82RxDob71ntNH4A=
+k8s.io/apimachinery v0.22.9/go.mod h1:ZvVLP5iLhwVFg2Yx9Gh5W0um0DUauExbRhe+2Z8I1EU=
+k8s.io/client-go v0.22.9/go.mod h1:IoH7exYnoH/zgvHOuVxh2c4yJepcCBt72FzCTisOc4k=
+k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
+k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
+k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
+k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20220706174534-f6158b442e7c/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
+sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

pushentniche/src/match/config.json → pushentniche/match/config.json

@@ -1,5 +1,5 @@
 {
-	"testQuery":{"entid":1},
+	"testQuery":{"i_entid":14636},
 	"testUserIds":[3870],
 	"matchPoolSize":60,
 	"savePoolSize":5,
@@ -7,7 +7,8 @@
 	"mergePoolSize":40,
 	"moveBatch":1000,
 	"moveDuration":30,
-	"maxPushSize":50000,
+	"maxPushSize":150,
+	"nicheMaxPushSize":50000,
 	"disMaxPushSize":2000,
 	"vipMaxPushSize":2000,
 	"memberMaxPushSize":3000,
@@ -25,6 +26,5 @@
 	"loadProjectPoolSize":5,
 	"projectPagingSize":400,
 	"maxLoadProjectCount":50000,
-	"projectPublishTimeLimit":99999999,
-	"loadEntProductUsersPoolSize":10
+	"projectPublishTimeLimit":99999999
 }

pushentniche/match/config/config.go

@@ -0,0 +1,60 @@
+package config
+
+import (
+	"regexp"
+
+	util "app.yhyue.com/moapp/jybase/common"
+)
+
+type config struct {
+	TestQuery               map[string]interface{} `json:"testQuery"`
+	TestUserIds             []int                  `json:"testUserIds"`
+	MatchPoolSize           int                    `json:"matchPoolSize"`
+	SavePoolSize            int                    `json:"savePoolSize"`
+	MatchDuration           int64                  `json:"matchDuration"`
+	MergePoolSize           int                    `json:"mergePoolSize"`
+	MoveBatch               int                    `json:"moveBatch"`
+	MoveDuration            int64                  `json:"moveDuration"`
+	MaxPushSize             int                    `json:"maxPushSize"`
+	NicheMaxPushSize        int                    `json:"nicheMaxPushSize"`
+	DisMaxPushSize          int                    `json:"disMaxPushSize"`
+	VipMaxPushSize          int                    `json:"vipMaxPushSize"`
+	MemberMaxPushSize       int                    `json:"memberMaxPushSize"`
+	NotMatchHour            []int                  `json:"notMatchHour"`
+	MaxCustomer             int64                  `json:"maxCustomer"`
+	ProjectBatch            int                    `json:"projectBatch"`
+	RelationProjectPoolSize int                    `json:"relationProjectPoolSize"`
+	ProjectRetainDay        int                    `json:"projectRetainDay"`
+	ProjectPushBatch        int                    `json:"projectPushBatch"`
+	ProjectSavePoolSize     int                    `json:"projectSavePoolSize"`
+	ProjectSaveSleep        int                    `json:"projectSaveSleep"`
+	ProjectPushTime         string                 `json:"projectPushTime"`
+	MaxRelationProject      int                    `json:"maxRelationProject"`
+	ProjectPushPoolSize     int                    `json:"projectPushPoolSize"`
+	LoadProjectPoolSize     int                    `json:"loadProjectPoolSize"`
+	ProjectPagingSize       int                    `json:"projectPagingSize"`
+	MaxLoadProjectCount     int                    `json:"maxLoadProjectCount"`
+	ProjectPublishTimeLimit int64                  `json:"projectPublishTimeLimit"`
+}
+
+type taskConfig struct {
+	Pici int64 `json:"pici"`
+}
+
+type projectTask struct {
+	Pici int64 `json:"pici"`
+}
+
+var (
+	Config      *config
+	TaskConfig  *taskConfig
+	ProjectTask *projectTask
+	FilterReg   *regexp.Regexp
+	RetainReg   *regexp.Regexp
+)
+
+func init() {
+	util.ReadConfig("./config.json", &Config)
+	util.ReadConfig("./task.json", &TaskConfig)
+	util.ReadConfig("./projecttask.json", &ProjectTask)
+}

pushentniche/src/match/db/db.go → pushentniche/match/db/db.go

@@ -2,12 +2,13 @@ package public
 
 import (
 	"log"
-	m "mongodb"
-	. "p"
-	"qfw/util"
-	"qfw/util/elastic"
-	"qfw/util/mysql"
-	"qfw/util/redis"
+
+	util "app.yhyue.com/moapp/jybase/common"
+	elastic "app.yhyue.com/moapp/jybase/esv1"
+	m "app.yhyue.com/moapp/jybase/mongodb"
+	"app.yhyue.com/moapp/jybase/mysql"
+	"app.yhyue.com/moapp/jybase/redis"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 )
 
 var (

pushentniche/src/match/job/job.go → pushentniche/match/job/job.go

@@ -1,11 +1,12 @@
 package job
 
 import (
-	. "match/config"
-	. "match/db"
-	. "projecter"
-	. "public"
+	. "pushentniche/match/config"
+	. "pushentniche/match/db"
+	. "pushentniche/public"
 	"sync"
+
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/projecter"
 )
 
 type Job interface {

pushentniche/src/match/job/matchjob.go → pushentniche/match/job/matchjob.go

@@ -2,18 +2,19 @@ package job
 
 import (
 	"fmt"
-	. "match/config"
-	. "match/db"
-	. "matcher"
-	. "p"
-	. "projecter"
-	. "public"
-	"qfw/util"
+	. "pushentniche/match/config"
+	. "pushentniche/match/db"
+	. "pushentniche/public"
 	"sort"
 	"strings"
 	"sync"
 	"time"
 
+	util "app.yhyue.com/moapp/jybase/common"
+	. "app.yhyue.com/moapp/jybase/date"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/matcher"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/projecter"
 	"github.com/donnie4w/go-logger/logger"
 )
 
@@ -52,9 +53,9 @@ func (m *MatchJob) Execute() {
 
 func (m *MatchJob) Start(datas *[]map[string]interface{}) {
 	defer util.Catch()
-	_, userEpu, entEpu, epus := LoadEntProductUsers(Mysql, Config.TestUserIds)
+	_, userEpu, _, _ := LoadEntProductUsers(Mysql, Config.TestUserIds)
 	m.userEpu = userEpu
-	InitEnt(Mysql, Mgo, DbConf.Mongodb.Main.DbName, Config.TestQuery, entEpu)
+	InitEnt(Mysql, Mgo, DbConf.Mongodb.Main.DbName, Config.TestQuery)
 	allSubSet := NewPayUser()
 	//标题匹配
 	title_key := make(map[string]*[]*UserInfo)
@@ -70,11 +71,7 @@ func (m *MatchJob) Start(datas *[]map[string]interface{}) {
 		Key_user:    &detail_key,
 		Notkey_user: &detail_notkey,
 	}
-	m.LoadMySubSet(entEpu, allSubSet, title_pjob, detail_pjob)
-	for k, _ := range LoadEntProductSubSet(Mgo, Config.LoadEntProductUsersPoolSize, epus) {
-		allSubSet.Users[k] = true
-		m.InitSubSet(allSubSet, k, title_pjob, detail_pjob)
-	}
+	m.LoadMySubSet(allSubSet, title_pjob, detail_pjob)
 	//
 	title_pjob.CreateDaf()
 	detail_pjob.CreateDaf()
@@ -87,7 +84,7 @@ func (m *MatchJob) Start(datas *[]map[string]interface{}) {
 }
 
 //商机管理产品我的订阅设置
-func (m *MatchJob) LoadMySubSet(epu map[int]*UserInfo, allSubSet *PayUser, title_pjob, detail_pjob *KeyDfa) {
+func (m *MatchJob) LoadMySubSet(allSubSet *PayUser, title_pjob, detail_pjob *KeyDfa) {
 	defer util.Catch()
 	sess := Mgo.GetMgoConn()
 	defer Mgo.DestoryMongoConn(sess)
@@ -101,6 +98,9 @@ func (m *MatchJob) LoadMySubSet(epu map[int]*UserInfo, allSubSet *PayUser, title
 		"i_deptid":   1,
 		"i_userid":   1,
 		"o_entniche": 1,
+		"i_status":   1,
+		"l_endtime":  1,
+		"i_type":     1,
 	}).Iter()
 	for temp := make(map[string]interface{}); it.Next(&temp); {
 		entId := util.IntAll(temp["i_entid"])
@@ -110,14 +110,22 @@ func (m *MatchJob) LoadMySubSet(epu map[int]*UserInfo, allSubSet *PayUser, title
 			continue
 		}
 		var entName string
-		if epu[entId] != nil {
-			entName = epu[entId].Entniche.EntName
-		} else if Ents[entId] != nil {
+		if Ents[entId] != nil {
 			entName = Ents[entId].Name
 		} else {
 			logger.Info("没有找到该企业，过滤掉", entId)
 			continue
 		}
+		user := &UserInfo{
+			Entniche: &Entniche{
+				EntId:   entId,
+				EntName: entName,
+				DeptId:  deptId,
+				UserId:  userId,
+				IsNew:   1,
+			},
+		}
+		subSetType := util.IntAll(temp["i_type"])
 		if deptId != 0 {
 			if EntDepts[deptId] == nil {
 				logger.Info("没有找到该部门，过滤掉", entName, entId, deptId)
@@ -130,32 +138,50 @@ func (m *MatchJob) LoadMySubSet(epu map[int]*UserInfo, allSubSet *PayUser, title
 			if EntUsers[userId] == nil {
 				logger.Info("没有找到该用户，过滤掉", entName, entId, userId)
 				continue
-			} else if EntUsers[userId].Power == 0 {
-				logger.Info("该用户没有权限，过滤掉", entName, entId, userId)
+			}
+			if subSetType == 0 {
+				if EntUsers[userId].Power == 0 {
+					logger.Info("没有商机管理权限，过滤掉", entName, entId, userId)
+					continue
+				}
+				user.NicheStatus = 1
+			} else if subSetType == 1 {
+				if m.userEpu[userId] == nil || util.Int64All(temp["l_endtime"]) < time.Now().Unix() {
+					logger.Info("超级订阅/大会员已到期，过滤掉", entName, entId, userId)
+					continue
+				}
+				user.MemberStatus = m.userEpu[userId].MemberStatus
+				user.VipStatus = m.userEpu[userId].VipStatus
+			} else if subSetType == 2 {
+				if EntUsers[userId].Power == 1 || (m.userEpu[userId] != nil && (m.userEpu[userId].VipStatus == 1 || m.userEpu[userId].MemberStatus == 1)) {
+					logger.Info("不是免费订阅，过滤掉", entName, entId, userId)
+					continue
+				}
+			} else {
 				continue
 			}
+			user.Phone = EntUsers[userId].Phone
 		}
 		subSet, _ := temp["o_entniche"].(map[string]interface{})
-		if subSet == nil || len(subSet) == 0 {
-			logger.Info("商机管理产品我的订阅设置为空，过滤掉", entName, entId, deptId, userId)
-			continue
+		if subSetType == 2 {
+			user.SubSet = GetSubSet(true, fmt.Sprint(userId), subSet)
+		} else {
+			user.SubSet = GetSubSet(false, fmt.Sprint(userId), subSet)
 		}
-		user := &UserInfo{
-			Entniche: &Entniche{
-				EntId:   entId,
-				EntName: entName,
-				DeptId:  deptId,
-				UserId:  userId,
-				IsNew:   1,
-			},
-			SubSet: GetSubSet(false, fmt.Sprint(userId), subSet),
+		if m.userEpu[userId] != nil && m.userEpu[userId].MemberStatus == 1 && subSetType == 1 {
+			user.SubSet.RateMode = util.IntAllDef(subSet["i_ratemode"], 1)
+		}
+		if subSetType == 2 && len(user.SubSet.Keys) == 0 {
+			logger.Info("过滤掉，没有关键词", entName, entId, deptId, userId)
+			continue
+		} else if subSetType != 2 && len(user.SubSet.Keys) == 0 && user.SubSet.Subtype == nil && user.SubSet.Area == nil && user.SubSet.Buyerclass == nil {
+			logger.Info("没有订阅，过滤掉", entName, entId, deptId, userId)
+			continue
 		}
 		if user.SubSet.MailPush == -1 {
 			user.SubSet.MailPush = 1
 		}
-		if Ents[entId] != nil {
-			user.Entniche.IsNew = Ents[entId].IsNew
-		}
+		user.Entniche.IsNew = Ents[entId].IsNew
 		if deptId == 0 {
 			if EntUserDept[userId] != nil {
 				user.Entniche.DeptId = EntUserDept[userId].DeptId
@@ -165,7 +191,6 @@ func (m *MatchJob) LoadMySubSet(epu map[int]*UserInfo, allSubSet *PayUser, title
 		}
 		logger.Info("加载商机管理产品我的订阅设置", "entId", entId, "entName", entName, "userId", userId, "wxPush", user.SubSet.WxPush, "appPush", user.SubSet.AppPush, "mailPush", user.SubSet.MailPush, "rateMode", user.SubSet.RateMode, "matchWay", user.SubSet.MatchWay)
 		if userId != 0 { //个人订阅
-			user.Phone = EntUsers[user.Entniche.UserId].Phone
 			m.InitSubSet(allSubSet, user, title_pjob, detail_pjob)
 			allSubSet.Users[user] = true
 		} else { //企业/部门订阅
@@ -346,7 +371,7 @@ func (m *MatchJob) ToMatch(matcher Matcher, datas *[]map[string]interface{}) {
 				saveWaitGroup.Done()
 			}()
 			isLimit := Mysql.CountBySql(`select count(1) as count from entniche_customer where ent_id=?`, user.Entniche.EntId) > Config.MaxCustomer
-			nowFormat := util.NowFormat(util.Date_Full_Layout)
+			nowFormat := NowFormat(Date_Full_Layout)
 			customer_count, update_customer_count := 0, 0
 			customer_array, update_customer_array := []interface{}{}, []int64{}
 			contactMap := map[string]bool{}
@@ -456,7 +481,7 @@ func (m *MatchJob) ToMatch(matcher Matcher, datas *[]map[string]interface{}) {
 				publishtimeFormat := nowFormat
 				publishtime := util.Int64All((*v2.Info)["publishtime"])
 				if publishtime > 0 {
-					publishtimeFormat = util.FormatDateByInt64(&publishtime, util.Date_Full_Layout)
+					publishtimeFormat = FormatDateByInt64(&publishtime, Date_Full_Layout)
 				}
 				if project_id > 0 {
 					if !project_repeat[project_id] {
@@ -644,6 +669,7 @@ func (m *MatchJob) ToMatch(matcher Matcher, datas *[]map[string]interface{}) {
 						"onlypush":     ui_v.Entniche.OnlyPush,
 						"vipstatus":    ui_v.VipStatus,
 						"memberstatus": ui_v.MemberStatus,
+						"nichestatus":  ui_v.NicheStatus,
 						"s_m_openid":   ui_v.S_m_openid,
 						"subscribe":    ui_v.Subscribe,
 						"applystatus":  ui_v.ApplyStatus,
@@ -707,7 +733,7 @@ func (m *MatchJob) SaveCustomerContact(array *[]interface{}) {
 //批量更新客户
 func (m *MatchJob) UpdateCustomer(array *[]int64) {
 	ws := []string{}
-	args := []interface{}{util.NowFormat(util.Date_Full_Layout)}
+	args := []interface{}{NowFormat(Date_Full_Layout)}
 	for _, v := range *array {
 		ws = append(ws, "?")
 		args = append(args, v)

pushentniche/src/match/job/movejob.go → pushentniche/match/job/movejob.go

@@ -3,14 +3,14 @@ package job
 
 import (
 	"fmt"
-	. "match/config"
-	. "match/db"
-	. "mover"
-	. "p"
-	. "public"
-	"qfw/util"
+	. "pushentniche/match/config"
+	. "pushentniche/match/db"
+	. "pushentniche/public"
 	"strings"
 
+	util "app.yhyue.com/moapp/jybase/common"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/mover"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	"github.com/donnie4w/go-logger/logger"
 )
 

pushentniche/src/match/job/projectjob.go → pushentniche/match/job/projectjob.go

@@ -2,15 +2,15 @@
 package job
 
 import (
-	. "match/config"
-	. "match/db"
-	. "p"
-	. "projecter"
-	. "public"
-	"qfw/util"
+	. "pushentniche/match/config"
+	. "pushentniche/match/db"
+	. "pushentniche/public"
 	"strings"
 	"time"
 
+	util "app.yhyue.com/moapp/jybase/common"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/projecter"
 	"github.com/donnie4w/go-logger/logger"
 )
 
@@ -110,8 +110,7 @@ func (p *ProjectPushJob) Execute() {
 		ClearEnt()
 	}()
 	logger.Info("开始关联项目推送任务。。。")
-	_, _, entEpu, _ := LoadEntProductUsers(Mysql, Config.TestUserIds)
-	InitEnt(Mysql, Mgo, DbConf.Mongodb.Main.DbName, Config.TestQuery, entEpu)
+	InitEnt(Mysql, Mgo, DbConf.Mongodb.Main.DbName, Config.TestQuery)
 	push := &Push{
 		Mgo_Bidding:             Mgo_Bidding,
 		Mgo_Log:                 Mgo_Log,

pushentniche/src/match/job/timetask.go → pushentniche/match/job/timetask.go

@@ -1,9 +1,10 @@
 package job
 
 import (
-	. "match/config"
-	. "p"
-	"qfw/util"
+	. "pushentniche/match/config"
+
+	util "app.yhyue.com/moapp/jybase/common"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 )
 
 type TimeTask struct {

pushsubscribe/src/match/main.go → pushentniche/match/main.go

@@ -4,8 +4,9 @@ package main
 import (
 	"flag"
 	"log"
-	"match/job"
-	. "public"
+	_ "pushentniche/match/db"
+	"pushentniche/match/job"
+	. "pushentniche/public"
 
 	"github.com/donnie4w/go-logger/logger"
 )

pushentniche/src/public/entity.go → pushentniche/public/entity.go

@@ -1,12 +1,13 @@
 package public
 
 import (
-	. "mongodb"
-	. "p"
-	"qfw/util"
-	"qfw/util/mysql"
 	"sort"
 
+	util "app.yhyue.com/moapp/jybase/common"
+	. "app.yhyue.com/moapp/jybase/date"
+	. "app.yhyue.com/moapp/jybase/mongodb"
+	"app.yhyue.com/moapp/jybase/mysql"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	"github.com/donnie4w/go-logger/logger"
 )
 
@@ -28,7 +29,7 @@ func (s UisSortByRateMode) Swap(i, j int) {
 func NewUserInfo(Mgo *MongodbSim, ui *UserInfo) UisSortByRateMode {
 	var users *[]map[string]interface{}
 	var ok bool
-	field := `{"_id":1,"base_user_id":1,"s_m_openid":1,"i_applystatus":1,"i_ispush":1,"s_jpushid":1,"s_opushid":1,"s_appponetype":1,"o_entniche":1,"i_member_status":1,"i_vip_status":1,"o_vipjy":1,"o_member_jy":1}`
+	field := `{"_id":1,"base_user_id":1,"s_m_openid":1,"i_applystatus":1,"i_ispush":1,"s_jpushid":1,"s_opushid":1,"s_appponetype":1}`
 	if ui.Id != "" {
 		var user *map[string]interface{}
 		user, ok = Mgo.FindById(Mgo_User, ui.Id, field)
@@ -71,6 +72,7 @@ func NewUserInfo(Mgo *MongodbSim, ui *UserInfo) UisSortByRateMode {
 			},
 			MemberStatus: ui.MemberStatus,
 			VipStatus:    ui.VipStatus,
+			NicheStatus:  ui.NicheStatus,
 			BaseUserId:   util.Int64All(v["base_user_id"]),
 			Jpushid:      util.ObjToString(v["s_jpushid"]),
 			Opushid:      util.ObjToString(v["s_opushid"]),
@@ -79,66 +81,18 @@ func NewUserInfo(Mgo *MongodbSim, ui *UserInfo) UisSortByRateMode {
 			Subscribe:    util.IntAllDef(v["i_ispush"], 1),
 			S_m_openid:   util.ObjToString(v["s_m_openid"]),
 		}
-		if ui.MemberStatus == 1 {
-			if util.IntAll(v["i_member_status"]) <= 0 {
-				logger.Info("分发的用户，不是大会员", u.Entniche.EntName, u.Entniche.EntId, u.Entniche.DeptId, u.Entniche.UserId, u.Phone, u.Id)
-				continue
-			}
-			obj, _ := v["o_member_jy"].(map[string]interface{})
-			u.SubSet = GetSubSet(false, u.Id, obj)
-			if ui.SubSet != nil {
-				u.SubSet = &SubSet{
-					RateMode:    ui.SubSet.RateMode,
-					WxPush:      ui.SubSet.WxPush,
-					AppPush:     ui.SubSet.AppPush,
-					MailPush:    ui.SubSet.MailPush,
-					Email:       ui.Entniche.Mail,
-					Keys:        ui.SubSet.Keys,
-					MaxPushSize: u.SubSet.MaxPushSize,
-					MaxMailSize: u.SubSet.MaxMailSize,
-				}
-			}
-		} else if ui.VipStatus == 1 {
-			if util.IntAll(v["i_vip_status"]) <= 0 {
-				logger.Info("分发的用户，超级订阅", u.Entniche.EntName, u.Entniche.EntId, u.Entniche.DeptId, u.Entniche.UserId, u.Phone, u.Id)
-				continue
-			}
-			obj, _ := v["o_vipjy"].(map[string]interface{})
-			u.SubSet = GetSubSet(false, u.Id, obj)
-			if ui.SubSet != nil {
-				u.SubSet = &SubSet{
-					RateMode:    ui.SubSet.RateMode,
-					WxPush:      ui.SubSet.WxPush,
-					AppPush:     ui.SubSet.AppPush,
-					MailPush:    ui.SubSet.MailPush,
-					Email:       ui.Entniche.Mail,
-					Keys:        ui.SubSet.Keys,
-					MaxPushSize: u.SubSet.MaxPushSize,
-					MaxMailSize: u.SubSet.MaxMailSize,
-				}
-			}
-		} else {
-			u.SubSet = &SubSet{
-				RateMode:    ui.SubSet.RateMode,
-				WxPush:      ui.SubSet.WxPush,
-				AppPush:     ui.SubSet.AppPush,
-				MailPush:    ui.SubSet.MailPush,
-				Email:       ui.Entniche.Mail,
-				Keys:        ui.SubSet.Keys,
-				MaxPushSize: ui.SubSet.MaxPushSize,
-				MaxMailSize: ui.SubSet.MaxMailSize,
-			}
-			if v["o_entniche"] != nil {
-				o_entniche, _ := v["o_entniche"].(map[string]interface{})
-				u.SubSet.RateMode = util.IntAllDef(o_entniche["i_ratemode"], 2)
-				u.SubSet.WxPush = util.IntAllDef(o_entniche["i_wxpush"], 1)
-				u.SubSet.AppPush = util.IntAllDef(o_entniche["i_apppush"], 1)
-				u.SubSet.MailPush = util.IntAll(o_entniche["i_mailpush"])
-				u.SubSet.Email = util.ObjToString(o_entniche["s_email"])
-			}
-			if !MailReg.MatchString(u.SubSet.Email) {
-				u.SubSet.MailPush = 0
-			}
+		u.SubSet = &SubSet{
+			RateMode:    ui.SubSet.RateMode,
+			WxPush:      ui.SubSet.WxPush,
+			AppPush:     ui.SubSet.AppPush,
+			MailPush:    ui.SubSet.MailPush,
+			Email:       ui.Entniche.Mail,
+			Keys:        ui.SubSet.Keys,
+			MaxPushSize: ui.SubSet.MaxPushSize,
+			MaxMailSize: ui.SubSet.MaxMailSize,
+		}
+		if !MailReg.MatchString(u.SubSet.Email) {
+			u.SubSet.MailPush = 0
 		}
 		logger.Info("mongodb中找到该用户", u.Entniche.EntName, u.Entniche.EntId, u.Entniche.DeptId, u.Entniche.UserId, u.Id, u.Phone, u.S_m_openid, u.Jpushid, u.Opushid, u.AppPhoneType, "Subscribe", u.Subscribe, "ApplyStatus", "ApplyStatus", u.ApplyStatus, "RateMode", u.SubSet.RateMode, "WxPush", u.SubSet.WxPush, "AppPush", u.SubSet.AppPush, "MailPush", u.SubSet.MailPush, "Email", u.SubSet.Email, "MatchWay", u.SubSet.MatchWay, "Matchbuyerclass_other", u.SubSet.Matchbuyerclass_other)
 		us = append(us, u)
@@ -161,7 +115,7 @@ type Ent struct {
 }
 
 func InitEnts(Mysql *mysql.Mysql) {
-	list := Mysql.SelectBySql("select id,model,name,isNew,dept_subscribe from entniche_info where status=1 and model in (1,2) and power_source is null")
+	list := Mysql.SelectBySql("select id,model,name,isNew,dept_subscribe from entniche_info")
 	if list == nil {
 		return
 	}
@@ -189,8 +143,8 @@ type EntUser struct {
 }
 
 func InitEntUsers(Mysql *mysql.Mysql) {
-	list := Mysql.SelectBySql(`select a.id,a.name,a.mail,a.phone,a.power from entniche_user a
-		inner join entniche_info b on (b.status=1 and b.model in (1,2) and b.power_source is null and a.ent_id=b.id)`)
+	list := Mysql.SelectBySql(`select a.id,a.name,a.mail,a.phone,if(b.status=1,a.power,0) as power from entniche_user a
+		inner join entniche_info b on (a.ent_id=b.id)`)
 	if list == nil {
 		return
 	}
@@ -319,7 +273,7 @@ func InitEntRuleUsers(Mysql *mysql.Mysql) {
 			select 1 from entniche_user b inner join entniche_info c on (c.status=1 and c.model in (1,2) and c.power_source is null and b.ent_id=c.id) where a.user_id=b.id
 		) or exists( select 1 from entniche_wait_empower b
 			inner join entniche_power c on (b.end_time>? and c.status=1 and b.id=c.wait_empower_id) where a.user_id=c.ent_user_id
-		)`, util.NowFormat(util.Date_Full_Layout))
+		)`, NowFormat(Date_Full_Layout))
 	if list == nil {
 		return
 	}
@@ -350,7 +304,7 @@ type EntDistribute struct {
 	Items      []string
 }
 
-func InitEntDistribute(mgo *MongodbSim, dbName string, testQuery map[string]interface{}, epu map[int]*UserInfo) {
+func InitEntDistribute(mgo *MongodbSim, dbName string, testQuery map[string]interface{}) {
 	query := map[string]interface{}{
 		"i_status": map[string]interface{}{"$ne": 1},
 	}

pushentniche/src/public/util.go → pushentniche/public/util.go

@@ -1,16 +1,16 @@
 package public
 
 import (
-	. "cache"
 	"fmt"
-	. "mongodb"
-	. "p"
-	"qfw/util"
-	. "qfw/util/mysql"
 	"strings"
-	"sync"
 	"time"
 
+	util "app.yhyue.com/moapp/jybase/common"
+	. "app.yhyue.com/moapp/jybase/date"
+	. "app.yhyue.com/moapp/jybase/mongodb"
+	. "app.yhyue.com/moapp/jybase/mysql"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/cache"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	"github.com/donnie4w/go-logger/logger"
 )
 
@@ -36,47 +36,53 @@ var (
 
 //一天的推送总数
 func DayCountKey(ymd string, u *UserInfo) string {
-	key := "entniche_daycount_%s_%d"
+	key := "entniche_daycount_%s_%d_free"
 	if u.Entniche.IsDis == 1 {
-		key += "_dis"
+		key = "entniche_daycount_%s_%d_dis"
 	} else if u.MemberStatus == 1 {
-		key += "_member"
+		key = "entniche_daycount_%s_%d_member"
 	} else if u.VipStatus == 1 {
-		key += "_vip"
+		key = "entniche_daycount_%s_%d_vip"
+	} else if u.NicheStatus == 1 {
+		key = "entniche_daycount_%s_%d"
 	}
 	return fmt.Sprintf(key, ymd, u.Entniche.UserId)
 }
 
 //是否分发推送
 func HasDisPushKey(u *UserInfo) string {
-	return fmt.Sprintf("entniche_haspush_%s_%d_dis", util.NowFormat(util.Date_yyyyMMdd), u.Entniche.UserId)
+	return fmt.Sprintf("entniche_haspush_%s_%d_dis", NowFormat(Date_yyyyMMdd), u.Entniche.UserId)
 }
 
 //是否订阅推送
 func HasPushKey(u *UserInfo) string {
-	key := "entniche_haspush_%s_%d"
+	key := "entniche_haspush_%s_%d_free"
 	if u.MemberStatus == 1 {
-		key += "_member"
+		key = "entniche_haspush_%s_%d_member"
 	} else if u.VipStatus == 1 {
-		key += "_vip"
+		key = "entniche_haspush_%s_%d_vip"
+	} else if u.NicheStatus == 1 {
+		key = "entniche_haspush_%s_%d"
 	}
-	return fmt.Sprintf(key, util.NowFormat(util.Date_yyyyMMdd), u.Entniche.UserId)
+	return fmt.Sprintf(key, NowFormat(Date_yyyyMMdd), u.Entniche.UserId)
 }
 
 //无消息提醒
-func NoMsgTipKey(id int, memberStatus, vipStatus int) string {
-	key := "entniche_nomsgtip_%s_%d"
-	if memberStatus == 1 {
-		key += "_member"
-	} else if vipStatus == 1 {
-		key += "_vip"
+func NoMsgTipKey(u *UserInfo) string {
+	key := "entniche_nomsgtip_%s_%d_free"
+	if u.MemberStatus == 1 {
+		key = "entniche_nomsgtip_%s_%d_member"
+	} else if u.VipStatus == 1 {
+		key = "entniche_nomsgtip_%s_%d_vip"
+	} else if u.NicheStatus == 1 {
+		key = "entniche_nomsgtip_%s_%d"
 	}
-	return fmt.Sprintf(key, util.NowFormat(util.Date_yyyyMMdd), id)
+	return fmt.Sprintf(key, NowFormat(Date_yyyyMMdd), u.Entniche.UserId)
 }
 
 //今天的总推送数
 func PushCountKey() string {
-	return fmt.Sprintf("entniche_pushcount_%s", util.NowFormat(util.Date_yyyyMMdd))
+	return fmt.Sprintf("entniche_pushcount_%s", NowFormat(Date_yyyyMMdd))
 }
 
 //
@@ -86,129 +92,34 @@ func PushInfoKey(userId int, infoId string) string {
 
 //
 func GetUserType(ui *UserInfo) (string, string, string) {
-	t1 := "商机管理"
-	vipStatus, memberStatus := 0, 0
+	t1 := "剑鱼标讯"
+	nicheStatus, vipStatus, memberStatus := 0, 0, 0
 	if ui.Entniche.IsDis == 1 {
-		t1 = "剑鱼标讯"
 		memberStatus = ui.Entniche.DisMember
 		vipStatus = ui.Entniche.DisVip
 	} else {
 		memberStatus = ui.MemberStatus
 		vipStatus = ui.VipStatus
+		nicheStatus = ui.NicheStatus
 		if memberStatus == 1 {
 			t1 = "大会员"
 		} else if vipStatus == 1 {
 			t1 = "超级订阅"
+		} else if nicheStatus == 1 {
+			t1 = "商机管理"
 		}
 	}
-	t2, t3 := "entniche", "e"
+	t2, t3 := "free", "f"
 	if memberStatus == 1 {
 		t2, t3 = "member", "m"
 	} else if vipStatus == 1 {
 		t2, t3 = "vip", "v"
+	} else if nicheStatus == 1 {
+		t2, t3 = "entniche", "e"
 	}
 	return t1, t2, t3
 }
 
-//加载购买企业产品用户的订阅设置
-func LoadEntProductSubSet(mgo *MongodbSim, poolSize int, epus []*UserInfo) map[*UserInfo]bool {
-	defer util.Catch()
-	logger.Info("开始加载购买企业产品用户的订阅设置。。。")
-	pool := make(chan bool, poolSize)
-	wait := &sync.WaitGroup{}
-	lock := &sync.Mutex{}
-	result := map[*UserInfo]bool{}
-	for _, v := range epus {
-		pool <- true
-		wait.Add(1)
-		go func(ui *UserInfo) {
-			defer util.Catch()
-			defer func() {
-				<-pool
-				wait.Done()
-			}()
-			onlyPush := 0
-			list, ok := mgo.Find(Mgo_User, map[string]interface{}{"$or": []map[string]interface{}{map[string]interface{}{"s_phone": ui.Phone}, map[string]interface{}{"s_m_phone": ui.Phone}}}, nil, map[string]interface{}{
-				"_id":             1,
-				"s_m_openid":      1,
-				"i_applystatus":   1,
-				"i_ispush":        1,
-				"i_member_status": 1,
-				"o_member_jy":     1,
-				"o_vipjy":         1,
-				"i_vip_status":    1,
-				"s_jpushid":       1,
-				"s_opushid":       1,
-				"s_appponetype":   1,
-				"base_user_id":    1,
-			}, false, -1, -1)
-			if !ok || *list == nil {
-				logger.Info("购买企业产品用户", "没有找到该用户", ui.Entniche.EntName, ui.Entniche.EntId, ui.Entniche.UserId, ui.Phone)
-				return
-			}
-			for _, vv := range *list {
-				var subSet *SubSet
-				userId := BsonIdToSId(vv["_id"])
-				if ui.MemberStatus == 1 {
-					if util.IntAll(vv["i_member_status"]) <= 0 {
-						logger.Info("企业分配的大会员用户", "不是大会员，过滤掉", userId)
-						return
-					}
-					subSetobj, _ := vv["o_member_jy"].(map[string]interface{})
-					if util.IntAllDef(subSetobj["i_subscribe"], 1) != 1 {
-						logger.Info("企业分配的大会员用户", "开关状态是关闭的，过滤掉", ui.Entniche.EntName, ui.Entniche.EntId, ui.Entniche.UserId, userId, ui.Phone)
-						return
-					}
-					subSet = GetSubSet(false, userId, subSetobj)
-					subSet.RateMode = util.IntAllDef(subSetobj["i_ratemode"], 1)
-				} else if ui.VipStatus == 1 {
-					if util.IntAll(vv["i_vip_status"]) <= 0 {
-						logger.Info("企业分配的超级订阅用户", "不是超级订阅，过滤掉", ui.Entniche.EntName, ui.Entniche.EntId, ui.Entniche.UserId, userId, ui.Phone)
-						return
-					}
-					subSetobj, _ := vv["o_vipjy"].(map[string]interface{})
-					subSet = GetSubSet(false, userId, subSetobj)
-				} else {
-					logger.Info("无效的产品类型", ui.Entniche.EntName, ui.Entniche.EntId, ui.Entniche.UserId, ui.Phone, ui.Entniche.ProductType)
-					return
-				}
-				u := &UserInfo{
-					Id:           userId,
-					BaseUserId:   util.Int64All(vv["base_user_id"]),
-					Jpushid:      util.ObjToString(vv["s_jpushid"]),
-					Opushid:      util.ObjToString(vv["s_opushid"]),
-					Phone:        ui.Phone,
-					AppPhoneType: util.ObjToString(vv["s_appponetype"]),
-					ApplyStatus:  util.IntAll(vv["i_applystatus"]),
-					Subscribe:    util.IntAllDef(vv["i_ispush"], 1),
-					S_m_openid:   util.ObjToString(vv["s_m_openid"]),
-					VipStatus:    ui.VipStatus,
-					MemberStatus: ui.MemberStatus,
-					SubSet:       subSet,
-					Entniche: &Entniche{
-						EntId:       ui.Entniche.EntId,
-						EntName:     ui.Entniche.EntName,
-						DeptId:      ui.Entniche.DeptId,
-						UserId:      ui.Entniche.UserId,
-						OnlyPush:    onlyPush,
-						ProductType: ui.Entniche.ProductType,
-						PowerSource: ui.Entniche.PowerSource,
-						IsNew:       ui.Entniche.IsNew,
-					},
-				}
-				logger.Info("加载购买企业产品用户的订阅设置", u.Entniche.EntName, u.Entniche.EntId, u.Entniche.DeptId, u.Entniche.UserId, u.Id, u.Phone, u.S_m_openid, u.Jpushid, u.Opushid, u.AppPhoneType, "Subscribe", u.Subscribe, "ApplyStatus", u.ApplyStatus, "RateMode", u.SubSet.RateMode, "WxPush", u.SubSet.WxPush, "AppPush", u.SubSet.AppPush, "MailPush", u.SubSet.MailPush, "Email", u.SubSet.Email, "MatchWay", u.SubSet.MatchWay, "Matchbuyerclass_other", u.SubSet.Matchbuyerclass_other)
-				lock.Lock()
-				result[u] = true
-				lock.Unlock()
-				onlyPush = 1
-			}
-		}(v)
-	}
-	wait.Wait()
-	logger.Info("加载购买企业产品用户的订阅设置加载结束。。。", len(result))
-	return result
-}
-
 //获取分发人员
 func GetDisUser(ei *Entniche) map[int]*EntRuleUser {
 	myIds := map[int]*EntRuleUser{}
@@ -256,11 +167,11 @@ func SaveToMysql(mysql, pushMysql *Mysql, savePool chan bool, sleep int, isProje
 		time.Sleep(time.Duration(sleep) * time.Millisecond)
 	}
 	unix := time.Now().Unix()
-	ymd := util.NowFormat(util.Date_Short_Layout)
-	fullYmd := util.NowFormat(util.Date_Full_Layout)
+	ymd := NowFormat(Date_Short_Layout)
+	fullYmd := NowFormat(Date_Full_Layout)
 	if jobTime != nil {
 		unix = jobTime.Unix()
-		ymd = util.FormatDate(jobTime, util.Date_Short_Layout)
+		ymd = FormatDate(jobTime, Date_Short_Layout)
 	}
 	length := len(*matchInfos)
 	fields := []string{"entid", "deptid", "userid", "infoid", "date", "matchkeys", "type", "source", "product", "matchways", "matchitems", "disid"}
@@ -314,8 +225,10 @@ func SaveToMysql(mysql, pushMysql *Mysql, savePool chan bool, sleep int, isProje
 			values = append(values, 1)
 		} else if u.MemberStatus == 1 {
 			values = append(values, 2)
-		} else {
+		} else if u.NicheStatus == 1 {
 			values = append(values, nil)
+		} else {
+			values = append(values, 3)
 		}
 		if len(matchInfo.MatchWays) > 0 {
 			values = append(values, strings.Join(matchInfo.MatchWays, ","))
@@ -385,14 +298,14 @@ func SaveToMysql(mysql, pushMysql *Mysql, savePool chan bool, sleep int, isProje
 }
 
 //
-func InitEnt(mysql *Mysql, mgo *MongodbSim, dbName string, testQuery map[string]interface{}, epu map[int]*UserInfo) {
+func InitEnt(mysql *Mysql, mgo *MongodbSim, dbName string, testQuery map[string]interface{}) {
 	InitEnts(mysql)
 	InitEntUsers(mysql)
 	InitEntDeptUsers(mysql)
 	InitEntRuleUsers(mysql)
 	InitEntDepts(mysql)
 	InitEntDeptParents(mysql)
-	InitEntDistribute(mgo, dbName, testQuery, epu)
+	InitEntDistribute(mgo, dbName, testQuery)
 }
 
 //

pushentniche/src/push/config/config.go → pushentniche/push/config/config.go

@@ -1,10 +1,11 @@
 package config
 
 import (
-	"qfw/util"
-	"qfw/util/mail"
-	qrpc "qfw/util/rpc"
 	"strings"
+
+	util "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/mail"
+	qrpc "app.yhyue.com/moapp/jybase/rpc"
 )
 
 type config struct {
@@ -19,12 +20,14 @@ type config struct {
 		Tr                string `json:"tr"`
 		Html              string `json:"html"`
 		MaxPushSize       int    `json:"maxPushSize"`
+		NicheMaxPushSize  int    `json:"nicheMaxPushSize"`
 		DisMaxPushSize    int    `json:"disMaxPushSize"`
 		VipMaxPushSize    int    `json:"vipMaxPushSize"`
 		MemberMaxPushSize int    `json:"memberMaxPushSize"`
 	}
 	Mails                       []*pushMail            `json:"mails"`
 	MaxPushSize                 int                    `json:"maxPushSize"`
+	NicheMaxPushSize            int                    `json:"nicheMaxPushSize"`
 	DisMaxPushSize              int                    `json:"disMaxPushSize"`
 	VipMaxPushSize              int                    `json:"vipMaxPushSize"`
 	MemberMaxPushSize           int                    `json:"memberMaxPushSize"`

pushentniche/src/push/db/db.go → pushentniche/push/db/db.go

@@ -2,11 +2,12 @@ package public
 
 import (
 	"log"
-	m "mongodb"
-	. "p"
-	"qfw/util"
-	"qfw/util/mysql"
-	"qfw/util/redis"
+
+	util "app.yhyue.com/moapp/jybase/common"
+	m "app.yhyue.com/moapp/jybase/mongodb"
+	"app.yhyue.com/moapp/jybase/mysql"
+	"app.yhyue.com/moapp/jybase/redis"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 )
 
 var (

pushentniche/src/push/job/jobs.go → pushentniche/push/job/jobs.go

@@ -1,7 +1,7 @@
 package job
 
 import (
-	. "push/config"
+	. "pushentniche/push/config"
 	"sync"
 )
 

pushentniche/src/push/job/nomsgtipjob.go → pushentniche/push/job/nomsgtipjob.go

@@ -3,20 +3,21 @@ package job
 import (
 	"fmt"
 	"net/http"
-	. "p"
-	. "public"
-	. "push/config"
-	. "push/db"
-	putil "push/util"
-	. "pusher"
-	"qfw/util"
-	"qfw/util/redis"
-	qrpc "qfw/util/rpc"
+	. "pushentniche/public"
+	. "pushentniche/push/config"
+	. "pushentniche/push/db"
+	putil "pushentniche/push/util"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
+	util "app.yhyue.com/moapp/jybase/common"
+	. "app.yhyue.com/moapp/jybase/date"
+	"app.yhyue.com/moapp/jybase/redis"
+	qrpc "app.yhyue.com/moapp/jybase/rpc"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/pusher"
 	"github.com/donnie4w/go-logger/logger"
 )
 
@@ -42,15 +43,11 @@ func (n *NoMsgTipJob) Execute(taskType int) {
 		return
 	}
 	defer ClearEnt()
-	_, _, entEpu, epus := LoadEntProductUsers(Mysql, Config.TestUserIds)
-	users := LoadEntProductSubSet(Mgo, Config.LoadEntProductUsersPoolSize, epus)
-	InitEnt(Mysql, Mgo, DbConf.Mongodb.Main.DbName, Config.TestQuery, entEpu)
+	_, userEpu, _, _ := LoadEntProductUsers(Mysql, Config.TestUserIds)
+	InitEnt(Mysql, Mgo, DbConf.Mongodb.Main.DbName, Config.TestQuery)
 	pushPool := make(chan bool, Config.PushPoolSize)
 	pushWait := &sync.WaitGroup{}
-	entSubSet := n.LoadSubSet(taskType)
-	for entRule, _ := range entSubSet {
-		users[entRule] = true
-	}
+	users := n.LoadSubSet(taskType, userEpu)
 	for k, _ := range users {
 		isTake := true
 		select {
@@ -86,7 +83,7 @@ func (n *NoMsgTipJob) Execute(taskType int) {
 }
 
 //
-func (n *NoMsgTipJob) LoadSubSet(taskType int) map[*UserInfo]bool {
+func (n *NoMsgTipJob) LoadSubSet(taskType int, userEpu map[int]*UserInfo) map[*UserInfo]bool {
 	defer util.Catch()
 	entSubSet := map[*UserInfo]bool{}
 	//
@@ -109,6 +106,9 @@ func (n *NoMsgTipJob) LoadSubSet(taskType int) map[*UserInfo]bool {
 		"i_deptid":   1,
 		"i_userid":   1,
 		"o_entniche": 1,
+		"i_status":   1,
+		"l_endtime":  1,
+		"i_type":     1,
 	}).Iter()
 	for temp := make(map[string]interface{}); it.Next(&temp); {
 		userId := util.IntAll(temp["i_userid"])
@@ -123,8 +123,24 @@ func (n *NoMsgTipJob) LoadSubSet(taskType int) map[*UserInfo]bool {
 		} else if EntUsers[userId] == nil {
 			logger.Info("无消息提醒任务", taskType, "没有找到该用户，过滤掉", entName, entId, userId)
 			continue
-		} else if EntUsers[userId].Power == 0 {
-			logger.Info("无消息提醒任务", taskType, "该用户没有权限，过滤掉", entName, entId, userId)
+		}
+		subSetType := util.IntAll(temp["i_type"])
+		if subSetType == 0 {
+			if EntUsers[userId].Power == 0 {
+				logger.Info("无消息提醒任务", taskType, "没有商机管理权限，过滤掉", entName, entId, userId)
+				continue
+			}
+		} else if subSetType == 1 {
+			if userEpu[userId] == nil || util.Int64All(temp["l_endtime"]) < time.Now().Unix() {
+				logger.Info("无消息提醒任务", taskType, "超级订阅/大会员已到期，过滤掉", entName, entId, userId)
+				continue
+			}
+		} else if subSetType == 2 {
+			if EntUsers[userId].Power == 1 || (userEpu[userId] != nil && (userEpu[userId].VipStatus == 1 || userEpu[userId].MemberStatus == 1)) {
+				logger.Info("无消息提醒任务", taskType, "不是免费订阅，过滤掉", entName, entId, userId)
+				continue
+			}
+		} else {
 			continue
 		}
 		subSet, _ := temp["o_entniche"].(map[string]interface{})
@@ -139,8 +155,15 @@ func (n *NoMsgTipJob) LoadSubSet(taskType int) map[*UserInfo]bool {
 				UserId:  userId,
 				IsNew:   Ents[entId].IsNew,
 			},
-			Phone:  EntUsers[userId].Phone,
-			SubSet: GetSubSet(false, fmt.Sprint(userId), subSet),
+			Phone: EntUsers[userId].Phone,
+		}
+		if subSetType == 2 {
+			user.SubSet = GetSubSet(true, fmt.Sprint(userId), subSet)
+		} else {
+			user.SubSet = GetSubSet(false, fmt.Sprint(userId), subSet)
+		}
+		if userEpu[userId] != nil && userEpu[userId].MemberStatus == 1 && subSetType == 1 {
+			user.SubSet.RateMode = util.IntAllDef(subSet["i_ratemode"], 1)
 		}
 		newUsers := NewUserInfo(Mgo, user)
 		if newUsers != nil {
@@ -168,7 +191,7 @@ func (n *NoMsgTipJob) tip(taskType int, user *UserInfo) {
 	} else if exists {
 		logger.Info("无消息提醒任务", taskType, "redis判断今天分发推送过，过滤掉", user.Entniche.EntName, user.Entniche.EntId, user.Entniche.UserId, user.Id)
 		return
-	} else if exists, err := redis.Exists(Pushcache_2_c, NoMsgTipKey(user.Entniche.UserId, user.MemberStatus, user.VipStatus)); err != nil {
+	} else if exists, err := redis.Exists(Pushcache_2_c, NoMsgTipKey(user)); err != nil {
 		logger.Error("无消息提醒任务", taskType, "redis判断今天是否提醒过出错", err, user.Entniche.EntName, user.Entniche.EntId, user.Entniche.UserId, user.Id)
 		return
 	} else if exists {
@@ -197,7 +220,7 @@ func (n *NoMsgTipJob) tip(taskType int, user *UserInfo) {
 		logger.Info("无消息提醒任务", taskType, "mysql判断用户该时间段推送过，过滤掉", start.Unix(), now.Unix(), user.Entniche.EntName, user.Entniche.EntId, user.Entniche.UserId, user.Id)
 		return
 	}
-	redis.Put(Pushcache_2_c, NoMsgTipKey(user.Entniche.UserId, user.MemberStatus, user.VipStatus), 1, OneDaySecond)
+	redis.Put(Pushcache_2_c, NoMsgTipKey(user), 1, OneDaySecond)
 	startEndMd := fmt.Sprintf("%d月%d日", start.Month(), start.Day())
 	if endMd := fmt.Sprintf("%d月%d日", now.Month(), now.Day()); startEndMd != endMd {
 		startEndMd += "-" + endMd
@@ -269,7 +292,7 @@ func (n *NoMsgTipJob) sendWeixin(user *UserInfo, startEndMd, ut1, ut3 string) (b
 			Color: Config.NoMsgTip.Wx.Keyword3.Color,
 		},
 		"keyword4": &qrpc.TmplItem{
-			Value: util.NowFormat(util.Date_Time_Layout),
+			Value: NowFormat(Date_Time_Layout),
 			Color: Config.NoMsgTip.Wx.Keyword4.Color,
 		},
 		"remark": &qrpc.TmplItem{

pushentniche/src/push/job/pushjob.go → pushentniche/push/job/pushjob.go

@@ -4,19 +4,20 @@ package job
 import (
 	"fmt"
 	"net/http"
-	. "p"
-	. "public"
-	. "push/config"
-	. "push/db"
-	. "push/pusher"
-	putil "push/util"
-	. "pusher"
-	"qfw/util"
-	qrpc "qfw/util/rpc"
+	. "pushentniche/public"
+	. "pushentniche/push/config"
+	. "pushentniche/push/db"
+	. "pushentniche/push/pusher"
+	putil "pushentniche/push/util"
 	"strconv"
 	"sync"
 	"time"
 
+	util "app.yhyue.com/moapp/jybase/common"
+	. "app.yhyue.com/moapp/jybase/date"
+	qrpc "app.yhyue.com/moapp/jybase/rpc"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/pusher"
 	"github.com/donnie4w/go-logger/logger"
 )
 
@@ -75,8 +76,8 @@ func (p *PushJob) StartPush(pusher Pusher, taskType int) {
 	//
 	pushPool := make(chan bool, Config.PushPoolSize)
 	pushWait := &sync.WaitGroup{}
-	_, entUserEpu, entEpu, _ := LoadEntProductUsers(Mysql, Config.TestUserIds)
-	InitEnt(Mysql, Mgo, DbConf.Mongodb.Main.DbName, Config.TestQuery, entEpu)
+	_, entUserEpu, _, _ := LoadEntProductUsers(Mysql, Config.TestUserIds)
+	InitEnt(Mysql, Mgo, DbConf.Mongodb.Main.DbName, Config.TestQuery)
 	for {
 		batchIndex++
 		isBreak, users := pusher.OncePushBatch(taskType, batchIndex, &userId)
@@ -110,16 +111,16 @@ func (p *PushJob) StartPush(pusher Pusher, taskType int) {
 					pusher.AfterPush(delPushResult, v.Ids)
 					return
 				}
+				if Ents[ui.Entniche.EntId] == nil {
+					logger.Info("没有找到该企业，过滤掉", ui.Entniche.EntName, ui.Entniche.EntId)
+					pusher.AfterPush(delPushResult, v.Ids)
+					return
+				} else if EntUsers[ui.Entniche.UserId] == nil {
+					logger.Info("没有找到该员工，过滤掉", ui.Entniche.EntName, ui.Entniche.EntId, ui.Entniche.UserId)
+					pusher.AfterPush(delPushResult, v.Ids)
+					return
+				}
 				if ui.Entniche.IsDis == 1 {
-					if entEpu[ui.Entniche.EntId] == nil && Ents[ui.Entniche.EntId] == nil {
-						logger.Info("分发规则没有找到该企业，过滤掉", ui.Entniche.EntName, ui.Entniche.EntId)
-						pusher.AfterPush(delPushResult, v.Ids)
-						return
-					} else if entUserEpu[ui.Entniche.UserId] == nil && EntUsers[ui.Entniche.UserId] == nil {
-						logger.Info("分发规则没有找到该员工，过滤掉", ui.Entniche.EntName, ui.Entniche.EntId, ui.Entniche.UserId)
-						pusher.AfterPush(delPushResult, v.Ids)
-						return
-					}
 					if entUserEpu[ui.Entniche.UserId] != nil {
 						ui.Entniche.DisMember = entUserEpu[ui.Entniche.UserId].MemberStatus
 						ui.Entniche.DisVip = entUserEpu[ui.Entniche.UserId].VipStatus
@@ -136,12 +137,8 @@ func (p *PushJob) StartPush(pusher Pusher, taskType int) {
 						pusher.AfterPush(delPushResult, v.Ids)
 						return
 					}
-				} else {
-					if EntUsers[ui.Entniche.UserId] == nil {
-						logger.Error("没有找到该员工，过滤掉", ui.Entniche.EntName, ui.Entniche.EntId, ui.Entniche.UserId)
-						pusher.AfterPush(delPushResult, v.Ids)
-						return
-					} else if EntUsers[ui.Entniche.UserId].Power == 0 {
+				} else if ui.NicheStatus == 1 {
+					if EntUsers[ui.Entniche.UserId].Power == 0 {
 						logger.Error("该员工没有权限，过滤掉", ui.Entniche.EntName, ui.Entniche.EntId, ui.Entniche.UserId)
 						pusher.AfterPush(delPushResult, v.Ids)
 						return
@@ -268,7 +265,7 @@ func (p *PushJob) sendWeixin(k *UserInfo, pushParam *PushParam, ut1, ut2 string)
 			keyword3_value = "全国"
 		}
 	}
-	keyword4_value := util.NowFormat(util.Date_Time_Layout)
+	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)))
 	tmplData := map[string]*qrpc.TmplItem{
 		"first": &qrpc.TmplItem{

pushentniche/src/push/job/timetask.go → pushentniche/push/job/timetask.go

@@ -1,13 +1,14 @@
 package job
 
 import (
-	. "p"
-	. "push/config"
-	. "pusher"
-	"qfw/util"
+	. "pushentniche/push/config"
 	"sort"
 	"strings"
 	"time"
+
+	util "app.yhyue.com/moapp/jybase/common"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/pusher"
 )
 
 type TimeTask struct{}

pushentniche/src/push/main.go → pushentniche/push/main.go

@@ -4,10 +4,10 @@ package main
 import (
 	"flag"
 	"log"
-	. "public"
-	_ "push/db"
-	. "push/job"
-	"push/util"
+	. "pushentniche/public"
+	_ "pushentniche/push/db"
+	. "pushentniche/push/job"
+	"pushentniche/push/util"
 
 	"github.com/donnie4w/go-logger/logger"
 )

pushentniche/src/push/pusher/normalpush.go → pushentniche/push/pusher/normalpush.go

@@ -1,18 +1,19 @@
 package pusher
 
 import (
-	. "db"
 	"encoding/json"
-	. "p"
-	. "public"
-	. "push/config"
-	. "push/db"
-	. "push/util"
-	. "pusher"
-	"qfw/util"
-	"qfw/util/redis"
+	. "pushentniche/public"
+	. "pushentniche/push/config"
+	. "pushentniche/push/db"
+	. "pushentniche/push/util"
 	"time"
 
+	util "app.yhyue.com/moapp/jybase/common"
+	. "app.yhyue.com/moapp/jybase/date"
+	"app.yhyue.com/moapp/jybase/redis"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/db"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/pusher"
 	"github.com/donnie4w/go-logger/logger"
 )
 
@@ -101,6 +102,7 @@ func (n *NormalPush) GetUserInfo(m map[string]interface{}) *UserInfo {
 		S_m_openid:   util.ObjToString(m["s_m_openid"]),
 		VipStatus:    util.IntAll(m["vipstatus"]),
 		MemberStatus: util.IntAll(m["memberstatus"]),
+		NicheStatus:  util.IntAll(m["nichestatus"]),
 		WxTplMsg:     wxTplMsg,
 	}
 	if ui.SubSet.MaxPushSize <= 0 {
@@ -140,7 +142,7 @@ func (n *NormalPush) AfterPush(pushResult *PushResult, ids []interface{}) {
 	}).AfterPush(ids)
 }
 func (n *NormalPush) GetPushParam(mailPush bool, u *UserInfo, sl *SortList) *PushParam {
-	dayCount := redis.GetInt(Pushcache_2_a, DayCountKey(util.NowFormat(util.Date_yyyyMMdd), u))
+	dayCount := redis.GetInt(Pushcache_2_a, DayCountKey(NowFormat(Date_yyyyMMdd), u))
 	if dayCount >= u.SubSet.MaxPushSize {
 		logger.Info(u.Entniche.UserId, "超过一天最大限制数，不再推送")
 		return nil
@@ -155,7 +157,7 @@ func (n *NormalPush) GetPushParam(mailPush bool, u *UserInfo, sl *SortList) *Pus
 		//推送记录id
 		pushParam.PushDate, pushParam.PushCount = SaveToMysql(Mysql, PushMysql, SavePool, Config.SaveSleep, false, u, pushParam.Infos, nil)
 		if pushParam.PushDate > 0 {
-			redis.Put(Pushcache_2_a, DayCountKey(util.NowFormat(util.Date_yyyyMMdd), u), dayCount+pushParam.PushCount, OneDaySecond)
+			redis.Put(Pushcache_2_a, DayCountKey(NowFormat(Date_yyyyMMdd), u), dayCount+pushParam.PushCount, OneDaySecond)
 			if u.Entniche.IsDis == 1 {
 				redis.Put(Pushcache_2_c, HasDisPushKey(u), 1, OneDaySecond)
 			} else {
@@ -197,7 +199,7 @@ func (n *NormalPush) weekMonthSave(u *UserInfo, pushParam *PushParam) {
 		"ratemode": u.SubSet.RateMode,
 		"isdis":    u.Entniche.IsDis,
 	}).Select(map[string]interface{}{"size": 1, "list": 1, "date": 1}).All(&datas)
-	nowymd := util.NowFormat(util.Date_yyyyMMdd)
+	nowymd := NowFormat(Date_yyyyMMdd)
 	saveArray := []map[string]interface{}{}
 	delArray := []interface{}{}
 	var list *SortList

pushentniche/src/push/pusher/pusher.go → pushentniche/push/pusher/pusher.go

@@ -1,7 +1,7 @@
 package pusher
 
 import (
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 )
 
 type Pusher interface {

pushentniche/src/push/pusher/weekmonthpush.go → pushentniche/push/pusher/weekmonthpush.go

@@ -1,13 +1,14 @@
 package pusher
 
 import (
-	. "p"
-	. "public"
-	. "push/config"
-	. "push/db"
-	. "push/util"
-	. "pusher"
-	"qfw/util"
+	. "pushentniche/public"
+	. "pushentniche/push/config"
+	. "pushentniche/push/db"
+	. "pushentniche/push/util"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/pusher"
+
+	util "app.yhyue.com/moapp/jybase/common"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 
 	"github.com/donnie4w/go-logger/logger"
 )

pushentniche/src/push/util/entity.go → pushentniche/push/util/entity.go

@@ -2,11 +2,11 @@ package util
 
 import (
 	"fmt"
-	. "p"
-	. "public"
-	. "push/config"
-	"qfw/util"
+	. "pushentniche/public"
+	. "pushentniche/push/config"
 
+	"app.yhyue.com/moapp/jybase/encrypt"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	"github.com/donnie4w/go-logger/logger"
 )
 
@@ -55,7 +55,7 @@ func NewPushParam(isLimit bool, dayCount int, mailPush bool, u *UserInfo, sl *So
 			lastInfoDate = info.Publishtime
 		}
 		if mailPush && infosLength <= u.SubSet.MaxMailSize { //关于邮件的处理
-			url := fmt.Sprintf("%s/article/mailprivate/%s.html", Config.JianyuDomain, util.CommonEncodeArticle("mailprivate", info.Id))
+			url := fmt.Sprintf("%s/article/mailprivate/%s.html", Config.JianyuDomain, encrypt.CommonEncodeArticle("mailprivate", info.Id))
 			industryClassName := ""
 			if info.Buyerclass != "" {
 				industryClassName = "buyerclass"

pushentniche/src/push/util/rpccall.go → pushentniche/push/util/rpccall.go

@@ -1,11 +1,12 @@
 package util
 
 import (
-	. "p"
-	. "push/config"
-	. "push/db"
-	qrpc "qfw/util/rpc"
+	. "pushentniche/push/config"
+	. "pushentniche/push/db"
 	"time"
+
+	qrpc "app.yhyue.com/moapp/jybase/rpc"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 )
 
 var (

pushentniche/src/push/util/util.go → pushentniche/push/util/util.go

@@ -2,10 +2,11 @@ package util
 
 import (
 	"fmt"
-	. "p"
-	. "push/config"
-	. "push/db"
-	"qfw/util"
+	. "pushentniche/push/config"
+	. "pushentniche/push/db"
+
+	util "app.yhyue.com/moapp/jybase/common"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 
 	"github.com/donnie4w/go-logger/logger"
 )

pushentniche/src/match/config/config.go

@@ -1,59 +0,0 @@
-package config
-
-import (
-	"qfw/util"
-	"regexp"
-)
-
-type config struct {
-	TestQuery                   map[string]interface{} `json:"testQuery"`
-	TestUserIds                 []int                  `json:"testUserIds"`
-	MatchPoolSize               int                    `json:"matchPoolSize"`
-	SavePoolSize                int                    `json:"savePoolSize"`
-	MatchDuration               int64                  `json:"matchDuration"`
-	MergePoolSize               int                    `json:"mergePoolSize"`
-	MoveBatch                   int                    `json:"moveBatch"`
-	MoveDuration                int64                  `json:"moveDuration"`
-	MaxPushSize                 int                    `json:"maxPushSize"`
-	DisMaxPushSize              int                    `json:"disMaxPushSize"`
-	VipMaxPushSize              int                    `json:"vipMaxPushSize"`
-	MemberMaxPushSize           int                    `json:"memberMaxPushSize"`
-	NotMatchHour                []int                  `json:"notMatchHour"`
-	MaxCustomer                 int64                  `json:"maxCustomer"`
-	ProjectBatch                int                    `json:"projectBatch"`
-	RelationProjectPoolSize     int                    `json:"relationProjectPoolSize"`
-	ProjectRetainDay            int                    `json:"projectRetainDay"`
-	ProjectPushBatch            int                    `json:"projectPushBatch"`
-	ProjectSavePoolSize         int                    `json:"projectSavePoolSize"`
-	ProjectSaveSleep            int                    `json:"projectSaveSleep"`
-	ProjectPushTime             string                 `json:"projectPushTime"`
-	MaxRelationProject          int                    `json:"maxRelationProject"`
-	ProjectPushPoolSize         int                    `json:"projectPushPoolSize"`
-	LoadProjectPoolSize         int                    `json:"loadProjectPoolSize"`
-	ProjectPagingSize           int                    `json:"projectPagingSize"`
-	MaxLoadProjectCount         int                    `json:"maxLoadProjectCount"`
-	ProjectPublishTimeLimit     int64                  `json:"projectPublishTimeLimit"`
-	LoadEntProductUsersPoolSize int                    `json:"loadEntProductUsersPoolSize"`
-}
-
-type taskConfig struct {
-	Pici int64 `json:"pici"`
-}
-
-type projectTask struct {
-	Pici int64 `json:"pici"`
-}
-
-var (
-	Config      *config
-	TaskConfig  *taskConfig
-	ProjectTask *projectTask
-	FilterReg   *regexp.Regexp
-	RetainReg   *regexp.Regexp
-)
-
-func init() {
-	util.ReadConfig("./config.json", &Config)
-	util.ReadConfig("./task.json", &TaskConfig)
-	util.ReadConfig("./projecttask.json", &ProjectTask)
-}

pushfollowent/src/match/config/config.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 )
 
 type config struct {

pushfollowent/src/match/db/db.go

@@ -2,12 +2,12 @@ package db
 
 import (
 	"log"
-	m "mongodb"
-	. "p"
-	"qfw/util"
+	m "app.yhyue.com/moapp/jybase/mongodb"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	util "app.yhyue.com/moapp/jybase/common"
 	"qfw/util/elastic"
-	"qfw/util/mysql"
-	"qfw/util/redis"
+	"app.yhyue.com/moapp/jybase/mysql"
+	"app.yhyue.com/moapp/jybase/redis"
 )
 
 var (

pushfollowent/src/match/job/matchjob.go

@@ -4,9 +4,9 @@ import (
 	. "match/config"
 	. "match/db"
 	. "match/matcher"
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 	"sort"
 	"strings"
 	"sync"

pushfollowent/src/match/job/movejob.go

@@ -7,7 +7,7 @@ import (
 	. "match/db"
 	. "mover"
 	. "public"
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 	"strings"
 
 	"github.com/donnie4w/go-logger/logger"

pushfollowent/src/match/job/timetask.go

@@ -2,8 +2,8 @@ package job
 
 import (
 	. "match/config"
-	. "p"
-	"qfw/util"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	util "app.yhyue.com/moapp/jybase/common"
 )
 
 type TimeTask struct {

pushfollowent/src/match/matcher/match.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	. "match/config"
 	. "match/db"
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 	"strings"
 
 	"github.com/donnie4w/go-logger/logger"

pushfollowent/src/public/entity.go

@@ -1,9 +1,9 @@
 package public
 
 import (
-	. "mongodb"
-	. "p"
-	"qfw/util"
+	. "app.yhyue.com/moapp/jybase/mongodb"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	util "app.yhyue.com/moapp/jybase/common"
 
 	"github.com/donnie4w/go-logger/logger"
 )

pushfollowent/src/public/util.go

@@ -3,8 +3,8 @@ package public
 import (
 	"encoding/json"
 	"fmt"
-	. "p"
-	"qfw/util"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	util "app.yhyue.com/moapp/jybase/common"
 	"sort"
 )
 

pushfollowent/src/push/config/config.go

@@ -1,9 +1,9 @@
 package config
 
 import (
-	"qfw/util"
-	"qfw/util/mail"
-	qrpc "qfw/util/rpc"
+	util "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/mail"
+	qrpc "app.yhyue.com/moapp/jybase/rpc"
 	"strings"
 )
 

pushfollowent/src/push/db/db.go

@@ -2,11 +2,11 @@ package public
 
 import (
 	"log"
-	m "mongodb"
-	. "p"
-	"qfw/util"
-	"qfw/util/mysql"
-	"qfw/util/redis"
+	m "app.yhyue.com/moapp/jybase/mongodb"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	util "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/mysql"
+	"app.yhyue.com/moapp/jybase/redis"
 )
 
 var (

pushfollowent/src/push/job/pushjob.go

@@ -4,14 +4,14 @@ package job
 import (
 	"fmt"
 	"net/http"
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
 	. "push/config"
 	. "push/pusher"
 	putil "push/util"
-	. "pusher"
-	"qfw/util"
-	qrpc "qfw/util/rpc"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/pusher"
+	util "app.yhyue.com/moapp/jybase/common"
+	qrpc "app.yhyue.com/moapp/jybase/rpc"
 	"strconv"
 	"strings"
 	"sync"
@@ -208,7 +208,7 @@ func (p *PushJob) sendWeixin(userId, s_m_openid string, followId int64, entName
 			Color: Config.WxTplMsg.Keyword1.Color,
 		},
 		"keyword2": &qrpc.TmplItem{
-			Value: util.FormatDateByInt64(&lastPublishTime, util.Date_Short_Layout),
+			Value: util.FormatDateByInt64(&lastPublishTime, Date_Short_Layout),
 		},
 		"remark": &qrpc.TmplItem{
 			Value: remark,

pushfollowent/src/push/job/timetask.go

@@ -1,7 +1,7 @@
 package job
 
 import (
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "push/config"
 )
 

pushfollowent/src/push/pusher/normalpush.go

@@ -1,13 +1,13 @@
 package pusher
 
 import (
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
 	. "push/config"
 	. "push/db"
 	putil "push/util"
-	. "pusher"
-	"qfw/util"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/pusher"
+	util "app.yhyue.com/moapp/jybase/common"
 	"time"
 
 	"github.com/donnie4w/go-logger/logger"

pushfollowent/src/push/pusher/pusher.go

@@ -1,7 +1,7 @@
 package pusher
 
 import (
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
 )
 

pushfollowent/src/push/util/entity.go

@@ -2,10 +2,10 @@ package util
 
 import (
 	"fmt"
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
 	. "push/config"
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 	"time"
 
 	"github.com/donnie4w/go-logger/logger"

pushfollowent/src/push/util/rpccall.go

@@ -1,10 +1,10 @@
 package util
 
 import (
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "push/config"
 	. "push/db"
-	qrpc "qfw/util/rpc"
+	qrpc "app.yhyue.com/moapp/jybase/rpc"
 	"time"
 )
 

pushfollowent/src/push/util/util.go

@@ -1,11 +1,11 @@
 package util
 
 import (
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
 	. "push/config"
 	. "push/db"
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 )
 
 var WTMCS = NewWxTplMsgCustoms(Mysql, Config.WxTplMsg.Id, Config.WxTplMsg.First.Value)

pushfollowproject/src/match/config/config.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 )
 
 type config struct {

pushfollowproject/src/match/db/db.go

@@ -2,12 +2,12 @@ package db
 
 import (
 	"log"
-	m "mongodb"
-	. "p"
-	"qfw/util"
+	m "app.yhyue.com/moapp/jybase/mongodb"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	util "app.yhyue.com/moapp/jybase/common"
 	"qfw/util/elastic"
-	"qfw/util/mysql"
-	"qfw/util/redis"
+	"app.yhyue.com/moapp/jybase/mysql"
+	"app.yhyue.com/moapp/jybase/redis"
 )
 
 var (

pushfollowproject/src/match/job/matchjob.go

@@ -4,9 +4,9 @@ import (
 	. "match/config"
 	. "match/db"
 	. "match/matcher"
-	. "p"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	. "public"
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 	"sync"
 	"time"
 

pushfollowproject/src/match/job/movejob.go

@@ -7,7 +7,7 @@ import (
 	. "match/db"
 	. "mover"
 	. "public"
-	"qfw/util"
+	util "app.yhyue.com/moapp/jybase/common"
 	"strings"
 
 	"github.com/donnie4w/go-logger/logger"

pushfollowproject/src/match/job/timetask.go

@@ -2,8 +2,8 @@ package job
 
 import (
 	. "match/config"
-	. "p"
-	"qfw/util"
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	util "app.yhyue.com/moapp/jybase/common"
 )
 
 type TimeTask struct {