Merge branch 'dev-zxlnft' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev-zxlnft

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/constant/GalaxyConstant.java

@@ -11,8 +11,9 @@ package com.liquidnet.service.galaxy.constant;
  */
 public class GalaxyConstant {
     public static final String REDIS_KET_GALAXY_USER="galaxy:user:";
-    public static final String REDIS_KET_GALAXY_ART_SERIES="galaxy:series:";
-    public static final String SERIES_STORE_NAME="NOW_ZXL_NFT_PIC";// 系列存储目录名称
+    public static final String REDIS_KET_GALAXY_SERIES="galaxy:series:";
+
+    public static final String SERIES_NAME_PREFIX="NOW_ZXL_";// 系列存储目录名称和系列声明
 
     public enum RouterTypeEnum{
         ZXINCHAIN("zxinchain","至信链"),
@@ -31,6 +32,26 @@ public class GalaxyConstant {
         }
     }
 
+
+    /**
+     * 路由业务枚举
+     */
+    public enum SeriesClaimStatusEnum{
+        PROCESSING("processing","系列声明中"),
+        SUCCESS ("success","系列声明成功"),
+        FAIL ("fail","系列声明失败");
+        private String code;
+        private String message;
+        SeriesClaimStatusEnum(String code, String message) {
+            this.code = code;
+            this.message = message;
+        }
+
+        public String getCode() {
+            return code;
+        }
+    }
+
     /**
      * 路由业务枚举
      */

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/constant/GalaxyErrorCodeEnum.java

@@ -10,7 +10,8 @@ package com.liquidnet.service.galaxy.constant;
  * @date 2022/3/8 11:25
  */
 public enum GalaxyErrorCodeEnum {
-    TRADE_PAY_WAY_ERROR("PAY0010001","错误的支付方式");
+    SERIES_CLAIM_ERROR("NFT0010001","NFT系列声明失败"),
+    SERIES_CLAIM_ERROR_FIVE_TIMES("NFT0010002","NFT系列声明失败,任务查询超过5次");
 
     private String code;
     private String message;

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

@@ -16,10 +16,24 @@ import java.io.Serializable;
  */
 @Data
 public class GalaxySeriesInfoBo implements Serializable,Cloneable {
+    /**
+     * 本地系列唯一标识id
+     */
     private String skuId;
+    /**
+     * 系列名称
+     */
     private String seriesName;
+    /**
+     * 区块链上系列ID
+     */
     private String seriesId;
     private Long totalCount;
+    private Long crtCount;
+    private String nftUrl;
+    private String publishStatus;
+
+
 
     @Override
     public String toString(){

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

 package com.liquidnet.service.galaxy.dto.param;
 
+import com.liquidnet.commons.lang.util.JsonUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
 /**
  * @author AnJiabin <anjiabin@zhengzai.tv>
  * @version V1.0
@@ -9,5 +16,33 @@ package com.liquidnet.service.galaxy.dto.param;
  * @Copyright: LightNet @ Copyright (c) 2021
  * @date 2022/3/14 11:21
  */
-public class GalaxyArtSeriesClaimRespDto {
+@ApiModel(value = "GalaxyArtSeriesClaimRespDto", description = "NFT系列声明返回结果")
+@Data
+public class GalaxyArtSeriesClaimRespDto implements Serializable,Cloneable {
+    @ApiModelProperty(position = 1, required = true, value = "skuId")
+    private String skuId;
+
+    @ApiModelProperty(position = 2, required = true, value = "素材访问地址")
+    private String materialAccessUrl;
+
+    @ApiModelProperty(position = 3, required = true, value = "系列在区块链上唯一ID")
+    private String seriesId;
+
+    @ApiModelProperty(position = 3, required = true, value = "系列在区块链上的名称")
+    private String seriesName;
+
+    @Override
+    public String toString(){
+        return JsonUtils.toJson(this);
+    }
+
+    private static final GalaxyArtSeriesClaimRespDto obj = new GalaxyArtSeriesClaimRespDto();
+
+    public static GalaxyArtSeriesClaimRespDto getNew() {
+        try {
+            return (GalaxyArtSeriesClaimRespDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GalaxyArtSeriesClaimRespDto();
+        }
+    }
 }
\ No newline at end of file

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

@@ -21,7 +21,7 @@ public class GalaxyNftImageReqDto extends GalaxyBaseReqDto implements Serializab
     /**
      * 素材地址(全路径)
      */
-    private String imageUrl;
+    private String nftOriginalUrl;
 
     @Override
     public String toString(){

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

@@ -20,11 +20,10 @@ import java.io.Serializable;
 @Data
 public class GalaxyNftUploadReqDto extends GalaxyBaseReqDto implements Serializable,Cloneable {
     @ApiModelProperty(position = 1, required = true, value = "上传原始图片url")
-    private String imageUrl;
+    private String nftOriginalUrl;
 
     @ApiModelProperty(position = 2, required = true, value = "商品唯一规格ID")
-    private String skuID;
-
+    private String skuId;
 
     @Override
     public String toString(){

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

@@ -19,11 +19,13 @@ import java.io.Serializable;
 @ApiModel(value = "GalaxyUserRegisterRespDto", description = "素材上传")
 @Data
 public class GalaxyNftUploadRespDto implements Serializable,Cloneable {
+    @ApiModelProperty(position = 1, required = true, value = "skuId")
+    private String skuId;
 
-    @ApiModelProperty(position = 1, required = true, value = "用户区块链类型")
-    private String blockChainType;
+    @ApiModelProperty(position = 2, required = true, value = "素材原始地址")
+    private String nftOriginalUrl;
 
-    @ApiModelProperty(position = 1, required = true, value = "素材访问地址")
+    @ApiModelProperty(position = 3, required = true, value = "素材访问地址")
     private String materialAccessUrl;
 
 

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -73,6 +73,17 @@ liquidnet:
       host: 39.107.71.112
       port: 6379
       password: 3Xa%8p
+    redis-stream:
+      database: 255
+      host: 39.107.71.112
+      port: 6379
+      password: 3Xa%8p
+    galaxy:
+      dbs: 0,16
+      database: 15
+      host: 39.107.71.112
+      port: 6379
+      password: 3Xa%8p
 #    goblin:
 #      dbs: 0,256
 #      database: 255

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/utils/DataUtils.java

@@ -39,12 +39,13 @@ public class DataUtils {
         }
     }
 
-    public void setSeriesInfoBo(String routeType,String userId, GalaxyUserInfoBo userInfoBo) {
-        redisUtil.set(GalaxyConstant.REDIS_KET_GALAXY_USER.concat(routeType).concat(":") + userId,userInfoBo,keyExpireTime);
+    public void setSeriesInfoBo(String routeType,String skuId, GalaxySeriesInfoBo seriesInfoBo) {
+        redisUtil.set(GalaxyConstant.REDIS_KET_GALAXY_SERIES.concat(routeType).concat(":") + skuId,seriesInfoBo,keyExpireTime);
+        mongoTemplate.save(seriesInfoBo,GalaxySeriesInfoBo.class.getSimpleName());
     }
 
     public GalaxySeriesInfoBo getSeriesInfoBo(String routeType, String skuId) {
-        Object obj = redisUtil.get(GalaxyConstant.REDIS_KET_GALAXY_ART_SERIES.concat(routeType).concat(":") + skuId);
+        Object obj = redisUtil.get(GalaxyConstant.REDIS_KET_GALAXY_SERIES.concat(routeType).concat(":") + skuId);
         if(obj!=null){
             return (GalaxySeriesInfoBo) obj;
         }else {
@@ -52,7 +53,7 @@ public class DataUtils {
             if (seriesInfoBo == null) {
                 return null;
             }
-            redisUtil.set(GalaxyConstant.REDIS_KET_GALAXY_ART_SERIES.concat(routeType).concat(":") + skuId, seriesInfoBo);
+            redisUtil.set(GalaxyConstant.REDIS_KET_GALAXY_SERIES.concat(routeType).concat(":") + skuId, seriesInfoBo);
             return seriesInfoBo;
         }
     }

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

@@ -26,6 +26,13 @@ public class TestZxlnftBiz {
     @Autowired
     private ZxlnftBiz zxlnftBiz;
 
+    @Test
+    public void getImageType(){
+        String url = "https://zhixinliantest-1302317679.cos.ap-guangzhou.myqcloud.com/nft/4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef/ZXLNFTIMAGE202202241512003609141721.jpg";
+        String imageType = url.substring(url.lastIndexOf("."),url.length());
+        System.out.println(imageType);
+    }
+
     @Test
     public void buildHeader(){
         MultiValueMap<String, String> commonHeader = new LinkedMultiValueMap();