7.19 引入RabbitMQ

docs/dev-ops/docker-compose-environment-aliyun.yml

@@ -1,87 +0,0 @@
-# 命令执行 docker-compose -f docker-compose-environment-aliyun.yml up -d
-version: '3.9'
-services:
-  mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/xfg-studio/mysql:8.0.32
-    container_name: mysql
-    command: --default-authentication-plugin=mysql_native_password
-    restart: always
-    environment:
-      TZ: Asia/Shanghai
-      MYSQL_ROOT_PASSWORD: 123456
-    ports:
-      - "13306:3306"
-    volumes:
-      - ./mysql/my.cnf:/etc/mysql/conf.d/mysql.cnf:ro
-      - ./mysql/sql:/docker-entrypoint-initdb.d
-    healthcheck:
-      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
-      interval: 5s
-      timeout: 10s
-      retries: 10
-      start_period: 15s
-    networks:
-      - my-network
-
-  # phpmyadmin https://hub.docker.com/_/phpmyadmin
-  phpmyadmin:
-    image: registry.cn-hangzhou.aliyuncs.com/xfg-studio/phpmyadmin:5.2.1
-    container_name: phpmyadmin
-    hostname: phpmyadmin
-    ports:
-      - 8899:80
-    environment:
-      - PMA_HOST=mysql
-      - PMA_PORT=3306
-      - MYSQL_ROOT_PASSWORD=123qwe!@#QWE
-    depends_on:
-      mysql:
-        condition: service_healthy
-    networks:
-      - my-network
-
-  # Redis
-  redis:
-    image: registry.cn-hangzhou.aliyuncs.com/xfg-studio/redis:6.2
-    container_name: redis
-    restart: always
-    hostname: redis
-    privileged: true
-    ports:
-      - 16379:6379
-    volumes:
-      - ./redis/redis.conf:/usr/local/etc/redis/redis.conf
-    command: redis-server /usr/local/etc/redis/redis.conf
-    networks:
-      - my-network
-    healthcheck:
-      test: [ "CMD", "redis-cli", "ping" ]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-
-  # RedisAdmin https://github.com/joeferner/redis-commander
-  # 账密 admin/admin
-  redis-admin:
-    image: registry.cn-hangzhou.aliyuncs.com/xfg-studio/redis-commander:0.8.0
-    container_name: redis-admin
-    hostname: redis-commander
-    restart: always
-    ports:
-      - 8081:8081
-    environment:
-      - REDIS_HOSTS=local:redis:6379
-      - HTTP_USER=admin
-      - HTTP_PASSWORD=admin
-      - LANG=C.UTF-8
-      - LANGUAGE=C.UTF-8
-      - LC_ALL=C.UTF-8
-    networks:
-      - my-network
-    depends_on:
-      redis:
-        condition: service_healthy
-
-networks:
-  my-network:
-    driver: bridge

docs/dev-ops/docker-compose-environment.yml

@@ -80,6 +80,24 @@ services:
       redis:
         condition: service_healthy
 
+  # rabbitmq
+  # 账密 admin/admin
+  # rabbitmq-plugins enable rabbitmq_management
+  rabbitmq:
+    image: rabbitmq:3.8-management
+    container_name: rabbitmq
+    restart: always
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+    environment:
+      RABBITMQ_DEFAULT_USER: admin
+      RABBITMQ_DEFAULT_PASS: admin
+    command: rabbitmq-server
+    volumes:
+      - ./rabbitmq/enabled_plugins:/etc/rabbitmq/enabled_plugins
+      - ./rabbitmq/mq-data:/var/lib/rabbitmq
+
 networks:
   my-network:
     driver: bridge

docs/dev-ops/nginx/html/css/index.css

