From bc74af22b8d6fda7efb90dc1eb9c8380de0f7439 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 13 Aug 2024 15:35:02 +0800 Subject: [PATCH] 1 --- server/marketserver/api/v1/recharge/recharge.go | 6 +++++- server/marketserver/mt/Config.go | 4 ++++ server/marketserver/mtb/mtb.auto_gen.go | 10 ++++++++++ server/marketserver/proto/mt.proto | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/server/marketserver/api/v1/recharge/recharge.go b/server/marketserver/api/v1/recharge/recharge.go index ff8a1210..e6c0af39 100644 --- a/server/marketserver/api/v1/recharge/recharge.go +++ b/server/marketserver/api/v1/recharge/recharge.go @@ -49,7 +49,7 @@ func (ea *RechargeApi) RechargeList(c *gin.Context) { } func (this *RechargeApi) Buy(c *gin.Context) { - passportAddress := c.MustGet("account_address").(string) + passportAddress := mt.Table.Config.GetEmailBuyerPassportAddress() reqJson := struct { NetId int32 `json:"net_id"` GoodsId int32 `json:"goods_id"` @@ -77,6 +77,10 @@ func (this *RechargeApi) BuyWithEmail(c *gin.Context) { f5.RspErr(c, 1, err.Error()) return } + if reqJson.Email == "" { + f5.RspErr(c, 1, "email is empty") + return + } this.internalBuy(c, reqJson.NetId, reqJson.GoodsId, reqJson.GoodsNum, reqJson.AccountAddress, passportAddress, reqJson.Email) } diff --git a/server/marketserver/mt/Config.go b/server/marketserver/mt/Config.go index 86e16b15..5c6612ad 100644 --- a/server/marketserver/mt/Config.go +++ b/server/marketserver/mt/Config.go @@ -22,6 +22,10 @@ func (this *ConfigTable) GetJwksUri() string { return this.selfConf.GetJwksUri() } +func (this *ConfigTable) GetEmailBuyerPassportAddress() string { + return this.selfConf.GetEmailBuyerPassportAddress() +} + func (this *ConfigTable) PostInit1() { this.selfConf = this.GetById(int64(0)) if this.selfConf == nil { diff --git a/server/marketserver/mtb/mtb.auto_gen.go b/server/marketserver/mtb/mtb.auto_gen.go index cdc502b1..3c227b39 100644 --- a/server/marketserver/mtb/mtb.auto_gen.go +++ b/server/marketserver/mtb/mtb.auto_gen.go @@ -55,6 +55,7 @@ type GameDb struct { type Config struct { gameapi_url string jwks_uri string + email_buyer_passport_address string _flags1_ uint64 _flags2_ uint64 @@ -319,6 +320,14 @@ func (this *Config) HasJwksUri() bool { return (this._flags1_ & (uint64(1) << 2)) > 0 } +func (this *Config) GetEmailBuyerPassportAddress() string { + return this.email_buyer_passport_address +} + +func (this *Config) HasEmailBuyerPassportAddress() bool { + return (this._flags1_ & (uint64(1) << 3)) > 0 +} + func (this *RechargeCurrency) GetCurrencyName() string { return this.currency_name } @@ -479,6 +488,7 @@ func (this *GameDb) LoadFromKv(kv map[string]interface{}) { func (this *Config) LoadFromKv(kv map[string]interface{}) { f5.ReadMetaTableField(&this.gameapi_url, "gameapi_url", &this._flags1_, 1, kv) f5.ReadMetaTableField(&this.jwks_uri, "jwks_uri", &this._flags1_, 2, kv) + f5.ReadMetaTableField(&this.email_buyer_passport_address, "email_buyer_passport_address", &this._flags1_, 3, kv) } func (this *RechargeCurrency) LoadFromKv(kv map[string]interface{}) { diff --git a/server/marketserver/proto/mt.proto b/server/marketserver/proto/mt.proto index c9c4e5e2..f69e6874 100644 --- a/server/marketserver/proto/mt.proto +++ b/server/marketserver/proto/mt.proto @@ -46,6 +46,7 @@ message Config { optional string gameapi_url = 1; optional string jwks_uri = 2; + optional string email_buyer_passport_address = 3; } message RechargeCurrency