添加正式环境配置

conflux-admin/src/main/java/com/conflux/web/controller/nft/mapper/NftCollectionMapper.java

@@ -4,6 +4,7 @@ package com.conflux.web.controller.nft.mapper;
 import com.conflux.web.controller.nft.domain.NftCollection;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -40,7 +41,7 @@ public interface NftCollectionMapper
      */
     public int insertNftCollection(NftCollection nftCollection);
 
-    public int insertListNftCollection(@Param("unitName") String unitName, @Param("stringList") List<String> stringList);
+    public int insertListNftCollection(@Param("unitName") String unitName, @Param("stringList") List<String> stringList, @Param("time")Date time);
 
     /**
      * 修改nft上链
@@ -66,5 +67,5 @@ public interface NftCollectionMapper
      */
     public int deleteNftCollectionByIds(Long[] ids);
 
-    int updateByTokenId(String hexTokenId);
+    int updateByTokenId(@Param("hexTokenId")String hexTokenId,@Param("time")Date time);
 }

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

@@ -80,7 +80,7 @@ public class ConfluxServiceImpl implements ConfluxService {
         }
         String[] ids = checkArgs.getIds();
         List<NftCollection> nftCollections = nftCollectionService.selectNftCollectionListByIds(ids, null);
-        if (nftCollections != null) {
+        if (nftCollections.size()>0) {
             List list = new ArrayList();
             for (NftCollection n : nftCollections) {
                 list.add(n.getInformationTableId());
@@ -98,12 +98,14 @@ public class ConfluxServiceImpl implements ConfluxService {
             //校验时间戳
             long time = Long.valueOf(checkArgs.getTimesTamp());
             long timesTamp = System.currentTimeMillis();
-            if (timesTamp - time > 10000l) {
-                return AjaxResult.error("参数错误！");
+            System.out.println("系统时间"+timesTamp);
+            System.out.println("传入的时间"+time);
+            if (timesTamp - time > 30000l) {
+                return AjaxResult.error("时间参数错误！");
             }
             //删除缓存
-            redisUtils.del(checkArgsToken);
-            redisUtils.del(sign);
+//            redisUtils.del(checkArgsToken);
+//            redisUtils.del(sign);
             //判断上链的数量
             CollectConfig collectConfig = collectConfigService.selectCollectConfigByStatus();
             if (collectConfig.getMintPause()) {
@@ -244,9 +246,12 @@ public class ConfluxServiceImpl implements ConfluxService {
         FilterMapVO vo = getFilter(eventParams);
         //获取数据高度
         String keyNumber = contract + "number";
-        long from = (long) redisUtils.get(keyNumber);
-        if (null == redisUtils.get(contract + "number")) {
+        long from = 0l;
+        if (null == redisUtils.get(keyNumber)) {
             from = collect.getEpochNumber();
+        }else {
+            Integer number = (Integer) redisUtils.get(keyNumber);
+            from= Long.valueOf(number);
         }
         // Invoke cfx method
         BigInteger epoch = cfx.getEpochNumber().sendAndGet();
@@ -312,7 +317,7 @@ public class ConfluxServiceImpl implements ConfluxService {
         if (isSuccess) {
             t.setEpochNumber(to);
             log.info("[dispatchHandler][更新高度]:{}", to);
-            redisUtils.set(contract + "number", to);
+            redisUtils.set(keyNumber, to);
         }
         if (logList.size() > 0) {
             int i = collectConfigService.updateCollectConfig(t);

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigInteger;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -68,7 +69,8 @@ public class NftCollectionServiceImpl implements INftCollectionService {
      */
     @Override
     public int insertListNftCollection(String unitName, List<String> strings) {
-        return nftCollectionMapper.insertListNftCollection(unitName, strings);
+
+        return nftCollectionMapper.insertListNftCollection(unitName, strings,new Date());
     }
 
     /**
@@ -125,7 +127,7 @@ public class NftCollectionServiceImpl implements INftCollectionService {
             log.info("[WjMyCollection][has mint]{}", nftDTO);
             return;
         }
-        int row = nftCollectionMapper.updateByTokenId(hexTokenId);
+        int row = nftCollectionMapper.updateByTokenId(hexTokenId,new Date());
         if (row < 1) {
             log.info("[WjMyCollection][updateCollect]{}", nftDTO);
             throw new RuntimeException("updateCollect error");

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("0x7803ec04eed7bd4f3fd9c3fc824408a80e0b20b599b5e726cbaa609d48a2082d","CONFLUX@123");
+            String encrypt = encrypt("8cfd5c44-2efd-4061-bcf3-4d51e623b69f","CONFLUX@123");
             System.err.println(encrypt);
         } catch (Exception e) {
             e.printStackTrace();

conflux-admin/src/main/resources/application-prod.yml

@@ -0,0 +1,57 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://47.108.105.48:3306/conflux_nft?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false
+                username: root
+                password: 123qweASD
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true

conflux-system/src/main/resources/mapper/system/NftCollectionMapper.xml

@@ -72,10 +72,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     <insert id="insertListNftCollection">
         insert into nft_collection
-        (unit_name, information_table_id,on_chain_status)
+        (unit_name, information_table_id,on_chain_status,created_time)
         VALUES
         <foreach collection ="stringList" item="item" separator =",">
-            (#{unitName}, #{item},1)
+            (#{unitName}, #{item},1,#{time})
         </foreach >
     </insert>
 
@@ -93,10 +93,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
     <update id="updateByTokenId">
-        UPDATE nft_collection
-        SET on_chain_status = 2
-        where information_table_id = #{hexTokenId}
-          AND on_chain_status = 1
+        update nft_collection
+        set
+            on_chain_status = 2,
+            updated_time = #{time}
+        where  information_table_id = #{hexTokenId} AND on_chain_status = 1
     </update>
 
     <delete id="deleteNftCollectionById" parameterType="Long">