From 176829b3776fecc0726a57f7060564445a6f4deb Mon Sep 17 00:00:00 2001 From: dengbiao Date: Sat, 27 Jul 2024 20:10:16 +0800 Subject: [PATCH] update --- consume/init.go | 18 +++---- consume/md/consume_key.go | 8 ++-- consume/one_circles_sign_in_consume.go | 49 +++++++++++++------- consume/one_circles_sign_in_copy_consume.go | 20 ++++---- cpu_profile | Bin 3618 -> 2271 bytes go.mod | 2 +- k8s/zyos-go-mq-consume-prd.yaml | 14 +++--- 7 files changed, 64 insertions(+), 47 deletions(-) diff --git a/consume/init.go b/consume/init.go index 8a51219..f4df471 100644 --- a/consume/init.go +++ b/consume/init.go @@ -85,14 +85,16 @@ func initConsumes() { //jobs[consumeMd.CanalO2oPayOrderForNumericalStatementConsumeFunName] = CanalO2oPayOrderForNumericalStatementConsume //jobs[consumeMd.CanalB2cOrderForNumericalStatementConsumeFunName] = CanalB2cOrderForNumericalStatementConsume - //////////////////////////////////////// oneCircles ///////////////////////////////////////////////////// - jobs[consumeMd.OneCirclesSignInGreenEnergyFunName] = OneCirclesSignInGreenEnergyConsume - jobs[consumeMd.OneCirclesStartLevelDividendFunName] = OneCirclesStartLevelDividendConsume - jobs[consumeMd.OneCirclesActivityCoinAutoExchangeGreenEnergyFunName] = OneCirclesActivityCoinAutoExchangeGreenEnergyConsume - jobs[consumeMd.OneCirclesActivityCoinAutoExchangeGreenEnergyForTeamFunName] = OneCirclesActivityCoinAutoExchangeGreenEnergyForTeamConsume - jobs[consumeMd.OneCirclesSettlementPublicGiveActivityCoinFunName] = OneCirclesSettlementPublicGiveActivityCoinConsume - jobs[consumeMd.OneCirclesAddPublicPlatoonUserRelationCommissionFunName] = OneCirclesAddPublicPlatoonUserRelationCommissionConsume - jobs[consumeMd.OneCirclesSignInUpdateRecordsGreenEnergyFunName] = OneCirclesSignInUpdateRecordsGreenEnergyConsume + //////////////////////////////////////// oneCircles-v1 ///////////////////////////////////////////////////// + //jobs[consumeMd.OneCirclesSignInGreenEnergyFunName] = OneCirclesSignInGreenEnergyConsume + //jobs[consumeMd.OneCirclesStartLevelDividendFunName] = OneCirclesStartLevelDividendConsume + //jobs[consumeMd.OneCirclesActivityCoinAutoExchangeGreenEnergyFunName] = OneCirclesActivityCoinAutoExchangeGreenEnergyConsume + //jobs[consumeMd.OneCirclesActivityCoinAutoExchangeGreenEnergyForTeamFunName] = OneCirclesActivityCoinAutoExchangeGreenEnergyForTeamConsume + //jobs[consumeMd.OneCirclesSettlementPublicGiveActivityCoinFunName] = OneCirclesSettlementPublicGiveActivityCoinConsume + //jobs[consumeMd.OneCirclesAddPublicPlatoonUserRelationCommissionFunName] = OneCirclesAddPublicPlatoonUserRelationCommissionConsume + + //////////////////////////////////////// oneCircles-v2 ///////////////////////////////////////////////////// + jobs[consumeMd.OneCirclesDealUserCoinConsumeFunName] = OneCirclesDealUserCoinConsume //////////////////////////////////////// withdraw ///////////////////////////////////////////////////// //jobs[consumeMd.WithdrawConsumeFunName] = WithdrawConsume diff --git a/consume/md/consume_key.go b/consume/md/consume_key.go index 20e5e83..9231e2a 100644 --- a/consume/md/consume_key.go +++ b/consume/md/consume_key.go @@ -562,12 +562,12 @@ var RabbitMqQueueKeyList = []*MqQueue{ }, { ExchangeName: "one.circles", - Name: "one_circles_sign_in_update_records", + Name: "one_circles_reward_user_coin", Type: TopicQueueType, IsPersistent: false, - RoutKey: "sign_in_update_records", + RoutKey: "reward_user_coin", BindKey: "", - ConsumeFunName: "OneCirclesSignInUpdateRecordsGreenEnergyConsume", + ConsumeFunName: "OneCirclesDealUserCoinConsume", }, { ExchangeName: "zhios.app.user.withdraw.apply.exchange", @@ -661,7 +661,7 @@ const ( MallAddSupplyGoodsFunName = "MallAddSupplyGoodsConsume" CanalUserVirtualCcoinFlowFunName = "CanalUserVirtualCoinFlowConsume" OneCirclesSignInGreenEnergyFunName = "OneCirclesSignInGreenEnergyConsume" - OneCirclesSignInUpdateRecordsGreenEnergyFunName = "OneCirclesSignInUpdateRecordsGreenEnergyConsume" + OneCirclesDealUserCoinConsumeFunName = "OneCirclesDealUserCoinConsume" OneCirclesStartLevelDividendFunName = "OneCirclesStartLevelDividendConsume" OneCirclesActivityCoinAutoExchangeGreenEnergyFunName = "OneCirclesActivityCoinAutoExchangeGreenEnergyConsume" OneCirclesActivityCoinAutoExchangeGreenEnergyForTeamFunName = "OneCirclesActivityCoinAutoExchangeGreenEnergyForTeamConsume" diff --git a/consume/one_circles_sign_in_consume.go b/consume/one_circles_sign_in_consume.go index c03a3d4..2ee4b1a 100644 --- a/consume/one_circles_sign_in_consume.go +++ b/consume/one_circles_sign_in_consume.go @@ -12,6 +12,8 @@ import ( "errors" "fmt" "github.com/streadway/amqp" + "os" + "runtime/pprof" ) func OneCirclesSignInGreenEnergyConsume(queue md.MqQueue) { @@ -32,33 +34,44 @@ func OneCirclesSignInGreenEnergyConsume(queue md.MqQueue) { var res amqp.Delivery var ok bool - for { - res, ok = <-delivery - if ok == true { - err = handleOneCirclesSignInGreenEnergy(ch, res.Body) - if err != nil { - fmt.Println("err ::: ", err) - utils.FilePutContents("OneCirclesSignInGreenEnergyConsume_ERR", "[err]:"+err.Error()) - _ = res.Reject(true) - //_ = res.Reject(false) - ////TODO::重新推回队列末尾，避免造成队列堵塞 - //var msg *md.OneCirclesStructForSignIn - //json.Unmarshal(res.Body, &msg) - //ch.Publish(queue.ExchangeName, msg, queue.RoutKey) - } else { - _ = res.Ack(true) - } + //for { + res, ok = <-delivery + if ok == true { + err = handleOneCirclesSignInGreenEnergy(ch, res.Body) + if err != nil { + fmt.Println("err ::: ", err) + utils.FilePutContents("OneCirclesSignInGreenEnergyConsume_ERR", "[err]:"+err.Error()) + _ = res.Reject(true) + //_ = res.Reject(false) + ////TODO::重新推回队列末尾，避免造成队列堵塞 + //var msg *md.OneCirclesStructForSignIn + //json.Unmarshal(res.Body, &msg) + //ch.Publish(queue.ExchangeName, msg, queue.RoutKey) } else { - panic(errors.New("error getting message")) + _ = res.Ack(true) } + } else { + panic(errors.New("error getting message")) } + //} fmt.Println("get msg done") } func handleOneCirclesSignInGreenEnergy(ch *rabbit.Channel, msgData []byte) error { + cpuProfile, err := os.Create("./cpu_profile") + if err != nil { + fmt.Printf("创建文件失败:%s", err.Error()) + return err + } + defer cpuProfile.Close() + + //采集CPU信息 + pprof.StartCPUProfile(cpuProfile) + defer pprof.StopCPUProfile() + //1、解析mq中queue的数据结构体 var msg *md.OneCirclesStructForSignIn - err := json.Unmarshal(msgData, &msg) + err = json.Unmarshal(msgData, &msg) if err != nil { return err } diff --git a/consume/one_circles_sign_in_copy_consume.go b/consume/one_circles_sign_in_copy_consume.go index 3d1e770..eb24744 100644 --- a/consume/one_circles_sign_in_copy_consume.go +++ b/consume/one_circles_sign_in_copy_consume.go @@ -6,8 +6,8 @@ import ( "applet/app/utils/logx" "applet/consume/md" "code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git/rabbit" - "code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/db/model" md2 "code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/md" + "code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/rule" "code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/rule/one_circles" "encoding/json" "errors" @@ -15,8 +15,8 @@ import ( "github.com/streadway/amqp" ) -func OneCirclesSignInUpdateRecordsGreenEnergyConsume(queue md.MqQueue) { - fmt.Println(">>>>>>>>>>>>OneCirclesSignInUpdateRecordsGreenEnergyConsume>>>>>>>>>>>>") +func OneCirclesDealUserCoinConsume(queue md.MqQueue) { + fmt.Println(">>>>>>>>>>>>OneCirclesDealUserCoinConsume>>>>>>>>>>>>") ch, err := rabbit.Cfg.Pool.GetChannel() if err != nil { logx.Error(err) @@ -36,10 +36,10 @@ func OneCirclesSignInUpdateRecordsGreenEnergyConsume(queue md.MqQueue) { for { res, ok = <-delivery if ok == true { - err = handleOneCirclesSignInUpdateRecordsGreenEnergyConsume(res.Body) + err = handleOneCirclesDealUserCoinConsume(res.Body) if err != nil { fmt.Println("err ::: ", err) - fmt.Println("OneCirclesSignInUpdateRecordsGreenEnergyConsume_ERR:::::", err.Error()) + fmt.Println("OneCirclesDealUserCoinConsume_ERR:::::", err.Error()) ////TODO::重新推回队列末尾，避免造成队列堵塞 //_ = res.Reject(false) _ = res.Reject(true) @@ -53,15 +53,17 @@ func OneCirclesSignInUpdateRecordsGreenEnergyConsume(queue md.MqQueue) { fmt.Println("get msg done") } -func handleOneCirclesSignInUpdateRecordsGreenEnergyConsume(msgData []byte) error { +func handleOneCirclesDealUserCoinConsume(msgData []byte) error { //1、解析mq中queue的数据结构体 - var msg *md2.UpdateOneCirclesStructForSignInRecords + var msg *md2.DealUserCoinReq err := json.Unmarshal(msgData, &msg) if err != nil { return err } - engine := db.DBs["31585332"] - _, err = engine.Where("id =?", msg.Id).Update(&model.OneCirclesGreenEnergySignIn{IsCompleted: 1}) + + //2、进行虚拟币奖励发放 + engine := db.DBs[msg.Mid] + err = rule.DealUserCoin(engine.NewSession(), *msg) if err != nil { fmt.Println("err::::", err) return err diff --git a/cpu_profile b/cpu_profile index 96c80f6cabe5890f9c9121ea0e9ad9f9a1636b33..53cca95683857efcd3b33342982e5c05edaee94b 100644 GIT binary patch literal 2271 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 diff --git a/go.mod b/go.mod index dc3f549..c356bed 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( code.fnuoos.com/go_rely_warehouse/zyos_go_condition_statistics.git v1.1.2-0.20240607091816-3df1433a2f0d code.fnuoos.com/go_rely_warehouse/zyos_go_es.git v1.0.0 code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5 - code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git v1.9.10-0.20240727102826-b17347dfda58 + code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git v1.9.10-0.20240727115614-da7c2fc02dd7 code.fnuoos.com/go_rely_warehouse/zyos_go_pay.git v1.6.2-0.20231116085701-9ba6e19f877b code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git v1.1.21-0.20240726151134-db88648c83ef code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20240726093338-fed880ca12ce diff --git a/k8s/zyos-go-mq-consume-prd.yaml b/k8s/zyos-go-mq-consume-prd.yaml index 608dbb7..a7b97b2 100644 --- a/k8s/zyos-go-mq-consume-prd.yaml +++ b/k8s/zyos-go-mq-consume-prd.yaml @@ -2,25 +2,25 @@ kind: Deployment apiVersion: apps/v1 # 元数据 metadata: - name: zyos-go-mq-consume-v6 + name: zyos-go-mq-consume-one-circles-v2 namespace: zhios labels: - app: zyos-go-mq-consume-v6 + app: zyos-go-mq-consume-one-circles-v2 annotations: kubesphere.io/creator: dengbiao - kubesphere.io/description: 绿色双链积分 + kubesphere.io/description: 一个圈圈v2 # deployment主要部分 spec: replicas: 1 selector: matchLabels: # 名称与上面的labels对应 - app: zyos-go-mq-consume-v6 + app: zyos-go-mq-consume-one-circles-v2 template: metadata: labels: # 名称与上面的matchLabels对应 - app: zyos-go-mq-consume-v6 + app: zyos-go-mq-consume-one-circles-v2 spec: # 声明挂载卷（将外部已存在的pvc、config等挂载进来） volumes: @@ -37,9 +37,9 @@ spec: defaultMode: 420 containers: # 主容器 - - name: zhios-zyos-go-mq-consume-v6-container + - name: zhios-zyos-go-mq-consume-one-circles-v2-container # 镜像地址（提前打包好并推送的镜像仓库） - image: 'registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/zyos-zyos-go-mq-consume-v6:20240310-01' + image: 'registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/zyos-go-mq-consume-one-circles-v2:20240727-01' # 将前面volume声明的需要用到的pvc、config挂载上来 volumeMounts: - name: host-time