修改文件上传接口

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/bo/GalaxySeriesInfoBo.java

@@ -40,7 +40,11 @@ public class GalaxySeriesInfoBo implements Serializable,Cloneable {
     /**
      * nft素材原始地址
      */
-    private String nftOriginalUrl;
+    private String originalNftUrl;
+    /**
+     * nft显示素材原始地址
+     */
+    private String originalDisplayUrl;
     /**
      * 系列发布状态
      */

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/param/GalaxyArtSeriesClaimResultQueryRespDto.java

@@ -20,7 +20,7 @@ import java.io.Serializable;
 @Data
 public class GalaxyArtSeriesClaimResultQueryRespDto  implements Serializable,Cloneable {
     /**
-     * 标记任务状态，2：任务执行中 7：任务成功 10：任务失败
+     * 标记任务状态，0：任务执行中 1：任务成功 2：任务失败
      */
     @ApiModelProperty(position = 3, required = true, value = "标记任务状态，0：任务执行中 1：任务成功 2：任务失败")
     private Integer taskStatus;

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/param/GalaxyBaseReqDto.java

@@ -24,7 +24,7 @@ public class GalaxyBaseReqDto implements Serializable,Cloneable{
      */
     @ApiModelProperty(position = 1, required = true, value = "路由类型(至信链zxinchain、以太坊eth)")
     @NotBlank(message = "路由类型不能为空！")
-    private String routeType = GalaxyConstant.RouterTypeEnum.ZXINCHAIN.getCode();
+    private String routerType = GalaxyConstant.RouterTypeEnum.ZXINCHAIN.getCode();
 
     @Override
     public String toString(){

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/param/GalaxyNftUploadReqDto.java

@@ -19,8 +19,11 @@ import java.io.Serializable;
 @ApiModel(value = "GalaxyNftUploadReqDto", description = "NFT素材上传")
 @Data
 public class GalaxyNftUploadReqDto extends GalaxyBaseReqDto implements Serializable,Cloneable {
-    @ApiModelProperty(position = 1, required = true, value = "上传原始素材url")
-    private String nftOriginalUrl;
+    @ApiModelProperty(position = 1, required = true, value = "nft原始素材url")
+    private String originalNftUrl;
+
+    @ApiModelProperty(position = 1, required = true, value = "显示图原始素材url")
+    private String originalDisplayUrl;
 
     @ApiModelProperty(position = 2, required = true, value = "商品唯一规格ID")
     private String skuId;

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/param/GalaxyNftUploadRespDto.java

@@ -22,11 +22,17 @@ public class GalaxyNftUploadRespDto implements Serializable,Cloneable {
     @ApiModelProperty(position = 1, required = true, value = "skuId")
     private String skuId;
 
-    @ApiModelProperty(position = 2, required = true, value = "素材原始地址")
-    private String nftOriginalUrl;
+    @ApiModelProperty(position = 1, required = true, value = "nft原始素材url")
+    private String originalNftUrl;
 
-    @ApiModelProperty(position = 3, required = true, value = "素材访问地址")
-    private String materialAccessUrl;
+    @ApiModelProperty(position = 1, required = true, value = "显示图原始素材url")
+    private String originalDisplayUrl;
+
+    @ApiModelProperty(position = 2, required = true, value = "nft链上访问地址")
+    private String nftUrl;
+
+    @ApiModelProperty(position = 3, required = true, value = "缩略图链上访问地址")
+    private String displayUrl;
 
 
     @Override

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/vo/mongo/GalaxySeriesInfoVo.java

@@ -40,7 +40,11 @@ public class GalaxySeriesInfoVo implements Serializable,Cloneable {
     /**
      * nft素材原始地址
      */
-    private String nftOriginalUrl;
+    private String originalNftUrl;
+    /**
+     * nft显示素材原始地址
+     */
+    private String originalDisplayUrl;
     /**
      * 系列发布状态
      */

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/pom.xml

@@ -21,6 +21,11 @@
             <artifactId>liquidnet-common-third-zxlnft</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-third-antchain</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-service-galaxy-api</artifactId>

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/strategy/biz/GalaxyCommonBiz.java

+package com.liquidnet.service.galaxy.router.strategy.biz;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: GalaxyCommonBiz
+ * @Package com.liquidnet.service.galaxy.router.strategy.biz
+ * @Copyright: LightNet @ Copyright (c) 2022
+ * @date 2022/3/23 11:20
+ */
+@Slf4j
+@Component
+public class GalaxyCommonBiz {
+    @Value("${liquidnet.galaxy.temp-file-path:/Users/anjiabin/mdsky_gitlab/galaxy/tempFilePath}")
+    private String tempFilePath;
+
+    /**
+     * 通过URL上传
+     * @param url
+     * @param name
+     * @return
+     */
+    public File inputStreamToFile(String url, String name) {
+        try {
+            HttpURLConnection httpUrl = (HttpURLConnection) new URL(url).openConnection();
+            httpUrl.connect();
+            InputStream ins = httpUrl.getInputStream();
+//            File file = new File(System.getProperty("java.io.tmpdir") + File.separator + name);
+            File file = new File(tempFilePath + File.separator + name);
+            if (file.exists()) {
+                return file;
+            }
+            OutputStream os = new FileOutputStream(file);
+            int bytesRead;
+            int len = 8192;
+            byte[] buffer = new byte[len];
+            while ((bytesRead = ins.read(buffer, 0, len)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+            os.close();
+            ins.close();
+            return file;
+        } catch (Exception e) {
+            log.error("inputStreamToFileUrlError", e);
+            return null;
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/strategy/biz/GalaxyEnumBiz.java

+package com.liquidnet.service.galaxy.router.strategy.biz;
+
+import com.liquidnet.common.third.antchain.constant.AntchainEnum;
+import com.liquidnet.common.third.zxlnft.constant.ZxlnftEnum;
+import com.liquidnet.service.galaxy.constant.GalaxyConstant;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: GalaxyConstantBiz
+ * @Package com.liquidnet.service.galaxy.router.strategy
+ * @Copyright: LightNet @ Copyright (c) 2022
+ * @date 2022/3/22 12:11
+ */
+public class GalaxyEnumBiz {
+
+    /**
+     * 任务状态转换
+     * @param routerTypeEnum
+     * @param code
+     * @return
+     */
+    public static GalaxyConstant.TaskStatusEnum getTaskStatusEnum(GalaxyConstant.RouterTypeEnum routerTypeEnum, String code){
+        GalaxyConstant.TaskStatusEnum taskStatusEnum = null;
+        switch (routerTypeEnum.getCode()){
+            case "zxinchain":
+                if(code.equalsIgnoreCase(ZxlnftEnum.TaskStatusEnum.PROCESSING.getCode())){
+                    taskStatusEnum = GalaxyConstant.TaskStatusEnum.PROCESSING;
+                    break;
+                }else if(code.equalsIgnoreCase(ZxlnftEnum.TaskStatusEnum.TASK_SUCCESS.getCode())){
+                    taskStatusEnum = GalaxyConstant.TaskStatusEnum.TASK_SUCCESS;
+                    break;
+                }else if(code.equalsIgnoreCase(ZxlnftEnum.TaskStatusEnum.TASK_FAIL.getCode())){
+                    taskStatusEnum = GalaxyConstant.TaskStatusEnum.TASK_FAIL;
+                    break;
+                }
+            case "antchain":
+                if(code.equalsIgnoreCase(AntchainEnum.TaskStatusEnum.PROCESSING.getCode())){
+                    taskStatusEnum = GalaxyConstant.TaskStatusEnum.PROCESSING;
+                    break;
+                }else if(code.equalsIgnoreCase(AntchainEnum.TaskStatusEnum.TASK_SUCCESS.getCode())){
+                    taskStatusEnum = GalaxyConstant.TaskStatusEnum.TASK_SUCCESS;
+                    break;
+                }else if(code.equalsIgnoreCase(AntchainEnum.TaskStatusEnum.TASK_FAIL.getCode())){
+                    taskStatusEnum = GalaxyConstant.TaskStatusEnum.TASK_FAIL;
+                    break;
+                }
+        }
+        return taskStatusEnum;
+    }
+
+    /**
+     * 用户绑定状态
+     * @param routerType
+     * @param code
+     * @return
+     */
+    public static GalaxyConstant.UserBindStatusEnum getUserBindStatusEnum(String routerType, String code) {
+        GalaxyConstant.UserBindStatusEnum userBindStatusEnum = null;
+        switch (routerType) {
+            case "zxinchain":
+                if (code.equalsIgnoreCase(ZxlnftEnum.UserBindStatusEnum.BIND_PROCESSING.getCode())) {
+                    userBindStatusEnum = GalaxyConstant.UserBindStatusEnum.BIND_PROCESSING;
+                    break;
+                } else if (code.equalsIgnoreCase(ZxlnftEnum.UserBindStatusEnum.BIND_SUCCESS.getCode())) {
+                    userBindStatusEnum = GalaxyConstant.UserBindStatusEnum.BIND_SUCCESS;
+                    break;
+                } else if (code.equalsIgnoreCase(ZxlnftEnum.UserBindStatusEnum.BIND_FAIL.getCode())) {
+                    userBindStatusEnum = GalaxyConstant.UserBindStatusEnum.BIND_FAIL;
+                    break;
+                } else if (code.equalsIgnoreCase(ZxlnftEnum.UserBindStatusEnum.BIND_CANNOT_QUERY.getCode())) {
+                    userBindStatusEnum = GalaxyConstant.UserBindStatusEnum.BIND_CANNOT_QUERY;
+                    break;
+                }
+            case "antchain":
+                if (code.equalsIgnoreCase(AntchainEnum.UserBindStatusEnum.BIND_PROCESSING.getCode())) {
+                    userBindStatusEnum = GalaxyConstant.UserBindStatusEnum.BIND_PROCESSING;
+                    break;
+                } else if (code.equalsIgnoreCase(AntchainEnum.UserBindStatusEnum.BIND_SUCCESS.getCode())) {
+                    userBindStatusEnum = GalaxyConstant.UserBindStatusEnum.BIND_SUCCESS;
+                    break;
+                } else if (code.equalsIgnoreCase(AntchainEnum.UserBindStatusEnum.BIND_FAIL.getCode())) {
+                    userBindStatusEnum = GalaxyConstant.UserBindStatusEnum.BIND_FAIL;
+                    break;
+                } else if (code.equalsIgnoreCase(AntchainEnum.UserBindStatusEnum.BIND_CANNOT_QUERY.getCode())) {
+                    userBindStatusEnum = GalaxyConstant.UserBindStatusEnum.BIND_CANNOT_QUERY;
+                    break;
+                }
+        }
+        return userBindStatusEnum;
+    }
+}

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinUserBiz.java

@@ -13,7 +13,6 @@ import com.liquidnet.common.third.zxlnft.exception.ZxlNftException;
 import com.liquidnet.common.third.zxlnft.util.ZxlWalletSdkUtil;
 import com.liquidnet.common.third.zxlnft.util.ZxlnftSdkUtil;
 import com.liquidnet.commons.lang.util.BASE64Util;
-import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.galaxy.constant.GalaxyConstant;
@@ -22,6 +21,7 @@ import com.liquidnet.service.galaxy.dto.param.GalaxyUserBindStatusQueryReqDto;
 import com.liquidnet.service.galaxy.dto.param.GalaxyUserBindStatusQueryRespDto;
 import com.liquidnet.service.galaxy.dto.param.GalaxyUserRegisterReqDto;
 import com.liquidnet.service.galaxy.dto.param.GalaxyUserRegisterRespDto;
+import com.liquidnet.service.galaxy.router.strategy.biz.GalaxyEnumBiz;
 import com.liquidnet.service.galaxy.utils.DataUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -192,7 +192,10 @@ public class ZxinUserBiz {
 
         GalaxyUserBindStatusQueryRespDto userBindStatusQueryRespDto = GalaxyUserBindStatusQueryRespDto.getNew();
         if(zxlnftResponseDto.isSuccess()){
-            BeanUtil.copy(zxlnftResponseDto.getData().getList().get(0),userBindStatusQueryRespDto);
+            Nft016QueryRsData nft016QueryRsData = zxlnftResponseDto.getData().getList().get(0);
+            userBindStatusQueryRespDto.setBlockChainAddress(nft016QueryRsData.getAddress());
+            Integer userBindStatus = Integer.valueOf(GalaxyEnumBiz.getUserBindStatusEnum(reqDto.getRouteType(),nft016QueryRsData.getStatus()).getCode());
+            userBindStatusQueryRespDto.setUserBindStatus(userBindStatus);
         }else{
             return ResponseDto.failure();
         }

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/service/GalaxyRouterStrategyZxlArtworkImpl.java

@@ -43,6 +43,6 @@ public class GalaxyRouterStrategyZxlArtworkImpl implements IGalaxyRouterStrategy
 
     @Override
     public ResponseDto<GalaxyArtSeriesClaimResultQueryRespDto> seriesClaimResultQuery(GalaxyArtSeriesClaimResultQueryReqDto reqDto) {
-        return null;
+        return zxinArtworkBiz.seriesClaimResultQuery(reqDto);
     }
 }

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/test/java/com/liquidnet/service/galaxy/TestZxinArtworkBiz.java

@@ -31,7 +31,7 @@ public class TestZxinArtworkBiz {
     public void nftUpload(){
         GalaxyNftUploadReqDto nftUploadReqDto = GalaxyNftUploadReqDto.getNew();
         nftUploadReqDto.setSkuId("video_test_001");
-        nftUploadReqDto.setNftOriginalUrl(oldUrl);
+        nftUploadReqDto.setOriginalNftUrl(oldUrl);
         nftUploadReqDto.setRouteType(GalaxyConstant.RouterTypeEnum.ZXINCHAIN.getCode());
         artworkBiz.nftUpload(nftUploadReqDto);
     }

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/test/java/com/liquidnet/service/galaxy/TestZxlnftSdkUtil.java

@@ -149,10 +149,12 @@ public class TestZxlnftSdkUtil {
 
     @Test
     public void nft008QueryImageModeration(){
+        String nftUrl = "https://zhixinliantest-1302317679.cos.ap-guangzhou.myqcloud.com/nft/4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef/ZXLNFTIMAGE202202241512003609141721.jpg";
+        nftUrl = "https://zhixinliantest-1302317679.cos.ap-guangzhou.myqcloud.com/nft/4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef/NOW_ZXL_video_test_001/ZXLNFTIMAGE202203191704225564978300.mp4";
         Nft008QueryImageModerationReqDto reqDto = Nft008QueryImageModerationReqDto.getNew();
-        reqDto.setImageUrl("https://zhixinliantest-1302317679.cos.ap-guangzhou.myqcloud.com/nft/4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef/ZXLNFTIMAGE202202241512003609141721.jpg");
-//        reqDto.setIntrval(0);
-//        reqDto.setMaxFrames(1);
+        reqDto.setImageUrl(nftUrl);
+        reqDto.setIntrval(0);
+        reqDto.setMaxFrames(1);
         ZxlnftResponseDto<Nft008QueryImageModerationRespDto> resp = zxlnftSdkUtil.nft008QueryImageModeration(reqDto);
         System.out.println(resp.toJson());
     }