diff --git a/.gitmodules b/.gitmodules index d6fffbbd..fa7f3c10 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "third_party/f5"] path = third_party/f5 url = git@git.kingsome.cn:server_common/f5.git +[submodule "third_party/contracts-imtbl"] + path = third_party/contracts-imtbl + url = git@git.kingsome.cn:crypto/contracts-imtbl.git diff --git a/bin/backtask/config/mail/gold_bullion/lock.content.txt b/bin/backtask/config/mail/gold_bullion/lock.content.txt new file mode 100644 index 00000000..e69de29b diff --git a/bin/backtask/config/mail/gold_bullion/lock.title.txt b/bin/backtask/config/mail/gold_bullion/lock.title.txt new file mode 100644 index 00000000..e69de29b diff --git a/bin/backtask/config/mail/gold_bullion/mint.content.txt b/bin/backtask/config/mail/gold_bullion/mint.content.txt new file mode 100644 index 00000000..f72ec0d2 --- /dev/null +++ b/bin/backtask/config/mail/gold_bullion/mint.content.txt @@ -0,0 +1 @@ +[${item.name}] has been synthesized successfully. Please go to the personal assets page on the web to view it. The web address : XXXXX diff --git a/bin/backtask/config/mail/gold_bullion/mint.title.txt b/bin/backtask/config/mail/gold_bullion/mint.title.txt new file mode 100644 index 00000000..e69de29b diff --git a/bin/backtask/config/mail/gold_bullion/unlock.content.txt b/bin/backtask/config/mail/gold_bullion/unlock.content.txt new file mode 100644 index 00000000..9d9ad53c --- /dev/null +++ b/bin/backtask/config/mail/gold_bullion/unlock.content.txt @@ -0,0 +1 @@ +[${item.name}] has been used successfully, you have received ${gold} gold diff --git a/bin/backtask/config/mail/gold_bullion/unlock.title.txt b/bin/backtask/config/mail/gold_bullion/unlock.title.txt new file mode 100644 index 00000000..e69de29b diff --git a/bin/backtask/config/mail/hero/lock.content.txt b/bin/backtask/config/mail/hero/lock.content.txt new file mode 100644 index 00000000..335e1762 --- /dev/null +++ b/bin/backtask/config/mail/hero/lock.content.txt @@ -0,0 +1 @@ +[{$hero.name} ${hero.quality}] has been off-chained successfully. Please check in the hero backpack. diff --git a/bin/backtask/config/mail/hero/lock.title.txt b/bin/backtask/config/mail/hero/lock.title.txt new file mode 100644 index 00000000..e69de29b diff --git a/bin/backtask/config/mail/hero/mint.content.txt b/bin/backtask/config/mail/hero/mint.content.txt new file mode 100644 index 00000000..3d31c66b --- /dev/null +++ b/bin/backtask/config/mail/hero/mint.content.txt @@ -0,0 +1 @@ +[{$hero.name} ${hero.quality}] has been on-chain successfully. Please go to the personal assets page on the web to view it. The web market address is XXXXX diff --git a/bin/backtask/config/mail/hero/mint.title.txt b/bin/backtask/config/mail/hero/mint.title.txt new file mode 100644 index 00000000..e69de29b diff --git a/bin/backtask/config/mail/hero/unlock.content.txt b/bin/backtask/config/mail/hero/unlock.content.txt new file mode 100644 index 00000000..3d31c66b --- /dev/null +++ b/bin/backtask/config/mail/hero/unlock.content.txt @@ -0,0 +1 @@ +[{$hero.name} ${hero.quality}] has been on-chain successfully. Please go to the personal assets page on the web to view it. The web market address is XXXXX diff --git a/bin/backtask/config/mail/hero/unlock.title.txt b/bin/backtask/config/mail/hero/unlock.title.txt new file mode 100644 index 00000000..e69de29b diff --git a/server/backtask/mt/Mail.go b/server/backtask/mt/Mail.go index bae247ad..10873f7a 100644 --- a/server/backtask/mt/Mail.go +++ b/server/backtask/mt/Mail.go @@ -1,14 +1,29 @@ package mt import ( - "f5" - "mtb" ) type Mail struct { - mtb.Mail } type MailTable struct { - f5.NameMetaTable[Mail] +} + +func (this *MailTable) IsNoLoad() bool { + return false +} + +func (this *MailTable) Load() { +} + +func (this *MailTable) PreInit1() { + +} + +func (this *MailTable) ElementsInit(int) { + +} + +func (this *MailTable) PostInit1() { + } diff --git a/server/backtask/mt/export.go b/server/backtask/mt/export.go index 190ab5d2..be6ee310 100644 --- a/server/backtask/mt/export.go +++ b/server/backtask/mt/export.go @@ -49,10 +49,7 @@ var Table = f5.New(func(this *table) { this.PrimKey = "id" }) - this.Mail = f5.New(func(this *MailTable) { - this.FileName = "../config/mail.json" - this.PrimKey = "name" - }) + this.Mail = new(MailTable) this.Language = f5.New(func(this *LanguageTable) { this.FileName = "../res/language@language.json" diff --git a/server/backtask/proto/mt.proto b/server/backtask/proto/mt.proto index 3149cc4b..fc80bf9c 100644 --- a/server/backtask/proto/mt.proto +++ b/server/backtask/proto/mt.proto @@ -56,13 +56,6 @@ message Language optional string en = 2; } -message Mail -{ - optional string name = 1; - optional string subject = 2; - optional string content = 3; -} - message RankSeason { optional int32 id = 1; diff --git a/server/backtask/task/spec_transfer721/hero.go b/server/backtask/task/spec_transfer721/hero.go index 875ecac2..a46b9bea 100644 --- a/server/backtask/task/spec_transfer721/hero.go +++ b/server/backtask/task/spec_transfer721/hero.go @@ -44,10 +44,11 @@ func (this* hero) internalSendMail(dbIdx int64, accountAddress string, mailName if accountId == "" { return true } + /* mailMeta := mt.Table.Mail.GetByName(mailName) if mailMeta == nil { return true - } + }*/ mailCfg := this.getMailConfig(mailName) if mailCfg == nil { return true diff --git a/server/backtask/task/spec_transfer721/spec_transfer721.go b/server/backtask/task/spec_transfer721/spec_transfer721.go index d86a25f7..27af7376 100644 --- a/server/backtask/task/spec_transfer721/spec_transfer721.go +++ b/server/backtask/task/spec_transfer721/spec_transfer721.go @@ -5,7 +5,7 @@ import ( "f5" "time" "fmt" - "mt" + //"mt" "jccommon" "main/constant" ) @@ -49,6 +49,7 @@ SELECT * FROM t_721nft_spec_transfer WHERE idx > %d AND status = 0 AND createtim } func (this* SpecTransfer721) dispatch(ds *f5.DataSet) bool { + /* idx := q5.ToInt64(ds.GetByName("idx")) netId := q5.ToInt32(ds.GetByName("net_id")) contractAddress := ds.GetByName("contract_address") @@ -69,6 +70,6 @@ func (this* SpecTransfer721) dispatch(ds *f5.DataSet) bool { } } } - } + }*/ return true } diff --git a/server/marketserver/api/v1/market/market.go b/server/marketserver/api/v1/market/market.go index dafb187d..1bd4b5e8 100644 --- a/server/marketserver/api/v1/market/market.go +++ b/server/marketserver/api/v1/market/market.go @@ -53,12 +53,13 @@ func (this *MarketApi) ProductList(c *gin.Context) { SELECT * FROM t_order A WHERE idx > %d AND net_id = %d AND status="%s" `, cursor, netId, jccommon.ORDER_STATUS_ACTIVE) + /* if f5.IsTestEnv() { sql = fmt.Sprintf(` SELECT * FROM t_order A WHERE idx > %d AND net_id = %d `, cursor, netId) - } + }*/ orderBy := "" /* diff --git a/server/marketserver/api/v1/shopcart/shopcart.go b/server/marketserver/api/v1/shopcart/shopcart.go index 2d6984cb..91d99706 100644 --- a/server/marketserver/api/v1/shopcart/shopcart.go +++ b/server/marketserver/api/v1/shopcart/shopcart.go @@ -144,65 +144,63 @@ func (this *ShopCartApi) Add(c *gin.Context) { c.JSON(200, rspObj) return } + cartDb := common.NewShopCart() + dirty := false if ds.Next() { - cartDb := common.NewShopCart() - dirty := false if q5.DecodeJson(ds.GetByName("data"), cartDb) == nil { - for _, val := range reqJson.Tokens { - netId := q5.SafeToInt32(reqJson.NetId) - contractAddress := val.ContractAddress - tokenId := q5.SafeToString(val.TokenId) - p := cartDb.GetGoods(netId, contractAddress, tokenId) - if p != nil { - cartDb.CurrSortIdx += 1 - p.SortIdx = cartDb.CurrSortIdx - p.AddTime = q5.ToInt32(f5.GetApp().GetRealSeconds()) - dirty = true; - } else { - var err1 error - f5.GetGoStyleDb().OrmSelectOne( - constant.BCNFT_DB, - "t_order", - [][]string{ - {"net_id", q5.ToString(netId)}, - {"contract_address", contractAddress}, - {"token_id", tokenId}, - {"status", jccommon.ORDER_STATUS_ACTIVE}, - }, - func (err error, ds* f5.DataSet) { - err1 = err - if err == nil { - if ds.Next() { - cartDb.CurrSortIdx += 1 - g := common.NewShopCartGoods() - g.NetId = netId - g.ContractAddress = contractAddress - g.TokenId = tokenId - g.SortIdx = cartDb.CurrSortIdx - g.AddTime = q5.ToInt32(f5.GetApp().GetRealSeconds()) - q5.AppendSlice(&cartDb.Goods, g) - } else { - } - } - }) - if err1 != nil { - rspObj.ErrCode = 500 - rspObj.ErrMsg = "server internal error" - c.JSON(200, rspObj) - return - } - dirty = true; - } - } } - if dirty { - cartDb.DeleteExcessData() - this.save(openId, cartDb) - } - c.JSON(200, rspObj) - } else { - c.JSON(200, rspObj) } + for _, val := range reqJson.Tokens { + netId := q5.SafeToInt32(reqJson.NetId) + contractAddress := val.ContractAddress + tokenId := q5.SafeToString(val.TokenId) + p := cartDb.GetGoods(netId, contractAddress, tokenId) + if p != nil { + cartDb.CurrSortIdx += 1 + p.SortIdx = cartDb.CurrSortIdx + p.AddTime = q5.ToInt32(f5.GetApp().GetRealSeconds()) + dirty = true; + } else { + var err1 error + f5.GetGoStyleDb().OrmSelectOne( + constant.BCNFT_DB, + "t_order", + [][]string{ + {"net_id", q5.ToString(netId)}, + {"contract_address", contractAddress}, + {"token_id", tokenId}, + {"status", jccommon.ORDER_STATUS_ACTIVE}, + }, + func (err error, ds* f5.DataSet) { + err1 = err + if err == nil { + if ds.Next() { + cartDb.CurrSortIdx += 1 + g := common.NewShopCartGoods() + g.NetId = netId + g.ContractAddress = contractAddress + g.TokenId = tokenId + g.SortIdx = cartDb.CurrSortIdx + g.AddTime = q5.ToInt32(f5.GetApp().GetRealSeconds()) + q5.AppendSlice(&cartDb.Goods, g) + } else { + } + } + }) + if err1 != nil { + rspObj.ErrCode = 500 + rspObj.ErrMsg = "server internal error" + c.JSON(200, rspObj) + return + } + dirty = true; + } + } + if dirty { + cartDb.DeleteExcessData() + this.save(openId, cartDb) + } + c.JSON(200, rspObj) }) } @@ -241,34 +239,32 @@ func (this *ShopCartApi) Del(c *gin.Context) { c.JSON(200, rspObj) return } + cartDb := common.NewShopCart() + dirty := false if ds.Next() { - cartDb := common.NewShopCart() - dirty := false if q5.DecodeJson(ds.GetByName("data"), cartDb) == nil { - newGoods := []*common.ShopCartGoods{} - for _, val := range cartDb.Goods { - found := false - for _, val2 := range reqJson.Tokens { - if val.NetId == q5.SafeToInt32(reqJson.NetId) && - q5.ToString(val.TokenId) == q5.SafeToString(val2.TokenId) && - strings.ToLower(val.ContractAddress) == strings.ToLower(val2.ContractAddress) { - found = true - } - } - if !found { - q5.AppendSlice(&newGoods, val) - } else { - dirty = true - } + } + } + newGoods := []*common.ShopCartGoods{} + for _, val := range cartDb.Goods { + found := false + for _, val2 := range reqJson.Tokens { + if val.NetId == q5.SafeToInt32(reqJson.NetId) && + q5.ToString(val.TokenId) == q5.SafeToString(val2.TokenId) && + strings.ToLower(val.ContractAddress) == strings.ToLower(val2.ContractAddress) { + found = true } } - if dirty { - this.save(openId, cartDb) + if !found { + q5.AppendSlice(&newGoods, val) + } else { + dirty = true } - c.JSON(200, rspObj) - } else { - c.JSON(200, rspObj) } + if dirty { + this.save(openId, cartDb) + } + c.JSON(200, rspObj) }) } diff --git a/third_party/contracts-imtbl b/third_party/contracts-imtbl new file mode 160000 index 00000000..6621b926 --- /dev/null +++ b/third_party/contracts-imtbl @@ -0,0 +1 @@ +Subproject commit 6621b926b460d820e6c01d69c13053259a80e5f3