Browse Source

修改接口文档,修改批量空投(转赠方式)bug

dev
long 3 years ago
parent
commit
7ba66f3d2b
  1. 9
      conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java
  2. 2
      conflux-admin/src/main/java/com/conflux/web/controller/util/AESUtil.java
  3. 2
      doc/conflux上链.html

9
conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java

@ -450,11 +450,11 @@ public class ConfluxServiceImpl implements ConfluxService {
//保存日志记录
nftLog.setMethod(metod);
nftLog.setHashCode(hash);
nftLog.setNftIds(checkArgs.getId());
nftLog.setNftIds(new Gson().toJson(checkArgs.getNftIds()));
nftLog.setGasUsed(est.getGasUsed());
NftBurn batchBurn = new NftBurn();
batchBurn.setContract(contract);
batchBurn.setNftId(new Gson().toJson(checkArgs.getNftId()));
batchBurn.setNftId(new Gson().toJson(checkArgs.getNftIds()));
batchBurn.setCretaeTime(new Date());
batchBurn.setInformationTableId(checkArgs.getId());
asyncExecutorNftSaveData.execute(() -> {
@ -471,7 +471,7 @@ public class ConfluxServiceImpl implements ConfluxService {
BigInteger[] bigIntegers = Arrays.stream(checkArgs.getNftIds()).map(BigInteger::new).toArray(BigInteger[]::new);
List<BigInteger> tokenids = Arrays.asList(bigIntegers);
est = confluxExecutor.getEstimateAirdrop(cfx, new Address(owner),
new Address(contract), AddressUtil.getHexAddress(owner), Arrays.asList(checkArgs.getAddress()), tokenids);
new Address(contract), AddressUtil.getHexAddress(owner), Arrays.asList(AddressUtil.getHexAddressToArry(checkArgs.getAddress())), tokenids);
//判断所需要的费用
if (sponsoredBalanceForGas.compareTo(est.getGasUsed()) < 0) {
return AjaxResult.error("代付余额不足");
@ -481,7 +481,7 @@ public class ConfluxServiceImpl implements ConfluxService {
opt.withGasLimit(est.getGasUsed());
opt.withStorageLimit(est.getStorageCollateralized());
hash = confluxExecutor.airdrop(opt,
AddressUtil.getHexAddress(owner), Arrays.asList(checkArgs.getAddress()), tokenids
AddressUtil.getHexAddress(owner), Arrays.asList(AddressUtil.getHexAddressToArry(checkArgs.getAddress())), tokenids
);
log.info("[--------------------->mintNft][hash],{}", hash);
log.info("[--------------------->mintNft][time end]{}", +(DateUtil.currentSeconds() - start));
@ -489,7 +489,6 @@ public class ConfluxServiceImpl implements ConfluxService {
metod = ConfluxExecutor.AIRDROP;
//保存日志记录
nftLog.setMethod(metod);
nftLog.setNftNum(checkArgs.getIds().length);
nftLog.setHashCode(hash);
nftLog.setNftIds(Arrays.toString(tokenids.toArray()));
nftLog.setGasUsed(est.getGasUsed());

2
conflux-admin/src/main/java/com/conflux/web/controller/util/AESUtil.java

@ -219,7 +219,7 @@ public final class AESUtil {
try {
//System.err.println(Integer.valueOf("00000000000000000000000000000017"));
//AES
String encrypt = Encrypt("4e45e5bc29d144a08f7eb6b043cc1e40","CONFLUX@12345678");
String encrypt = Encrypt("bd7f631d597b4603a8c7b672d0898f5d","CONFLUX@12345678");
System.err.println(encrypt);
//md5
// String hash = Md5Utils.md5Salt("0efc989dea214ed8bff99b0d14714481d660a7e7137c3ef0fc093efad244ee171f4308d9ccda9359add79e029bd169c9");

2
doc/conflux上链.html

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save