Merge remote-tracking branch 'origin/master' into jxl_yb_0729

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/service/ICandyConsumerService.java

+package com.liquidnet.service.candy.service;
+
+import com.liquidnet.service.base.ResponseDto;
+
+import java.util.ArrayList;
+
+/**
+ * <p>
+ * 券消费 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-18
+ */
+public interface ICandyConsumerService {
+
+    ResponseDto<Boolean> couponOrderBackRedis(String uid,ArrayList<String> uCouponIdList);
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/pom.xml

@@ -27,6 +27,11 @@
             <artifactId>easyexcel</artifactId>
             <version>3.0.5</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-dragon-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/PhoneDto.java

+package com.liquidnet.service.goblin.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode
+public class PhoneDto {
+    private String uid;
+    private String mobile;
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/NoticeGoblinGoodsSkuInfoVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.goblin.dto.manage.vo.GoblinGoodsAnticipateValueVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author TT
+ */
+
+@ApiModel(value = "NoticeGoblinGoodsSkuInfoVo", description = "票务")
+@Data
+public class NoticeGoblinGoodsSkuInfoVo implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "商品单品ID")
+    private String skuId;
+    @ApiModelProperty(value = "商品ID[64]")
+    private String spuId;
+    @ApiModelProperty(value = "单品的编号[45]")
+    private String skuNo;
+    @ApiModelProperty(value = "商品类型[0-常规|1-数字藏品]")
+    private int skuType;
+    @ApiModelProperty(value = "单品的名称[100]")
+    private String name;
+    @ApiModelProperty(value = "单品的副标题[128]")
+    private String subtitle;
+    @ApiModelProperty(value = "单品默认图片的URL[256]")
+    private String skuPic;
+    @ApiModelProperty(value = "单品详情展示文件URL[256]")
+    private String skuWatch;
+    @ApiModelProperty(value = "展示文件类型[1-图片|2-视频|3-模型]")
+    private String watchType;
+    @ApiModelProperty(value = "展示预览图片URL[256]")
+    private String skuWatchPic;
+    @ApiModelProperty(value = "素材原始文件类型[1-图片|2-视频|3-模型]")
+    private String materialType;
+    @ApiModelProperty(value = "素材原始文件URL")
+    private String materialUrl;
+    @ApiModelProperty(value = "单品销售价-原价[20,2]")
+    private BigDecimal sellPrice;
+    @ApiModelProperty(value = "单品现价[20,2]")
+    private BigDecimal price;
+    @ApiModelProperty(value = "IOS商品价格[20,2]")
+    private BigDecimal priceV;
+    @ApiModelProperty(value = "IOS商品价格ID")
+    private String productId;
+    @ApiModelProperty(value = "单品会员价格[20,2]")
+    private BigDecimal priceMember;
+    @ApiModelProperty(value = "NFT路由")
+    private String routeType;
+    @ApiModelProperty(value = "NFT上传声明状态[0-待上传|1-已声明|2-声明失败|9-声明中]")
+    private Integer upchain;
+    @ApiModelProperty(value = "NFT预览图访问URL")
+    private String displayUrl;
+    @ApiModelProperty(value = "NFT素材访问URL")
+    private String nftUrl;
+    @ApiModelProperty(value = "NFT系列ID")
+    private String seriesId;
+    @ApiModelProperty(value = "NFT系列HASH")
+    private String seriesHash;
+    @ApiModelProperty(value = "NFT藏品HASH")
+    private String nftHash;
+    @ApiModelProperty(value = "NFT系列声明时间")
+    private String declareAt;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(value = "开售时间")
+    private LocalDateTime saleStartTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(value = "停售时间")
+    private LocalDateTime saleStopTime;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(value = "预约开始时间")
+    private LocalDateTime aboutStartTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(value = "预约停止时间")
+    private LocalDateTime aboutStopTime;
+    @ApiModelProperty(value = "上架处理方式[1-等待手动上架|2-直接上架售卖|3-预约定时上架]")
+    private String shelvesHandle;
+    @ApiModelProperty(value = "预约上架时间[上架处理方式为3-预约定时上架时需要指定]")
+    private String shelvesTime;
+
+    @ApiModelProperty(position = 62, value = "标签[0-提前购买|1-分段购买|2-预约|3-普通数字藏品]")
+    private Integer tagType;
+    @ApiModelProperty(position = 70, value = "分批购活动id")
+    private String listId;
+
+    @ApiModelProperty(position = 12, value = "创作者")
+    private String author;
+    @ApiModelProperty(position = 13, value = "发行方")
+    private String publisher;
+
+
+    private static final NoticeGoblinGoodsSkuInfoVo obj = new NoticeGoblinGoodsSkuInfoVo();
+
+    public static NoticeGoblinGoodsSkuInfoVo getNew() {
+        try {
+            return (NoticeGoblinGoodsSkuInfoVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new NoticeGoblinGoodsSkuInfoVo();
+        }
+    }
+
+    public NoticeGoblinGoodsSkuInfoVo copy(GoblinGoodsSkuInfoVo goblinGoodsSkuInfoVo) {
+        if (null == goblinGoodsSkuInfoVo) return getNew();
+        this.declareAt = goblinGoodsSkuInfoVo.getDeclareAt();
+        this.displayUrl = goblinGoodsSkuInfoVo.getDisplayUrl();
+        this.price = goblinGoodsSkuInfoVo.getPrice();
+        this.materialType = goblinGoodsSkuInfoVo.getMaterialType();
+        this.materialUrl = goblinGoodsSkuInfoVo.getMaterialUrl();
+        this.name = goblinGoodsSkuInfoVo.getName();
+        this.nftHash = goblinGoodsSkuInfoVo.getNftHash();
+        this.nftUrl = goblinGoodsSkuInfoVo.getNftUrl();
+        this.priceV = goblinGoodsSkuInfoVo.getPriceV();
+        this.priceMember = goblinGoodsSkuInfoVo.getPriceMember();
+        this.productId = goblinGoodsSkuInfoVo.getProductId();
+        this.routeType = goblinGoodsSkuInfoVo.getRouteType();
+        this.saleStartTime = goblinGoodsSkuInfoVo.getSaleStartTime();
+        this.saleStopTime = goblinGoodsSkuInfoVo.getSaleStopTime();
+        this.sellPrice = goblinGoodsSkuInfoVo.getSellPrice();
+        this.seriesHash = goblinGoodsSkuInfoVo.getSeriesHash();
+        this.seriesId = goblinGoodsSkuInfoVo.getSeriesId();
+        this.skuId = goblinGoodsSkuInfoVo.getSkuId();
+        this.skuNo = goblinGoodsSkuInfoVo.getSkuNo();
+        this.skuPic = goblinGoodsSkuInfoVo.getSkuPic();
+        this.skuType = goblinGoodsSkuInfoVo.getSkuType();
+        this.spuId = goblinGoodsSkuInfoVo.getSpuId();
+        this.skuWatch = goblinGoodsSkuInfoVo.getSkuWatch();
+        this.skuWatchPic = goblinGoodsSkuInfoVo.getSkuWatchPic();
+        this.subtitle = goblinGoodsSkuInfoVo.getSubtitle();
+        this.upchain = goblinGoodsSkuInfoVo.getUpchain();
+        this.watchType = goblinGoodsSkuInfoVo.getWatchType();
+        this.shelvesHandle = goblinGoodsSkuInfoVo.getShelvesHandle();
+        this.shelvesTime = goblinGoodsSkuInfoVo.getShelvesTime();
+        return this;
+    }
+
+
+    public NoticeGoblinGoodsSkuInfoVo valueCopy(GoblinGoodsAnticipateValueVo valueVo) {
+        if (null == valueVo) return getNew();
+        this.aboutStartTime = valueVo.getAboutStartDate();
+        this.aboutStopTime = valueVo.getAboutEndDate();
+        return this;
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/NoticeGoblinMixDetailsItemVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author TT
+ */
+
+@ApiModel(value = "NoticeGoblinMixDetailsItemVo", description = "票务")
+@Data
+public class NoticeGoblinMixDetailsItemVo implements Serializable, Cloneable {
+    @ApiModelProperty(value = "spuId")
+    private String spuId;
+    @ApiModelProperty(value = "skuId")
+    private String skuId;
+    @ApiModelProperty(value = "skuId")
+    private String skuPic;
+    @ApiModelProperty(value = "sku名称")
+    private String skuName;
+    @ApiModelProperty(value = "spu名称")
+    private String spuName;
+    @ApiModelProperty(value = "商品类型[1-商城|2-数字藏品]")
+    private String position;
+    @ApiModelProperty(value = "sku原价")
+    private BigDecimal skuPrice;
+    @ApiModelProperty(value = "组合价格")
+    private BigDecimal price;
+    @ApiModelProperty(value = "苹果价格")
+    private BigDecimal priceV;
+    @ApiModelProperty(value = "苹果价格id")
+    private String productId;
+    @ApiModelProperty(value = "组合件数[数字藏品不能大于1]")
+    private Integer count;
+
+    private static final NoticeGoblinMixDetailsItemVo obj = new NoticeGoblinMixDetailsItemVo();
+
+    public static NoticeGoblinMixDetailsItemVo getNew() {
+        try {
+            return (NoticeGoblinMixDetailsItemVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new NoticeGoblinMixDetailsItemVo();
+        }
+    }
+
+    public NoticeGoblinMixDetailsItemVo copy(GoblinMixDetailsItemVo goblinMixDetailsItemVo){
+        if (null==goblinMixDetailsItemVo) return getNew();
+        this.count = goblinMixDetailsItemVo.getCount();
+        this.position = goblinMixDetailsItemVo.getPosition();
+        this.priceV = goblinMixDetailsItemVo.getPriceV();
+        this.price = goblinMixDetailsItemVo.getPrice();
+        this.productId = goblinMixDetailsItemVo.getProductId();
+        this.skuId = goblinMixDetailsItemVo.getSkuId();
+        this.skuName = goblinMixDetailsItemVo.getSkuName();
+        this.skuPic = goblinMixDetailsItemVo.getSkuPic();
+        this.skuPrice = goblinMixDetailsItemVo.getSkuPrice();
+        this.spuId = goblinMixDetailsItemVo.getSpuId();
+        this.spuName = goblinMixDetailsItemVo.getSpuName();
+        return this;
+    }
+
+
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/NoticeGoblinMixDetailsVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author TT
+ */
+
+@ApiModel(value = "NoticeGoblinMixDetailsVo", description = "票务")
+@Data
+public class NoticeGoblinMixDetailsVo implements Serializable, Cloneable {
+    @ApiModelProperty(value = "活动id")
+    private String mixId;
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+    @ApiModelProperty(value = "活动名称")
+    private String name;
+    @ApiModelProperty(value = "开始时间")
+    private String timeStart;
+    @ApiModelProperty(value = "结束时间")
+    private String timeEnd;
+    @ApiModelProperty(value = "展示位置[1-商城|2-数字藏品]")
+    private Integer showPosition;
+    @ApiModelProperty(value = "组合名称")
+    private String sellName;
+    @ApiModelProperty(value = "封面图片地址")
+    private String coverPic;
+    @ApiModelProperty(value = "展示文件类型[1-图片|2-视频]")
+    private Integer watchType;
+    @ApiModelProperty(value = "销售价格")
+    private BigDecimal sellPrice;
+    @ApiModelProperty(value = "原价")
+    private BigDecimal price;
+    @ApiModelProperty(value = "配置详情")
+    private List<NoticeGoblinMixDetailsItemVo> item;
+
+    private static final NoticeGoblinMixDetailsVo obj = new NoticeGoblinMixDetailsVo();
+
+    public static NoticeGoblinMixDetailsVo getNew() {
+        try {
+            return (NoticeGoblinMixDetailsVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new NoticeGoblinMixDetailsVo();
+        }
+    }
+
+    public NoticeGoblinMixDetailsVo copy(GoblinMixDetailsVo goblinMixDetailsVo) {
+        if (null == goblinMixDetailsVo) return getNew();
+        this.coverPic = goblinMixDetailsVo.getCoverPic();
+        this.item = goblinMixDetailsVo.getItem().stream().map(goblinMixDetailsItemVo -> {
+            return NoticeGoblinMixDetailsItemVo.getNew().copy(goblinMixDetailsItemVo);
+        }).collect(Collectors.toList());
+        this.price = goblinMixDetailsVo.getPrice();
+        this.mixId = goblinMixDetailsVo.getMixId();
+        this.timeEnd = goblinMixDetailsVo.getTimeEnd();
+        this.name = goblinMixDetailsVo.getName();
+        this.sellName = goblinMixDetailsVo.getSellName();
+        this.sellPrice = goblinMixDetailsVo.getSellPrice();
+        this.showPosition = goblinMixDetailsVo.getShowPosition();
+        this.timeStart = goblinMixDetailsVo.getTimeStart();
+        this.userId = goblinMixDetailsVo.getUserId();
+        this.watchType = goblinMixDetailsVo.getWatchType();
+        return this;
+    }
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNftOrderPayCallbackParam.java

 package com.liquidnet.service.goblin.param;
 
+import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -46,4 +47,18 @@ public class GoblinNftOrderPayCallbackParam implements Cloneable {
             return new GoblinNftOrderPayCallbackParam();
         }
     }
+
+    public GoblinNftOrderPayCallbackParam copy(DragonPayOrderQueryRespDto source) {
+        if (null == source) return this;
+        this.setStatus(source.getStatus());
+//        this.setOrderId(source.getOrderCodeId());
+        this.setOrderCode(source.getOrderCode());
+        this.setCode(source.getCode());
+        this.setPrice(source.getPrice());
+        this.setType(source.getType());
+        this.setPaymentId(source.getPaymentId());
+        this.setPaymentType(source.getPaymentType());
+        this.setPaymentAt(source.getPaymentAt());
+        return this;
+    }
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinConsumerService.java

+package com.liquidnet.service.goblin.service.manage;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.ArDataVo;
+import com.liquidnet.service.goblin.dto.vo.TempCouponVo;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IGoblinConsumerService {
+
+
+    ResponseDto<Boolean> consumerType12(String finalSkuId, Integer finalType, String xlsPath);
+
+    ResponseDto<Boolean> consumerType34(String finalSkuId,Integer finalType,String xlsPath,String oXlsPath,String listId);
+
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -7,6 +7,7 @@ public class KylinRedisConst {
     public static final String PERFORMANCES_LIST_CITY = "kylin:performances:city:";
     public static final String PERFORMANCES_LIST_SYSTEM_RECOMMEND = "kylin:performances:systemRecommend";
     public static final String PERFORMANCES_LIST_NOTICE = "kylin:performances:notice";
+    public static final String PERFORMANCES_LIST_NOTICE_IDS = "kylin:performances:notice:ids";
     public static final String PERFORMANCES_LIST_RECOMMEND = "kylin:performances:recommend";
     public static final String PERFORMANCES_LIST_EXCLUSIVE = "kylin:performances:exclusive";
     public static final String PERFORMANCES_ROADLIST = "kylin:performances:roadShowId:";

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/NoticeKylinPerformanceVo.java

+package com.liquidnet.service.kylin.dto.vo.returns;
+
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author TT
+ */
+
+@ApiModel(value = "NoticeKylinPerformanceVo", description = "票务")
+@Data
+public class NoticeKylinPerformanceVo  implements Serializable, Cloneable {
+    private Integer mid;
+    @ApiModelProperty(value = "主键")
+    private String performancesId;
+    @ApiModelProperty(value = "演出名称")
+    private String title;
+    @ApiModelProperty(value = "演出图片")
+    private String imgPoster;
+    @ApiModelProperty(value = "演出开始时间")
+    private String timeStart;
+    @ApiModelProperty(value = "演出结束时间")
+    private String timeEnd;
+    @ApiModelProperty(value = "停售时间")
+    private String stopSellTime;
+    @ApiModelProperty(value = "价格")
+    private String price;
+    @ApiModelProperty(value = "开售时间")
+    private String sellTime;
+    @ApiModelProperty(value = "城市id")
+    private Integer cityId;
+    @ApiModelProperty(value = "城市名称")
+    private String cityName;
+    @ApiModelProperty(value = "场地id")
+    private String fieldId;
+    @ApiModelProperty(value = "场地名称")
+    private String fieldName;
+    @ApiModelProperty(value = "搭售id")
+    private String projectId;
+    @ApiModelProperty(value = "巡演id")
+    private String roadShowId;
+
+    private static final NoticeKylinPerformanceVo obj = new NoticeKylinPerformanceVo();
+
+    public static NoticeKylinPerformanceVo getNew() {
+        try {
+            return (NoticeKylinPerformanceVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new NoticeKylinPerformanceVo();
+        }
+    }
+
+    public NoticeKylinPerformanceVo copy(KylinPerformanceVo kylinPerformanceVo){
+        if (null == kylinPerformanceVo) return getNew();
+        this.mid = kylinPerformanceVo.getMid();
+        this.cityId = kylinPerformanceVo.getCityId();
+        this.cityName = kylinPerformanceVo.getCityName();
+        this.performancesId = kylinPerformanceVo.getPerformancesId();
+        this.fieldId = kylinPerformanceVo.getFieldId();
+        this.fieldName = kylinPerformanceVo.getFieldName();
+        this.imgPoster = kylinPerformanceVo.getImgPoster();
+        this.price = kylinPerformanceVo.getPrice();
+        this.projectId = kylinPerformanceVo.getProjectId();
+        this.roadShowId = kylinPerformanceVo.getRoadShowId();
+        this.sellTime = kylinPerformanceVo.getSellTime();
+        this.stopSellTime = kylinPerformanceVo.getStopSellTime();
+        this.timeEnd = kylinPerformanceVo.getTimeEnd();
+        this.timeStart = kylinPerformanceVo.getTimeStart();
+        this.title = kylinPerformanceVo.getTitle();
+        return this;
+    }
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinConsmerService.java

+package com.liquidnet.service.kylin.service;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.WqTempParam;
+import com.liquidnet.service.kylin.dto.vo.WqTempVo;
+
+/**
+ * <p>
+ * 补偿接口 胡佳晨
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-05
+ */
+public interface IKylinConsmerService {
+
+    ResponseDto<Boolean> orderTransferOverTime(String orderId);
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-client-admin-web.yml

 #eurekaServer配置
 eureka:
   client:
-    register-with-eureka: false
+    register-with-eureka: true
     fetch-registry: true
     serviceUrl:
       defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-test2.yml

+# begin-test2-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: test2
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 172.17.192.59:7001
+# end-test2-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: client-admin-web
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/logback.xml

@@ -4,7 +4,7 @@
         <property name="log.path" value="./data/logs/client-admin-web" />
     </springProfile>
 
-    <springProfile name="test,prod">
+    <springProfile name="test,prod,test2,yace">
         <property name="log.path" value="/data/logs/client-admin-web" />
     </springProfile>
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/AdminUpushServiceImpl.java

@@ -232,7 +232,7 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
             String custom = UpushTargetType.getTypeAction(adminUpush.getJumpType());
             broadcast.goCustomAfterOpen(custom);
             broadcast.setDisplayType(AndroidNotification.DisplayType.NOTIFICATION);
-            if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE))) {
+            if (!LnsEnum.ENV.prod.name().equals(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE))) {
                 broadcast.setTestMode();
             } else {
                 broadcast.setProductionMode();
@@ -296,7 +296,7 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
             broadcast.setAlert(adminUpush.getPushTitle(), "", adminUpush.getPushContent());
             broadcast.setBadge(1);
             broadcast.setSound("default");
-            if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE))) {
+            if (!LnsEnum.ENV.prod.name().equals(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE))) {
                 broadcast.setTestMode();
             } else {
                 broadcast.setProductionMode();

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/QueueUtils.java

@@ -24,6 +24,6 @@ public class QueueUtils {
     public void sendMsgByRedis(String streamKey, String jsonMsg) {
         HashMap<String, String> map = CollectionUtil.mapStringString();
         map.put(MQConst.QUEUE_MESSAGE_KEY, jsonMsg);
-        redisDataSourceUtil.getRedisKylinUtil().getStringRedisTemplate().opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
+        redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate().opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
     }
 }

liquidnet-bus-client/liquidnet-client-job/src/main/resources/bootstrap-client-job.yml

 #eurekaServer配置
 eureka:
   client:
-    register-with-eureka: false
+    register-with-eureka: true
     fetch-registry: true
     serviceUrl:
       defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka

liquidnet-bus-client/liquidnet-client-job/src/main/resources/bootstrap-test2.yml

+# begin-test2-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: test2
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 172.17.192.59:7001
+# end-test2-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: client-job
\ No newline at end of file

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/HttpUtil.java

@@ -2,7 +2,7 @@ package com.liquidnet.commons.lang.util;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.liquidnet.commons.lang.util.spring.RestTemplateConfig;
+import com.liquidnet.commons.lang.util.spring.RestTemplateOkConfig;
 import org.springframework.http.*;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -19,7 +19,10 @@ public class HttpUtil {
     private static final RestTemplate restTemplate;
 
     static {
-        restTemplate = RestTemplateConfig.getRestTemplate();
+        //apache httpClient
+//        restTemplate = RestTemplateConfig.getRestTemplate();
+//        //okhttp3 client
+        restTemplate = RestTemplateOkConfig.getRestTemplate();
     }
 
     /**
@@ -42,7 +45,7 @@ public class HttpUtil {
      * @return
      */
     public static String get(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
-        return request(url, params, headers, HttpMethod.GET);
+        return requestForGet(url, params, headers, HttpMethod.GET);
     }
 
     /**
@@ -242,13 +245,29 @@ public class HttpUtil {
      * @param method  请求方式
      * @return
      */
-    public static String request(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers, HttpMethod method) {
+    private static String request(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers, HttpMethod method) {
         if (params == null) {
             params = new LinkedMultiValueMap<>();
         }
         return request(url, params, headers, method, MediaType.APPLICATION_FORM_URLENCODED);
     }
 
+    /**
+     * 表单请求
+     *
+     * @param url
+     * @param params  请求参数
+     * @param headers 请求头
+     * @param method  请求方式
+     * @return
+     */
+    private static String requestForGet(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers, HttpMethod method) {
+        if (params == null) {
+            params = new LinkedMultiValueMap<>();
+        }
+        return requestForGet(url, params, headers, method, MediaType.APPLICATION_FORM_URLENCODED);
+    }
+
     /**
      * http请求 通过uri
      * @param url
@@ -256,7 +275,7 @@ public class HttpUtil {
      * @param method
      * @return
      */
-    public static String request(URI url,MultiValueMap<String, String> headers, HttpMethod method) {
+    private static String request(URI url,MultiValueMap<String, String> headers, HttpMethod method) {
         if (url == null) {
             return null;
         }
@@ -283,13 +302,64 @@ public class HttpUtil {
      * @param method  请求方式
      * @return
      */
-    public static String requestRaw(String url, String params, MultiValueMap<String, String> headers, HttpMethod method) {
+    private static String requestRaw(String url, String params, MultiValueMap<String, String> headers, HttpMethod method) {
         if (params == null) {
             params = "";
         }
         return requestRaw(url, params, headers, method, MediaType.APPLICATION_JSON);
     }
 
+
+    /**
+     * http请求
+     *
+     * @param url
+     * @param params    请求参数
+     * @param headers   请求头
+     * @param method    请求方式
+     * @param mediaType 参数类型
+     * @return
+     */
+    private static String requestForGet(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
+        if (url == null || url.trim().isEmpty()) {
+            return null;
+        }
+
+        // header
+        HttpHeaders httpHeaders = new HttpHeaders();
+        if (headers != null) {
+            httpHeaders.addAll(headers);
+        }
+        HttpEntity<Object> httpEntity = new HttpEntity(httpHeaders);
+        MultiValueMap<String, String> multiValueMap = (MultiValueMap<String, String>)params;
+        String paramStr = "";
+        if(multiValueMap.size()>0) {
+            if (!url.contains("?")) {
+                // 提交方式：表单、json
+                for (String key : multiValueMap.keySet()) {
+                    try {
+                        String value = multiValueMap.get(key).get(0);
+                        paramStr = paramStr.concat("&" + key + "=" + value);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+
+                url = url.concat("?").concat(paramStr);
+//                System.out.println("url=="+url);
+            }
+
+            ResponseEntity<String> response = restTemplate.exchange(url, method, httpEntity, String.class);
+            return response.getBody();
+        }else{
+            // 提交方式：表单、json
+            ResponseEntity<String> response = restTemplate.exchange(url, method, httpEntity, String.class);
+            return response.getBody();
+        }
+    }
+
+
+
     /**
      * http请求
      *
@@ -300,7 +370,7 @@ public class HttpUtil {
      * @param mediaType 参数类型
      * @return
      */
-    public static String request(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
+    private static String request(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
         if (url == null || url.trim().isEmpty()) {
             return null;
         }
@@ -318,7 +388,7 @@ public class HttpUtil {
         return response.getBody();
     }
 
-    public static String requestRaw(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
+    private static String requestRaw(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
         if (url == null || url.trim().isEmpty()) {
             return null;
         }

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/SuperAccountUtils.java

+package com.liquidnet.commons.lang.util;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class SuperAccountUtils {
+
+    private static final ArrayList<String> ACCOUNT_LIST = new ArrayList<>(Arrays.asList("809406", "773650", "2011301", "544327", "1997335"));
+
+    public static boolean isSuperAccount(String uid, String ownerUid) {
+        if (!ACCOUNT_LIST.contains(uid)) {
+            if (!ownerUid.equals(uid)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+}

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/spring/RestTemplateConfig.java

@@ -29,7 +29,7 @@ public class RestTemplateConfig {
     static {
         // 长链接保持时间长度20秒
         PoolingHttpClientConnectionManager poolConnManager =
-                new PoolingHttpClientConnectionManager(20, TimeUnit.SECONDS);
+                new PoolingHttpClientConnectionManager(20, TimeUnit.MINUTES);
         // 设置最大链接数
         poolConnManager.setMaxTotal(80 * getMaxCpuCore() * 5);
         // 单路由的并发数
@@ -48,11 +48,11 @@ public class RestTemplateConfig {
 
         HttpComponentsClientHttpRequestFactory httpComponentsClientHttpRequestFactory = new HttpComponentsClientRestfulHttpRequestFactory(httpClient);
         // 链接超时配置 5秒
-        httpComponentsClientHttpRequestFactory.setConnectTimeout(5000);
+        httpComponentsClientHttpRequestFactory.setConnectTimeout(120000);
         // 连接读取超时配置
-//        httpComponentsClientHttpRequestFactory.setReadTimeout(10000);
+        httpComponentsClientHttpRequestFactory.setReadTimeout(120000);
         // 连接池不够用时候等待时间长度设置，分词那边 500毫秒 ，我们这边设置成1秒
-        httpComponentsClientHttpRequestFactory.setConnectionRequestTimeout(5000);
+        httpComponentsClientHttpRequestFactory.setConnectionRequestTimeout(120000);
 
         // 缓冲请求数据，POST大量数据，可以设定为true 我们这边机器比较内存较大
         httpComponentsClientHttpRequestFactory.setBufferRequestBody(true);

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/spring/RestTemplateOkConfig.java

+package com.liquidnet.commons.lang.util.spring;
+
+import okhttp3.ConnectionPool;
+import okhttp3.OkHttpClient;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.OkHttp3ClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: RestTemplateOkConfig
+ * @Package com.liquidnet.commons.lang.util.spring
+ * @Copyright: LightNet @ Copyright (c) 2022
+ * @date 2022/6/9 11:56
+ */
+public class RestTemplateOkConfig {
+    private static RestTemplate restTemplate;
+
+    static{
+        long startTime = System.currentTimeMillis();
+        ConnectionPool pool = new ConnectionPool(500, 5, TimeUnit.MINUTES);
+
+        OkHttpClient okHttpClient = new OkHttpClient().newBuilder()
+                .connectionPool(pool)
+                .connectTimeout(2, TimeUnit.MINUTES)
+                .readTimeout(2, TimeUnit.MINUTES)
+                .writeTimeout(2, TimeUnit.MINUTES)
+                .hostnameVerifier((hostname, session) -> true)
+                // 设置代理
+//              .proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 8888)))
+                // 拦截器
+//                .addInterceptor()
+                .build();
+        ClientHttpRequestFactory factory = new OkHttp3ClientHttpRequestFactory(okHttpClient);
+
+        restTemplate = new RestTemplate(factory);
+        System.out.println("初始化 RestTemplate，bean name :{}"+"restTemplate");
+        System.out.println("初始化 ok RestTemplate总耗时"+(System.currentTimeMillis()-startTime));
+
+    }
+
+    public static RestTemplate getRestTemplate(){
+        return restTemplate;
+    }
+
+    private static int getMaxCpuCore(){
+        int cpuCore = Runtime.getRuntime().availableProcessors();
+        return  cpuCore;
+    }
+}

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/config/AbstractRedisConfig.java

@@ -37,7 +37,7 @@ public abstract class AbstractRedisConfig {
 
     public int totalDbs = 1;
 
-    public int stringTemplateDb = 1;
+    /*public int stringTemplateDb = 1;*/
 
     public Map<Integer, RedisTemplate<String, Object>> redisTemplateMap = new HashMap<>();
 
@@ -77,11 +77,11 @@ public abstract class AbstractRedisConfig {
         log.info("###### START 初始化 Redis-queue{} "+this.getClass().getSimpleName()+"连接池 START ######", this.getHost());
         //初始化队列
         LettuceConnectionFactory factory = null;
-        if(this.getDbs().size()==3){
+        /*if(this.getDbs().size()==3){
             stringTemplateDb = this.getDbs().get(2);
         }else{
             stringTemplateDb = totalDbs-1;
-        }
+        }*/
         if(totalDbs==1){
             log.info("###### 正在加载Redis-queue-db-" + defaultDb + " ######");
             factory = getDbFactory(defaultDb);
@@ -164,8 +164,10 @@ public abstract class AbstractRedisConfig {
             log.info("###### 正在加载Redis-stringTemplate-" + (defaultDb) + " ######");
             factory = getDbFactory(defaultDb);
         }else{
-            log.info("###### 正在加载Redis-stringTemplate-" + (stringTemplateDb) + " ######");
-            factory = getDbFactory(stringTemplateDb);
+            log.info("###### 正在加载Redis-stringTemplate-" + (totalDbs-1) + " ######");
+            factory = getDbFactory(totalDbs-1);
+            /*log.info("###### 正在加载Redis-stringTemplate-" + (stringTemplateDb) + " ######");
+            factory = getDbFactory(stringTemplateDb);*/
         }
         StringRedisTemplate stringRedisTemplate = new StringRedisTemplate();
         stringRedisTemplate.setConnectionFactory(factory);

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/config/RedisQueueConfig.java

+package com.liquidnet.common.cache.redis.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: 队列redis
+ * @class: RedisStreamQueueConfig
+ * @Package com.liquidnet.common.cache.redis.config
+ * @Copyright: LightNet @ Copyright (c) 2022
+ * @date 2022/6/14 15:10
+ */
+@Slf4j
+@Configuration
+public class RedisQueueConfig extends AbstractRedisConfig{
+    @Value("${spring.redis.queue.host:null}")
+    private String host;
+    @Value("${spring.redis.queue.port:-1}")
+    private int port;
+    @Value("${spring.redis.queue.password:null}")
+    private String password;
+    @Value("${spring.redis.queue.lettuce.pool.max-active:-1}")
+    private int maxActive;
+    @Value("${spring.redis.queue.lettuce.pool.max-idle:-1}")
+    private int maxIdle;
+    @Value("${spring.redis.queue.lettuce.pool.min-idle:-1}")
+    private int minIdle;
+    @Value("${spring.redis.queue.lettuce.pool.max-wait:-1}")
+    private int maxWait;
+
+    @Value("${spring.redis.queue.dbs:${spring.redis.queue.database:-1}}")
+    private List<Integer> dbs;
+
+    String getHost(){
+        return this.host;
+    }
+
+    int getPort(){
+        return this.port;
+    }
+    String getPassword(){
+        return this.password;
+    }
+    int getMaxActive(){
+        return this.maxActive;
+    }
+    int getMaxIdle(){
+        return this.maxIdle;
+    }
+    int getMinIdle(){
+        return this.minIdle;
+    }
+    int getMaxWait(){
+        return this.maxWait;
+    }
+    List<Integer> getDbs(){
+        return this.dbs;
+    }
+}
+

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisDataSourceUtil.java

@@ -35,6 +35,9 @@ public class RedisDataSourceUtil {
     @Autowired
     private RedisGalaxyUtil redisGalaxyUtil;
 
+    @Autowired
+    private RedisQueueUtil redisQueueUtil;
+
     public AbstractRedisUtil getRedisKylinUtil() {
         return this.redisKylinUtil;
     }
@@ -66,4 +69,8 @@ public class RedisDataSourceUtil {
     public AbstractRedisUtil getRedisGalaxyUtil(){
         return this.redisGalaxyUtil;
     }
+
+    public AbstractRedisUtil getRedisQueueUtil(){
+        return this.redisQueueUtil;
+    }
 }

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisQueueUtil.java

+package com.liquidnet.common.cache.redis.util;
+
+import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
+import com.liquidnet.common.cache.redis.config.RedisQueueConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: RedisQueueUtil
+ * @Package com.liquidnet.common.cache.redis.util
+ * @Copyright: LightNet @ Copyright (c) 2022
+ * @date 2022/6/14 15:30
+ */
+@Slf4j
+@Component("redisQueueUtil")
+public final class RedisQueueUtil extends AbstractRedisUtil{
+    @Autowired
+    private RedisQueueConfig redisConfig;
+
+    @Override
+    public String fillingKey(String key) {
+        return key;
+    }
+
+    @Override
+    public int getDbs() {
+        log.info("RedisQueueUtil.totalDbs:{}===", redisConfig.totalDbs);
+        return redisConfig.totalDbs;
+    }
+
+    @Override
+    AbstractRedisConfig getRedisConfig() {
+        return this.redisConfig;
+    }
+}
\ No newline at end of file

liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-handler-service/src/main/java/com/liquidnet/common/exception/RestControllerAdviceHandler.java

@@ -9,6 +9,7 @@ import com.liquidnet.common.exception.constant.ErrorCode;
 import com.liquidnet.common.exception.entity.Error;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageNotReadableException;
@@ -36,25 +37,30 @@ import javax.validation.ConstraintViolationException;
 @ControllerAdvice(annotations = RestController.class)
 public class RestControllerAdviceHandler {
     private final Logger logger = LoggerFactory.getLogger(RestControllerAdviceHandler.class);
+    @Value("${spring.profiles.active:prod}")
+    private String active;
 
     @ExceptionHandler(value = Exception.class)
     @ResponseBody
     public ResponseEntity<Error> serviceExceptionHandler(Exception rex, HttpServletRequest req) {
-        logger.error("Ex.Handler.RestController:uri:{},param:{},ex:{},msg:{},",
-                req.getRequestURI(), JSON.toJSONString(req.getParameterMap()), rex.getClass().getSimpleName(), rex.getLocalizedMessage());
+        logger.warn("Ex.Rest[uri:{},param:{},ex:{},msg:{}]", req.getRequestURI(), JSON.toJSONString(req.getParameterMap()),
+                rex.getClass().getSimpleName(), rex.getMessage());
 
         if (rex instanceof HttpMessageNotReadableException) {
             return new ResponseEntity<>(Error.getNew().setCode(ErrorCode.HTTP_PARAM_ERROR.getCode()).setMessage(ErrorCode.HTTP_PARAM_ERROR.getMessage()), HttpStatus.OK);
         }
         if (rex instanceof MissingServletRequestParameterException) {
-            MissingServletRequestParameterException ygex = (MissingServletRequestParameterException) rex;
-            String message = ygex.getMessage();
+            String message = ErrorCode.HTTP_PARAM_ERROR.getMessage();
+            if (!"prod".equals(active)) {
+                MissingServletRequestParameterException ygex = (MissingServletRequestParameterException) rex;
+                message = ygex.getMessage();
+            }
             return new ResponseEntity<>(Error.getNew().setCode(ErrorCode.HTTP_PARAM_ERROR.getCode()).setMessage(message), HttpStatus.OK);
         }
         if (rex instanceof ConstraintViolationException) {
             ConstraintViolationException ygex = (ConstraintViolationException) rex;
             ConstraintViolation violation = (ConstraintViolation) ygex.getConstraintViolations().toArray()[0];
-            String violationNode = violation.getPropertyPath().toString();
+//            String violationNode = violation.getPropertyPath().toString();
 //            String message = violationNode.substring(violationNode.indexOf(".") + 1) + violation.getMessage();
             String message = violation.getMessage();
             return new ResponseEntity<>(Error.getNew().setCode(ErrorCode.HTTP_PARAM_ERROR.getCode()).setMessage(message), HttpStatus.OK);

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/MdbMessage.java

+package com.liquidnet.service.base;
+
+import com.liquidnet.commons.lang.util.JsonUtils;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MdbMessage implements Serializable, Cloneable {
+    private static final long serialVersionUID = 4814549190217810630L;
+    /**
+     * Mongo集合名
+     */
+    private String collect;
+    /**
+     * Mongo集合中的字段属性名称
+     */
+    private String column;
+    /**
+     * Mongo集合中的字段属性值
+     */
+    private String bizId;
+    /**
+     * Redis缓存中的Key前缀
+     */
+    private String prefix;
+    /**
+     * 操作类型[1-insert|2-update]
+     */
+    private int opType;
+
+    private static final MdbMessage obj = new MdbMessage();
+
+    public static MdbMessage getNew() {
+        try {
+            return (MdbMessage) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new MdbMessage();
+        }
+    }
+
+    public String toJson() {
+        return JsonUtils.toJson(this);
+    }
+}

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java

@@ -353,8 +353,74 @@ public class MQConst {
         }
     }
 
-    public static void main(String[] args) {
-        System.out.println(ChimeQueue.USER_OPERATION_LIKE.name());
+    public enum DragonQueue {
+        //支付相关队列
+        DRAGON_PAY_KEY("dragon:stream:dragon-pay","dragon-pay-group","同步数据-支付"),
+        DRAGON_REFUND_KEY ("dragon:stream:dragon-refund","dragon-refund-group","同步数据-退款"),
+        //三方异步通知相关队列
+        DRAGON_PAY_NOTIFY_KEY("dragon:stream:dragon-pay-notify-key","dragon-pay-notify-group","支付异步通知"),
+        //商户通知相关队列
+        PAY_MCH_NOTIFY_KEY("dragon:stream:pay-mch-notify-key","pay-mch-notify-group","商户异步通知"),
+        PAY_MCH_NOTIFY_ERROR_KEY("dragon:stream:pay-mch-notify-error-key","pay-mch-notify-error-group","商户异步通知失败");
+
+        private final String key;
+        private final String group;
+        private final String desc;
+
+        DragonQueue(String key, String group, String desc) {
+            this.key = key;
+            this.group = group;
+            this.desc = desc;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public String getGroup() {
+            return group;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
     }
 
+    public enum CommonQueue {
+        /**
+         * SQL持久化：优先级0<1<2<3...
+         */
+        SQL0("stream:common:sql:0", "group.sql", "Mysql持久化0"),
+        SQL1("stream:common:sql:1", "group.sql", "Mysql持久化1"),
+        SQL2("stream:common:sql:2", "group.sql", "Mysql持久化2"),
+        SQL3("stream:common:sql:3", "group.sql", "Mysql持久化3"),
+
+        MDB0("stream:common:mdb:0", "group.mdb", "Mongo持久化0"),
+
+        ;
+        private final String key;
+        private final String group;
+        private final String desc;
+
+        CommonQueue(String key, String group, String desc) {
+            this.key = key;
+            this.group = group;
+            this.desc = desc;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public String getGroup() {
+            return group;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+    }
+
+    public static void main(String[] args) {
+    }
 }

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-xuper/src/main/java/com/liquidnet/common/third/xuper/util/XuperSdkUtil.java

@@ -68,7 +68,7 @@ public class XuperSdkUtil {
             log.debug("xuperUploadFile resp : "+ JsonUtils.toJson(respDto));
         }catch(Exception e){
             log.error("error msg "+e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -91,7 +91,7 @@ public class XuperSdkUtil {
             log.debug("xuper000CreateAccount resp : "+ JsonUtils.toJson(respDto));
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -118,7 +118,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error("error msg "+e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -164,7 +164,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -212,7 +212,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -241,7 +241,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -265,7 +265,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -296,7 +296,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -331,7 +331,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -366,7 +366,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -396,7 +396,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -422,7 +422,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -450,7 +450,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -478,7 +478,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -506,7 +506,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -532,7 +532,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }
@@ -556,7 +556,7 @@ public class XuperSdkUtil {
             }
         }catch(Exception e){
             log.error(e.getMessage(),e);
-            throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
+            XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return XuperResponseDto.success(respDto);
     }

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

@@ -2,6 +2,7 @@ package com.liquidnet.common.third.zxlnft.biz;
 
 import com.alibaba.fastjson.JSONObject;
 import com.liquidnet.common.third.zxlnft.config.ZxlnftConfig;
+import com.liquidnet.common.third.zxlnft.constant.ZxlErrorEnum;
 import com.liquidnet.common.third.zxlnft.dto.wallet.*;
 import com.liquidnet.common.third.zxlnft.exception.ZxlNftException;
 import com.liquidnet.common.third.zxlnft.service.WalletSdkService;
@@ -83,7 +84,21 @@ public class ZxlnftBiz {
     }
 
     public <T> T buildNftRespObj(String response,Class<T> tClass){
-        return this.buildNftRespObj(response,tClass,true);
+        T resp = null;
+        try {
+            /**
+             * 构造返回结果
+             */
+            resp = this.buildNftRespObj(response,tClass,true);
+            log.info(tClass.getName()+"--->>> return result : {} ",resp.toString());
+        } catch (ZxlNftException e){
+            log.error("buildNftRespObj biz error response: {}", JsonUtils.toJson(response),e);
+            throw new ZxlNftException(e.getCode(),e.getMsg());
+        }catch (Exception e) {
+            log.error("buildNftRespObj sys error response: {}", JsonUtils.toJson(response),e);
+            throw new ZxlNftException(ZxlErrorEnum.SYSTEM_ERROR.getCode(),e.getMessage());
+        }
+        return resp;
     }
 
     public <T> T buildNftRespObj(String response,Class<T> tClass,boolean isJson){

liquidnet-bus-common/pom.xml

@@ -77,6 +77,11 @@
             <artifactId>fst</artifactId>
             <version>2.57</version>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.9.3</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

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

@@ -31,6 +31,11 @@ liquidnet:
   knife4j:
     disable: false
   redis:
+    queue:
+      database: 0
+      host: r-2ze1t1tldilykz86uzpd.redis.rds.aliyuncs.com
+      port: 6380
+      password: Zhengzai@2022
     kylin:
       database: 255
       dbs: 0,256
@@ -81,8 +86,8 @@ liquidnet:
   service:
     adam:
       url-pay:
-        pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
-        check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
+        pay: http://devorder.zhengzai.tv/order/pay/dragonPay
+        check: http://devorder.zhengzai.tv/order/pay/checkOrder
         callback: http://devadam.zhengzai.tv/adam/member/order/callback
       url: http://devadam.zhengzai.tv
     kylin:
@@ -103,18 +108,18 @@ liquidnet:
       url: http://devorder.zhengzai.tv
       url-pay:
         pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
-        applePay: http://devdragon.zhengzai.tv/dragon/notify/apple/purchase
+#        applePay: http://devorder.zhengzai.tv/order/notify/apple/purchase
         check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
         localUrl: http://devorder.zhengzai.tv/order/order/syncOrder
-        goblinUrl: http://devgoblin.zhengzai.tv/goblin/order/pay/syncOrder
-        goblinRefundUrl: http://devgoblin.zhengzai.tv/goblin/order/pay/refundSyncOrder
+        goblinUrl: http://devorder.zhengzai.tv/goblin/order/pay/syncOrder
+        goblinRefundUrl: http://devorder.zhengzai.tv/goblin/order/pay/refundSyncOrder
         nftPayNotify: https://devorder.zhengzai.tv/order/goblin/nft/syncOrder
         nftRefundNotify: https://devorder.zhengzai.tv/order/goblin/nft/refundSyncOrder
     dragon:
-      notifyUrl: https://devdragon.zhengzai.tv/dragon
+      notifyUrl: https://devorder.zhengzai.tv/order
       urls:
-        refundApply: https://devdragon.zhengzai.tv/dragon/refund/refundSingle
-        refundResult: https://devdragon.zhengzai.tv/dragon/refund/refund/alipay/result
+        refundApply: https://devorder.zhengzai.tv/order/refund/refundSingle
+        refundResult: https://devorder.zhengzai.tv/order/refund/refund/alipay/result
     platform:
       urls:
         ticketRefundNotify: https://devplatform.zhengzai.tv/platform/refund/callback

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

@@ -31,45 +31,50 @@ liquidnet:
   knife4j:
     disable: false
   redis:
+    queue:
+      database: 1
+      host: r-2ze1t1tldilykz86uzpd.redis.rds.aliyuncs.com
+      port: 6380
+      password: Zhengzai@2022
     kylin:
-      database: 251
-      dbs: 0,256,251
+      database: 255
+      dbs: 0,256
       host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
       port: 6380
       password: 7eoK2XehKqF1
     goblin:
-      database: 251
-      dbs: 0,256,251
+      database: 255
+      dbs: 0,256
       host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
       port: 6380
       password: 7eoK2XehKqF1
     slime:
-      database: 251
-      dbs: 0,256,251
+      database: 255
+      dbs: 0,256
       host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
       port: 6380
       password: 7eoK2XehKqF1
     dragon:
-      database: 251
-      dbs: 0,256,251
+      database: 255
+      dbs: 0,256
       host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
       port: 6380
       password: 7eoK2XehKqF1
     sweet:
-      database: 251
-      dbs: 0,256,251
+      database: 255
+      dbs: 0,256
       host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
       port: 6380
       password: 7eoK2XehKqF1
     adam:
-      database: 251
-      dbs: 0,256,251
+      database: 255
+      dbs: 0,256
       host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
       port: 6380
       password: 7eoK2XehKqF1
     candy:
-      database: 251
-      dbs: 0,256,251
+      database: 255
+      dbs: 0,256
       host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
       port: 6380
       password: 7eoK2XehKqF1
@@ -81,14 +86,14 @@ liquidnet:
   service:
     adam:
       url-pay:
-        pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
-        check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
+        pay: http://testorder.zhengzai.tv/order/pay/dragonPay
+        check: http://testorder.zhengzai.tv/order/pay/checkOrder
         callback: http://testadam.zhengzai.tv/adam/member/order/callback
       url: http://testadam.zhengzai.tv
     kylin:
       url-pay:
-        pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
-        check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
+        pay: http://testorder.zhengzai.tv/order/pay/dragonPay
+        check: http://testorder.zhengzai.tv/order/pay/checkOrder
         localUrl: http://testkylin.zhengzai.tv/kylin/order/syncOrder
       url: http://testkylin.zhengzai.tv/kylin
     candy:
@@ -102,19 +107,19 @@ liquidnet:
     order:
       url: http://testorder.zhengzai.tv
       url-pay:
-        pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
-        applePay: http://testdragon.zhengzai.tv/dragon/notify/apple/purchase
-        check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
+        pay: http://testorder.zhengzai.tv/order/pay/dragonPay
+#        applePay: http://testorder.zhengzai.tv/order/notify/apple/purchase
+        check: http://testorder.zhengzai.tv/order/pay/checkOrder
         localUrl: http://testorder.zhengzai.tv/order/order/syncOrder
         goblinUrl: http://testorder.zhengzai.tv/order/goblin/syncOrder
         goblinRefundUrl: http://testorder.zhengzai.tv/order/goblin/refundSyncOrder
         nftPayNotify: https://testorder.zhengzai.tv/order/goblin/nft/syncOrder
         nftRefundNotify: https://testorder.zhengzai.tv/order/goblin/nft/refundSyncOrder
     dragon:
-      notifyUrl: https://testdragon.zhengzai.tv/dragon
+      notifyUrl: https://testorder.zhengzai.tv/order
       urls:
-        refundApply: https://testdragon.zhengzai.tv/dragon/refund/refundSingle
-        refundResult: https://testdragon.zhengzai.tv/dragon/refund/refund/alipay/result
+        refundApply: https://testorder.zhengzai.tv/order/refund/refundSingle
+        refundResult: https://testorder.zhengzai.tv/order/refund/refund/alipay/result
     platform:
       urls:
         ticketRefundNotify: https://testplatform.zhengzai.tv/platform/refund/callback
@@ -155,7 +160,7 @@ liquidnet:
           addresses: 172.17.121.250:8090
   client:
     admin:
-#      phpPayUrl: http://testdragon.zhengzai.tv
+#      phpPayUrl: http://testorder.zhengzai.tv
       phpMallUrl: https://testmall.zhengzai.tv
       platformUrl: https://testplatform.zhengzai.tv
       h5Url: https://testm.zhengzai.tv

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

+config-server-git: test2
+#application-test2-begin
+#这里后续添加公共参数值
+liquidnet:
+  secret:
+    passwd-salt: NTZiYzg4
+  security:
+    username: user
+    password: user123
+  jwt:
+    secret: qZHglvNP0n0aOOckHiQXq5JMD468J4eG
+    expire-ttl: 43200
+    refresh-ttl: 525600
+    blacklist_grace_period: 5
+  mysql:
+    urlHostAndPort: java-test.mysql.polardb.rds.aliyuncs.com:3306
+    username: zhengzai
+    password: Zhengzai@rd2U#
+#  rabbitmq:
+#    host: 101.201.127.58
+#    port: 5672
+#    username: admin
+#    password: admin
+#    virtual-host: liquidnet
+#    adam:
+#      host: rabbitmq.zhengzai.tv
+#      port: 5672
+#      username: admin
+#      password: admin
+#      virtual-host: liquidnet
+  knife4j:
+    disable: false
+  redis:
+    queue:
+      database: 2
+      host: r-2ze1t1tldilykz86uzpd.redis.rds.aliyuncs.com
+      port: 6380
+      password: Zhengzai@2022
+    kylin:
+      database: 255
+      dbs: 0,256
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+      port: 6380
+      password: 7eoK2XehKqF1
+    goblin:
+      database: 255
+      dbs: 0,256
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+      port: 6380
+      password: 7eoK2XehKqF1
+    slime:
+      database: 255
+      dbs: 0,256
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+      port: 6380
+      password: 7eoK2XehKqF1
+    dragon:
+      database: 255
+      dbs: 0,256
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+      port: 6380
+      password: 7eoK2XehKqF1
+    sweet:
+      database: 255
+      dbs: 0,256
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+      port: 6380
+      password: 7eoK2XehKqF1
+    adam:
+      database: 255
+      dbs: 0,256
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+      port: 6380
+      password: 7eoK2XehKqF1
+    candy:
+      database: 255
+      dbs: 0,256
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+      port: 6380
+      password: 7eoK2XehKqF1
+  mongodb:
+    host: dds-2ze23697d93111041932-pub.mongodb.rds.aliyuncs.com:3717,dds-2ze23697d93111042720-pub.mongodb.rds.aliyuncs.com:3717
+    port: 3717
+    user: root
+    pwd: Sy6d*JwJ
+  service:
+    adam:
+      url-pay:
+        pay: http://test2order.zhengzai.tv/order/pay/dragonPay
+        check: http://test2order.zhengzai.tv/order/pay/checkOrder
+        callback: http://test2adam.zhengzai.tv/adam/member/order/callback
+      url: http://test2adam.zhengzai.tv
+    kylin:
+      url-pay:
+        pay: http://test2order.zhengzai.tv/order/pay/dragonPay
+        check: http://test2order.zhengzai.tv/order/pay/checkOrder
+        localUrl: http://test2kylin.zhengzai.tv/kylin/order/syncOrder
+      url: http://test2kylin.zhengzai.tv/kylin
+    candy:
+      url: http://test2candy.zhengzai.tv/candy
+    goblin:
+      url: http://test2goblin.zhengzai.tv
+    stone:
+      url: http://test2stone.zhengzai.tv/stone
+    smile:
+      url: http://test2smile.zhengzai.tv
+    order:
+      url: http://test2order.zhengzai.tv
+      url-pay:
+        pay: http://test2order.zhengzai.tv/order/pay/dragonPay
+#        applePay: http://test2order.zhengzai.tv/order/notify/apple/purchase
+        check: http://test2order.zhengzai.tv/order/pay/checkOrder
+        localUrl: http://test2order.zhengzai.tv/order/order/syncOrder
+        goblinUrl: http://test2order.zhengzai.tv/order/goblin/syncOrder
+        goblinRefundUrl: http://test2order.zhengzai.tv/order/goblin/refundSyncOrder
+        nftPayNotify: https://test2order.zhengzai.tv/order/goblin/nft/syncOrder
+        nftRefundNotify: https://test2order.zhengzai.tv/order/goblin/nft/refundSyncOrder
+    dragon:
+      notifyUrl: https://test2order.zhengzai.tv/order
+      urls:
+        refundApply: https://test2order.zhengzai.tv/order/refund/refundSingle
+        refundResult: https://test2order.zhengzai.tv/order/refund/refund/alipay/result
+    platform:
+      urls:
+        ticketRefundNotify: https://test2platform.zhengzai.tv/platform/refund/callback
+        memberRefundNotify: https://test2platform.zhengzai.tv/platform/amorder/callack/refund
+      url: http://test2platform.zhengzai.tv
+    sweet:
+      url: http://test2sweet.zhengzai.tv
+    chime:
+      url: http://test2chime.zhengzai.tv
+    galaxy:
+      temp-file-path: /data/galaxy/tempFilePath
+      router: zxinchain,xuper
+      zxlnft:
+        walletSdkUrl: http://127.0.0.1:30505
+        nftApiUrl: https://nfttest2.zxinchain.com
+        appId: 220214000100001
+        appKey: 82b561110c4b4f4d91ad2a2b0d5b7908
+        nftPlatformAddress: ZXa66c8a684727d0f9aaa434044362aa8a18b61bb4
+        nftPlatformPubKey: LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUZrd0V3WUhLb1pJemowQ0FRWUlLb0VjejFVQmdpMERRZ0FFbFNTQk00MHJIZlJFa0NjWUxlRm1RZzE0SHlIcAp5Rk9uSktzblFqbDBCL2JXOStFWnZPblArNW0vMEdkUCtXM29yeG5Kd3p5OHNoYS9OYkQ4QVBmNXlBPT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg==
+        nftPlatformPriKey: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JR1RBZ0VBTUJNR0J5cUdTTTQ5QWdFR0NDcUJITTlWQVlJdEJIa3dkd0lCQVFRZ1VhbTVWM2V6ZFZJTmNoZ28KVDRKL28zMHArMGJCd3hQWUZFL01FdEU3MTZhZ0NnWUlLb0VjejFVQmdpMmhSQU5DQUFTVkpJRXpqU3NkOUVTUQpKeGd0NFdaQ0RYZ2ZJZW5JVTZja3F5ZENPWFFIOXRiMzRSbTg2Yy83bWIvUVowLzViZWl2R2NuRFBMeXlGcjgxCnNQd0E5L25JCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K
+        platformIdentification: 4e40d5f6f65aa8ec9bc33ab424e0167e68783bbe95d4d265086314d749808eef
+      xuper:
+        nftApiUrl: http://120.48.16.137:8360
+        appId: 110353
+        accessKeyID: 4e99daf33303efc8c822daa90c925389
+        secretAccessKey: ac77c0e94424edd98ea8a23b342e877a
+        nftPlatformMnemonic: person lucky trophy wall kangaroo body bounce coach unable sister second goat guitar virus tree security acoustic ankle kiss deputy sunny message weapon believe
+        nftPlatformAddress: YqsYxgBSP74piDhNQHTjWMH9wXnXxZbt8
+    other:
+      ticketSystemUrl: http://dev-report.capapiao.com/
+      appId: 11920532
+      secret: 0854C2FFE6BED88E1E21E7F5BAF988CDF9D81D38
+    slime:
+      url: http://test2slime.zhengzai.tv
+    executor-main:
+      xxl:
+        admin:
+          addresses: 172.17.192.59:8090
+  client:
+    admin:
+#      phpPayUrl: http://test2order.zhengzai.tv
+      phpMallUrl: https://testmall.zhengzai.tv
+      platformUrl: https://test2platform.zhengzai.tv
+      h5Url: https://test2m.zhengzai.tv
+  aliyun:
+    dypns:
+      accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
+      accessKeySecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU
+    dysms:
+      accessKeyId: LTAI5tHt7yvm97G8zxackcMK
+      accessKeySecret: xC3i5qEptJ3JIIRaYLaKvhk4gVASfl
+    oss:
+      imgUrl: "https://img.zhengzai.tv/"
+      appUrl: "https://app.zhengzai.tv/"
+      endpoint: http://oss-cn-hangzhou.aliyuncs.com
+      accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
+      accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
+  wechat:
+    service:
+      zhengzai:
+        appid: wx3498304dda39c5a1
+        secret: a1307fab0a5f2380086a7c636f7339ea
+        token: tftipg1427706847
+        aeskey: LwVpmpuOcl7Mi3mtfQgBol11MsmMCATIqbPgHrEpDzx
+      zhengzaiActivity:
+        appid: wx769aa9167bef9ce2
+        secret: bebccc204b9472ba41661372b197eb81
+      modernsky:
+        appid: wx6bf7999941a06d15
+        secret: a12012b31307a539719dbe4d137ca45a
+      test:
+        appid: wxc7edcfdcb28e21f6
+        secret: 554c17cea13dffa05c290e7e722665ac
+    applet:
+      zhengzai:
+        appid: wx4732efeaa2b08086
+        secret: 94562c1f92da1b6cb3f1327c8842c6d3
+      strawberry:
+        appid: wx08b852ade69f8019
+        secret: 0aac285fd1fbc6aa4e562b7ad81de392
+      five:
+        appid: wxb5371c8c95226957
+        secret: a6a909ae1ab25a79d4addd154eafbb7e
+      mdsk:
+        appid: wxc278ddf30f515188
+        secret: 21c0daa5d7d323f86c70c29db3c0613b
+      airship:
+        appid: wxefc896f987d72d32
+        secret: 24c80a734c1fdb316a31a5be1f3606d5
+      smile:
+        appid: wx4956704fe769112c
+        secret: 645919ab4a4c48eb8e73aea38752adfa
+  umeng:
+    ios:
+      appkey: 54fe819bfd98c546b50004f0
+      appMasterSecret: fsls9dv1vwyemqdv9lidjfppk37nmssa
+    android:
+      appkey: 5c6cf6cbb465f592e4000bae
+      appMasterSecret: dmsho74wlpd1hp7vrwp9bjehzwo29pza
+  easemob:
+    api-url: https://a1.easemob.com
+    org-name: 1106210901175651
+    app-name: demo
+    client-id: YXA6x4Xs7cYDQcOv6BPuM3hUDA
+    client-secret: YXA6olr2qaW65xlkFixS81kiWnplrW4
+  express:
+    shunfeng:
+      url: "https://butler-dev.sit.sf-express.com"
+      sk: 21e9a70f677a2bf29dfa2b3bead4f018
+      appid: 557104628450889728
+      custid: "7551234567"
+      jCompany: 北京正在映画互联网有限公司
+      jContact: 摩登天空票务部
+      jTel: 4006310750
+      jProvince: 北京
+      jCity: 北京市
+      jAddress: 朝阳区广渠路1号北京市商业储运公司3-12号 摩登天空
+      expressType: 2 # 默认顺丰特快
+      depositumInfo: 演出纸质票
+
+#application-test2-end
\ No newline at end of file

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

@@ -13,7 +13,7 @@ liquidnet:
     refresh-ttl: 525600
     blacklist_grace_period: 5
   mysql:
-    urlHostAndPort: pc-2ze0t10lf4x6j29fb.mysql.polardb.rds.aliyuncs.com
+    urlHostAndPort: pc-2ze0t10lf4x6j29fb.mysql.polardb.rds.aliyuncs.com:3306
     username: zhengzai
     password: Zhengzai@rd2U#
 #  rabbitmq:
@@ -31,6 +31,11 @@ liquidnet:
   knife4j:
     disable: false
   redis:
+    queue:
+      database: 11
+      host: r-2ze1t1tldilykz86uz.redis.rds.aliyuncs.com
+      port: 6380
+      password: Zhengzai@2022
     kylin:
       database: 255
       dbs: 0,256
@@ -81,14 +86,14 @@ liquidnet:
   service:
     adam:
       url-pay:
-        pay: http://ttestdragon.zhengzai.tv/dragon/pay/dragonPay
-        check: http://ttestdragon.zhengzai.tv/dragon/pay/checkOrder
+        pay: http://ttestorder.zhengzai.tv/order/pay/dragonPay
+        check: http://ttestorder.zhengzai.tv/order/pay/checkOrder
         callback: http://ttestadam.zhengzai.tv/adam/member/order/callback
       url: http://ttestadam.zhengzai.tv
     kylin:
       url-pay:
-        pay: http://ttestdragon.zhengzai.tv/dragon/pay/dragonPay
-        check: http://ttestdragon.zhengzai.tv/dragon/pay/checkOrder
+        pay: http://ttestorder.zhengzai.tv/order/pay/dragonPay
+        check: http://ttestorder.zhengzai.tv/order/pay/checkOrder
         localUrl: http://ttestkylin.zhengzai.tv/kylin/order/syncOrder
       url: http://ttestkylin.zhengzai.tv/kylin
     candy:
@@ -102,19 +107,19 @@ liquidnet:
     order:
       url: http://ttestorder.zhengzai.tv
       url-pay:
-        pay: http://ttestdragon.zhengzai.tv/dragon/pay/dragonPay
-        applePay: http://ttestdragon.zhengzai.tv/dragon/notify/apple/purchase
-        check: http://ttestdragon.zhengzai.tv/dragon/pay/checkOrder
+        pay: http://ttestorder.zhengzai.tv/order/pay/dragonPay
+#        applePay: http://ttestorder.zhengzai.tv/order/notify/apple/purchase
+        check: http://ttestorder.zhengzai.tv/order/pay/checkOrder
         localUrl: http://ttestorder.zhengzai.tv/order/order/syncOrder
         goblinUrl: http://ttestorder.zhengzai.tv/order/goblin/syncOrder
         goblinRefundUrl: http://ttestorder.zhengzai.tv/order/goblin/refundSyncOrder
         nftPayNotify: https://ttestorder.zhengzai.tv/order/goblin/nft/syncOrder
         nftRefundNotify: https://ttestorder.zhengzai.tv/order/goblin/nft/refundSyncOrder
     dragon:
-      notifyUrl: https://ttestdragon.zhengzai.tv/dragon
+      notifyUrl: https://ttestorder.zhengzai.tv/order
       urls:
-        refundApply: https://ttestdragon.zhengzai.tv/dragon/refund/refundSingle
-        refundResult: https://ttestdragon.zhengzai.tv/dragon/refund/refund/alipay/result
+        refundApply: https://ttestorder.zhengzai.tv/order/refund/refundSingle
+        refundResult: https://ttestorder.zhengzai.tv/order/refund/refund/alipay/result
     platform:
       urls:
         ticketRefundNotify: https://ttestplatform.zhengzai.tv/platform/refund/callback
@@ -155,7 +160,7 @@ liquidnet:
           addresses: 172.17.121.250:8090
   client:
     admin:
-#      phpPayUrl: http://ttestdragon.zhengzai.tv
+#      phpPayUrl: http://ttestorder.zhengzai.tv
       phpMallUrl: https://ttestmall.zhengzai.tv
       platformUrl: https://ttestplatform.zhengzai.tv
       h5Url: https://ttestm.zhengzai.tv

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-druid-test2.yml

+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://${liquidnet.mysql.master.urlHostAndPort}/${liquidnet.mysql.master.database-name}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: ${liquidnet.mysql.master.username}
+                password: ${liquidnet.mysql.master.password}
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: jdbc:mysql://${liquidnet.mysql.slave.urlHostAndPort}/${liquidnet.mysql.slave.database-name}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: ${liquidnet.mysql.slave.username}
+                password: ${liquidnet.mysql.slave.password}
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 300000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-test2.yml

+# begin-test-这里是配置信息基本值
+liquidnet:
+    info:
+        port: 7099
+        context:
+        name: liquidnet-client-admin-web
+    logfile:
+        path: /data/logs
+        name: client-admin-web
+        level: info
+    mysql:
+        master:
+            urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
+            username: ${liquidnet.mysql.username}
+            password: ${liquidnet.mysql.password}
+            database-name: test2_ln_scene
+        slave:
+            urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
+            username: ${liquidnet.mysql.username}
+            password: ${liquidnet.mysql.password}
+            database-name: test2_ln_scene
+    mongodb:
+        sslEnabled: false
+        database: test2_ln_scene
+
+# end-test-这里是配置信息基本值
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml

@@ -85,6 +85,17 @@ spring:
       sslEnabled: ${liquidnet.mongodb.sslEnabled}
       database: ${liquidnet.mongodb.database}
   redis:
+    queue:
+      database: ${liquidnet.redis.queue.database}
+      port: ${liquidnet.redis.queue.port}
+      host: ${liquidnet.redis.queue.host}
+      password: ${liquidnet.redis.queue.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
     kylin:
       database: 15
       dbs: ${liquidnet.redis.kylin.dbs}

liquidnet-bus-config/liquidnet-config/liquidnet-client-job-test2.yml

+liquidnet:
+  info:
+    context: /
+    name: liquidnet-client-job
+    port: 8090
+  logfile:
+    name: client-job
+    path: /data/logs
+    max-history: 7
+    level: info
+  mysql:
+    database-name: test2_ln_clijob
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-client-job.yml

@@ -116,6 +116,6 @@ logging:
     com.liquidnet.service.feign: error
     com.liquidnet: ${liquidnet.logfile.level}
   pattern:
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test2.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9001
+    context: /adam
+    name: liquidnet-service-adam
+  logfile:
+    path: /data/logs
+    name: service-adam
+    max-history: 7
+    level: info
+  mysql:
+    database-name: test2_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test2_ln_scene
+  url-pay:
+    pay: ${liquidnet.service.adam.url-pay.pay}
+    check: ${liquidnet.service.adam.url-pay.check}
+    callback: ${liquidnet.service.adam.url-pay.callback}
+  reviewer:
+    app-login:
+      mobile: 13724286255
+    user-info: false
+    limit:
+      enters: 12
+      enters_opr: 20
+
+#以下为spring各环境个性配置
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml

@@ -25,8 +25,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -76,6 +76,17 @@ spring:
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
       - org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
   redis:
+    queue:
+      database: ${liquidnet.redis.queue.database}
+      port: ${liquidnet.redis.queue.port}
+      host: ${liquidnet.redis.queue.host}
+      password: ${liquidnet.redis.queue.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
     database: 15
     dbs: ${liquidnet.redis.adam.dbs}
     port: ${liquidnet.redis.adam.port}

liquidnet-bus-config/liquidnet-config/liquidnet-service-candy-test2.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9009
+    context: /candy
+    name: liquidnet-service-candy
+  logfile:
+    path: /data/logs
+    name: service-candy
+    max-history: 7
+    level: info
+  mysql:
+    database-name: test2_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test2_ln_scene
+

liquidnet-bus-config/liquidnet-config/liquidnet-service-candy.yml

@@ -25,8 +25,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -75,6 +75,17 @@ spring:
       - org.springframework.cloud.bus.BusAutoConfiguration
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   redis:
+    queue:
+      database: ${liquidnet.redis.queue.database}
+      port: ${liquidnet.redis.queue.port}
+      host: ${liquidnet.redis.queue.host}
+      password: ${liquidnet.redis.queue.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
     database: 15
     dbs: ${liquidnet.redis.candy.dbs}
     port: ${liquidnet.redis.candy.port}
@@ -97,6 +108,7 @@ global-auth:
     - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/candy-coupon/useBack
     - ${liquidnet.info.context}/candy-coupon/useBackJxl
+    - ${liquidnet.info.context}/inner/**
   oncheck-url-pattern:
 #    - ${liquidnet.info.context}/**
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-chime-test2.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9011
+    context: /chime
+    name: liquidnet-service-chime
+  logfile:
+    path: /data/logs
+    name: service-chime
+    max-history: 7
+    level: info
+  mongodb:
+    sslEnabled: false
+    database: test2_ln_scene

liquidnet-bus-config/liquidnet-config/liquidnet-service-chime.yml

@@ -25,8 +25,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-adam.yml

@@ -19,8 +19,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-base-dev.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9989
+    context:
+#    context: /service-consumer
+    name: liquidnet-service-consumer-base
+  logfile:
+    path: /data/logs
+    name: service-consumer-base
+    max-history: 7
+    level: debug
+  mysql:
+    database-name: dev_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: dev_ln_scene
+
+#以下为spring各环境个性配置
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-base-test.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9989
+    context:
+#    context: /service-consumer
+    name: liquidnet-service-consumer-base
+  logfile:
+    path: /data/logs
+    name: service-consumer-base
+    max-history: 7
+    level: info
+  mysql:
+    database-name: test_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test_ln_scene
+
+#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-base-test2.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9989
+    context:
+#    context: /service-consumer
+    name: liquidnet-service-consumer-base
+  logfile:
+    path: /data/logs
+    name: service-consumer-base
+    max-history: 7
+    level: info
+  mysql:
+    database-name: test2_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test2_ln_scene
+
+#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-base-yace.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9989
+    context:
+#    context: /service-consumer
+    name: liquidnet-service-consumer-base
+  logfile:
+    path: /data/logs
+    name: service-consumer-base
+    max-history: 7
+    level: info
+  mysql:
+    database-name: yace_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: yace_ln_scene
+
+#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-base.yml

+server:
+  port: ${liquidnet.info.port}
+  tomcat:
+    uri-encoding: UTF-8
+  servlet:
+    context-path: ${liquidnet.info.context}
+# -----------------------------------------------------------
+knife4j:
+  production: ${liquidnet.knife4j.disable}
+  basic:
+    enable: true
+    username: ${liquidnet.security.username}
+    password: ${liquidnet.security.password}
+# -----------------------------------------------------------
+logging:
+#  config: ${liquidnet.logfile.config}
+  file:
+    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+    max-size: 200MB
+    max-history: ${liquidnet.logfile.max-history}
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: error
+    #以下是为指定包设置日志级别
+    com.liquidnet.service.feign: error
+    com.liquidnet: ${liquidnet.logfile.level}
+# -----------------------------------------------------------
+eureka:
+#  client:
+#    register-with-eureka: true
+#    fetch-registry: true
+#    serviceUrl:
+#      defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka
+  instance:
+    hostname: ${spring.cloud.client.ip-address}
+    lease-expiration-duration-in-seconds: 15 #服务过期时间配置,超过这个时间没有接收到心跳EurekaServer就会将这个实例剔除
+    lease-renewal-interval-in-seconds: 5 #服务刷新时间配置，每隔这个时间会主动心跳一次
+    prefer-ip-address: true
+    instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${spring.application.instance_id:${server.port}}
+# -----------------------------------------------------------
+#actuator/info
+info:
+  app:
+    name: ${liquidnet.info.name}
+  company:
+    name: zhengzai.tv
+  build:
+    groupId: '@project.groupId@'
+    artifactId: '@project.artifactId@'
+    version: '@project.version@'
+# -----------------------------------------------------------
+spring:
+  application:
+    name: ${liquidnet.info.name}
+  profiles:
+    include: common-service #这里加载management相关公共配置
+  redis:
+#    queue:
+#      database: ${liquidnet.redis.queue.database}
+#      port: ${liquidnet.redis.queue.port}
+#      host: ${liquidnet.redis.queue.host}
+#      password: ${liquidnet.redis.queue.password}
+#      lettuce:
+#        pool:
+#          max-active: 8
+#          max-wait: -1
+#          max-idle: 8
+#          min-idle: 0
+    database: ${liquidnet.redis.queue.database}
+    port: ${liquidnet.redis.queue.port}
+    host: ${liquidnet.redis.queue.host}
+    password: ${liquidnet.redis.queue.password}
+    lettuce:
+      pool:
+        max-active: 500
+        max-wait: -1
+        max-idle: 380
+        min-idle: 0
+  data:
+    mongodb:
+      uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=200&waitQueueMultiple=100
+      sslEnabled: ${liquidnet.mongodb.sslEnabled}
+      database: ${liquidnet.mongodb.database}
+  datasource:
+    name: ${liquidnet.mysql.database-name}
+    url: jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=UTC&characterEncoding=utf-8&useSSL=false
+    username: ${liquidnet.mysql.username}
+    password: ${liquidnet.mysql.password}
+#    type: org.apache.tomcat.jdbc.pool.DataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    hikari:
+      maximum-pool-size: 45
+      minimum-idle: 8
+      connection-test-query: SELECT 1
+# -----------------------------------------------------------
+
+# -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-candy.yml

@@ -19,8 +19,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-dragon.yml

@@ -19,8 +19,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-goblin.yml

@@ -19,8 +19,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-kylin.yml

@@ -19,8 +19,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-nft.yml

@@ -19,8 +19,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -65,9 +65,9 @@ spring:
     password: ${liquidnet.redis.goblin.password}
     lettuce:
       pool:
-        max-active: 20
+        max-active: 80
         max-wait: -1
-        max-idle: 8
+        max-idle: 40
         min-idle: 0
   data:
     mongodb:

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-order-test2.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9993
+    context:
+#    context: /service-consumer
+    name: liquidnet-service-consumer-order
+  logfile:
+    path: /data/logs
+    name: service-consumer-order
+    max-history: 7
+    level: info
+  mysql:
+    database-name: test2_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test2_ln_scene
+
+#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-order.yml

@@ -19,8 +19,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -58,11 +58,22 @@ spring:
   profiles:
     include: common-service #这里加载management相关公共配置
   redis:
-    database: ${liquidnet.redis.kylin.database}
-    dbs: ${liquidnet.redis.kylin.dbs}
-    port: ${liquidnet.redis.kylin.port}
-    host: ${liquidnet.redis.kylin.host}
-    password: ${liquidnet.redis.kylin.password}
+    kylin:
+      database: ${liquidnet.redis.kylin.database}
+      dbs: ${liquidnet.redis.kylin.dbs}
+      port: ${liquidnet.redis.kylin.port}
+      host: ${liquidnet.redis.kylin.host}
+      password: ${liquidnet.redis.kylin.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
+    database: ${liquidnet.redis.queue.database}
+    port: ${liquidnet.redis.queue.port}
+    host: ${liquidnet.redis.queue.host}
+    password: ${liquidnet.redis.queue.password}
     lettuce:
       pool:
         max-active: 300

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-slowly.yml

@@ -19,8 +19,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-stone.yml

@@ -19,8 +19,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-sweet.yml

@@ -19,8 +19,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error

liquidnet-bus-config/liquidnet-config/liquidnet-service-dragon.yml

@@ -25,8 +25,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -75,6 +75,17 @@ spring:
       - org.springframework.cloud.bus.BusAutoConfiguration
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   redis:
+    queue:
+      database: ${liquidnet.redis.queue.database}
+      port: ${liquidnet.redis.queue.port}
+      host: ${liquidnet.redis.queue.host}
+      password: ${liquidnet.redis.queue.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
     database: 0
     #如果配置了dbs，则database配置失效 格式为0,16   0为分库初始索引(目前只支持从0开始)，16为redis总的db数，队列会自动创建在db15
     #如果配置了dbs为具体dbNo 如：0  则作用同database配置一样

liquidnet-bus-config/liquidnet-config/liquidnet-service-example.yml

@@ -68,8 +68,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error

liquidnet-bus-config/liquidnet-config/liquidnet-service-executor-main-test2.yml

+liquidnet:
+  info:
+    port: 8190
+    context: /service-executor-main
+    name: liquidnet-service-executor-main
+  logfile:
+    path: /data/logs
+    name: service-executor-main
+    max-history: 7
+    level: info
+  xxl:
+    accessToken: qk52rqSejRBm9enf6BTTxw==
+    admin:
+      # Job执行器注册地址，多个地址则用逗号分隔
+#      addresses: ${liquidnet.service.executor-main.xxl.admin.addresses}
+      addresses: ${liquidnet.service.executor-main.xxl.admin.addresses}
+    executor:
+      # Job执行器IP，默认为空表示自动获取IP，多网卡时手动指定
+      ip:
+      # Job执行器端口，单机多个执行器端口号不能相同
+      port: 8191
+      # Job执行器心跳注册分组依据，按需配置
+      appname: liquidnet-service-executor
+      # Job执行器运行日志，注意目录读写权限
+      logpath: /data/logs/job
+  url:
+    platform: ${liquidnet.service.platform.url}
+    sweet: ${liquidnet.service.sweet.url}

liquidnet-bus-config/liquidnet-config/liquidnet-service-executor-main.yml

@@ -11,8 +11,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error

liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin-test2.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9014
+    context: /goblin
+    name: liquidnet-service-goblin
+  logfile:
+    path: /data/logs
+    name: service-goblin
+    max-history: 7
+    level: info
+  mysql:
+    database-name: test2_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test2_ln_scene
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin.yml

@@ -25,8 +25,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -75,6 +75,17 @@ spring:
       - org.springframework.cloud.bus.BusAutoConfiguration
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   redis:
+    queue:
+      database: ${liquidnet.redis.queue.database}
+      port: ${liquidnet.redis.queue.port}
+      host: ${liquidnet.redis.queue.host}
+      password: ${liquidnet.redis.queue.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
     database: 15
     dbs: ${liquidnet.redis.goblin.dbs}
     port: ${liquidnet.redis.goblin.port}
@@ -112,6 +123,7 @@ global-auth:
     - ${liquidnet.info.context}/nftGoods/list
     - ${liquidnet.info.context}/nftGoods/detail
     - ${liquidnet.info.context}/rsc/**
+    - ${liquidnet.info.context}/que/**
     - ${liquidnet.info.context}/nftArtwork/**
     - ${liquidnet.info.context}/nftPublish/**
     - ${liquidnet.info.context}/nftTrade/**

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test2.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9002
+    context: /kylin
+    name: liquidnet-service-kylin
+  logfile:
+    path: /data/logs
+    name: service-kylin
+    max-history: 7
+    level: info
+  mysql:
+    database-name: test2_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test2_ln_scene
+  url-pay:
+    pay: ${liquidnet.service.kylin.url-pay.pay}
+    check: ${liquidnet.service.kylin.url-pay.check}
+    localUrl: ${liquidnet.service.kylin.url-pay.localUrl}
+  adam:
+    url: ${liquidnet.service.adam.url}
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -25,8 +25,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -75,6 +75,17 @@ spring:
       - org.springframework.cloud.bus.BusAutoConfiguration
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   redis:
+    queue:
+      database: ${liquidnet.redis.queue.database}
+      port: ${liquidnet.redis.queue.port}
+      host: ${liquidnet.redis.queue.host}
+      password: ${liquidnet.redis.queue.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
     database: 15
     dbs: ${liquidnet.redis.kylin.dbs}
     port: ${liquidnet.redis.kylin.port}

liquidnet-bus-config/liquidnet-config/liquidnet-service-notify.yml

@@ -25,8 +25,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -82,6 +82,17 @@ spring:
 #    virtual-host: ${liquidnet.rabbitmq.virtual-host}
 #    connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
   redis:
+    queue:
+      database: ${liquidnet.redis.queue.database}
+      port: ${liquidnet.redis.queue.port}
+      host: ${liquidnet.redis.queue.host}
+      password: ${liquidnet.redis.queue.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
     database: 0
     #如果配置了dbs，则database配置失效 格式为0,16   0为分库初始索引(目前只支持从0开始)，16为redis总的db数，队列会自动创建在db15
     #如果配置了dbs为具体dbNo 如：0  则作用同database配置一样

liquidnet-bus-config/liquidnet-config/liquidnet-service-order-dev.yml

@@ -24,3 +24,26 @@ liquidnet:
     url: ${liquidnet.service.adam.url}
   candy:
     url: ${liquidnet.service.candy.url}
+  dragon:
+    url: ${liquidnet.service.dragon.notifyUrl}
+    alipay:
+      gataway-url: https://openapi.alipay.com/gateway.do
+      appId: 2019082866535131
+      merchantPubKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmePaETscydypY3rV4mXa8MtcQIL5zjP1KxdusNkHpePeU61hAZxKn0Z8pDB1wNaTK72wgEWaORXeRp4YTbf4usHlW562Pe5wdiSutb3iT6EMJ5eBD4HLI9wWDgYBtwfHwS5JJFhf0eptP4R1XluLiMhmMynLwJvHepgkVrS3mN+jmoPRmKFhZHGIYDoWypBMbUKiFHWiToHK1n0NYHHIi4WgK2wt4Wj7nexQGD69W7ofRCirYmz35c/cNFUA1lqzOEKu2z7PpjA6jQV2GJolnJ4xXPJ8Dpgp4g/dgsGqRydlmFqZD71i/pDDpF0RfRKHL+WhWVhI1hqe6jLtvJE+zQIDAQAB
+      merchantPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCArhnBTpcAww8wSYBTwGp6oBvenzCCYFrugERgxJDZ7YnBZ3ZdiAaHjJ9PI0WymkpDr27FSg9czVbiH7G91zPq+8s9onrZi/l6cBZ2VjrwQ9BQPN2a8zHy8D6BfoKEV+PIicGz6hNPA7lgf04NgsXeWjeXnYD/IBTLZmnCxB2sPYo/0EN32mlSG9snO63HlPkoqn8ycw71a1cBrlQ+Y22fFnJAk/vrGoou8E0UHfL5zVE/up+ToOYW/eOKMFL/DSceCy32t9Za0RmpV3i2E9s8gBDewzT10Yf4+4mPUiTR6AhcLjqafAy2IaKPK57WZ6cGF9cGs9yq8bSTRpeNC4alAgMBAAECggEAH0Ms+qvPP94j6IVS6gYLWHNhkfp23JXwQZVkB2Z6EpgFKbmrJhoQDAp8Acv9+OBHPp52ePP/O3qfqxwsIIUSFfrKa9T3p7a8C6UDsAhPFWRETdobtLN05SK87NUBfImly2i8aKtruXycIveKzPmCfPzKGMmpN1Jh+vCMrUbcNqX8OUcxmhGvJwnQuBW4QEiepzl89Nl91iSwFmxaZoqLaB9lYUKke/z7FDHTpTWpZvtvxlZ0gvMVNLVp9NBNazolQ8eEjBG2PsQGD2cLUbM33mLTz+/VQjzZR3KXu5kQR9MloURILDsdxE1AyA4AkIXd4eMszEjA4Dv6CQK/jjrsgQKBgQDIiCt1OGmV2sqDBSn4nZNH7BzY3Hdnf+qsYUi+TXKhnQaT8XPKWZpKE/AcqsIKnANmO4sX0NL7ACBe7Rl1RcU9Mq5XuHhnkveFBVRRIHindzUfEN0WgdLy23qmJ2N+1i4FigelY0E5T2lojVb7wycAgAc6vflwE+eYf8W3968q0QKBgQCkRgsVCWWNMSLZeB0V9LV3Om2/UPWY/ovadTxAQtxg0Z75V6Wdu8u0hrYaPSeUK2ryaoE6HKgp7U8NiJGzgm2wpj7D2ysrPmhX5+CjiWkDMCuvWytVT7hLqhhLp7frZT39u8VhyfC8lE0xA67gAPsGSl1sBoZPwvvsmNAQ/h6rlQKBgQCtCtw9be2m88M3JnieYhOax8Po2u5qsLZoBBcKqLhXf7ISbhPWNFXwwJ29jxicoR5J1O3lIj09fVFxuLX0Pb3DXn2VksjLz8Wp0vx8eUHEeRis8xdleaf4C68du/WemOHjw8VvUWQSOVWjc/vwiumYA+K5LQAXWAXM0c1jP+e3UQKBgEWY/1z8TDATn0Yvo3MH6FIJSTIDJOqa/bmibdJ0AVZruUS+o4Y+aEGlyUU4n6og8wCdqv5p4b1Rs2pyb/hzy/FJndHw60s495A2x2/B6eHV6Mw0fhl42wYDnKOA/WUX0bnMcgXKPtpGoqWff9mb0L6LhyUbZpAodf95hr2MTIY5AoGBAIyPtYP6jRyR980h/Ud1MS0fBxymjQrR+kg3GWjnw0ZJJ8yFEXxDqLV8uLyXQKc89HGbI0cClWgZBTjfIPJ5U4Gl19Xlwx1SFrdgg5mGUqnMARTg7w1TG5QLSqNhZo2jgBM5FCJRbDUCO/MzLcFhTeGNva9yP7E7gW5/Dott9D7d
+      signtType: 2019082866535131
+      charset: 2019082866535131
+    wepay:
+      gataway-url: https://openapi.alipay.com/gateway.do
+      merchantId: 1551961491
+      appId: wx3498304dda39c5a1
+      partnerKey: itIuO65O9yKmemOu3S8g1S4orqvCGwXK
+    unionpay:
+      merchantId: 821690048160PQY
+      gateway-url: https://gateway.95516.com
+      refund-url: https://gateway.95516.com/
+      certs-path: /data/certs/dragon/unionpay/test
+      certs-prefix: acp_test
+      pfx-pwd: '520360'
+    apple:
+      urlVerify: https://sandbox.itunes.apple.com/verifyReceipt
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-order-test.yml

@@ -23,4 +23,27 @@ liquidnet:
   adam:
     url: ${liquidnet.service.adam.url}
   candy:
-    url: ${liquidnet.service.candy.url}
+    url: ${liquidnet.service.candy.url}
\ No newline at end of file
+  dragon:
+    url: ${liquidnet.service.dragon.notifyUrl}
+    alipay:
+      gataway-url: https://openapi.alipay.com/gateway.do
+      appId: 2019082866535131
+      merchantPubKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmePaETscydypY3rV4mXa8MtcQIL5zjP1KxdusNkHpePeU61hAZxKn0Z8pDB1wNaTK72wgEWaORXeRp4YTbf4usHlW562Pe5wdiSutb3iT6EMJ5eBD4HLI9wWDgYBtwfHwS5JJFhf0eptP4R1XluLiMhmMynLwJvHepgkVrS3mN+jmoPRmKFhZHGIYDoWypBMbUKiFHWiToHK1n0NYHHIi4WgK2wt4Wj7nexQGD69W7ofRCirYmz35c/cNFUA1lqzOEKu2z7PpjA6jQV2GJolnJ4xXPJ8Dpgp4g/dgsGqRydlmFqZD71i/pDDpF0RfRKHL+WhWVhI1hqe6jLtvJE+zQIDAQAB
+      merchantPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCArhnBTpcAww8wSYBTwGp6oBvenzCCYFrugERgxJDZ7YnBZ3ZdiAaHjJ9PI0WymkpDr27FSg9czVbiH7G91zPq+8s9onrZi/l6cBZ2VjrwQ9BQPN2a8zHy8D6BfoKEV+PIicGz6hNPA7lgf04NgsXeWjeXnYD/IBTLZmnCxB2sPYo/0EN32mlSG9snO63HlPkoqn8ycw71a1cBrlQ+Y22fFnJAk/vrGoou8E0UHfL5zVE/up+ToOYW/eOKMFL/DSceCy32t9Za0RmpV3i2E9s8gBDewzT10Yf4+4mPUiTR6AhcLjqafAy2IaKPK57WZ6cGF9cGs9yq8bSTRpeNC4alAgMBAAECggEAH0Ms+qvPP94j6IVS6gYLWHNhkfp23JXwQZVkB2Z6EpgFKbmrJhoQDAp8Acv9+OBHPp52ePP/O3qfqxwsIIUSFfrKa9T3p7a8C6UDsAhPFWRETdobtLN05SK87NUBfImly2i8aKtruXycIveKzPmCfPzKGMmpN1Jh+vCMrUbcNqX8OUcxmhGvJwnQuBW4QEiepzl89Nl91iSwFmxaZoqLaB9lYUKke/z7FDHTpTWpZvtvxlZ0gvMVNLVp9NBNazolQ8eEjBG2PsQGD2cLUbM33mLTz+/VQjzZR3KXu5kQR9MloURILDsdxE1AyA4AkIXd4eMszEjA4Dv6CQK/jjrsgQKBgQDIiCt1OGmV2sqDBSn4nZNH7BzY3Hdnf+qsYUi+TXKhnQaT8XPKWZpKE/AcqsIKnANmO4sX0NL7ACBe7Rl1RcU9Mq5XuHhnkveFBVRRIHindzUfEN0WgdLy23qmJ2N+1i4FigelY0E5T2lojVb7wycAgAc6vflwE+eYf8W3968q0QKBgQCkRgsVCWWNMSLZeB0V9LV3Om2/UPWY/ovadTxAQtxg0Z75V6Wdu8u0hrYaPSeUK2ryaoE6HKgp7U8NiJGzgm2wpj7D2ysrPmhX5+CjiWkDMCuvWytVT7hLqhhLp7frZT39u8VhyfC8lE0xA67gAPsGSl1sBoZPwvvsmNAQ/h6rlQKBgQCtCtw9be2m88M3JnieYhOax8Po2u5qsLZoBBcKqLhXf7ISbhPWNFXwwJ29jxicoR5J1O3lIj09fVFxuLX0Pb3DXn2VksjLz8Wp0vx8eUHEeRis8xdleaf4C68du/WemOHjw8VvUWQSOVWjc/vwiumYA+K5LQAXWAXM0c1jP+e3UQKBgEWY/1z8TDATn0Yvo3MH6FIJSTIDJOqa/bmibdJ0AVZruUS+o4Y+aEGlyUU4n6og8wCdqv5p4b1Rs2pyb/hzy/FJndHw60s495A2x2/B6eHV6Mw0fhl42wYDnKOA/WUX0bnMcgXKPtpGoqWff9mb0L6LhyUbZpAodf95hr2MTIY5AoGBAIyPtYP6jRyR980h/Ud1MS0fBxymjQrR+kg3GWjnw0ZJJ8yFEXxDqLV8uLyXQKc89HGbI0cClWgZBTjfIPJ5U4Gl19Xlwx1SFrdgg5mGUqnMARTg7w1TG5QLSqNhZo2jgBM5FCJRbDUCO/MzLcFhTeGNva9yP7E7gW5/Dott9D7d
+      signtType: 2019082866535131
+      charset: 2019082866535131
+    wepay:
+      gataway-url: https://openapi.alipay.com/gateway.do
+      merchantId: 1551961491
+      appId: wx3498304dda39c5a1
+      partnerKey: itIuO65O9yKmemOu3S8g1S4orqvCGwXK
+    unionpay:
+      merchantId: 821690048160PQY
+      gateway-url: https://gateway.95516.com
+      refund-url: https://gateway.95516.com/
+      certs-path: /data/certs/dragon/unionpay/test
+      certs-prefix: acp_test
+      pfx-pwd: '520360'
+    apple:
+      urlVerify: https://sandbox.itunes.apple.com/verifyReceipt
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-order-test2.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9004
+    context: /order
+    name: liquidnet-service-order
+  logfile:
+    path: /data/logs
+    name: service-order
+    max-history: 7
+    level: info
+  mysql:
+    database-name: test2_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test2_ln_scene
+  url-pay:
+    pay: ${liquidnet.service.order.url-pay.pay}
+    check: ${liquidnet.service.order.url-pay.check}
+    localUrl: ${liquidnet.service.order.url-pay.localUrl}
+  adam:
+    url: ${liquidnet.service.adam.url}
+  candy:
+    url: ${liquidnet.service.candy.url}
+  dragon:
+    url: ${liquidnet.service.dragon.notifyUrl}
+    alipay:
+      gataway-url: https://openapi.alipay.com/gateway.do
+      appId: 2019082866535131
+      merchantPubKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmePaETscydypY3rV4mXa8MtcQIL5zjP1KxdusNkHpePeU61hAZxKn0Z8pDB1wNaTK72wgEWaORXeRp4YTbf4usHlW562Pe5wdiSutb3iT6EMJ5eBD4HLI9wWDgYBtwfHwS5JJFhf0eptP4R1XluLiMhmMynLwJvHepgkVrS3mN+jmoPRmKFhZHGIYDoWypBMbUKiFHWiToHK1n0NYHHIi4WgK2wt4Wj7nexQGD69W7ofRCirYmz35c/cNFUA1lqzOEKu2z7PpjA6jQV2GJolnJ4xXPJ8Dpgp4g/dgsGqRydlmFqZD71i/pDDpF0RfRKHL+WhWVhI1hqe6jLtvJE+zQIDAQAB
+      merchantPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCArhnBTpcAww8wSYBTwGp6oBvenzCCYFrugERgxJDZ7YnBZ3ZdiAaHjJ9PI0WymkpDr27FSg9czVbiH7G91zPq+8s9onrZi/l6cBZ2VjrwQ9BQPN2a8zHy8D6BfoKEV+PIicGz6hNPA7lgf04NgsXeWjeXnYD/IBTLZmnCxB2sPYo/0EN32mlSG9snO63HlPkoqn8ycw71a1cBrlQ+Y22fFnJAk/vrGoou8E0UHfL5zVE/up+ToOYW/eOKMFL/DSceCy32t9Za0RmpV3i2E9s8gBDewzT10Yf4+4mPUiTR6AhcLjqafAy2IaKPK57WZ6cGF9cGs9yq8bSTRpeNC4alAgMBAAECggEAH0Ms+qvPP94j6IVS6gYLWHNhkfp23JXwQZVkB2Z6EpgFKbmrJhoQDAp8Acv9+OBHPp52ePP/O3qfqxwsIIUSFfrKa9T3p7a8C6UDsAhPFWRETdobtLN05SK87NUBfImly2i8aKtruXycIveKzPmCfPzKGMmpN1Jh+vCMrUbcNqX8OUcxmhGvJwnQuBW4QEiepzl89Nl91iSwFmxaZoqLaB9lYUKke/z7FDHTpTWpZvtvxlZ0gvMVNLVp9NBNazolQ8eEjBG2PsQGD2cLUbM33mLTz+/VQjzZR3KXu5kQR9MloURILDsdxE1AyA4AkIXd4eMszEjA4Dv6CQK/jjrsgQKBgQDIiCt1OGmV2sqDBSn4nZNH7BzY3Hdnf+qsYUi+TXKhnQaT8XPKWZpKE/AcqsIKnANmO4sX0NL7ACBe7Rl1RcU9Mq5XuHhnkveFBVRRIHindzUfEN0WgdLy23qmJ2N+1i4FigelY0E5T2lojVb7wycAgAc6vflwE+eYf8W3968q0QKBgQCkRgsVCWWNMSLZeB0V9LV3Om2/UPWY/ovadTxAQtxg0Z75V6Wdu8u0hrYaPSeUK2ryaoE6HKgp7U8NiJGzgm2wpj7D2ysrPmhX5+CjiWkDMCuvWytVT7hLqhhLp7frZT39u8VhyfC8lE0xA67gAPsGSl1sBoZPwvvsmNAQ/h6rlQKBgQCtCtw9be2m88M3JnieYhOax8Po2u5qsLZoBBcKqLhXf7ISbhPWNFXwwJ29jxicoR5J1O3lIj09fVFxuLX0Pb3DXn2VksjLz8Wp0vx8eUHEeRis8xdleaf4C68du/WemOHjw8VvUWQSOVWjc/vwiumYA+K5LQAXWAXM0c1jP+e3UQKBgEWY/1z8TDATn0Yvo3MH6FIJSTIDJOqa/bmibdJ0AVZruUS+o4Y+aEGlyUU4n6og8wCdqv5p4b1Rs2pyb/hzy/FJndHw60s495A2x2/B6eHV6Mw0fhl42wYDnKOA/WUX0bnMcgXKPtpGoqWff9mb0L6LhyUbZpAodf95hr2MTIY5AoGBAIyPtYP6jRyR980h/Ud1MS0fBxymjQrR+kg3GWjnw0ZJJ8yFEXxDqLV8uLyXQKc89HGbI0cClWgZBTjfIPJ5U4Gl19Xlwx1SFrdgg5mGUqnMARTg7w1TG5QLSqNhZo2jgBM5FCJRbDUCO/MzLcFhTeGNva9yP7E7gW5/Dott9D7d
+      signtType: 2019082866535131
+      charset: 2019082866535131
+    wepay:
+      gataway-url: https://openapi.alipay.com/gateway.do
+      merchantId: 1551961491
+      appId: wx3498304dda39c5a1
+      partnerKey: itIuO65O9yKmemOu3S8g1S4orqvCGwXK
+    unionpay:
+      merchantId: 821690048160PQY
+      gateway-url: https://gateway.95516.com
+      refund-url: https://gateway.95516.com/
+      certs-path: /data/certs/dragon/unionpay/test
+      certs-prefix: acp_test
+      pfx-pwd: '520360'
+    apple:
+      urlVerify: https://sandbox.itunes.apple.com/verifyReceipt
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-order.yml

@@ -25,8 +25,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -75,6 +75,17 @@ spring:
       - org.springframework.cloud.bus.BusAutoConfiguration
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   redis:
+    queue:
+      database: ${liquidnet.redis.queue.database}
+      port: ${liquidnet.redis.queue.port}
+      host: ${liquidnet.redis.queue.host}
+      password: ${liquidnet.redis.queue.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
     database: 15
     dbs: ${liquidnet.redis.kylin.dbs}
     port: ${liquidnet.redis.kylin.port}
@@ -109,8 +120,58 @@ global-auth:
     - ${liquidnet.info.context}/goblin/nft/airdrop
     - ${liquidnet.info.context}/mix/syncOrder
     - ${liquidnet.info.context}/goblin/nft/airdropInner
+    - ${liquidnet.info.context}/notify/**
+    - ${liquidnet.info.context}/refund/**
+    - ${liquidnet.info.context}/pay/**
 # -----------------------------------------------------------
 
 # -----------------------------------------------------------
 
-# -----------------------------------------------------------
+# -----------------------------------------------------------
\ No newline at end of file
+# ---------------------以下为银联支付--------------------------------------
+##交易请求地址
+acpsdk:
+  ## 消费接口
+  frontTransUrl: ${liquidnet.dragon.unionpay.gateway-url}/gateway/api/frontTransReq.do
+  ## app 消费接口
+  appTransUrl: ${liquidnet.dragon.unionpay.gateway-url}/gateway/api/appTransReq.do
+  ## 交易状态查询
+  backTransUrl: ${liquidnet.dragon.unionpay.gateway-url}/gateway/api/backTransReq.do
+  ## 交易状态查询：app用的路径
+  singleQueryUrl: ${liquidnet.dragon.unionpay.gateway-url}/gateway/api/queryTrans.do
+  ##  退款路径  (https://gateway.95516.com/gateway/api/backTransReq.do)
+  refundUrl: ${liquidnet.dragon.unionpay.refund-url}/gateway/api/backTransReq.do
+  ########################################################################
+  ########################################################################
+  # 报文版本号，固定5.1.0，请勿改动
+  version: 5.1.0
+  # 签名方式，证书方式固定01，请勿改动
+  signMethod: '01'
+  # 是否验证验签证书的CN，测试环境请设置false，生产环境请设置true。非false的值默认都当true处理。
+  ifValidateCNName: false
+  # 是否验证https证书，测试环境请设置false，生产环境建议优先尝试true，不行再false。非true的值默认都当false处理。
+  ifValidateRemoteCert: false
+  #后台通知地址，填写接收银联后台通知的地址，必须外网能访问
+  #backUrl: http://222.222.222.222:8080/ACPSample_AppServer/backRcvResponse
+  #前台通知地址，填写处理银联前台通知的地址，必须外网能访问
+  #frontUrl: http://localhost:8080/ACPSample_AppServer/frontRcvResponse
+  #########################入网测试环境签名证书配置 ################################
+  # 多证书的情况证书路径为代码指定，可不对此块做配置。
+  # 签名证书路径，必须使用绝对路径，如果不想使用绝对路径，可以自行实现相对路径获取证书的方法；测试证书所有商户共用开发包中的测试签名证书，生产环境请从cfca下载得到。
+  # windows样例：
+  signCertPath: ${liquidnet.dragon.unionpay.certs-path}/${liquidnet.dragon.unionpay.certs-prefix}_sign.pfx
+
+  # 签名证书密码，测试环境固定000000，生产环境请修改为从cfca下载的正式证书的密码，正式环境证书密码位数需小于等于6位，否则上传到商户服务网站会失败
+  signCertPwd: ${liquidnet.dragon.unionpay.pfx-pwd}
+  # 签名证书类型，固定不需要修改
+  signCertType: PKCS12
+  ##########################加密证书配置################################
+  # 敏感信息加密证书路径(商户号开通了商户对敏感信息加密的权限，需要对 卡号accNo，pin和phoneNo，cvn2，expired加密（如果这些上送的话），对敏感信息加密使用)
+  encryptCertPath: ${liquidnet.dragon.unionpay.certs-path}/${liquidnet.dragon.unionpay.certs-prefix}_enc.cer
+  ##########################验签证书配置################################
+  # 验签中级证书路径(银联提供)
+  middleCertPath: ${liquidnet.dragon.unionpay.certs-path}/${liquidnet.dragon.unionpay.certs-prefix}_middle.cer
+  # 验签根证书路径(银联提供)
+  rootCertPath: ${liquidnet.dragon.unionpay.certs-path}/${liquidnet.dragon.unionpay.certs-prefix}_root.cer
+apple:
+  urlVerify: ${liquidnet.dragon.apple.urlVerify}
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform-test2.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9003
+    context: /platform
+    name: liquidnet-service-platform
+  logfile:
+    path: /data/logs
+    name: service-platform
+    max-history: 7
+    level: info
+#  rabbitmq:
+#    connection-timeout: 5000
+  mysql:
+    database-name: test2_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test2_ln_scene
+
+#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform.yml

@@ -25,8 +25,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -78,6 +78,17 @@ spring:
 #    virtual-host: ${liquidnet.rabbitmq.virtual-host}
 #    connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
   redis:
+    queue:
+      database: ${liquidnet.redis.queue.database}
+      port: ${liquidnet.redis.queue.port}
+      host: ${liquidnet.redis.queue.host}
+      password: ${liquidnet.redis.queue.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
     kylin:
       database: 15
       dbs: ${liquidnet.redis.kylin.dbs}

liquidnet-bus-config/liquidnet-config/liquidnet-service-reconciliation.yml

@@ -79,8 +79,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error

liquidnet-bus-config/liquidnet-config/liquidnet-service-slime-test2.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9013
+    context: /slime
+    name: liquidnet-service-slime
+  logfile:
+    path: /data/logs
+    name: service-slime
+    max-history: 7
+    level: info
+  mysql:
+    database-name: test2_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test2_ln_scene
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-slime.yml

@@ -25,8 +25,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -75,6 +75,17 @@ spring:
       - org.springframework.cloud.bus.BusAutoConfiguration
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   redis:
+    queue:
+      database: ${liquidnet.redis.queue.database}
+      port: ${liquidnet.redis.queue.port}
+      host: ${liquidnet.redis.queue.host}
+      password: ${liquidnet.redis.queue.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
     database: 15
     dbs: ${liquidnet.redis.slime.dbs}
     port: ${liquidnet.redis.slime.port}

liquidnet-bus-config/liquidnet-config/liquidnet-service-smile-test2.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9015
+    context: /smile
+    name: liquidnet-service-smile
+  logfile:
+    path: /data/logs
+    name: service-smile
+    max-history: 7
+    level: info
+  mysql:
+    database-name: test2_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test2_ln_scene
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-smile.yml

@@ -25,8 +25,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -75,6 +75,17 @@ spring:
       - org.springframework.cloud.bus.BusAutoConfiguration
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   redis:
+    queue:
+      database: ${liquidnet.redis.queue.database}
+      port: ${liquidnet.redis.queue.port}
+      host: ${liquidnet.redis.queue.host}
+      password: ${liquidnet.redis.queue.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
     database: 15
     dbs: ${liquidnet.redis.sweet.dbs}
     port: ${liquidnet.redis.sweet.port}

liquidnet-bus-config/liquidnet-config/liquidnet-service-stone-test2.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9010
+    context: /stone
+    name: liquidnet-service-stone
+  logfile:
+    path: /data/logs
+    name: service-stone
+    max-history: 7
+    level: info
+  mysql:
+    database-name: test2_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test2_ln_scene
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-stone.yml

@@ -25,8 +25,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -75,6 +75,17 @@ spring:
       - org.springframework.cloud.bus.BusAutoConfiguration
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   redis:
+    queue:
+      database: ${liquidnet.redis.queue.database}
+      port: ${liquidnet.redis.queue.port}
+      host: ${liquidnet.redis.queue.host}
+      password: ${liquidnet.redis.queue.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
     database: 15
     dbs: ${liquidnet.redis.sweet.dbs}
     port: ${liquidnet.redis.sweet.port}

liquidnet-bus-config/liquidnet-config/liquidnet-service-sweet-test2.yml

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9008
+    context: /sweet
+    name: liquidnet-service-sweet
+  logfile:
+    path: /data/logs
+    name: service-sweet
+    max-history: 7
+    level: info
+  mysql:
+    database-name: test2_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test2_ln_scene
+
+#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-sweet.yml

@@ -25,8 +25,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error
@@ -71,6 +71,17 @@ spring:
   profiles:
     include: common-service #这里加载management相关公共配置
   redis:
+    queue:
+      database: ${liquidnet.redis.queue.database}
+      port: ${liquidnet.redis.queue.port}
+      host: ${liquidnet.redis.queue.host}
+      password: ${liquidnet.redis.queue.password}
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1
+          max-idle: 8
+          min-idle: 0
     database: ${liquidnet.redis.sweet.database}
     dbs: ${liquidnet.redis.sweet.dbs}
     port: ${liquidnet.redis.sweet.port}

liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul-test2.yml

+liquidnet:
+  info:
+    port: 80
+    name: liquidnet-support-zuul
+  logfile:
+    path: /data/logs
+    name: support-zuul
+    max-history: 7
+    level: info
+

liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul.yml

@@ -23,8 +23,8 @@ logging:
     max-size: 200MB
     max-history: ${liquidnet.logfile.max-history}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%level] %thread [%logger{36}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: error

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinSelfTag.java

@@ -44,7 +44,7 @@ public class GoblinSelfTag implements Serializable {
     private String tagPic;
 
     /**
-     * 标签类型[1-音乐人|2-艺术家|3-品牌方|4-厂牌]
+     * 标签类型[1-音乐人|2-艺术家|3-品牌方|4-厂牌|5-AR]
      */
     private String tagType;
 

liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/api/FeignKylinForChimeClient.java

@@ -52,4 +52,8 @@ public interface FeignKylinForChimeClient {
     ResponseDto<KylinPerformanceVo> getDetail(
             @RequestParam("performancesId") String performancesId
     );
+
+
+    @GetMapping("inner/setNoticeIds")
+    ResponseDto<HashMap<String,Object>> setNoticeIds();
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -444,7 +444,7 @@ public class AdamLoginController {
     /* ---------------------------- Internal Method ---------------------------- */
 
     private ResponseDto<AdamLoginInfoVo> checkSmsCode(String mobile, String code) {
-        if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
+        if (!LnsEnum.ENV.prod.name().equals(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
                 || reviewMobile.equals(mobile)) {
             if (CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(code)) {
                 return ResponseDto.success();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -508,7 +508,7 @@ public class AdamUserController {
     private static final String PHP_API_SMS_CODE_VALID = "/smsValidation";
 
     private ResponseDto<String> checkSmsCode(String mobile, String code) {
-        if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
+        if (!LnsEnum.ENV.prod.name().equals(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
                 && CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(code)) {
             return ResponseDto.success();
         }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/util/QueueUtils.java

 package com.liquidnet.service.adam.util;
 
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.base.constant.MQConst;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,10 +13,10 @@ import java.util.HashMap;
 @Component
 public class QueueUtils {
 
-//    @Autowired
+    //    @Autowired
 //    private RabbitTemplate rabbitTemplate;
     @Autowired
-    StringRedisTemplate stringRedisTemplate;
+    RedisDataSourceUtil redisDataSourceUtil;
 
     /**
      * 发送消息 - RABBIT
@@ -37,6 +38,6 @@ public class QueueUtils {
     public void sendMsgByRedis(String streamKey, String jsonMsg) {
         HashMap<String, String> map = CollectionUtil.mapStringString();
         map.put(MQConst.QUEUE_MESSAGE_KEY, jsonMsg);
-        stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
+        redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate().opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/bootstrap-test2.yml

+# begin-test2-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: test2
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 172.17.192.59:7001
+# end-test2-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-adam
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/controller/CandyConsumerController.java

+package com.liquidnet.service.candy.controller;
+
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.candy.service.ICandyConsumerService;
+import com.liquidnet.service.candy.service.ICandyCouponService;
+import com.liquidnet.service.candy.vo.CandyCouponPreVo;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 券消费 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-18
+ */
+@RestController
+@RequestMapping("/inner/candy-consumer")
+public class CandyConsumerController {
+
+    @Autowired
+    private ICandyConsumerService candyConsumerService;
+
+    @PostMapping("couponOrderBackRedis")
+    @ApiOperation("AbstractCouponOrderBackRedisReceiver")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", dataType = "String", name = "uid", value = "用户id", required = true),
+            @ApiImplicitParam(type = "form", dataType = "String", name = "uCouponId", value = "券code", required = true),
+    })
+    public ResponseDto<Boolean> myCouponPre(String uid, String uCouponId) {
+        ArrayList<String> uCouponIdList = CollectionUtil.arrayListString();
+        uCouponIdList.add(uCouponId);
+        return candyConsumerService.couponOrderBackRedis(uid, uCouponIdList);
+    }
+}

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyConsumerServiceImpl.java

+package com.liquidnet.service.candy.service.impl;
+
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.service.base.OrderCloseMapping;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.candy.constant.CandyRedisConst;
+import com.liquidnet.service.candy.dto.CandyUserCouponBasicDto;
+import com.liquidnet.service.candy.service.ICandyConsumerService;
+import com.liquidnet.service.candy.util.QueueUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * <p>
+ * 券消费 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-18
+ */
+@Service
+public class CandyConsumerServiceImpl implements ICandyConsumerService {
+
+    @Autowired
+    RedisUtil redisUtil;
+    @Autowired
+    QueueUtils queueUtils;
+
+    @Override
+    public ResponseDto<Boolean> couponOrderBackRedis(String uid, ArrayList<String> uCouponIdList) {
+        try {
+            List<CandyUserCouponBasicDto> dtoList = backCoupon(getCouponByUid(uid), uCouponIdList);
+            setCouponByUid(uid, dtoList);
+        } catch (Exception e) {
+            LinkedList<String> mqList = new LinkedList<>();
+            mqList.add(uCouponIdList + "," + uid);
+            queueUtils.sendMsgByRedis(MQConst.CandyQueue.COUPON_ORDER_BACK.getKey(), OrderCloseMapping.get(mqList));
+            return ResponseDto.failure();
+        }
+        return ResponseDto.success();
+    }
+
+
+    private List<CandyUserCouponBasicDto> getCouponByUid(String uid) {
+        String redisKey = CandyRedisConst.BASIC_USER_COUPON.concat(uid);
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            //降级
+            return new ArrayList();
+        } else {
+            return (List<CandyUserCouponBasicDto>) obj;
+        }
+    }
+
+    // 覆盖 CandyUserCouponBasicDto数组 根据用户id
+    private void setCouponByUid(String uid, List<CandyUserCouponBasicDto> dtoList) {
+        String redisKey = CandyRedisConst.BASIC_USER_COUPON.concat(uid);
+        redisUtil.set(redisKey, dtoList);
+    }
+
+    /**
+     * 回退券
+     *
+     * @param dtoList       CouponBaseDtoList
+     * @param uCouponIdList 券唯一id list
+     * @return List<CandyUserCouponBasicDto>
+     */
+    private List<CandyUserCouponBasicDto> backCoupon(List<CandyUserCouponBasicDto> dtoList, ArrayList<String> uCouponIdList) {
+        boolean isHas = false;
+        for (CandyUserCouponBasicDto dtoItem : dtoList) {
+            if (uCouponIdList.contains(dtoItem.getUcouponId())) {
+                if (dtoItem.getState().equals(5)) {
+                    dtoItem.setState(1);
+                    isHas = true;//券存在
+                } else {
+                }
+            }
+        }
+        if (!isHas) {
+            return null;//券不存在
+        }
+        return dtoList;
+    }
+}