调试至信链NFt发行接口

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/biz/ZxlnftBiz.java

@@ -80,6 +80,10 @@ public class ZxlnftBiz {
     }
 
     public <T> T buildNftRespObj(String response,Class<T> tClass){
+        return this.buildNftRespObj(response,tClass,true);
+    }
+
+    public <T> T buildNftRespObj(String response,Class<T> tClass,boolean isJson){
         T resp = null;
         try {
             resp = tClass.newInstance();
@@ -90,8 +94,14 @@ public class ZxlnftBiz {
         }
         JSONObject json = JSONObject.parseObject(response);
         if (json.containsKey("retCode") && json.containsKey("data") && json.getInteger("retCode").intValue() == 0) {
-            JSONObject data = json.getJSONObject("data");
-            resp = JsonUtils.fromJson(data.toJSONString(),tClass);
+            if(isJson){
+                JSONObject data = json.getJSONObject("data");
+                resp = JsonUtils.fromJson(data.toJSONString(),tClass);
+            }else{
+                String rsData = json.getString("data");
+                resp = (T)rsData;
+            }
+
         }
         else {
             if (json.containsKey("retCode") && json.getInteger("retCode").intValue() != 0) {

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/dto/Nft014IdentityBindSubmitByTrustedRespDto.java

@@ -16,6 +16,7 @@ import java.io.Serializable;
  */
 @Data
 public class Nft014IdentityBindSubmitByTrustedRespDto implements Serializable {
+    private String address;
     private static final Nft014IdentityBindSubmitByTrustedRespDto obj = new Nft014IdentityBindSubmitByTrustedRespDto();
     public static Nft014IdentityBindSubmitByTrustedRespDto getNew() {
         try {

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/dto/Nft030SeriesClaimReqDto.java

@@ -46,12 +46,12 @@ public class Nft030SeriesClaimReqDto implements Serializable {
     /**
      * 历史遗留字段，无意义，填任意值都一样，建议填0即可
      */
-    private String maxPublishCount;
+    private Integer maxPublishCount;
     /**
      * 系列下的nftId后缀，是否从0开始，true就是从0开始，默认为false,从1开始
      */
     //@Null
-    private String seriesBeginFromZero;
+    private Boolean seriesBeginFromZero;
     /**
      * 系列声明人的私钥签名，签名对象是（platformPubKey_pubKey_接口名_seriesName_totalCount_coverUrl_desc_maxPublishCount
      * _seriesBeginFromZero_operateId） 接口名：series_claim

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/dto/Nft031SeriesClaimResultRespDto.java

@@ -27,6 +27,7 @@ public class Nft031SeriesClaimResultRespDto implements Serializable {
     /**
      * 系列ID，后面用于查询系列信息
      */
+    private String seriesId;
     /**
      * 交易hash
      */

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/dto/nft/Nft014IdentityBindSubmitByTrustedResp.java

@@ -16,6 +16,7 @@ import java.io.Serializable;
  */
 @Data
 public class Nft014IdentityBindSubmitByTrustedResp implements Serializable {
+    private String address;
     private static final Nft014IdentityBindSubmitByTrustedResp obj = new Nft014IdentityBindSubmitByTrustedResp();
     public static Nft014IdentityBindSubmitByTrustedResp getNew() {
         try {

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/dto/nft/Nft030SeriesClaimReq.java

@@ -46,12 +46,12 @@ public class Nft030SeriesClaimReq implements Serializable {
     /**
      * 历史遗留字段，无意义，填任意值都一样，建议填0即可
      */
-    private String maxPublishCount;
+    private Integer maxPublishCount;
     /**
      * 系列下的nftId后缀，是否从0开始，true就是从0开始，默认为false,从1开始
      */
     //@Null
-    private String seriesBeginFromZero;
+    private Boolean seriesBeginFromZero;
     /**
      * 系列声明人的私钥签名，签名对象是（platformPubKey_pubKey_接口名_seriesName_totalCount_coverUrl_desc_maxPublishCount
      * _seriesBeginFromZero_operateId） 接口名：series_claim

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/dto/nft/Nft031SeriesClaimResultResp.java

@@ -27,6 +27,7 @@ public class Nft031SeriesClaimResultResp implements Serializable {
     /**
      * 系列ID，后面用于查询系列信息
      */
+    private String seriesId;
     /**
      * 交易hash
      */

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/util/ZxlnftSdkUtil.java

@@ -600,6 +600,44 @@ public class ZxlnftSdkUtil {
         Nft030SeriesClaimReq req = Nft030SeriesClaimReq.getNew();
         BeanUtil.copy(reqDto,req);
 
+        req.setPlatformPubKey(zxlnftConfig.getNftPlatformPubKey());
+
+        /**
+         * 系列声明人的私钥签名，签名对象是（platformPubKey_pubKey_接口名_seriesName_totalCount_coverUrl_desc_maxPublishCount
+         * _seriesBeginFromZero_operateId） 接口名：series_claim
+         */
+        String signMetaData = req.getPlatformPubKey()
+                .concat("_").concat(req.getPubKey())
+                .concat("_").concat("series_claim")
+                .concat("_").concat(req.getSeriesName())
+                .concat("_").concat(req.getTotalCount().toString())
+                .concat("_").concat(req.getCoverUrl())
+                .concat("_").concat(req.getDesc())
+                .concat("_").concat(req.getMaxPublishCount().toString())
+                .concat("_").concat(req.getSeriesBeginFromZero().toString())
+                .concat("_").concat(req.getOperateId());
+        String signature = zxlnftBiz.createSign(zxlnftConfig.getNftPlatformPriKey(),signMetaData);
+        req.setSignature(signature);
+
+        /**
+         * 平台方的私钥签名，签名对象是（platformPubKey_pubKey_接口名_seriesName_totalCount_coverUrl_desc_maxPublishCount
+         * _seriesBeginFromZero_operateId） 接口名：series_claim
+         */
+        String platformSignMetaData = req.getPlatformPubKey()
+                .concat("_").concat(req.getPubKey())
+                .concat("_").concat("series_claim")
+                .concat("_").concat(req.getSeriesName())
+                .concat("_").concat(req.getTotalCount().toString())
+                .concat("_").concat(req.getCoverUrl())
+                .concat("_").concat(req.getDesc())
+                .concat("_").concat(req.getMaxPublishCount().toString())
+                .concat("_").concat(req.getSeriesBeginFromZero().toString())
+                .concat("_").concat(req.getOperateId());
+        String platformSignature = zxlnftBiz.createSign(zxlnftConfig.getNftPlatformPriKey(),platformSignMetaData);
+        req.setPlatformSignature(platformSignature);
+
+
+
         Nft030SeriesClaimRespDto respDto = Nft030SeriesClaimRespDto.getNew();
         try{
             Nft030SeriesClaimResp resp = zxlnftSdkService.nft030SeriesClaim(req);
@@ -617,6 +655,8 @@ public class ZxlnftSdkUtil {
         Nft031SeriesClaimResultReq req = Nft031SeriesClaimResultReq.getNew();
         BeanUtil.copy(reqDto,req);
 
+        req.setPlatformPubKey(zxlnftConfig.getNftPlatformPubKey());
+
         Nft031SeriesClaimResultRespDto respDto = Nft031SeriesClaimResultRespDto.getNew();
         try{
             Nft031SeriesClaimResultResp resp = zxlnftSdkService.nft031SeriesClaimResult(req);
@@ -673,7 +713,9 @@ public class ZxlnftSdkUtil {
          * _sellStatus_sellCount_metaData_operateId)
          * 接口名：publish_nft
          */
-        String signMetaData = req.getPlatformPubKey().concat("_").concat("publish_nft")
+        String signMetaData = req.getPlatformPubKey()
+                .concat("_").concat(req.getPubKey())
+                .concat("_").concat("publish_nft")
                 .concat("_").concat(req.getAuthor())
                 .concat("_").concat(req.getName())
                 .concat("_").concat(req.getUrl())

liquidnet-bus-service/liquidnet-service-zxlnft/liquidnet-service-zxlnft-impl/src/test/java/com/liquidnet/service/zxlnft/TestZxlWalletSdkUtil.java

@@ -90,8 +90,15 @@ public class TestZxlWalletSdkUtil {
     public void deriveKeyPair(){
         DeriveKeyPairReq req = DeriveKeyPairReq.getNew();
 //        req.setPriKey(zxlnftConfig.getNftPlatformPriKey());
-        req.setMnemonic("stuff");
-        req.setIndex(0l);
+//        req.setMnemonic("stuff");
+//        req.setIndex(0l);
+
+//        req.setMnemonic("region");
+//        req.setIndex(0l);
+
+        req.setMnemonic("use");
+        req.setIndex(2l);
+
         //3045022072ba19d02f43ae883764ffa43d111ab62fd0bcd6ace31bc91356e7ce38756cbb022100deb5f7666f4768f297ccdf386a867d2a0d71227548f2595a62130e5016fb1d54
         zxlWalletSdkUtil.deriveKeyPair(req);
     }