+ * + *
+ * + * @author ban123 + * @since 2021-04-26 + */ +@Data +public class EventParam implements Serializable { + + private static final long serialVersionUID = 1L; + private Integer id; + private Integer chainId; + private String contract; + private String param; + private String method; + private Integer type; + private String remark; + +} diff --git a/conflux-admin/src/main/java/com/conflux/web/controller/nft/mapper/NftCollectionMapper.java b/conflux-admin/src/main/java/com/conflux/web/controller/nft/mapper/NftCollectionMapper.java index 7f2c1b8..024bd85 100644 --- a/conflux-admin/src/main/java/com/conflux/web/controller/nft/mapper/NftCollectionMapper.java +++ b/conflux-admin/src/main/java/com/conflux/web/controller/nft/mapper/NftCollectionMapper.java @@ -22,6 +22,8 @@ public interface NftCollectionMapper */ public NftCollection selectNftCollectionById(Long id); + public NftCollection selectNftCollectionByIdSting(String id); + /** * 查询nft上链列表 * @@ -63,4 +65,6 @@ public interface NftCollectionMapper * @return 结果 */ public int deleteNftCollectionByIds(Long[] ids); + + int updateByTokenId(String hexTokenId); } diff --git a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/INftCollectionService.java b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/INftCollectionService.java index 0644123..bce8722 100644 --- a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/INftCollectionService.java +++ b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/INftCollectionService.java @@ -2,6 +2,7 @@ package com.conflux.web.controller.nft.service; import com.conflux.web.controller.nft.domain.NftCollection; +import com.conflux.web.controller.nft.domain.dto.NftDTO; import java.util.List; @@ -68,4 +69,6 @@ public interface INftCollectionService * @return 结果 */ public int deleteNftCollectionById(Long id); + + void updateCollect(NftDTO nftDTO); } diff --git a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java index 9f01bc6..6772ba2 100644 --- a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java +++ b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java @@ -9,19 +9,29 @@ import com.conflux.web.controller.collect.service.ICollectConfigService; import com.conflux.web.controller.contract.domain.ContractConfig; import com.conflux.web.controller.contract.service.IContractConfigService; import com.conflux.web.controller.nft.domain.*; +import com.conflux.web.controller.nft.domain.vo.FilterMapVO; import com.conflux.web.controller.nft.service.ConfluxService; +import com.conflux.web.controller.nft.service.IHandlerStrategy; import com.conflux.web.controller.nft.service.INftCollectionService; import com.conflux.web.controller.nft.service.INftLogService; import com.conflux.web.controller.util.AESUtil; import com.conflux.web.controller.util.AddressUtil; +import com.conflux.web.controller.util.CfxUtils; import com.conflux.web.controller.util.redis.RedisUtils; +import com.google.gson.Gson; import conflux.web3j.Account; import conflux.web3j.Cfx; +import conflux.web3j.Request; +import conflux.web3j.request.Epoch; +import conflux.web3j.request.LogFilter; +import conflux.web3j.response.Log; import conflux.web3j.response.UsedGasAndCollateral; import conflux.web3j.types.Address; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -49,6 +59,10 @@ public class ConfluxServiceImpl implements ConfluxService { private INftCollectionService nftCollectionService; @Autowired private INftLogService nftLogService; + @Resource + private IHandlerStrategy iHandlerStrategy; + @Autowired + private ThreadPoolTaskExecutor executor; @SneakyThrows @Override @@ -64,73 +78,81 @@ public class ConfluxServiceImpl implements ConfluxService { if (checkArgs.getIds().length > 100) { return AjaxResult.error("上链数量超出100！"); } - String checkArgsToken = AESUtil.decrypt(checkArgs.getToken(), ConfluxArt.AESKEY); - String token = (String) redisUtils.get(checkArgsToken); - String sign = AESUtil.decrypt(checkArgs.getSign(), ConfluxArt.AESKEY); - //校验token和sign签名 - if (token.equals(checkArgsToken) && sign.equals(ConfluxArt.SIGN)) { - //校验时间戳 - long time = Long.valueOf(checkArgs.getTimesTamp()); - long timesTamp = System.currentTimeMillis(); - if (timesTamp - time > 10000l) { - return AjaxResult.error("参数错误！"); - } - //删除缓存 - redisUtils.del(checkArgsToken); - redisUtils.del(sign); - //判断上链的数量 - CollectConfig collectConfig = collectConfigService.selectCollectConfigByStatus(); - if (collectConfig.getMintPause()) { - log.info("[--------------------->mintNft][start pause]"); - Thread.sleep(5000); - return AjaxResult.error("pause参数异常！"); - } - Cfx cfx = Cfx.create(collectConfig.getNode(), 3, 1000); - ContractConfig contractConfig = contractConfigService.selectContractConfigByUnitName(checkArgs.getUnitName()); - Account account = Account.create(cfx, AESUtil.decrypt(contractConfig.getPrivateKey())); - Account.Option opt = new Account.Option(); - opt.withValue(BigInteger.ZERO); - opt.withChainId(collectConfig.getChainId()); - opt.withEpochHeight(cfx.getEpochNumber().sendAndGet()); - opt.withGasPrice(contractConfig.getGasPrice()); - //获取余额 - BigInteger balance = cfx.getBalance(account.getAddress()).sendAndGet(); - log.info("[--------------------->mintNft][balance]{}", balance); - if (balance.compareTo(new BigInteger("50000000000000000000")) < 0) { - log.info("[--------------------->mintNft][balance not enough 50]{}", balance); - //sms notice - return AjaxResult.error("账户余额不足！"); - } - String contract = contractConfig.getContract(); - String owner = contractConfig.getContract(); - ConfluxExecutor confluxExecutor=new ConfluxExecutor(account,contract); - List
- * event Transfer(address indexed operator, address indexed from, address indexed to);
*
* @param json json
*/
@@ -59,8 +39,8 @@ public class NftInfoV2ImplHandler extends BaseHandler implements INftInfoV2Handl
nftDTO.setTokenId(CfxUtils.getNumber(logInfo.getTopics().get(3)));
nftDTO.setEpochNumber(logInfo.getEpochNumber().get().longValue());
nftDTO.setUpdateTime(DateUtil.currentSeconds());
- //
- //wjMyCollectionService.updateCollect(nftDTO);
+ log.info("-------------->json:",json);
+ nftCollectionService.updateCollect(nftDTO);
}
public static Address decode(String encodedResult) {
diff --git a/conflux-admin/src/main/java/com/conflux/web/controller/util/AESUtil.java b/conflux-admin/src/main/java/com/conflux/web/controller/util/AESUtil.java
index 69dbd5e..1e08380 100644
--- a/conflux-admin/src/main/java/com/conflux/web/controller/util/AESUtil.java
+++ b/conflux-admin/src/main/java/com/conflux/web/controller/util/AESUtil.java
@@ -175,7 +175,7 @@ public final class AESUtil {
public static void main(String[] args) {
try {
- String encrypt = encrypt("cbe3bbb2-8a6e-48e5-9a4f-42377d381b9c","CONFLUX@123");
+ String encrypt = encrypt("a92ccc5a-d74c-4b58-9092-c91ff4a4fb9a","CONFLUX@123");
System.err.println(encrypt);
} catch (Exception e) {
e.printStackTrace();
diff --git a/conflux-quartz/src/main/java/com/conflux/quartz/domain/NftJob.java b/conflux-quartz/src/main/java/com/conflux/quartz/domain/NftJob.java
new file mode 100644
index 0000000..e0085b1
--- /dev/null
+++ b/conflux-quartz/src/main/java/com/conflux/quartz/domain/NftJob.java
@@ -0,0 +1,152 @@
+package com.conflux.quartz.domain;
+
+import com.conflux.common.annotation.Excel;
+
+import java.io.Serializable;
+
+/**
+ * conflux对象 collect_config
+ *
+ * @author conflux
+ * @date 2022-05-31
+ */
+public class NftJob implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ private Integer id;
+
+ /**
+ * node
+ */
+ @Excel(name = "node")
+ private String node;
+
+ /**
+ * limit_count
+ */
+ @Excel(name = "limit_count")
+ private Integer limitCount;
+
+ /**
+ * chain_id
+ */
+ @Excel(name = "chain_id")
+ private Integer chainId;
+
+ /**
+ * epoch_number
+ */
+ @Excel(name = "epoch_number")
+ private Long epochNumber;
+
+ /**
+ * on_pause
+ */
+ @Excel(name = "on_pause")
+ private Boolean onPause;
+
+ /**
+ * mint_pause
+ */
+ @Excel(name = "mint_pause")
+ private Boolean mintPause;
+
+ /**
+ * createTime
+ */
+ @Excel(name = "createTime")
+ private Long createTime;
+
+ /**
+ * updateTime
+ */
+ @Excel(name = "updateTime")
+ private Long updateTime;
+
+ @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+ private String status;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getNode() {
+ return node;
+ }
+
+ public void setNode(String node) {
+ this.node = node;
+ }
+
+ public Integer getLimitCount() {
+ return limitCount;
+ }
+
+ public void setLimitCount(Integer limitCount) {
+ this.limitCount = limitCount;
+ }
+
+ public Integer getChainId() {
+ return chainId;
+ }
+
+ public void setChainId(Integer chainId) {
+ this.chainId = chainId;
+ }
+
+ public Long getEpochNumber() {
+ return epochNumber;
+ }
+
+ public void setEpochNumber(Long epochNumber) {
+ this.epochNumber = epochNumber;
+ }
+
+ public Boolean getOnPause() {
+ return onPause;
+ }
+
+ public void setOnPause(Boolean onPause) {
+ this.onPause = onPause;
+ }
+
+ public Boolean getMintPause() {
+ return mintPause;
+ }
+
+ public void setMintPause(Boolean mintPause) {
+ this.mintPause = mintPause;
+ }
+
+ public Long getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Long createTime) {
+ this.createTime = createTime;
+ }
+
+ public Long getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Long updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+}
diff --git a/conflux-quartz/src/main/java/com/conflux/quartz/mapper/NftJobMapper.java b/conflux-quartz/src/main/java/com/conflux/quartz/mapper/NftJobMapper.java
new file mode 100644
index 0000000..b71de95
--- /dev/null
+++ b/conflux-quartz/src/main/java/com/conflux/quartz/mapper/NftJobMapper.java
@@ -0,0 +1,69 @@
+package com.conflux.quartz.mapper;
+
+
+
+import com.conflux.quartz.domain.NftJob;
+
+import java.util.List;
+
+/**
+ * confluxMapper接口
+ *
+ * @author conflux
+ * @date 2022-05-31
+ */
+public interface NftJobMapper
+{
+ /**
+ * 查询conflux
+ *
+ * @param id conflux主键
+ * @return conflux
+ */
+ public NftJob selectCollectConfigById(Long id);
+
+ /**
+ * 查询conflux列表
+ *
+ * @param nftjob conflux
+ * @return conflux集合
+ */
+ public List