Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

# Conflicts:
#	liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -13,11 +13,15 @@ public class GoblinRedisConst {
      * {goblin:basic:goods_sku:${sku_id}, com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo}
      */
     public static final String BASIC_GOODS_SKU = PREFIX.concat("basic:goods_sku:");
+
+
     /* ----------------------------------------------------------------- */
-    public static final String FRONT_BANNER = "front_banner";  //前端banner
-    public static final String FRONT_NAVIGATION = "front_navigation";  //前端banner
-    public static final String FRONT_HOTWORD = "front_hot_word";  //前端banner
-    public static final String FRONT_HOTWORD_INDEX = "front_hot_word_index";  //前端banner
+    public static final String FRONT_BANNER = PREFIX.concat("front_banner");  //前端banner
+    public static final String FRONT_NAVIGATION = PREFIX.concat("front_navigation");  //前端banner
+    public  static final String FRONT_HOTWORD = PREFIX.concat("front_hot_word");  //前端banner
+    public  static final String FRONT_HOTWORD_INDEX = PREFIX.concat("front_hot_word_index");  //前端banner index
+    public  static final String FRONT_FRONT_SECKILL = PREFIX.concat("front_front_seckill");  //前端 首页秒杀
+    public  static final String FRONT_SECKILL = PREFIX.concat("front_seckill");  //前端 秒杀列表
 
 
     /* ----------------------------------------------------------------- */

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinFrontSeckillController.java

@@ -13,6 +13,7 @@ import com.liquidnet.service.goblin.entity.GoblinSelfMarketing;
 import com.liquidnet.service.goblin.entity.GoblinStoreMarketing;
 import com.liquidnet.service.goblin.mapper.GoblinSelfMarketingMapper;
 import com.liquidnet.service.goblin.mapper.GoblinStoreMarketingMapper;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -28,6 +29,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-12-29
  */
+@Api(tags = "秒杀管理")
 @RestController
 @RequestMapping("/seckill")
 public class GoblinFrontSeckillController extends BaseController {

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

 package com.liquidnet.client.admin.zhengzai.goblin.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinFrontSeckillService;
+import com.liquidnet.common.cache.redis.util.RedisGoblinUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.entity.GoblinFrontSeckill;
 import com.liquidnet.service.goblin.mapper.GoblinFrontSeckillMapper;
+import com.mongodb.BasicDBObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -28,11 +36,16 @@ import java.util.List;
 public class GoblinFrontSeckillServiceImpl extends ServiceImpl<GoblinFrontSeckillMapper, GoblinFrontSeckill> implements IGoblinFrontSeckillService {
     @Autowired
     GoblinFrontSeckillMapper goblinFrontSeckillMapper;
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    @Autowired
+    private RedisGoblinUtil redisGoblinUtil;
 
     public boolean create(GoblinFrontSeckill goblinFrontSeckill){
         goblinFrontSeckill.setCreateTime(LocalDateTime.now());
         //设置bannerid
-        goblinFrontSeckill.setSeckilId(GoblinRedisConst.FRONT_BANNER+ IDGenerator.nextTimeId());
+        goblinFrontSeckill.setSeckilId(GoblinRedisConst.FRONT_SECKILL+ IDGenerator.nextTimeId());
         //增加 banner
         goblinFrontSeckillMapper.insert(goblinFrontSeckill);
         return true;
@@ -46,6 +59,12 @@ public class GoblinFrontSeckillServiceImpl extends ServiceImpl<GoblinFrontSeckil
         goblinFrontSeckill.setUpdateTime(LocalDateTime.now());
         //数据库修改
         goblinFrontSeckillMapper.updateById(goblinFrontSeckill);
+        //修改所有的展示形式
+        UpdateWrapper updateWrapper = new UpdateWrapper();
+        updateWrapper.set("activityType", goblinFrontSeckill.getActivityType());
+        updateWrapper.set("show_type", goblinFrontSeckill.getShowType());
+
+        goblinFrontSeckillMapper.update(null,updateWrapper);
         return true;
     }
     public GoblinFrontSeckill getOne(Long id){
@@ -76,5 +95,49 @@ public class GoblinFrontSeckillServiceImpl extends ServiceImpl<GoblinFrontSeckil
         }
         return pageInfoTmp;
     }
+    /**
+     * @author zhangfuxin
+     * @Description:上线
+     * @date 2021/12/29 下午4:44
+     */
+    public boolean online(){
+        //查询
+        LambdaQueryWrapper<GoblinFrontSeckill> queryWrapper = Wrappers.lambdaQuery(GoblinFrontSeckill.class);
+        queryWrapper.ne(GoblinFrontSeckill::getDelTag,1);
+        queryWrapper.orderByAsc(GoblinFrontSeckill::getIndexs);
+        List<GoblinFrontSeckill> list=goblinFrontSeckillMapper.selectList(queryWrapper);
+        //mongodb
+        for(GoblinFrontSeckill goblinFrontSeckill: list){
+            GoblinFrontSeckill goblinFrontNavigation1=mongoTemplate.findOne(Query.query(Criteria.where("seckilId").is(goblinFrontSeckill.getSeckilId())), GoblinFrontSeckill.class, GoblinFrontSeckill.class.getSimpleName());
+            if(null==goblinFrontNavigation1){
+                mongoTemplate.save(goblinFrontSeckill,GoblinFrontSeckill.class.getSimpleName());
+            }else{
+                BasicDBObject orderObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(goblinFrontSeckill)));
+                mongoTemplate.getCollection(GoblinFrontSeckill.class.getSimpleName()).updateOne(
+                        Query.query(Criteria.where("seckilId").is(goblinFrontSeckill.getSeckilId())).getQueryObject(),
+                        orderObject
+                );
+            }
+        }
+        //redis  根据  秒杀配置， 然后 判断活动是否 有效 然后 拼接 活动
+        for(GoblinFrontSeckill goblinFrontSeckill:list){
+            //1、关闭模块2、保留模块
+            int activityType=goblinFrontSeckill.getActivityType();
+            //查看是 1、官方营销表2、商铺营销表
+            int marketType =goblinFrontSeckill.getMarketType();
+            //找到对应表里的信息
+            if(marketType==1){
+                //官方营销表
+
+                //找到活动时间
+                //找到商品
+            }else if(marketType==2){
+                //商铺营销表
+
+            }
+        }
+        //redisGoblinUtil.set(GoblinRedisConst.FRONT_NAVIGATION,list);
 
+        return true;
+    }
 }

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

@@ -200,6 +200,33 @@ public class MQConst {
         }
     }
 
+    public enum GoblinQueue {
+        GOBLIN_STORE_MARKET("goblin:stream:store.market", "group.store.market", "店铺活动"),
+        ;
+
+        private final String key;
+        private final String group;
+        private final String desc;
+
+        GoblinQueue(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) {
         System.out.println(ChimeQueue.USER_OPERATION_LIKE.name());
     }

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

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9993
+    context:
+#    context: /service-consumer
+    name: liquidnet-service-consumer-goblin
+  logfile:
+    path: /data/logs
+    name: service-consumer-candy
+    config: classpath:logback-spring.xml
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level: debug
+  mysql:
+    database-name: dev_ln_scene
+
+#以下为spring各环境个性配置
\ No newline at end of file

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

+liquidnet:
+  system:
+    updating:
+      switch: false
+  info:
+    port: 9993
+    context:
+    #    context: /service-consumer
+    name: liquidnet-service-consumer-goblin
+  logfile:
+    path: /data/logs
+    name: service-consumer-candy
+    config: classpath:logback-spring.xml
+    file-max-size: 200MB
+    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+    level: debug
+  mysql:
+    database-name: test_ln_scene
+
+#以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-goblin.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
+  pattern:
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{26}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{26}:%line] - %msg%n'
+    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+  level:
+    root: 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: lightnet.io
+  build:
+    groupId: '@project.groupId@'
+    artifactId: '@project.artifactId@'
+    version: '@project.version@'
+# -----------------------------------------------------------
+spring:
+  application:
+    name: ${liquidnet.info.name}
+  profiles:
+    include: common-service #这里加载management相关公共配置
+  redis:
+    database: ${liquidnet.redis.goblin.database}
+    dbs: ${liquidnet.redis.goblin.dbs}
+    port: ${liquidnet.redis.goblin.port}
+    host: ${liquidnet.redis.goblin.host}
+    password: ${liquidnet.redis.goblin.password}
+    lettuce:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
+  datasource:
+    name: ${liquidnet.mysql.database-name}
+    url: jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=Asia/Shanghai&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: 16
+      minimum-idle: 8
+      connection-test-query: SELECT 1
+# -----------------------------------------------------------
+
+# -----------------------------------------------------------

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