@@ -14,7 +14,7 @@ body{
 
 /* ========== 轮播图 ========== */
 .swiper-container{
-    width:100%;height:375px;position:relative;overflow:hidden;
+    width:100%;height:375px;position:relative;overflow:hidden;margin-top: 10px;
 }
 .swiper-wrapper{display:flex;transition:transform .3s;}
 .swiper-slide{flex:0 0 100%;height:375px;}
@@ -62,7 +62,14 @@ body{
 }
 
 /* ========== 拼单列表 ========== */
-.group-buying{background:#fff;padding:15px;margin-bottom:10px;position:relative;overflow:hidden;}
+.group-buying {
+    background: #fff;
+    padding: 15px;
+    margin-bottom: 10px;      /* 如果还想保留一点外边距 */
+    min-height: 230px;        /* 根据需要调整数值 */
+    position: relative;
+    overflow: hidden;
+}
 .section-title{
     font-size:16px;font-weight:bold;margin-bottom:12px;position:relative;padding-left:10px;
 }
@@ -71,7 +78,7 @@ body{
     width:3px;height:16px;background:#ff5000;border-radius:2px;
 }
 
-.group-users{height:120px;position:relative;overflow:hidden;}
+.group-users{height:180px;position:relative;overflow:hidden;}
 .user-list{position:absolute;top:0;left:0;width:100%;transition:transform .5s ease;}
 
 .user-item{

docs/dev-ops/rabbitmq/enabled_plugins

@@ -0,0 +1 @@
+[rabbitmq_management].

docs/tag/v2.0/nginx/html/js/index.js

@@ -86,7 +86,7 @@ document.addEventListener('DOMContentLoaded', () => {
         }
         userList.innerHTML = '';
         list.forEach(t => userList.appendChild(makeItem(t, groupPrice)));
-        initUserMarquee();
+        initUserMarquee(3);   // 显示 3 条
         initCountdown();
     }
 
@@ -137,28 +137,61 @@ document.addEventListener('DOMContentLoaded', () => {
     /* =====================================================
      * 2. 拼单列表纵向轮播
      * =================================================== */
-    function initUserMarquee() {
+    function initUserMarquee(visibleCount = 3, interval = 3000, duration = 500) {
-        const items = userList.querySelectorAll('.user-item');
+        const box = document.querySelector('.group-users');
-        if (items.length <= 1) return;
+        const listEl = userList;
+        let originals = Array.from(listEl.children);
+        const total = originals.length;
 
-        const itemH = items[0].offsetHeight;
+        if (total === 0) return;
-        userList.appendChild(items[0].cloneNode(true));
+        // 如果原本就 <= 可见数，直接定高，不滚
+        if (total <= visibleCount) {
+            const h0 = originals[0].offsetHeight;
+            box.style.height = (h0 * visibleCount) + 'px';
+            return;
+        }
 
-        let idx = 0;
+        // 1. 复制整份加入末尾
-        userList.addEventListener('transitionend', () => {
+        originals.forEach(item => listEl.appendChild(item.cloneNode(true)));
-            if (idx >= items.length) {
+
-                userList.style.transition = 'none';
+        // 2. 重新测量单条高度（此时 DOM 完整）
-                userList.style.transform  = 'translateY(0)';
+        const itemH = listEl.children[0].offsetHeight;
-                idx = 0;
+
-                void userList.offsetWidth;
+        // 3. 设定窗口高度
+        box.style.height = (itemH * visibleCount) + 'px';
+
+        // 4. 状态
+        let index = 0;
+        let ticking = false;
+
+        function step() {
+            index++;
+            listEl.style.transition = `transform ${duration}ms ease`;
+            listEl.style.transform = `translateY(-${index * itemH}px)`;
+        }
+
+        listEl.addEventListener('transitionend', () => {
+            ticking = false;
+            // 5. 到达复制段的“第一帧”（index === total）就无缝重置
+            if (index === total) {
+                listEl.style.transition = 'none';
+                listEl.style.transform = 'translateY(0)';
+                index = 0;
+                // 强制 reflow 再恢复 transition
+                void listEl.offsetHeight;
+                listEl.style.transition = `transform ${duration}ms ease`;
             }
         });
 
-        setInterval(() => {
+        const timer = setInterval(() => {
-            idx++;
+            if (!ticking) {
-            userList.style.transition = 'transform .5s ease';
+                ticking = true;
-            userList.style.transform  = `translateY(${-idx * itemH}px)`;
+                step();
-        }, 3000);
+            }
+        }, interval);
+
+        // 可选：鼠标悬停暂停
+        listEl.addEventListener('mouseenter', () => clearInterval(timer));
     }
 
     /* =====================================================

group-buying-sys-app/pom.xml

@@ -78,7 +78,10 @@
             <artifactId>converter-gson</artifactId>
             <version>2.9.0</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
         <!-- http 接口框架 https://bugstack.cn/md/road-map/http.html -->
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>

group-buying-sys-app/src/main/java/edu/whut/config/RabbitMQConfig.java

@@ -0,0 +1,33 @@
+package edu.whut.config;
+
+import org.springframework.amqp.core.*;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+
+//@Configuration
+public class RabbitMQConfig {
+
+    @Value("${spring.rabbitmq.config.producer.exchange}")
+    private String exchangeName;
+
+    /**
+     * 专属交换机
+     */
+    @Bean
+    public TopicExchange topicExchange() {
+        return new TopicExchange(exchangeName, true, false);
+    }
+
+    /**
+     * 绑定队列到交换机
+     */
+    @Bean
+    public Binding topicTeamSuccessBinding(
+            @Value("${spring.rabbitmq.config.producer.topic_team_success.routing_key}") String routingKey,
+            @Value("${spring.rabbitmq.config.producer.topic_team_success.queue}") String queue) {
+        return BindingBuilder.bind(new Queue(queue, true))
+                .to(topicExchange())
+                .with(routingKey);
+    }
+
+}

group-buying-sys-app/src/main/resources/application-dev.yml

@@ -30,6 +30,29 @@ spring:
     connection-timeout: 30000 #数据库连接超时时间,默认30秒，即30000
     connection-test-query: SELECT 1
   type: com.zaxxer.hikari.HikariDataSource
+  # RabbitMQ
+  rabbitmq:
+    addresses: 192.168.10.218
+    port: 5672
+    username: admin
+    password: admin
+    listener:
+      simple:
+        prefetch: 1 # 每次投递n个消息，消费完在投递n个
+    template:
+      delivery-mode: persistent # 确保全局默认设置为持久化
+    # 消息配置
+    config:
+      # 生产者
+      producer:
+        # 1. 用哪个交换机（Exchange）
+        exchange: group_buy_market_exchange
+        # 2. 针对不同“业务消息”定义 routing key 和 queue
+        topic_team_success:
+          # 消息主题
+          routing_key: topic.team_success
+          # 消费队列
+          queue: group_buy_market_queue_2_topic_team_success
 
 # MyBatis 配置【如需使用记得打开】
 mybatis:

group-buying-sys-app/src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: prod
+    active: dev

group-buying-sys-app/src/test/java/edu/whut/test/ApiTest.java

@@ -1,19 +1,40 @@
 package edu.whut.test;
 
+import edu.whut.infrastructure.event.EventPublisher;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import javax.annotation.Resource;
+import java.util.concurrent.CountDownLatch;
+
 @Slf4j
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class ApiTest {
 
+    @Resource
+    private EventPublisher publisher;
+
+    @Value("${spring.rabbitmq.config.producer.topic_team_success.routing_key}")
+    private String routingKey;
+
     @Test
-    public void test() {
+    public void test_rabbitmq() throws InterruptedException {
-        log.info("测试完成");
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+
+        publisher.publish(routingKey, "订单结算：ORD-20231234");
+        publisher.publish(routingKey, "订单结算：ORD-20231235");
+        publisher.publish(routingKey, "订单结算：ORD-20231236");
+        publisher.publish(routingKey, "订单结算：ORD-20231237");
+        publisher.publish(routingKey, "订单结算：ORD-20231238");
+
+        // 等待，消息消费。测试后，可主动关闭。
+        countDownLatch.await();
     }
 
+
 }

group-buying-sys-infrastructure/pom.xml

@@ -28,13 +28,15 @@
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp-sse</artifactId>
         </dependency>
-
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
             <version>5.8.26</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
         <!-- 系统模块 -->
         <dependency>
             <groupId>edu.whut</groupId>

group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/TagRepository.java

@@ -73,13 +73,13 @@ public class TagRepository implements ITagRepository {
 
         try {
             crowdTagsDetailDao.addCrowdTagsUserId(crowdTagsDetailReq);
-            // 获取BitSet
-            RBitSet bitSet = redisService.getBitSet(tagId);
-            bitSet.set(redisService.getIndexFromUserId(userId));
         } catch (DuplicateKeyException ignore) {
             log.info("用户id{}已在人群标签{}中",userId,tagId);
             // 忽略唯一索引冲突
         }
+        // 获取BitSet
+        RBitSet bitSet = redisService.getBitSet(tagId);
+        bitSet.set(redisService.getIndexFromUserId(userId));
     }
     /**
      * 更新标签的统计量（例如已命中的用户总数）。

group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/event/EventPublisher.java

@@ -0,0 +1,36 @@
+package edu.whut.infrastructure.event;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.MessageDeliveryMode;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * 消息发送
+ */
+@Slf4j
+@Component
+public class EventPublisher {
+
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+
+    @Value("${spring.rabbitmq.config.producer.exchange}")
+    private String exchangeName;
+
+    public void publish(String routingKey, String message) {
+        try {
+            rabbitTemplate.convertAndSend(exchangeName, routingKey, message, m -> {
+                // 持久化消息配置
+                m.getMessageProperties().setDeliveryMode(MessageDeliveryMode.PERSISTENT);
+                return m;
+            });
+        } catch (Exception e) {
+            log.error("发送MQ消息失败 team_success message:{}", message, e);
+            throw e;
+        }
+    }
+
+}

group-buying-sys-trigger/pom.xml

@@ -30,6 +30,10 @@
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
         <!-- 系统模块 -->
         <dependency>
             <groupId>edu.whut</groupId>

group-buying-sys-trigger/src/main/java/edu/whut/trigger/listener/TeamSuccessTopicListener.java

@@ -0,0 +1,30 @@
+package edu.whut.trigger.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.ExchangeTypes;
+import org.springframework.amqp.rabbit.annotation.Exchange;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.QueueBinding;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Fuzhengwei bugstack.cn @小傅哥
+ * 结算完成消息监听
+ */
+@Slf4j
+@Component
+public class TeamSuccessTopicListener {
+
+    @RabbitListener(
+            bindings = @QueueBinding(
+                    value = @Queue(value = "${spring.rabbitmq.config.producer.topic_team_success.queue}"),
+                    exchange = @Exchange(value = "${spring.rabbitmq.config.producer.exchange}", type = ExchangeTypes.TOPIC),
+                    key = "${spring.rabbitmq.config.producer.topic_team_success.routing_key}"
+            )
+    )
+    public void listener(String message) {
+        log.info("接收消息:{}", message);
+    }
+
+}

group-buying-sys-types/src/main/java/edu/whut/types/event/BaseEvent.java

@@ -0,0 +1,30 @@
+package edu.whut.types.event;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 基础时间
+ */
+@Data
+public abstract class BaseEvent<T> {
+
+    public abstract EventMessage<T> buildEventMessage(T data);
+
+    public abstract String topic();
+
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class EventMessage<T> {
+        private String id;
+        private Date timestamp;
+        private T data;
+    }
+
+}

pom.xml

@@ -132,6 +132,12 @@
                 <artifactId>logging-interceptor</artifactId>
                 <version>3.14.9</version>
             </dependency>
+            <!-- rabbitmq https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-amqp -->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-amqp</artifactId>
+                <version>3.2.0</version>
+            </dependency>
 
             <!-- 工程模块 -->
             <dependency>