优化相关策略实现

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

@@ -3,9 +3,12 @@ package com.liquidnet.service.galaxy.router.strategy;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.galaxy.constant.GalaxyErrorCodeEnum;
+import com.liquidnet.service.galaxy.router.strategy.config.GalaxyConfig;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -19,12 +22,18 @@ import java.util.Map;
  */
 @Component
 public class GalaxyRouterStrategyContext {
+    @Autowired
+    private GalaxyConfig galaxyConfig;
+
     private final Map<String, IGalaxyRouterStrategyArtwork> artworkHandlerMap = new HashMap<>();
     private final Map<String, IGalaxyRouterStrategyUser> userHandlerMap = new HashMap<>();
     private final Map<String, IGalaxyRouterStrategyPublish> publishHandlerMap = new HashMap<>();
     private final Map<String, IGalaxyRouterStrategyTrade> tradeHandlerMap = new HashMap<>();
 
     public IGalaxyRouterStrategyArtwork getArtworkStrategy(String type) {
+        if(!this.isActived(type)){
+            throw new LiquidnetServiceException(GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getCode(),GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getMessage());
+        }
         IGalaxyRouterStrategyArtwork obj = artworkHandlerMap.get(type);
         if(StringUtil.isNull(obj)) throw new LiquidnetServiceException(GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getCode(),GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getMessage());
         return obj;
@@ -35,6 +44,9 @@ public class GalaxyRouterStrategyContext {
     }
 
     public IGalaxyRouterStrategyUser getUserStrategy(String type) {
+        if(!this.isActived(type)){
+            throw new LiquidnetServiceException(GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getCode(),GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getMessage());
+        }
         IGalaxyRouterStrategyUser obj = userHandlerMap.get(type);
         if(StringUtil.isNull(obj)) throw new LiquidnetServiceException(GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getCode(),GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getMessage());
         return obj;
@@ -45,6 +57,9 @@ public class GalaxyRouterStrategyContext {
     }
 
     public IGalaxyRouterStrategyPublish getPublishStrategy(String type) {
+        if(!this.isActived(type)){
+            throw new LiquidnetServiceException(GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getCode(),GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getMessage());
+        }
         IGalaxyRouterStrategyPublish obj = publishHandlerMap.get(type);
         if(StringUtil.isNull(obj)) throw new LiquidnetServiceException(GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getCode(),GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getMessage());
         return obj;
@@ -55,6 +70,9 @@ public class GalaxyRouterStrategyContext {
     }
 
     public IGalaxyRouterStrategyTrade getTradeStrategy(String type) {
+        if(!this.isActived(type)){
+            throw new LiquidnetServiceException(GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getCode(),GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getMessage());
+        }
         IGalaxyRouterStrategyTrade obj = tradeHandlerMap.get(type);
         if(StringUtil.isNull(obj)) throw new LiquidnetServiceException(GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getCode(),GalaxyErrorCodeEnum.ROUTER_NOT_EXIST.getMessage());
         return obj;
@@ -63,4 +81,17 @@ public class GalaxyRouterStrategyContext {
     public void putTradeStrategy(String code, IGalaxyRouterStrategyTrade strategy) {
         tradeHandlerMap.put(code, strategy);
     }
+
+    private boolean isActived(String routerType){
+        List<String> routerList = galaxyConfig.getRouterList();
+        boolean rs = false;
+        if(StringUtil.isNotNull(routerList)){
+            for(int i=0;i<routerList.size();i++){
+                if(routerType.equalsIgnoreCase(routerList.get(i))){
+                    rs = true;
+                }
+            }
+        }
+        return rs;
+    }
 }

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/strategy/config/GalaxyConfig.java

+package com.liquidnet.service.galaxy.router.strategy.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: GalaxyConstantConfig
+ * @Package com.liquidnet.service.galaxy.router.strategy.config
+ * @Copyright: LightNet @ Copyright (c) 2022
+ * @date 2022/3/18 17:14
+ */
+@Configuration
+public class GalaxyConfig {
+    @Value("${liquidnet.galaxy.router:zxinchain}")
+    private String router;
+
+    public List<String> getRouterList() {
+        return Arrays.asList(router.split(","));
+    }
+
+}

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

+package com.liquidnet.service.galaxy;
+
+import com.liquidnet.service.galaxy.constant.GalaxyConstant;
+import com.liquidnet.service.galaxy.dto.param.GalaxyNftUploadReqDto;
+import com.liquidnet.service.galaxy.router.zxin.biz.ZxinArtworkBiz;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: TestZxinArtworkBiz
+ * @Package com.liquidnet.service.galaxy
+ * @Copyright: LightNet @ Copyright (c) 2022
+ * @date 2022/3/19 16:54
+ */
+@Slf4j
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest
+public class TestZxinArtworkBiz {
+    private static final String oldUrl = "https://zhixinliantest-1302317679.cos.ap-guangzhou.myqcloud.com/nft/4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef/NOW_ZXL_NFT_PIC001_skuId001_test/2022-03-19/ZXLNFTIMAGE202203191647596747100501.mp4";
+
+    @Autowired
+    private ZxinArtworkBiz artworkBiz;
+    @Test
+    public void nftUpload(){
+        GalaxyNftUploadReqDto nftUploadReqDto = GalaxyNftUploadReqDto.getNew();
+        nftUploadReqDto.setSkuId("video_test_001");
+        nftUploadReqDto.setNftOriginalUrl(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/TestZxlWalletSdkUtil.java

@@ -82,11 +82,13 @@ public class TestZxlWalletSdkUtil {
 //        String filePath = "/Users/anjiabin/Downloads/zxl_image_test_002.jpeg";
 //        String filePath = "/Users/anjiabin/Downloads/zxl_image_series_test_001.jpeg";
 //        String filePath = "/Users/anjiabin/Downloads/zxl_image_test_001.jpg";
-        String filePath = "https://img.zhengzai.tv/other/2022/03/09/1f88d2bc6fea40e19430227326410cb3.jpg";
+//        String filePath = "https://img.zhengzai.tv/other/2022/03/09/1f88d2bc6fea40e19430227326410cb3.jpg";
+        String filePath = "/Users/anjiabin/Downloads/春季花卉TEST001.mp4";
         String seriesName = "NOW_ZXL_NFT_PIC001_skuId001_test";
 //        String fileName = "/"+ seriesName + "/" + DateUtil.getNowTime()+"/"+ IDGenerator.getZxlNftImageCosCode() +".jpg";
-        String fileName = DateUtil.getNowTime(DateUtil.DATE_SMALL_STR)+"/"+ IDGenerator.getZxlNftImageCosCode() +".jpg";
-
+//        String fileName = DateUtil.getNowTime(DateUtil.DATE_SMALL_STR)+"/"+ IDGenerator.getZxlNftImageCosCode() +".jpg";
+        String fileName = DateUtil.getNowTime(DateUtil.DATE_SMALL_STR)+"/"+ IDGenerator.getZxlNftImageCosCode() +".mp4";
+        System.out.println("fileName====="+fileName);
         //调用生成素材上传临时密钥接口
         Nft022UploadSecretReqDto nft022ReqDto = Nft022UploadSecretReqDto.getNew();
         nft022ReqDto.setSeriesName(seriesName);