From c18524eee8d02c8af50806cf4053d23689d98858 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 17 Aug 2024 16:40:42 +0800 Subject: [PATCH] 1 --- server/marketserver/mt/Config.go | 2 ++ server/marketserver/mtb/mtb.auto_gen.go | 10 ---------- server/marketserver/proto/mt.proto | 1 - server/marketserver/service/contribution.go | 2 ++ 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/server/marketserver/mt/Config.go b/server/marketserver/mt/Config.go index 5c6612ad..72b63288 100644 --- a/server/marketserver/mt/Config.go +++ b/server/marketserver/mt/Config.go @@ -22,9 +22,11 @@ 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)) diff --git a/server/marketserver/mtb/mtb.auto_gen.go b/server/marketserver/mtb/mtb.auto_gen.go index a49fd5e8..84f57689 100644 --- a/server/marketserver/mtb/mtb.auto_gen.go +++ b/server/marketserver/mtb/mtb.auto_gen.go @@ -68,7 +68,6 @@ type GameDb struct { type Config struct { gameapi_url string jwks_uri string - email_buyer_passport_address string _flags1_ uint64 _flags2_ uint64 @@ -390,14 +389,6 @@ 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 } @@ -576,7 +567,6 @@ 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 4b2dba3a..235a3165 100644 --- a/server/marketserver/proto/mt.proto +++ b/server/marketserver/proto/mt.proto @@ -57,7 +57,6 @@ message Config { optional string gameapi_url = 1; optional string jwks_uri = 2; - optional string email_buyer_passport_address = 3; } message RechargeCurrency diff --git a/server/marketserver/service/contribution.go b/server/marketserver/service/contribution.go index 70888bbf..995e7bc8 100644 --- a/server/marketserver/service/contribution.go +++ b/server/marketserver/service/contribution.go @@ -31,6 +31,7 @@ func (this *contribution) unInit() { } func (this *contribution) GetAddressContribution(accountAddress string) (float64, error) { + return 0, nil accinfo, exist := this.accountContricutionlist.Load(accountAddress) var beforcontribution float64 = 0 if nowseconds := f5.GetApp().GetRealSeconds(); !exist || (*accinfo).gcTime+60 < nowseconds { @@ -159,6 +160,7 @@ func (this *contribution) GetAddressContribution(accountAddress string) (float64 } func (this *contribution) GetGlobalContribution(instant bool) (float64, error) { + return 0, nil if this.historyContribution < 0.000001 { sql := `SELECT SUM(contribution) FROM t_contribution WHERE idx > 0` f5.GetGoStyleDb().RawQuery(