diff --git a/app/mix/service/logic/vas.go b/app/mix/service/logic/vas.go index f56c9d29..adaf703c 100644 --- a/app/mix/service/logic/vas.go +++ b/app/mix/service/logic/vas.go @@ -1231,7 +1231,7 @@ func (v *Vas) GetAddWechatCoinOrders(ctx *gin.Context, mid int64, offset, limit statusList := make([]int32, 0) switch tab { case vasproto.AddWechatListTabWait: - statusList = []int32{dbstruct.VasCoinOrderStatusNotFill, dbstruct.VasCoinOrderStatusWaitDeal} + statusList = []int32{dbstruct.VasCoinOrderStatusNotFill, dbstruct.VasCoinOrderStatusWaitDeal, dbstruct.VasCoinOrderStatusRefund} case vasproto.AddWechatListTabFinish: statusList = []int32{dbstruct.VasCoinOrderStatusDeal, dbstruct.VasCoinOrderStatusFinish, dbstruct.VasCoinOrderStatusRefund} } diff --git a/app/mix/service/vasservice.go b/app/mix/service/vasservice.go index 5ae37455..da7568e8 100644 --- a/app/mix/service/vasservice.go +++ b/app/mix/service/vasservice.go @@ -56,16 +56,15 @@ func (s *Service) GetAddWechatList(ctx *gin.Context, req *vasproto.GetAddWechatL ec = errcode.ErrCodeVasSrvFail return } + logger.Info("GetAddWechatCoinOrders len: %v", len(coinOrders)) // 获取用户 mids := make([]int64, 0) for _, co := range coinOrders { - mid := util.DerefInt64(co.Mid) - if mid > 0 { - mids = append(mids, mid) - } + mids = append(mids, co.GetMid()) } acntMap, _ := _DefaultAccount.GetAccountMapByMids(ctx, mids) + logger.Info("GetAccountMapByMids mids: %v, len: %v", mids, len(mids)) // 组装 list := make([]*vasproto.AddWechatSt, 0) diff --git a/etc/mix/mix-prod.yaml b/etc/mix/mix-prod.yaml new file mode 100644 index 00000000..70687ccf --- /dev/null +++ b/etc/mix/mix-prod.yaml @@ -0,0 +1,93 @@ +log: + stdout_enable: true + stdout_level: "info" + file_enable: true + file_level: "info" + file_abs_path: "/app/ironfan/log/mix/" + +app: + app_name: "mix" + ip: "127.0.0.1" + #ip: "172.26.47.174" + port: 9999 + +mix_mongo: + uri: "mongodb://root:Tbuy!vj@24vq@dds-bp1628b447c242e41.mongodb.rds.aliyuncs.com:3717,dds-bp1628b447c242e42.mongodb.rds.aliyuncs.com:3717/admin?replicaSet=mgset-74245203" + username: "" + password: "" + max_pool_size: 16 + connection_timeout_ms: 30000 + socket_timeout_ms: 5000 + +mix_mysql: + uri: "rm-bp11t1616a1kjvmx5.mysql.rds.aliyuncs.com:3306" + username: "vas_rw" + password: "qzWv1C87a!@k" + timeout: 3 + read_timeout_s: 5 + write_timeout_s: 3 + +wxpay: + mchid: "1111" + serial_no: "1111" + apiv3_key: "1111" + private_key: "af21aw65aw23efwa132f1waef56wa56awef" + +crypto: + aes: + private_key: "Xbz1145141919810" + rsa: + private_key: "MIIBOgIBAAJBAMXPIjKV6CMi5O9tIXJWNIfnqXjqOZ1KmRByRAP073DU+gzMLygzEsrztJzbz/K/Julkz6XhheZ8vdz+boAl1HsCAwEAAQJAD5PNRKCLhGDWGIjGjoN9ZYp3zR7c5KcgQKxO8OTUClWHxXWAHSO8WEMDUjYTB9xhTbzyyjfOV7GJf2YFRgQUYQIhANEFkyp7xKLIq284zmvJ+YAqMMqc5Wxkz/0Kv77PERfxAiEA8kRrSX2QcObiQkE2Jxn4VlW8M+bHZMdfabjSkYgKvysCIHGYhweCpjYVut3CUKTR6q/VvhiPNjw3ebW6vsSTQmXxAiBBe4DMQmYyPhXV9q5eb0SSgWX3WV93u/PsLYqsz2qoNQIhAKiqbRvYMzfg+OTBKuuGu3m+QLav4TjYVSSPD8VVf7/z" + token: + private_key: "" + sha256: + salts: "23XSka ZsMTz3 xdnKtT mx229Z aJ3VS7 ett3nV YDEgFB lBm57J 92hgkJ B0u9VF keyNK3 cB16Tm 63r1mX IUs471 ytbW7o ic8Pxw" + +alipay: + appid: "2021004115647165" + private_key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCeA8ADj0arLzUK5B3R5bqbOkXm8TBe0dI6XpefxnHeNyksEFhQuWTFtQA550lGj/VMyNQC0R+gL6VK/5SdgonzxMx8bC+/1lIWrl3Q8F+JLsAUcNh6C+WzDw7m5YSrG9361f3+i/gPVC4GRTzx91qLdk1ySGZv/GpSVv49k9qtD83gRCbxJq5FY1QA83Wb5xkJoMwl+SlKvFLNxIIzPQh9DvDF+32FTsVQgm3sX1lsArTA4yp7Y4SG3A8mkOanidYX1KiUawMBWaDgZi1CMpQ+Zbb3w0C0txCeZ8ek5JeUw2EYHJ0awMnFE6+vPDm1LNJ0DodkvszGbmLvXQS2eMfVAgMBAAECggEABj1nq7xQshnfIlr3wn4r7E1UzVXg7x2iC6QIoMqZXIkZGyBaHHX1wMjxBVhY0GyG501W8fWIJi87e8az+7RX9kRjPtaW3CB+hV7FXabgXu51r1j1c3xcycFieUO/BXLIRUuGCDNGzHQqjRzW10dJUBCP5l9tjCaPnEjLKWtZS1QwhtmjmAJalC+oQLnhvlmURSWwyvIIgrqK82DZj5DFgXrxlah21Sou/N4xV/W/d0OkaouDxHtQ4Oy/yE/oc2z+vbcBcHrIt+r2g8gymKPdsDFyglUqZeNRlwYnifSUH7Bmn+1uiXAi86RlUdtCYngNUUNoOStB9oC7gidPHyeb0QKBgQDV58AFBOCHdG2gO+VvKiIpbquWMYTbmbRGmCai911G6zX8X/37nawKWZkyk4kIkrohZtwwL5s6AIlD5F9nRBp+Uk1QvlIYokD3vjUuVPyvpC3raASUvTs0WoWbq3gfPH5Qn5vS1C89CQ/68FC+89CYiexxwq7ybX86lzhYGpRXrwKBgQC9HE7e5Cr9akJrUuPW8NjbKATYg2h8s3/FMa4AbeTLPSEPPp20yRGA5P0xPgV1JocfmVd3VC6ivF6YHKKVnKoVbR74InCi4hhriGb3uLz7i6ngjcxysBfOlKA8lOlMAMY4ZrE2zTp2mUKF1Wp3a0IiC0xGPmdh44xvrO8h4UK1uwKBgGkY3Lealdb31YUM6MWdpftFbPj2i5h6BKFK0HDxqNrXZkcBwwCFj6nmK+c1pfaYYOtYZocmXNY6vTamVlmelIXMWkB5wkxoLBONWQPSrfR+bjFjghyyfQxUDaFWtkZiqo1iXmVP64XJlhhtSr8HfE32Nj4OsXZbZk+bTQu8w3XxAoGBAJJg3wvYQQ52uYKpXoJ5WuIIT/fnf3FG35ebpLvgVECcyIIsTZYqLMpAdVswTrknYWAsKW/MUWzVscK8J3z3DxAWruoSfm0V5SEXK9yDuoRazttp5t6/Py5ADOfXu92Am+38Tx/EK4SxjLRbRVW6SC5h4GBe3Vb/8yxeB5uJ6UERAoGAbsCHaS1NW21qYxeWAD8XC1x8B5vLwcVILP0kIt5CPFgKRcRbJPEfnSF8fFC0OKwJrp32+AhMTOEISwJVkR10Jzqn7VU1bu7lHYkiiOIZJCb1cdjfPxYUR60vpIttoKuz+CBIgc0zo1tu3TgCVdCy//coVRCoLeK+JawP43VLJ+g=" + +apollo: + app_id: "wishpal_live_service" + cluster: "dev" + ip: "http://localhost:8080" + namespace_name: "application,tag,account_init,platform,support_wx_id,version" + secret: "" + is_back_up_config: true + sync_server_timeout: 2 + +dysmsapi: + access_key_id: "LTAI5tMZEAgdr7ZqHQfBF314" + access_key_secret: "Qd8Sf94841y22vUjAhXCpLTdo2r0ys" + sign_name: "成都心意到了科技" + template_code: "SMS_290196756" + +imageaudit: + access_key_id: "LTAI5tD2Mg5mPUDQLPZZriPJ" + access_key_secret: "IseIbk7fMbwy0eL33J2ro4Y55mWkn4" + scenes: "porn terrorism ad live logo" + task_buffer_size: 100 + task_packet_size: 100 + +textaudit: + labels: "spam politics abuse terrorism porn flood contraband ad" + task_buffer_size: 100 + task_packet_size: 100 + +media: + access_key: "LTAI5tAdu5LRvZwm4LJa21Fo" + access_secret: "WGvSQsDralTfFAAxhEqLBOgbXqflHo" + endpoint: "oss-cn-hangzhou.aliyuncs.com" + bucket: "wishpal-ironfan-media" + expire_time: 1800 + +redis: + uri: "r-bp1slashewonusih6h.redis.rds.aliyuncs.com" + password: "SWEbaxdt6aM@" + max_active: 0 + max_idle: 0 + idle_timeout: 0 + prefix: "" + +server_info: + file_server_domain_name: "https://file.tiefen.fun/" \ No newline at end of file diff --git a/library/logger/logger.go b/library/logger/logger.go index 05af61ce..3b6c5b1b 100644 --- a/library/logger/logger.go +++ b/library/logger/logger.go @@ -32,17 +32,17 @@ type DefaultFormatter struct{} func (m *DefaultFormatter) Format(entry *logrus.Entry) ([]byte, error) { // 根据不同的level展示颜色 - var levelColor int - switch entry.Level { - case logrus.DebugLevel, logrus.TraceLevel: - levelColor = gray - case logrus.WarnLevel: - levelColor = yellow - case logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel: - levelColor = red - default: - levelColor = blue - } + //var levelColor int + //switch entry.Level { + //case logrus.DebugLevel, logrus.TraceLevel: + // levelColor = gray + //case logrus.WarnLevel: + // levelColor = yellow + //case logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel: + // levelColor = red + //default: + // levelColor = blue + //} var b *bytes.Buffer if entry.Buffer != nil { @@ -54,7 +54,7 @@ func (m *DefaultFormatter) Format(entry *logrus.Entry) ([]byte, error) { timestamp := entry.Time.Format("2006-01-02 15:04:05") var newLog string - newLog = fmt.Sprintf("[%s] \033[%dm[%s]\033[0m %s \n", timestamp, levelColor, entry.Level, entry.Message) + newLog = fmt.Sprintf("[%s] [%s] %s \n", timestamp, entry.Level, entry.Message) b.WriteString(newLog) return b.Bytes(), nil }