铸造id自增

3 years ago · fe171d73f4
7 changed files with 32 additions and 78 deletions
--- 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
@ -68,4 +68,6 @@ public interface NftCollectionMapper
    public int deleteNftCollectionByIds(Long[] ids);
    int updateByTokenId(@Param("hexTokenId")String hexTokenId,@Param("time")Date time);
    int selectMax(String unitName);
 }
--- 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
@ -79,4 +79,6 @@ public interface INftCollectionService
    public int deleteNftCollectionById(Long id);
    void updateCollect(NftDTO nftDTO);
    int  queryTotalNum(String unitName);
 }
--- 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
@ -211,7 +211,7 @@ public class ConfluxServiceImpl implements ConfluxService {
    }
    /**
-     * 带有图片元数据nft铸造 限量版
+     * 带有图片元数据nft铸造
     *
     * @param checkArgs
     * @return
@ -302,11 +302,13 @@ public class ConfluxServiceImpl implements ConfluxService {
            String contract = contractConfig.getContract();
            String owner = contractConfig.getOwner();
            ConfluxExecutor confluxExecutor = new ConfluxExecutor(account, contract);
            int totalNum = nftCollectionService.queryTotalNum(checkArgs.getUnitName());
            List<String> list = Arrays.asList(checkArgs.getIds());
            List<BigInteger> tokenIds = autoincrement(totalNum, list.size());
            List<String> tokenURIs = Arrays.asList(checkArgs.getUri());
            long start = DateUtil.currentSeconds();
            log.info("[--------------------->mintNft][time]{}", new SimpleDateFormat("HH:mm:ss").format(new Date(start * 1000)));
-            List<BigInteger> tokenIds = list.stream().map(n -> new BigInteger(n, 16)).collect(Collectors.toList());
+            //List<BigInteger> tokenIds = list.stream().map(n -> new BigInteger(n, 16)).collect(Collectors.toList());
            log.info("[--------------------->mintNft][tokenIds]:{}", tokenIds);
            //估算gas
            UsedGasAndCollateral est = confluxExecutor.getEstimateData(cfx, new Address(owner),
@ -801,4 +803,19 @@ public class ConfluxServiceImpl implements ConfluxService {
        vo.setMap(map);
        return vo;
    }
    /**
     * 实现自增
     * @param count
     * @param size
     * @return
     */
    private  List<BigInteger> autoincrement(int count,int size){
        List<BigInteger> big=new ArrayList<>();
        for (int i = 0; i < size; i++) {
            count=count+1;
            big.add(BigInteger.valueOf(count));
        }
        return big;
    }
 }
--- a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/NftCollectionServiceImpl.java
+++ b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/NftCollectionServiceImpl.java
@ -133,4 +133,9 @@ public class NftCollectionServiceImpl implements INftCollectionService {
            throw new RuntimeException("updateCollect error");
        }
    }
    @Override
    public int queryTotalNum(String unitName) {
        return nftCollectionMapper.selectMax(unitName);
    }
 }
--- a/conflux-admin/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/index.html
+++ b/conflux-admin/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/index.html
@ -1,75 +0,0 @@
 <!-- HTML for static distribution bundle build -->
 <!DOCTYPE html>
 <html lang="en">
 <head>
  <meta charset="UTF-8">
  <title>Swagger UI</title>
  <link rel="stylesheet" type="text/css" href="https://ad.szcp.pub/swagger/springfox.css?v=3.0.0" >
  <link rel="stylesheet" type="text/css" href="https://ad.szcp.pub/swagger/swagger-ui.css?v=3.0.0" >
  <link rel="icon" type="image/png" href="https://ad.szcp.pub/swagger/favicon-32x32.png?v=3.0.0" sizes="32x32" />
  <link rel="icon" type="image/png" href="https://ad.szcp.pub/swagger/favicon-16x16.png?v=3.0.0" sizes="16x16" />
  <style>
    html
    {
      box-sizing: border-box;
      overflow: -moz-scrollbars-vertical;
      overflow-y: scroll;
    }
    *,
    *:before,
    *:after
    {
      box-sizing: inherit;
    }
    body {
      margin:0;
      background: #fafafa;
    }
  </style>
 </head>
 <body>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
  <defs>
    <symbol viewBox="0 0 20 20" id="unlocked">
      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
    </symbol>
    <symbol viewBox="0 0 20 20" id="locked">
      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
    </symbol>
    <symbol viewBox="0 0 20 20" id="close">
      <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
    </symbol>
    <symbol viewBox="0 0 20 20" id="large-arrow">
      <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
    </symbol>
    <symbol viewBox="0 0 20 20" id="large-arrow-down">
      <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
    </symbol>
    <symbol viewBox="0 0 24 24" id="jump-to">
      <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
    </symbol>
    <symbol viewBox="0 0 24 24" id="expand">
      <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
    </symbol>
  </defs>
 </svg>
 <div id="swagger-ui"></div>
 <script src="https://ad.szcp.pub/swagger/swagger-ui-bundle.js?v=3.0.0"> </script>
 <script src="https://ad.szcp.pub/swagger/swagger-ui-standalone-preset.js?v=3.0.0"> </script>
 <script src="https://ad.szcp.pub/swagger/springfox.js?v=3.0.0"> </script>
 </body>
 </html>
--- a/conflux-admin/src/main/resources/logback.xml
+++ b/conflux-admin/src/main/resources/logback.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
    <!-- 日志存放路径 -->
-	<property name="log.path" value="/www/wwwroot/nft/conflux/logs" />
+	<property name="log.path" value="./logs" />
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
--- a/conflux-system/src/main/resources/mapper/system/NftCollectionMapper.xml
+++ b/conflux-system/src/main/resources/mapper/system/NftCollectionMapper.xml
@ -110,4 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            #{id}
        </foreach>
    </delete>
    <select id="selectMax" parameterType="String">
        SELECT IF(MAX(nft_id) IS NULL,0, MAX(nft_id)) FROM nft_collection WHERE unit_name=${unitName};
    </select>
 </mapper>