redis-队列多数据源

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

@@ -127,7 +127,7 @@ liquidnet:
     galaxy:
       url: http://devgalaxy.zhengzai.tv
       temp-file-path: /data/galaxy/tempFilePath
-      router: zxinchain,eth
+      router: zxinchain,xuper
       zxlnft:
         walletSdkUrl: http://127.0.0.1:30505
         nftApiUrl: https://nfttest2.zxinchain.com

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-common/src/main/java/com/liquidnet/service/galaxy/router/xuper/biz/XuperUserCommonBiz.java

@@ -14,7 +14,6 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.galaxy.constant.GalaxyConstant;
-import com.liquidnet.service.galaxy.constant.GalaxyEnum;
 import com.liquidnet.service.galaxy.dto.bo.GalaxyUserInfoBo;
 import com.liquidnet.service.galaxy.dto.param.GalaxyUserRegisterReqDto;
 import com.liquidnet.service.galaxy.dto.param.GalaxyUserRegisterRespDto;
@@ -135,7 +134,7 @@ public class XuperUserCommonBiz {
                     userInfoBo.setUserIdentification(userIdentification);
                     userInfoBo.setUserPubKey(userPubKey);
                     userInfoBo.setUserPriKey(userPriKey);
-                    userInfoBo.setRouterType(GalaxyEnum.RouterTypeEnum.ZXINCHAIN.getCode());
+                    userInfoBo.setRouterType(reqDto.getRouterType());
                     userInfoBo.setBlockChainAddress(address);
                     dataUtils.setGalaxyUserInfo(reqDto.getRouterType(),reqDto.getUserId(),userInfoBo);
                 }catch(Exception e){

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/galaxy/controller/GalaxyTradeController.java

 package com.liquidnet.service.galaxy.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.galaxy.aop.annotation.ControllerLog;
 import com.liquidnet.service.galaxy.dto.param.*;
@@ -17,8 +16,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author AnJiabin <anjiabin@zhengzai.tv>
@@ -38,21 +35,21 @@ public class GalaxyTradeController {
     @Resource(name = "galaxyTradeServiceImpl")
     private IGalaxyTradeService galaxyTradeService;
 
-    @ControllerLog(description = "NFT购买")
-    @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "NFT购买")
-    @PostMapping(value = {"nftBuy"})
-    public ResponseDto<GalaxyNftBuyRespDto> nftBuy(@Valid @RequestBody GalaxyNftBuyReqDto reqDto){
-        return galaxyTradeService.nftBuy(reqDto);
-    }
-
-    @ControllerLog(description = "NFT购买结果查询")
-    @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "NFT购买结果查询")
-    @PostMapping(value = {"nftBuyResultQuery"})
-    public ResponseDto<GalaxyNftBuyResultQueryRespDto> nftBuyResultQuery(@Valid @RequestBody GalaxyNftBuyResultQueryReqDto reqDto){
-        return galaxyTradeService.nftBuyResultQuery(reqDto);
-    }
+//    @ControllerLog(description = "NFT购买")
+//    @ApiOperationSupport(order = 1)
+//    @ApiOperation(value = "NFT购买")
+//    @PostMapping(value = {"nftBuy"})
+//    public ResponseDto<GalaxyNftBuyRespDto> nftBuy(@Valid @RequestBody GalaxyNftBuyReqDto reqDto){
+//        return galaxyTradeService.nftBuy(reqDto);
+//    }
+//
+//    @ControllerLog(description = "NFT购买结果查询")
+//    @ApiOperationSupport(order = 1)
+//    @ApiOperation(value = "NFT购买结果查询")
+//    @PostMapping(value = {"nftBuyResultQuery"})
+//    public ResponseDto<GalaxyNftBuyResultQueryRespDto> nftBuyResultQuery(@Valid @RequestBody GalaxyNftBuyResultQueryReqDto reqDto){
+//        return galaxyTradeService.nftBuyResultQuery(reqDto);
+//    }
 
     @ControllerLog(description = "NFT购买(发行+购买)")
     @ApiOperationSupport(order = 1)
@@ -75,30 +72,30 @@ public class GalaxyTradeController {
         return galaxyTradeService.nftPublishAndBuyResultQuery(reqDto);
     }
 
