Commit 0efddbd7 authored by 33's avatar 33

更新版权状态定时器调整为10分钟一次

parent 6b565204
...@@ -66,7 +66,7 @@ public class CopyrightTask { ...@@ -66,7 +66,7 @@ public class CopyrightTask {
/** /**
* 定时任务更新版权申请状态 * 定时任务更新版权申请状态
*/ */
@Scheduled(cron = "0 */2 * * * ?") @Scheduled(cron = "0 */10 * * * ?")
public void updateCopyrightState() throws InterruptedException { public void updateCopyrightState() throws InterruptedException {
// 加锁,防止集群部署时,定时任务在多个节点上执行 // 加锁,防止集群部署时,定时任务在多个节点上执行
RLock lock = redisson.getLock("update:copyright:state"); RLock lock = redisson.getLock("update:copyright:state");
......
...@@ -23,6 +23,9 @@ public class NftTransferRecordVo { ...@@ -23,6 +23,9 @@ public class NftTransferRecordVo {
@ApiModelProperty("nft哈希") @ApiModelProperty("nft哈希")
private String nftHash; private String nftHash;
@ApiModelProperty("id")
private String tradeId;
@ApiModelProperty("类型") @ApiModelProperty("类型")
private String category; private String category;
......
...@@ -155,9 +155,10 @@ public class NftServiceImpl extends ServiceImpl<NftMapper, Nft> implements NftSe ...@@ -155,9 +155,10 @@ public class NftServiceImpl extends ServiceImpl<NftMapper, Nft> implements NftSe
throw GlobalException.newException(ResultCode.TRANSFER_ERROR, "短信验证码校验失败"); throw GlobalException.newException(ResultCode.TRANSFER_ERROR, "短信验证码校验失败");
} }
// 转让nft
String tokenInfo = paraChainClient.evmGetTokenInfo(abi, contractAddr, nft.getTokenId(), user.getWallet()); String tokenInfo = paraChainClient.evmGetTokenInfo(abi, contractAddr, nft.getTokenId(), user.getWallet());
log.info("tokenInfo:{}", tokenInfo); log.info("tokenInfo:{}", tokenInfo);
// 转让nft
String hash = paraChainClient.evmTransfer(abi, contractAddr, EvmTokenEnum.ERC1155, 1000000L, String hash = paraChainClient.evmTransfer(abi, contractAddr, EvmTokenEnum.ERC1155, 1000000L,
param.getReceiveWallet(), nft.getTokenId(), param.getCount(), tokenInfo, user.getWallet(), null, true); param.getReceiveWallet(), nft.getTokenId(), param.getCount(), tokenInfo, user.getWallet(), null, true);
if (StringUtils.isBlank(hash)) { if (StringUtils.isBlank(hash)) {
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
a.from_address, a.from_address,
a.to_address, a.to_address,
a.nft_hash, a.nft_hash,
a.transfer_hash AS tradeId,
a.create_date, a.create_date,
b.`name` AS nftName, b.`name` AS nftName,
c.nickname AS fromNickName, c.nickname AS fromNickName,
...@@ -41,6 +42,7 @@ ...@@ -41,6 +42,7 @@
<select id="list" resultType="com.fzm.common.entity.vo.NftTransferDetailVo"> <select id="list" resultType="com.fzm.common.entity.vo.NftTransferDetailVo">
SELECT a.id, SELECT a.id,
a.nft_hash, a.nft_hash,
a.transfer_hash AS tradeId,
a.create_date, a.create_date,
b.cover, b.cover,
b.`name` AS nftName, b.`name` AS nftName,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment