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

zxl

2025-07-11 4e6d6e7c8e4ca42e96528a71162f5e58e473f652

 consumer/src/main/resources/application.yml

@@ -38,7 +38,7 @@
  redis:
    host: 127.0.0.1
    port: 6379
#    password: lilishop
    #    password: lilishop
    lettuce:
      pool:
        # 连接池最大连接数（使用负值表示没有限制） 默认 8
@@ -247,8 +247,8 @@
    #      account:
    #        username: elastic
    #        password: LiLiShopES
#    logstash:
#      server: 127.0.0.1:4560
    #    logstash:
    #      server: 127.0.0.1:4560
    rocketmq:
      promotion-topic: lili_promotion_topic
      promotion-group: lili_promotion_group