merge

entdataexport/src/config/config.go

@@ -65,8 +65,6 @@ type config struct {
 		MaxOpenConns int
 		MaxIdleConns int
 	}
-<<<<<<< HEAD
-=======
 	GlobalCommonData struct {
 		DbName       string
 		Address      string
@@ -75,7 +73,6 @@ type config struct {
 		MaxOpenConns int
 		MaxIdleConns int
 	}
->>>>>>> feature/v2.9.10
 	MaxExportCount  int
 	CostUserAccount []int
 	DedupUrl        string

entdataexport/src/db/db.go

@@ -15,8 +15,6 @@ var BaseMysql *mysql.Mysql
 var GlobalCommonData *mysql.Mysql
 var Qyfw mg.MongodbSim
 var Mgo_bidding mg.MongodbSim
-var BaseMysql *mysql.Mysql
-var GlobalCommonData *mysql.Mysql
 
 func init() {
 	//初始化redis
@@ -77,7 +75,6 @@ func init() {
 	PushMysql.Init()
 	jy.PushMapping.Init(PushMysql)
 	BaseMysql = &mysql.Mysql{
-<<<<<<< HEAD
 		Address:      Config.BaseMysql.Address,
 		UserName:     Config.BaseMysql.UserName,
 		PassWord:     Config.BaseMysql.PassWord,
@@ -85,23 +82,6 @@ func init() {
 		MaxOpenConns: Config.BaseMysql.MaxOpenConns,
 		MaxIdleConns: Config.BaseMysql.MaxIdleConns,
 	}
-	BaseMysql.Init()
-	//jy.PushMapping.Init(BaseMysql)
-=======
-
-		Address: Config.BaseMysql.Address,
-
-		UserName: Config.BaseMysql.UserName,
-
-		PassWord: Config.BaseMysql.PassWord,
-
-		DBName: Config.BaseMysql.DbName,
-
-		MaxOpenConns: Config.BaseMysql.MaxOpenConns,
-
-		MaxIdleConns: Config.BaseMysql.MaxIdleConns,
-	}
-
 	BaseMysql.Init()
 	GlobalCommonData = &mysql.Mysql{
 
@@ -119,7 +99,6 @@ func init() {
 	}
 	GlobalCommonData.Init()
 	jy.NewPushMapping.Init(GlobalCommonData)
->>>>>>> feature/v2.9.10
 	//初始化elastic
 	elastic.InitElasticSize(Config.Elasticsearch.Address, Config.Elasticsearch.Size)
 }

entdataexport/src/service/dataexport/dataexport.go

@@ -57,12 +57,9 @@ func (a *EntDataExport) SubscribeList() {
 		pageNum = 1
 		log.Println("页码获取失败")
 		pageSize = 10
-<<<<<<< HEAD
 	}
 	if pageSize == 0 {
 		pageSize = 10
-=======
->>>>>>> feature/v2.9.10
 	}
 	log.Println("pageNum", pageNum)
 	if pageSize == 0 {
@@ -80,11 +77,7 @@ func (a *EntDataExport) SubscribeList() {
 	}
 	isGetSubscribe := true
 	if getsubscribe != 1 {
-<<<<<<< HEAD
-		hasNextPage, list, count := jy.EntnichePush.NewDatas(Mgo_bidding, biddings, biddings_back, PushMysql, entId, entUserId, pageNum, selectTime, area, buyerclass, isEnt, config.Config.DedupUrl, pageSize)
-=======
 		hasNextPage, list, count := jy.EntnichePush.NewDatas(Mgo_bidding, biddings, biddings_back, BaseMysql, entId, entUserId, pageNum, selectTime, area, buyerclass, isEnt, config.Config.DedupUrl, pageSize)
->>>>>>> feature/v2.9.10
 		if list != nil && len(list) > 0 {
 			isGetSubscribe = false
 		}
@@ -119,14 +112,6 @@ func (this *EntDataExport) SubscribeExport() {
 	UserLockMap[entId] = &sync.Mutex{}
 	entLock := UserLockMap[entId]
 	MainLock.Unlock()
-<<<<<<< HEAD
-=======
-	var (
-	//entexportPool      = make(chan bool, 20)
-	//entexportWaitGroup = &sync.WaitGroup{}
-	//newsDatalen        = make(chan bool, 1000000)
-	)
->>>>>>> feature/v2.9.10
 	entUserData := Mysql.FindOne("entniche_user", map[string]interface{}{"id": entUserId}, "export_power", "")
 	if entUserData != nil {
 		export_power := util.IntAll((*entUserData)["export_power"])
@@ -146,16 +131,11 @@ func (this *EntDataExport) SubscribeExport() {
 	} else {
 		current = GetCurrentCount(entId)
 	}
-
 	//新扣除条数
 	newCount := 0
 	isOk := true
 	url := config.Config.DedupUrl
-<<<<<<< HEAD
-	list, count, secondCount := jy.EntnichePush.NewExportDatas(Mgo_bidding, biddings, biddings_back, BaseMysql, entId, entUserId, selectTime, area, buyerclass, isEnt, MaxExportCount, url)
-=======
 	list, count, secondCount := jy.EntnichePush.NewExportDatas(Mgo_bidding, biddings, biddings_back, BaseMysql, entId, entUserId, selectTime, area, city, buyerclass, isEnt, MaxExportCount, url)
->>>>>>> feature/v2.9.10
 	if secondCount > current {
 		isOk = false
 	}
@@ -217,10 +197,6 @@ func (this *EntDataExport) SubscribeExport() {
 				"isEnt":    "true",
 			})
 			if err5 != nil || util.IntAll(rs["code"]) != 0 {
-<<<<<<< HEAD
-				//打开
-=======
->>>>>>> feature/v2.9.10
 				log.Println("判重失败===", err5)
 				return
 			} else {