From b46d1fa468a64ddccd6061d2ab29ef209b78b08a Mon Sep 17 00:00:00 2001
From: zhuml4 <zhuml4@xiaopeng.com>
Date: 星期六, 07 三月 2026 21:01:23 +0800
Subject: [PATCH] fix:redis问题
---
xp-robotaxi-common/xp-common-redis/src/main/java/com/xiaopeng/common/redis/configure/RedisConfig.java | 6 ++-
/dev/null | 57 ----------------------------
xp-robotaxi-itinerary-boot/src/main/resources/application-local.yml | 18 +++++++-
xp-robotaxi-itinerary-boot/src/main/resources/bootstrap.yml | 2
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 1
5 files changed, 21 insertions(+), 63 deletions(-)
diff --git a/xp-robotaxi-common/xp-common-redis/src/main/java/com/xiaopeng/common/redis/configure/RedisConfig.java b/xp-robotaxi-common/xp-common-redis/src/main/java/com/xiaopeng/common/redis/configure/RedisConfig.java
index 318e9d0..037c9d4 100644
--- a/xp-robotaxi-common/xp-common-redis/src/main/java/com/xiaopeng/common/redis/configure/RedisConfig.java
+++ b/xp-robotaxi-common/xp-common-redis/src/main/java/com/xiaopeng/common/redis/configure/RedisConfig.java
@@ -59,8 +59,10 @@
// config.useClusterServers().addNodeAddress("192.168.110.188:7004", "192.168.110.188:7001");
String address = String.format("redis://%s:%d", redisProperties.getHost(), redisProperties.getPort());
// 2.根据 Config 创建出 RedissonClient 示例。
- config.useSingleServer().setAddress(address)
- .setPassword(redisProperties.getPassword());
+ config.useSingleServer()
+ .setAddress(address)
+ .setPassword(redisProperties.getPassword())
+ .setDatabase(redisProperties.getDatabase());
return Redisson.create(config);
}
}
diff --git a/xp-robotaxi-itinerary-boot/src/main/resources/application-local.properties b/xp-robotaxi-itinerary-boot/src/main/resources/application-local.properties
deleted file mode 100644
index c90d029..0000000
--- a/xp-robotaxi-itinerary-boot/src/main/resources/application-local.properties
+++ /dev/null
@@ -1,57 +0,0 @@
-spring.config.activate.on-profile=local
-spring.autoconfigure.exclude=com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-spring.shardingsphere.datasource.names=xp0
-spring.shardingsphere.datasource.xp0.type=com.alibaba.druid.pool.DruidDataSource
-spring.shardingsphere.datasource.xp0.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.shardingsphere.datasource.xp0.url=jdbc:mysql://192.168.110.34:3306/xprt_order?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-spring.shardingsphere.datasource.xp0.username=root
-spring.shardingsphere.datasource.xp0.password=123456
-spring.shardingsphere.datasource.xp0.druid.initial-size=10
-spring.shardingsphere.datasource.xp0.druid.min-idle=10
-spring.shardingsphere.datasource.xp0.druid.max-active=100
-spring.shardingsphere.datasource.xp0.druid.max-wait=60000
-spring.shardingsphere.datasource.xp0.druid.time-between-eviction-runs-millis=60000
-spring.shardingsphere.datasource.xp0.druid.min-evictable-idle-time-millis=300000
-spring.shardingsphere.datasource.xp0.druid.validation-query=SELECT 1
-spring.shardingsphere.datasource.xp0.druid.test-while-idle=true
-spring.shardingsphere.datasource.xp0.druid.test-on-borrow=false
-spring.shardingsphere.datasource.xp0.druid.test-on-return=false
-spring.shardingsphere.datasource.xp0.druid.pool-prepared-statements=true
-spring.shardingsphere.datasource.xp0.druid.max-pool-prepared-statement-per-connection-size=20
-spring.shardingsphere.datasource.xp0.druid.filters=stat,wall,log4j
-spring.shardingsphere.datasource.xp0.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-spring.shardingsphere.datasource.xp0.druid.remove-abandoned=true
-spring.shardingsphere.datasource.xp0.druid.remove-abandoned-timeout=1800
-spring.shardingsphere.datasource.xp0.druid.log-abandoned=true
-spring.shardingsphere.datasource.xp0.druid.stat-view-servlet.enabled=true
-spring.shardingsphere.datasource.xp0.druid.stat-view-servlet.url-pattern=/druid/*
-spring.shardingsphere.datasource.xp0.druid.stat-view-servlet.login-username=admin
-spring.shardingsphere.datasource.xp0.druid.stat-view-servlet.login-password=admin
-spring.shardingsphere.datasource.xp0.druid.stat-view-servlet.reset-enable=false
-spring.shardingsphere.datasource.xp0.druid.wall.config.multi-statement-allow=false
-spring.shardingsphere.rules.sharding.tables.sys_oper_log.actual-data-nodes=xp0.sys_oper_log_${0..9}
-spring.shardingsphere.rules.sharding.tables.sys_oper_log.table-strategy.standard.sharding-column=userId
-spring.shardingsphere.rules.sharding.tables.sys_oper_log.table-strategy.standard.sharding-algorithm-name=sys-oper-log-inline
-spring.shardingsphere.rules.sharding.tables.sys_oper_log.key-generate-strategy.column=oper_id
-spring.shardingsphere.rules.sharding.tables.sys_oper_log.key-generate-strategy.key-generator-name=snowflake
-spring.shardingsphere.rules.sharding.tables.xp_agreement_app_user.actual-data-nodes=xp0.xp_agreement_app_user_${0..9}
-spring.shardingsphere.rules.sharding.tables.xp_agreement_app_user.table-strategy.standard.sharding-column=app_user_id
-spring.shardingsphere.rules.sharding.tables.xp_agreement_app_user.table-strategy.standard.sharding-algorithm-name=xp-agreement-app-user-inline
-spring.shardingsphere.rules.sharding.tables.xp_agreement_app_user.key-generate-strategy.column=id
-spring.shardingsphere.rules.sharding.tables.xp_agreement_app_user.key-generate-strategy.key-generator-name=snowflake
-spring.shardingsphere.rules.sharding.tables.xp_point.actual-data-nodes=xp0.xp_point_${0..9}
-spring.shardingsphere.rules.sharding.tables.xp_point.table-strategy.standard.sharding-column=electronic_area_id
-spring.shardingsphere.rules.sharding.tables.xp_point.table-strategy.standard.sharding-algorithm-name=xp-point-inline
-spring.shardingsphere.rules.sharding.tables.xp_point.key-generate-strategy.column=id
-spring.shardingsphere.rules.sharding.tables.xp_point.key-generate-strategy.key-generator-name=snowflake
-spring.shardingsphere.rules.sharding.sharding-algorithms.sys-oper-log-inline.type=INLINE
-spring.shardingsphere.rules.sharding.sharding-algorithms.sys-oper-log-inline.props.algorithm-expression=sys_oper_log_${userId % 10}
-spring.shardingsphere.rules.sharding.sharding-algorithms.xp-agreement-app-user-inline.type=INLINE
-spring.shardingsphere.rules.sharding.sharding-algorithms.xp-agreement-app-user-inline.props.algorithm-expression=xp_agreement_app_user_${app_user_id % 10}
-spring.shardingsphere.rules.sharding.sharding-algorithms.xp-point-inline.type=INLINE
-spring.shardingsphere.rules.sharding.sharding-algorithms.xp-point-inline.props.algorithm-expression=xp_point_${electronic_area_id % 10}
-spring.shardingsphere.rules.sharding.key-generators.snowflake.type=SNOWFLAKE
-spring.shardingsphere.rules.single-table.default-data-source-name=xp0
-spring.shardingsphere.props.sql-show=true
-spring.shardingsphere.props.sql-simple=true
-seata.enabled=false
diff --git a/xp-robotaxi-itinerary-boot/src/main/resources/application-local.yml b/xp-robotaxi-itinerary-boot/src/main/resources/application-local.yml
index 0e814f0..f39136b 100644
--- a/xp-robotaxi-itinerary-boot/src/main/resources/application-local.yml
+++ b/xp-robotaxi-itinerary-boot/src/main/resources/application-local.yml
@@ -4,15 +4,27 @@
on-profile: local
autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+ redis:
+ database: 99
+ host: r-bp1ip8die60uuo3ovypd.redis.rds.aliyuncs.com
+ password: syAktm2x9uDusoF_
+ port: 6379
+ data:
+ mongodb:
+ host: dds-bp1f4a38f3cccad4-pub.mongodb.rds.aliyuncs.com
+ port: 3717
+ database: xp_robotaxi
+ username: xp_robotaxi
+ password: hDXSBe_hs0d5KxUf
shardingsphere:
datasource:
names: xp0
xp0:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.110.34:3306/xprt_order?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
+ url: jdbc:mysql://pc-bp1o444934f546768po.rwlb.rds.aliyuncs.com:3306/xp_rt_order?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: xp_rt_order
+ password: JLZtAI_BL4Lv5mbE
druid:
initial-size: 10
min-idle: 10
diff --git a/xp-robotaxi-itinerary-boot/src/main/resources/bootstrap.yml b/xp-robotaxi-itinerary-boot/src/main/resources/bootstrap.yml
index 18e1381..fa4e472 100644
--- a/xp-robotaxi-itinerary-boot/src/main/resources/bootstrap.yml
+++ b/xp-robotaxi-itinerary-boot/src/main/resources/bootstrap.yml
@@ -1,7 +1,7 @@
server:
port: 6030
tomcat:
- basedir: /data/tomcat
+ basedir: data/tomcat
# Spring
spring:
application:
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
index 96d603b..81d8fdd 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
@@ -104,6 +104,7 @@
public void taskOrder() {
log.info("5秒执行一次");
Set<String> quoteMatchName = redisService.getQuoteMatchName(CacheConstants.QUEUE_POINT_ID);
+ log.info("quoteMatchName:{}", quoteMatchName);
for (String name : quoteMatchName) {
String firstElement = redisService.getFirstElement(name);
if (firstElement != null) {
--
Gitblit v1.7.1