-    @ControllerLog(description = "NFT发行购买结果批量查询")
-    @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "NFT发行购买结果批量查询")
-    @PostMapping(value = {"nftPublishAndBuyResultBatchQuery"})
-    public ResponseDto<GalaxyNftPublishAndBuyResultBatchQueryRespDto> nftPublishAndBuyResultBatchQuery(@Valid @RequestBody GalaxyNftPublishAndBuyResultBatchQueryReqDto reqDto){
-        //定义返回结果
-        List<GalaxyNftPublishAndBuyResultQueryRespDto> routerBuyInfoList = new ArrayList<>();
-        //获取请求信息
-        List<GalaxyNftPublishAndBuyResultBatchQueryReqDto.RouterOrderInfo> routerOrderInfoList = reqDto.getRouterOrderInfoList();
-        routerOrderInfoList.forEach(routerOrderInfo -> {
-            GalaxyNftPublishAndBuyRouterBatchQueryReqDto batchQueryReqDto =  GalaxyNftPublishAndBuyRouterBatchQueryReqDto.getNew();
-            batchQueryReqDto.setUserId(routerOrderInfo.getUserId());
-            batchQueryReqDto.setRouterType(routerOrderInfo.getRouterType());
-            batchQueryReqDto.setNftOrderPayIdList(routerOrderInfo.getNftOrderPayIdList());
-            //进行批量查询
-            ResponseDto<GalaxyNftPublishAndBuyRouterBatchQueryRespDto> responseDtoTemp = galaxyTradeService.nftPublishAndBuyResultBatchQuery(batchQueryReqDto);
-            if(StringUtil.isNotNull(responseDtoTemp)&&responseDtoTemp.isSuccess()){
-                routerBuyInfoList.addAll(responseDtoTemp.getData().getBuyInfoList());
-            }
-        });
-        GalaxyNftPublishAndBuyResultBatchQueryRespDto respDto = GalaxyNftPublishAndBuyResultBatchQueryRespDto.getNew();
-        respDto.setRouterBuyInfoList(routerBuyInfoList);
-        return ResponseDto.success(respDto);
-    }
+//    @ControllerLog(description = "NFT发行购买结果批量查询")
+//    @ApiOperationSupport(order = 1)
+//    @ApiOperation(value = "NFT发行购买结果批量查询")
+//    @PostMapping(value = {"nftPublishAndBuyResultBatchQuery"})
+//    public ResponseDto<GalaxyNftPublishAndBuyResultBatchQueryRespDto> nftPublishAndBuyResultBatchQuery(@Valid @RequestBody GalaxyNftPublishAndBuyResultBatchQueryReqDto reqDto){
+//        //定义返回结果
+//        List<GalaxyNftPublishAndBuyResultQueryRespDto> routerBuyInfoList = new ArrayList<>();
+//        //获取请求信息
+//        List<GalaxyNftPublishAndBuyResultBatchQueryReqDto.RouterOrderInfo> routerOrderInfoList = reqDto.getRouterOrderInfoList();
+//        routerOrderInfoList.forEach(routerOrderInfo -> {
+//            GalaxyNftPublishAndBuyRouterBatchQueryReqDto batchQueryReqDto =  GalaxyNftPublishAndBuyRouterBatchQueryReqDto.getNew();
+//            batchQueryReqDto.setUserId(routerOrderInfo.getUserId());
+//            batchQueryReqDto.setRouterType(routerOrderInfo.getRouterType());
+//            batchQueryReqDto.setNftOrderPayIdList(routerOrderInfo.getNftOrderPayIdList());
+//            //进行批量查询
+//            ResponseDto<GalaxyNftPublishAndBuyRouterBatchQueryRespDto> responseDtoTemp = galaxyTradeService.nftPublishAndBuyResultBatchQuery(batchQueryReqDto);
+//            if(StringUtil.isNotNull(responseDtoTemp)&&responseDtoTemp.isSuccess()){
+//                routerBuyInfoList.addAll(responseDtoTemp.getData().getBuyInfoList());
+//            }
+//        });
+//        GalaxyNftPublishAndBuyResultBatchQueryRespDto respDto = GalaxyNftPublishAndBuyResultBatchQueryRespDto.getNew();
+//        respDto.setRouterBuyInfoList(routerBuyInfoList);
+//        return ResponseDto.success(respDto);
+//    }
 
 //    @ControllerLog(description = "NFT购买支付结果查询")
 //    @ApiOperationSupport(order = 1)