diff --git a/backend/docker-compose.windows.yml b/backend/docker-compose.windows.yml index 7c1f11a3..ed14038b 100644 --- a/backend/docker-compose.windows.yml +++ b/backend/docker-compose.windows.yml @@ -46,6 +46,7 @@ services: redis: image: redis:7-alpine container_name: rwa-redis + command: redis-server --databases 20 ports: - "6379:6379" healthcheck: diff --git a/backend/services/docker-compose.2.0.yml b/backend/services/docker-compose.2.0.yml index 8632dbf5..27d94a94 100644 --- a/backend/services/docker-compose.2.0.yml +++ b/backend/services/docker-compose.2.0.yml @@ -4,7 +4,7 @@ # # 2.0 系统共享 1.0 的基础设施 (PostgreSQL, Redis, Kafka),但完全隔离: # - 数据库:使用独立的数据库名称 (rwa_contribution, rwa_mining, etc.) -# - Redis:使用独立的 DB 分区 (DB 10-15) +# - Redis:使用独立的 DB 分区 (DB 8,10,12-16),避免与 1.0 服务 (DB 0-11) 冲突 # - Kafka:仅通过 CDC 消费 1.0 的数据变更事件,单向同步 # - HTTP:2.0 服务之间互相调用,不调用 1.0 服务 # @@ -69,11 +69,11 @@ services: PORT: 3021 # PostgreSQL - 使用独立的数据库 DATABASE_URL: postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@postgres:5432/rwa_mining?schema=public - # Redis - 使用 DB 11 隔离 + # Redis - 使用 DB 16 隔离 (避免与 1.0 blockchain-service 的 DB 11 冲突) REDIS_HOST: redis REDIS_PORT: 6379 REDIS_PASSWORD: ${REDIS_PASSWORD:-} - REDIS_DB: 11 + REDIS_DB: 16 # Kafka KAFKA_BROKERS: kafka:29092 # JWT 配置 (与 auth-service 共享密钥以验证 token) diff --git a/backend/services/docker-compose.infra.yml b/backend/services/docker-compose.infra.yml index 2d9511fc..4e6950d5 100644 --- a/backend/services/docker-compose.infra.yml +++ b/backend/services/docker-compose.infra.yml @@ -36,6 +36,7 @@ services: redis: image: redis:7-alpine container_name: rwa-redis + command: redis-server --appendonly yes --databases 20 ports: - "6379:6379" volumes: diff --git a/backend/services/docker-compose.yml b/backend/services/docker-compose.yml index 50fc85b6..b47d6016 100644 --- a/backend/services/docker-compose.yml +++ b/backend/services/docker-compose.yml @@ -52,7 +52,7 @@ services: container_name: rwa-redis environment: TZ: Asia/Shanghai - command: redis-server --appendonly yes ${REDIS_PASSWORD:+--requirepass $REDIS_PASSWORD} + command: redis-server --appendonly yes --databases 20 ${REDIS_PASSWORD:+--requirepass $REDIS_PASSWORD} ports: - "6379:6379" volumes: diff --git a/backend/services/mining-service/.env.example b/backend/services/mining-service/.env.example index 16ef4ea5..ab1b8437 100644 --- a/backend/services/mining-service/.env.example +++ b/backend/services/mining-service/.env.example @@ -10,7 +10,7 @@ DATABASE_URL=postgresql://postgres:password@localhost:5432/mining_db?schema=publ REDIS_HOST=localhost REDIS_PORT=6379 REDIS_PASSWORD= -REDIS_DB=1 +REDIS_DB=16 # Kafka KAFKA_BROKERS=localhost:9092 diff --git a/backend/services/mining-service/src/infrastructure/infrastructure.module.ts b/backend/services/mining-service/src/infrastructure/infrastructure.module.ts index 2c121f80..f030581d 100644 --- a/backend/services/mining-service/src/infrastructure/infrastructure.module.ts +++ b/backend/services/mining-service/src/infrastructure/infrastructure.module.ts @@ -49,7 +49,7 @@ import { KafkaProducerService } from './kafka/kafka-producer.service'; host: configService.get('REDIS_HOST', 'localhost'), port: configService.get('REDIS_PORT', 6379), password: configService.get('REDIS_PASSWORD'), - db: configService.get('REDIS_DB', 11), + db: configService.get('REDIS_DB', 16), }), inject: [ConfigService], }, diff --git a/backend/services/mining-service/src/infrastructure/redis/redis.service.ts b/backend/services/mining-service/src/infrastructure/redis/redis.service.ts index 1331db79..faa4cfe5 100644 --- a/backend/services/mining-service/src/infrastructure/redis/redis.service.ts +++ b/backend/services/mining-service/src/infrastructure/redis/redis.service.ts @@ -20,7 +20,7 @@ export class RedisService implements OnModuleInit, OnModuleDestroy { host: this.options.host, port: this.options.port, password: this.options.password, - db: this.options.db ?? 1, + db: this.options.db ?? 16, retryStrategy: (times) => Math.min(times * 50, 2000), });