@@ -65,8 +65,13 @@ public class GoblinFrontSeckill implements Serializable {
      * 排序
      */
     private Integer indexs;
-
+    /**
+     * 秒杀id
+     */
     private String seckilId;
-
+    /**
+     * 1、官方营销表2、商铺营销表
+     */
+    private int marketType;
 
 }

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>liquidnet-service-consumer-all</artifactId>
+        <groupId>com.liquidnet</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>liquidnet-service-consumer-goblin</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-cache-redis</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-goblin-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+</project>
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/ServiceConsumerGoblinApplication.java

+package com.liquidnet.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.core.env.Environment;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+
+@Slf4j
+@SpringBootApplication(scanBasePackages = {"com.liquidnet"})
+@MapperScan(basePackages = {"com.liquidnet.service.goblin.mapper"})
+public class ServiceConsumerGoblinApplication implements CommandLineRunner {
+    @Autowired
+    private Environment environment;
+
+    public static void main(String[] args) {
+        SpringApplication.run(ServiceConsumerGoblinApplication.class, args);
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        try {
+            log.info("\n----------------------------------------------------------\n\t" +
+                            "Application '{}' is running! Access URLs:\n\t" +
+                            "Local: \t\thttp://127.0.0.1:{}\n\t" +
+                            "External: \thttp://{}:{}{}/doc.html\n\t" +
+                            "Profile(s): \t{}\n----------------------------------------------------------",
+                    environment.getProperty("spring.application.name"),
+                    environment.getProperty("server.port"),
+                    InetAddress.getLocalHost().getHostAddress(),
+                    environment.getProperty("server.port"),
+                    environment.getProperty("server.servlet.context-path"),
+                    Arrays.toString(environment.getActiveProfiles()));
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/config/ConsumerGoblinStoneMarketRedisStreamConfig.java

+package com.liquidnet.service.consumer.goblin.config;
+
+import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.consumer.goblin.receiver.ConsumerGoblinStoreMarketRdsReceiver;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.stream.Consumer;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.connection.stream.StreamOffset;
+import org.springframework.data.redis.stream.StreamMessageListenerContainer;
+import org.springframework.data.redis.stream.Subscription;
+
+import java.time.Duration;
+
+
+@Configuration
+public class ConsumerGoblinStoneMarketRedisStreamConfig {
+    @Autowired
+    ConsumerGoblinStoreMarketRdsReceiver consumerGoblinStoreMarketRdsReceiver;
+
+    private StreamMessageListenerContainer<String, MapRecord<String, String, String>> buildStreamMessageListenerContainer(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        return StreamMessageListenerContainer.create(factory, options);
+    }
+
+    /**
+     * 缺票登记
+     *
+     * @param listenerContainer
+     * @param t
+     * @return
+     */
+    private Subscription receiveGoblinStoreMarket(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
+        return listenerContainer.receiveAutoAck(
+                Consumer.from(MQConst.GoblinQueue.GOBLIN_STORE_MARKET.getGroup(), MQConst.GoblinQueue.GOBLIN_STORE_MARKET.name() + t),
+                StreamOffset.create(MQConst.GoblinQueue.GOBLIN_STORE_MARKET.getKey(), ReadOffset.lastConsumed()), consumerGoblinStoreMarketRdsReceiver
+        );
+    }
+
+    /* —————————————————————————— ｜ —————————————————————————— ｜ —————————————————————————— */
+
+    /* -------------------------------------------------------- ｜ 缺票登记 */
+
+    @Bean
+    public Subscription subscriptionGoblinStoreMarket(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveGoblinStoreMarket(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionGoblinStoreMarket2(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveGoblinStoreMarket(listenerContainer, 2);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionGoblinStoreMarket3(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveGoblinStoreMarket(listenerContainer, 3);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    /* -------------------------------------------------------- ｜  */
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/receiver/AbstractSqlRedisReceiver.java

+package com.liquidnet.service.consumer.goblin.receiver;
+
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.consumer.goblin.service.IBaseDao;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.StreamRecords;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.stream.StreamListener;
+
+import java.util.HashMap;
+
+@Slf4j
+public abstract class AbstractSqlRedisReceiver implements StreamListener<String, MapRecord<String, String, String>> {
+    @Autowired
+    private IBaseDao baseDao;
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+    @Autowired
+    private RedisUtil redisUtil;
+
+    @Override
+    public void onMessage(MapRecord<String, String, String> message) {
+        log.debug("CONSUMER SQL[streamKey:{},messageId:{},stream:{},body:{}]",
+                this.getRedisStreamKey(), message.getId(), message.getStream(), message.getValue());
+
+        boolean result = this.consumerSqlDaoHandler(message.getValue().get("message"));
+        log.info("CONSUMER SQL RESULT:{} ==> MESSAGE_ID:{}", result, message.getId());
+
+        try {
+            stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
+            stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
+        } catch (Exception e) {
+            log.error("#CONSUMER SQL RESULT:{} ==> DEL_REDIS_QUEUE_MSG_EXCEPTION[MESSAGE_ID:{},MSG:{}]", result, message.getId(), JsonUtils.toJson(message), e);
+        } finally {
+            try {
+                stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
+                stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    private boolean consumerSqlDaoHandler(String msg) {
+        Boolean aBoolean = false;
+        try {
+            SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(msg, SqlMapping.SqlMessage.class);
+            if (sqlMessage == null) {
+                aBoolean = true;
+            } else {
+                aBoolean = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+            }
+        } catch (Exception e) {
+            log.error("CONSUMER SQL FAIL ==> {}", e.getMessage(), e);
+        } finally {
+            if (!aBoolean) {
+                HashMap<String, String> map = CollectionUtil.mapStringString();
+                map.put("message", msg);
+                stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(this.getRedisStreamKey()));
+            }
+        }
+        return aBoolean;
+    }
+
+    protected abstract String getRedisStreamKey();
+
+    protected abstract String getRedisStreamGroup();
+}
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/receiver/ConsumerGoblinStoreMarketRdsReceiver.java

+package com.liquidnet.service.consumer.goblin.receiver;
+
+import com.liquidnet.service.base.constant.MQConst;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ConsumerGoblinStoreMarketRdsReceiver extends AbstractSqlRedisReceiver {
+    @Override
+    protected String getRedisStreamKey() {
+        return MQConst.GoblinQueue.GOBLIN_STORE_MARKET.getKey();
+    }
+
+    @Override
+    protected String getRedisStreamGroup() {
+        return MQConst.GoblinQueue.GOBLIN_STORE_MARKET.getGroup();
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/service/IBaseDao.java

+package com.liquidnet.service.consumer.goblin.service;
+
+import java.util.LinkedList;
+
+public interface IBaseDao {
+    /**
+     * 批量执行sql
+     *
+     * @param sql
+     * @param values
+     * @return
+     */
+    Boolean batchSql(String sql, LinkedList<Object[]> values);
+
+    /**
+     * 批量执行不定量sql
+     *
+     * @param sql
+     * @param values
+     * @return
+     */
+    Boolean batchSqls(LinkedList<String> sql, LinkedList<Object[]>... values);
+
+    /**
+     * 执行sql语句 无 参数
+     *
+     * @param sql
+     * @return
+     */
+    Boolean batchSqlNoArgs(LinkedList<String> sql);
+
+    /**
+     * xs 新增一条记录且返回主键Id
+     *
+     * @param sql   新增待执行sql
+     * @param param 参数
+     * @return 主键ID
+     */
+    int insertSqlAndReturnKeyId(final String sql, final Object[] param);
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/service/impl/BaseDao.java

+package com.liquidnet.service.consumer.goblin.service.impl;
+
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.consumer.goblin.service.IBaseDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementCreator;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallback;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.annotation.Resource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.LinkedList;
+
+@Service
+public class BaseDao implements IBaseDao {
+    private static final Logger log = LoggerFactory.getLogger(BaseDao.class);
+    @Resource
+    public JdbcTemplate jdbcTemplate;
+    @Resource(name = "transactionManager")
+    public DataSourceTransactionManager transactionManager;
+
+    @Override
+    public Boolean batchSql(final String sql, final LinkedList<Object[]> values) {
+        TransactionCallback<Boolean> callback = new TransactionCallback<Boolean>() {
+            @Override
+            public Boolean doInTransaction(final TransactionStatus transactionStatus) {
+                if (values.size() > 0) {
+                    int[] ints = jdbcTemplate.batchUpdate(sql, values);
+                }
+                return true;
+            }
+        };
+        try {
+            TransactionTemplate tt = new TransactionTemplate(transactionManager);
+            return tt.execute(callback);
+        } catch (Exception ex) {
+            log.error("###\nSQL.Preparing:{}\nParameters:{}", JsonUtils.toJson(sql), JsonUtils.toJson(values), ex);
+            return false;
+        }
+    }
+
+    @Override
+    public Boolean batchSqls(final LinkedList<String> sql,
+                             final LinkedList<Object[]>... values) {
+        try {
+            TransactionCallback<Boolean> callback = new TransactionCallback<Boolean>() {
+                @Override
+                public Boolean doInTransaction(final TransactionStatus transactionStatus) {
+                    int i = 0;
+                    for (LinkedList<Object[]> o : values) {
+                        if (sql.size() < i + 1) {
+                            break;
+                        }
+                        if (!o.isEmpty()) {
+                            jdbcTemplate.batchUpdate(sql.get(i), o);
+                        }
+                        i++;
+                    }
+                    return true;
+                }
+            };
+
+            TransactionTemplate tt = new TransactionTemplate(transactionManager);
+            return tt.execute(callback);
+        } catch (Exception ex) {
+//            if (ex instanceof LiquidnetServiceException) {
+//                log.error("###Error.Code:{} - {}", ((LiquidnetServiceException) ex).getCode(), ex.getMessage());
+//            } else {
+            log.error("###Error.Sqls:{}\nParameters:{},Ex:{}", JsonUtils.toJson(sql), JsonUtils.toJson(values), ex.getMessage());
+//            }
+            return false;
+        }
+    }
+
+    @Override
+    public Boolean batchSqlNoArgs(final LinkedList<String> sql) {
+        try {
+            TransactionCallback<Boolean> callback = new TransactionCallback<Boolean>() {
+                @Override
+                public Boolean doInTransaction(final TransactionStatus transactionStatus) {
+                    for (String o : sql) {
+                        jdbcTemplate.execute(o);
+                    }
+                    return true;
+                }
+            };
+
+            TransactionTemplate tt = new TransactionTemplate(transactionManager);
+            return tt.execute(callback);
+        } catch (Exception ex) {
+            log.error("###Error.Sqls:{}\nParameters:{},Ex:{}", sql);
+            return false;
+        }
+    }
+
+    /**
+     * xs 新增一条记录且返回主键Id
+     *
+     * @param sql   新增待执行sql
+     * @param param 参数
+     * @return 主键ID
+     */
+    public int insertSqlAndReturnKeyId(final String sql, final Object[] param) {
+        final String innersql = sql;
+        final Object[] innerO = param;
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+        try {
+            jdbcTemplate.update(new PreparedStatementCreator() {
+                @Override
+                public PreparedStatement createPreparedStatement(final Connection con)
+                        throws SQLException {
+                    PreparedStatement ps = con.prepareStatement(innersql,
+                            Statement.RETURN_GENERATED_KEYS);
+                    for (int i = 0; i < innerO.length; i++) {
+                        ps.setObject(i + 1, innerO[i]);
+                    }
+
+                    return ps;
+                }
+            }, keyHolder);
+        } catch (Exception e) {
+            log.error("###\nSQL.Preparing:{}\nParameters:{}", sql, JsonUtils.toJson(param), e);
+        }
+        return keyHolder.getKey().intValue();
+
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/resources/bootstrap-dev.yml

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: dev
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 127.0.0.1:7001
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-goblin

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/resources/bootstrap-prod.yml

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

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/resources/bootstrap-service-consumer-goblin.yml

+#eurekaServer配置
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka
+#configServer配置
+spring:
+  cloud:
+    config:
+#      uri: http://39.106.122.201:7002/support-config
+      profile: ${liquidnet.cloudConfig.profile}
+      name: ${spring.application.name} #默认为spring.application.name
+      discovery:
+        enabled: true
+        service-id: liquidnet-support-config

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/resources/bootstrap-test.yml

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: test
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
+    #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
+
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-goblin
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/resources/bootstrap.yml

+spring:
+  application:
+    name: liquidnet-service-consumer-goblin
+  profiles:
+    active: dev
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/pom.xml

@@ -17,6 +17,7 @@
         <module>liquidnet-service-consumer-sweet</module>
         <module>liquidnet-service-consumer-stone</module>
         <module>liquidnet-service-consumer-candy</module>
+        <module>liquidnet-service-consumer-goblin</module>
     </modules>
 
     <dependencies>