server/game2006go
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-07-16 14:31:26 +08:00
parent 4170e36ddb
commit db6deac23e
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/marketserver/config/contract.json
View File

@ -40,5 +40,11 @@
"type": "logic", "type": "logic",
"json": "assets/contracts/NFTLock.json", "json": "assets/contracts/NFTLock.json",
"address": "0xC8607507451059CfAe6Ca4D07EC6f631ce8ef9f9" "address": "0xC8607507451059CfAe6Ca4D07EC6f631ce8ef9f9"
},
{
"name": "CFHero_normal",
"type": "erc721",
"json": "assets/contracts/CFNFTGame.json",
"address": "0x994dE61dD536B22F7e3BDB77aa3ef55AeC938bFD"
} }
] ]

20
server/marketserver/api/v1/nft/nft.go
View File

@ -6,6 +6,7 @@ import (
"mt" "mt"
"jccommon" "jccommon"
"main/constant" "main/constant"
"strings"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -26,9 +27,10 @@ func (this *NftApi) Unlock(c *gin.Context) {
f5.RspErr(c, 401, "params parse error") f5.RspErr(c, 401, "params parse error")
return return
} }
lockMeta := mt.Table.Contract.GetByName(jccommon.CONTRACT_NAME_NFTLock)
heroMeta := mt.Table.Contract.GetByName(jccommon.CONTRACT_NAME_CFHero) heroMeta := mt.Table.Contract.GetByName(jccommon.CONTRACT_NAME_CFHero)
gcardMeta := mt.Table.Contract.GetByName(jccommon.CONTRACT_NAME_GCardHero) gcardMeta := mt.Table.Contract.GetByName(jccommon.CONTRACT_NAME_GCardHero)
if heroMeta == nil && gcardMeta == nil { if (heroMeta == nil && gcardMeta == nil) || lockMeta == nil {
f5.RspErr(c, 1, "contract_address params error") f5.RspErr(c, 1, "contract_address params error")
return return
} }
@ -40,6 +42,7 @@ func (this *NftApi) Unlock(c *gin.Context) {
f5.RspErr(c, 1, "tokens params error") f5.RspErr(c, 1, "tokens params error")
return return
} }
accountAddress := c.MustGet("account_address").(string)
f5.GetGoStyleDb().OrmSelectOne( f5.GetGoStyleDb().OrmSelectOne(
constant.BCNFT_DB, constant.BCNFT_DB,
"t_nft", "t_nft",
@ -47,8 +50,21 @@ func (this *NftApi) Unlock(c *gin.Context) {
{"net_id", q5.SafeToString(reqJson.NetId)}, {"net_id", q5.SafeToString(reqJson.NetId)},
{"contract_address", reqJson.ContractAddress}, {"contract_address", reqJson.ContractAddress},
{"token_id", reqJson.Tokens[0].TokenId}, {"token_id", reqJson.Tokens[0].TokenId},
{"owner_address", strings.ToLower(lockMeta.GetAddress())},
}, },
func (err error, ds *f5.DataSet) { func (err error, ds *f5.DataSet) {
if err != nil {
f5.RspErr(c, 500, "server internal error")
return
}
if ds.Next() {
if accountAddress != ds.GetByName("last_lock_address") {
f5.RspErr(c, 500, "nft not found")
return
}
} else {
f5.RspErr(c, 500, "nft not found")
return
}
}) })
} }

2
third_party/contracts-imtbl vendored

@ -1 +1 @@
Subproject commit 6621b926b460d820e6c01d69c13053259a80e5f3 Subproject commit 92cd4db0d87f5f2d10b20174c0f40301646e9059