1

.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

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

bin/backtask/config/mail/gold_bullion/unlock.content.txt

@@ -0,0 +1 @@
+[${item.name}] has been used successfully, you have received ${gold} gold

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.

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

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

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() {
+
 }

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"

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;

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

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
 }

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 := ""
 	/*

server/marketserver/api/v1/shopcart/shopcart.go

@@ -144,10 +144,12 @@ func (this *ShopCartApi) Add(c *gin.Context) {
 				c.JSON(200, rspObj)
 				return
 			}
-			if ds.Next() {
 			cartDb := common.NewShopCart()
 			dirty := false
+			if ds.Next() {
 				if q5.DecodeJson(ds.GetByName("data"), cartDb) == nil {
+				}
+			}
 			for _, val := range reqJson.Tokens {
 				netId := q5.SafeToInt32(reqJson.NetId)
 				contractAddress := val.ContractAddress
@@ -194,15 +196,11 @@ func (this *ShopCartApi) Add(c *gin.Context) {
 					dirty = true;
 				}
 			}
-				}
 			if dirty {
 				cartDb.DeleteExcessData()
 				this.save(openId, cartDb)
 			}
 			c.JSON(200, rspObj)
-			} else {
-				c.JSON(200, rspObj)
-			}
 		})
 }
 
@@ -241,10 +239,12 @@ func (this *ShopCartApi) Del(c *gin.Context) {
 				c.JSON(200, rspObj)
 				return
 			}
-			if ds.Next() {
 			cartDb := common.NewShopCart()
 			dirty := false
+			if ds.Next() {
 				if q5.DecodeJson(ds.GetByName("data"), cartDb) == nil {
+				}
+			}
 			newGoods := []*common.ShopCartGoods{}
 			for _, val := range cartDb.Goods {
 				found := false
@@ -261,14 +261,10 @@ func (this *ShopCartApi) Del(c *gin.Context) {
 					dirty = true
 				}
 			}
-				}
 			if dirty {
 				this.save(openId, cartDb)
 			}
 			c.JSON(200, rspObj)
-			} else {
-				c.JSON(200, rspObj)
-			}
 		})
 }
 

third_party/contracts-imtbl

@@ -0,0 +1 @@
+Subproject commit 6621b926b460d820e6c01d69c13053259a80e5f3