mmm-go / partnermg · 提交

转到一个项目

作者 唐旭辉
提交 eab3e6c41f8800ba8547833fe5dcfc53c134a313 1 个父辈 894cc6d2

调试

内嵌 并排对比
正在显示 4 个修改的文件 包含 60 行增加 和 63 行删除
@@ -6,7 +6,6 @@ import ( @@ -6,7 +6,6 @@ import (
6 "os/signal" 6 "os/signal"
7 "sync" 7 "sync"
8 "syscall" 8 "syscall"
9 - "time"  
10 9
11 "github.com/astaxie/beego" 10 "github.com/astaxie/beego"
12 "github.com/astaxie/beego/logs" 11 "github.com/astaxie/beego/logs"
@@ -14,7 +13,6 @@ import ( @@ -14,7 +13,6 @@ import (
14 _ "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/log" 13 _ "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/log"
15 _ "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/port/beego" 14 _ "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/port/beego"
16 "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/port/consumer" 15 "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/port/consumer"
17 - "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/port/consumer/produce"  
18 ) 16 )
19 17
20 func main() { 18 func main() {
@@ -39,11 +37,6 @@ func main() { @@ -39,11 +37,6 @@ func main() {
39 <-consumerRun.IsReady() 37 <-consumerRun.IsReady()
40 logs.Info("Sarama consumer up and running!...") 38 logs.Info("Sarama consumer up and running!...")
41 }() 39 }()
42 - go func() {  
43 - t := time.NewTimer(10 * time.Second)  
44 - <-t.C  
45 - produce.Producer()  
46 - }()  
47 for { 40 for {
48 select { 41 select {
49 case <-sigs: 42 case <-sigs:
@@ -922,6 +922,7 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord @@ -922,6 +922,7 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord
922 "receivedDividends": orderBase.OrderCompute.PartnerBonusHas, 922 "receivedDividends": orderBase.OrderCompute.PartnerBonusHas,
923 "notReceivedDividend": orderBase.OrderCompute.PartnerBonusNot, 923 "notReceivedDividend": orderBase.OrderCompute.PartnerBonusNot,
924 "dividendSpending": orderBase.OrderCompute.PartnerBonusExpense, 924 "dividendSpending": orderBase.OrderCompute.PartnerBonusExpense,
  925 + "orderNumber": orderBase.OrderCode,
925 } 926 }
926 //订单中的商品 927 //订单中的商品
927 product := map[string]interface{}{ 928 product := map[string]interface{}{
@@ -97,7 +97,10 @@ func (r *Runer) InitConsumer() error { @@ -97,7 +97,10 @@ func (r *Runer) InitConsumer() error {
97 config := sarama.NewConfig() 97 config := sarama.NewConfig()
98 //config.Consumer.Group.Rebalance.Strategy = sarama.BalanceStrategyRoundRobin 98 //config.Consumer.Group.Rebalance.Strategy = sarama.BalanceStrategyRoundRobin
99 config.Consumer.Offsets.Initial = sarama.OffsetOldest 99 config.Consumer.Offsets.Initial = sarama.OffsetOldest
100 - config.Version = sarama.V0_10_2_0 100 + config.Version = sarama.V0_10_2_1
  101 + // config.Version = sarama.KafkaVersion{
  102 + // version: [4]int{},
  103 + // }
101 consumerGroup, err := sarama.NewConsumerGroup(r.msgConsumer.kafkaHosts, r.msgConsumer.groupId, config) 104 consumerGroup, err := sarama.NewConsumerGroup(r.msgConsumer.kafkaHosts, r.msgConsumer.groupId, config)
102 if err != nil { 105 if err != nil {
103 return err 106 return err
1 package produce 1 package produce
2 2
3 -import (  
4 - "fmt"  
5 - "strconv"  
6 - "time" 3 +// import (
  4 +// "fmt"
  5 +// "strconv"
  6 +// "time"
7 7
8 - "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/port/consumer/configs" 8 +// "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/port/consumer/configs"
9 9
10 - "github.com/Shopify/sarama"  
11 - "github.com/astaxie/beego/logs"  
12 -) 10 +// "github.com/Shopify/sarama"
  11 +// "github.com/astaxie/beego/logs"
  12 +// )
13 13
14 -var (  
15 - producer sarama.SyncProducer  
16 -) 14 +// var (
  15 +// producer sarama.SyncProducer
  16 +// )
17 17
18 -func init() { 18 +// func init() {
19 19
20 - logs.Info("init kafka producer, it may take a few seconds to init the connection\n")  
21 - var err error  
22 - mqConfig := sarama.NewConfig()  
23 - mqConfig.Producer.Return.Successes = true  
24 - mqConfig.Version = sarama.V0_10_2_0  
25 - if err = mqConfig.Validate(); err != nil {  
26 - msg := fmt.Sprintf("Kafka producer config invalidate. config: %v. err: %v", configs.Cfg, err)  
27 - logs.Info(msg)  
28 - panic(msg)  
29 - } 20 +// logs.Info("init kafka producer, it may take a few seconds to init the connection\n")
  21 +// var err error
  22 +// mqConfig := sarama.NewConfig()
  23 +// mqConfig.Producer.Return.Successes = true
  24 +// mqConfig.Version = sarama.V0_10_2_1
  25 +// if err = mqConfig.Validate(); err != nil {
  26 +// msg := fmt.Sprintf("Kafka producer config invalidate. config: %v. err: %v", configs.Cfg, err)
  27 +// logs.Info(msg)
  28 +// panic(msg)
  29 +// }
30 30
31 - producer, err = sarama.NewSyncProducer(configs.Cfg.Servers, mqConfig)  
32 - if err != nil {  
33 - msg := fmt.Sprintf("Kafak producer create fail. err: %v", err)  
34 - logs.Info(msg)  
35 - panic(msg)  
36 - } 31 +// producer, err = sarama.NewSyncProducer(configs.Cfg.Servers, mqConfig)
  32 +// if err != nil {
  33 +// msg := fmt.Sprintf("Kafak producer create fail. err: %v", err)
  34 +// logs.Info(msg)
  35 +// panic(msg)
  36 +// }
37 37
38 -} 38 +// }
39 39
40 -func produce(topic string, key string, content string) error {  
41 - msg := &sarama.ProducerMessage{  
42 - Topic: topic,  
43 - Key: sarama.StringEncoder(key),  
44 - Value: sarama.StringEncoder(content),  
45 - Timestamp: time.Now(),  
46 - } 40 +// func produce(topic string, key string, content string) error {
  41 +// msg := &sarama.ProducerMessage{
  42 +// Topic: topic,
  43 +// Key: sarama.StringEncoder(key),
  44 +// Value: sarama.StringEncoder(content),
  45 +// Timestamp: time.Now(),
  46 +// }
47 47
48 - _, _, err := producer.SendMessage(msg)  
49 - if err != nil {  
50 - msg := fmt.Sprintf("Send Error topic: %v. key: %v. content: %v", topic, key, content)  
51 - logs.Info(msg)  
52 - return err  
53 - }  
54 - logs.Info("Send OK topic:%s key:%s value:%s\n", topic, key, content)  
55 - return nil  
56 -} 48 +// _, _, err := producer.SendMessage(msg)
  49 +// if err != nil {
  50 +// msg := fmt.Sprintf("Send Error topic: %v. key: %v. content: %v", topic, key, content)
  51 +// logs.Info(msg)
  52 +// return err
  53 +// }
  54 +// logs.Info("Send OK topic:%s key:%s value:%s\n", topic, key, content)
  55 +// return nil
  56 +// }
57 57
58 -func Producer() error {  
59 - key := strconv.FormatInt(time.Now().UTC().UnixNano(), 10)  
60 - value := "this is a new kafka message!"  
61 - err := produce("topic_test", key, value)  
62 - if err != nil {  
63 - logs.Info("producer err:%s \n", err)  
64 - return err  
65 - }  
66 - return nil  
67 -} 58 +// func Producer() error {
  59 +// key := strconv.FormatInt(time.Now().UTC().UnixNano(), 10)
  60 +// value := "this is a new kafka message!"
  61 +// err := produce("topic_test", key, value)
  62 +// if err != nil {
  63 +// logs.Info("producer err:%s \n", err)
  64 +// return err
  65 +// }
  66 +// return nil
  67 +// }