|
@@ -1,17 +1,15 @@
|
|
|
package com.izouma.nineth.service;
|
|
package com.izouma.nineth.service;
|
|
|
|
|
|
|
|
-import com.alipay.api.AlipayClient;
|
|
|
|
|
-import com.github.binarywang.wxpay.service.WxPayService;
|
|
|
|
|
import com.github.kevinsawicki.http.HttpRequest;
|
|
import com.github.kevinsawicki.http.HttpRequest;
|
|
|
-import com.izouma.nineth.config.AlipayProperties;
|
|
|
|
|
-import com.izouma.nineth.config.WxPayProperties;
|
|
|
|
|
import com.izouma.nineth.domain.Asset;
|
|
import com.izouma.nineth.domain.Asset;
|
|
|
import com.izouma.nineth.domain.User;
|
|
import com.izouma.nineth.domain.User;
|
|
|
import com.izouma.nineth.dto.NFT;
|
|
import com.izouma.nineth.dto.NFT;
|
|
|
import com.izouma.nineth.dto.NFTAccount;
|
|
import com.izouma.nineth.dto.NFTAccount;
|
|
|
import com.izouma.nineth.event.CreateAssetEvent;
|
|
import com.izouma.nineth.event.CreateAssetEvent;
|
|
|
import com.izouma.nineth.exception.BusinessException;
|
|
import com.izouma.nineth.exception.BusinessException;
|
|
|
-import com.izouma.nineth.repo.*;
|
|
|
|
|
|
|
+import com.izouma.nineth.repo.AssetRepo;
|
|
|
|
|
+import com.izouma.nineth.repo.TokenHistoryRepo;
|
|
|
|
|
+import com.izouma.nineth.repo.UserRepo;
|
|
|
import io.ipfs.api.IPFS;
|
|
import io.ipfs.api.IPFS;
|
|
|
import io.ipfs.api.MerkleNode;
|
|
import io.ipfs.api.MerkleNode;
|
|
|
import io.ipfs.api.NamedStreamable;
|
|
import io.ipfs.api.NamedStreamable;
|
|
@@ -39,14 +37,14 @@ public class AssetMintService {
|
|
|
public void mint(Asset asset, Long historyId) {
|
|
public void mint(Asset asset, Long historyId) {
|
|
|
User user = userRepo.findById(asset.getUserId()).orElseThrow(new BusinessException("用户不存在"));
|
|
User user = userRepo.findById(asset.getUserId()).orElseThrow(new BusinessException("用户不存在"));
|
|
|
if (StringUtils.isEmpty(user.getPublicKey())) {
|
|
if (StringUtils.isEmpty(user.getPublicKey())) {
|
|
|
- NFTAccount account = nftService.createAccount(user.getUsername());
|
|
|
|
|
|
|
+ NFTAccount account = nftService.createAccount(user.getUsername() + "_");
|
|
|
user.setNftAccount(account.getAccountId());
|
|
user.setNftAccount(account.getAccountId());
|
|
|
user.setKmsId(account.getAccountKmsId());
|
|
user.setKmsId(account.getAccountKmsId());
|
|
|
user.setPublicKey(account.getPublicKey());
|
|
user.setPublicKey(account.getPublicKey());
|
|
|
userRepo.save(user);
|
|
userRepo.save(user);
|
|
|
}
|
|
}
|
|
|
try {
|
|
try {
|
|
|
- NFT nft = nftService.createToken(user.getNftAccount());
|
|
|
|
|
|
|
+ NFT nft = nftService.createToken(user.getNftAccount() + "_");
|
|
|
if (nft != null) {
|
|
if (nft != null) {
|
|
|
asset.setTokenId(nft.getTokenId());
|
|
asset.setTokenId(nft.getTokenId());
|
|
|
asset.setBlockNumber(nft.getBlockNumber());
|
|
asset.setBlockNumber(nft.getBlockNumber());
|