diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index f13aabc..e0bea18 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -27,13 +27,13 @@
3.5.19
3.5.17
1.5.9
- 4.5.0
+ 4.6.0
3.1.8
- 4.7.0
+ 4.8.0
8.1.3.140
9.0.1.jre7
- 7.0.0-RC3-og
- 3.9.2
+ 7.0.0-og
+ 3.10.0
2.0.8
2.3.6
@@ -42,50 +42,49 @@
9.7.0
3.5.9
- 1.66.0
+ 1.67.0
- 2.3.232
8.0.2.RELEASE
- 1.1.19
+ 1.1.20
5.2.0
8.0.0
- 1.4.0
+ 2.0.0
1.23.2
0.29.5
2.5.1
1.18.48
1.7.0.Beta2
- 5.8.47
+ 5.8.48
6.0.0-M22
2.1.0-incubating
5.4.4
2.4.1
- 2.0.65
- 33.7.1-jre
+ 2.0.66
+ 33.7.2-jre
2.14.5
3.13.0
- 3.20.0
- 2.28.7
+ 3.21.0
+ 2.28.8
3.3.1
2.7.0
3.0.6
- 4.2.18.Final
+ 4.2.19.Final
1.2.5
4.5.26
4.12.0
3.14.0
3.4.0
- 2.55.5
+ 2.57.3
1.16.7
1.4.0
2.5.4
2.5.4
- 4.8.6-20260919.232150
- 1.80
- 4.40.1014.ALL
+ 4.8.6-20261010.094603
+ 1.85
+ 4.40.1044.ALL
@@ -99,6 +98,13 @@
import
+ io.opentelemetry
+ opentelemetry-bom
+ ${opentelemetry.version}
+ pom
+ import
+
+
org.springframework.boot
spring-boot-dependencies
${spring.boot.version}
@@ -278,7 +284,7 @@
org.redisson
-
+
redisson-spring-data-41
@@ -439,12 +445,6 @@
- com.h2database
- h2
- ${h2.version}
-
-
-
com.github.fppt
jedis-mock
${jedis-mock.version}
@@ -707,7 +707,7 @@
-
org.bouncycastle
diff --git a/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java b/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
index 86f1f10..de9dcf3 100644
--- a/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
+++ b/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
@@ -211,7 +211,8 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
CodegenUpdateReqVO updateReqVO = randomPojo(CodegenUpdateReqVO.class,
o -> o.getTable().setId(table.getId())
.setTemplateType(CodegenTemplateTypeEnum.ONE.getType())
- .setScene(CodegenSceneEnum.ADMIN.getScene()));
+ .setScene(CodegenSceneEnum.ADMIN.getScene())
+ .setModuleName("infra").setBusinessName("codegen").setClassName("CodegenTable"));
CodegenColumnSaveReqVO columnVO01 = randomPojo(CodegenColumnSaveReqVO.class,
o -> o.setId(column01.getId()).setTableId(table.getId()));
CodegenColumnSaveReqVO columnVO02 = randomPojo(CodegenColumnSaveReqVO.class,
diff --git a/yudao-module-oa/src/test/java/cn/iocoder/yudao/module/oa/service/vehicle/OaVehicleReturnServiceImplTest.java b/yudao-module-oa/src/test/java/cn/iocoder/yudao/module/oa/service/vehicle/OaVehicleReturnServiceImplTest.java
index 25314cc..0d58c77 100644
--- a/yudao-module-oa/src/test/java/cn/iocoder/yudao/module/oa/service/vehicle/OaVehicleReturnServiceImplTest.java
+++ b/yudao-module-oa/src/test/java/cn/iocoder/yudao/module/oa/service/vehicle/OaVehicleReturnServiceImplTest.java
@@ -64,7 +64,8 @@ public class OaVehicleReturnServiceImplTest extends BaseDbUnitTest {
// mock 数据：实际提前出车，不能用计划时间代替事实
OaVehicleApplyDO apply = randomVehicleApplyDO();
OaVehicleReturnSaveReqVO reqVO = toBean(randomVehicleReturnDO(), OaVehicleReturnSaveReqVO.class)
- .setActualStartTime(apply.getStartTime().minusHours(2)).setActualReturnTime(apply.getStartTime().minusHours(1))
+ .setActualStartTime(apply.getStartTime().minusHours(2).withNano(0))
+ .setActualReturnTime(apply.getStartTime().minusHours(1).withNano(0))
.setStartLocation("客户现场").setReason("现场支持").setPassenger("李四");
// mock 方法
when(vehicleApplyService.validateVehicleApplyExists(20L)).thenReturn(apply);
diff --git a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java
index 9773917..8b8de87 100644
--- a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java
+++ b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java
@@ -223,7 +223,7 @@ public class OAuth2ApproveServiceImplTest extends BaseDbUnitTest {
String clientId = randomString();
String scope = randomString();
Boolean approved = randomBoolean();
- LocalDateTime expireTime = LocalDateTime.ofInstant(randomDay(1, 30).toInstant(), ZoneId.systemDefault());
+ LocalDateTime expireTime = LocalDateTime.ofInstant(randomDay(1, 30).toInstant(), ZoneId.systemDefault()).withNano(0);
// mock 方法
// 调用
@@ -251,7 +251,7 @@ public class OAuth2ApproveServiceImplTest extends BaseDbUnitTest {
String clientId = approve.getClientId();
String scope = approve.getScope();
Boolean approved = randomBoolean();
- LocalDateTime expireTime = LocalDateTime.ofInstant(randomDay(1, 30).toInstant(), ZoneId.systemDefault());
+ LocalDateTime expireTime = LocalDateTime.ofInstant(randomDay(1, 30).toInstant(), ZoneId.systemDefault()).withNano(0);
// mock 方法
// 调用
diff --git a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
index 36b69c7..487667f 100644
--- a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
+++ b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
@@ -311,7 +311,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
// 测试 userType 不匹配
oauth2AccessTokenMapper.insert(cloneIgnoreId(dbAccessToken, o -> o.setClientId("it_client")));
// 测试 expireTime 不匹配
- oauth2AccessTokenMapper.insert(cloneIgnoreId(dbAccessToken, o -> o.setExpiresTime(LocalDateTimeUtil.now())));
+ oauth2AccessTokenMapper.insert(cloneIgnoreId(dbAccessToken, o -> o.setExpiresTime(LocalDateTimeUtil.now().minusDays(1))));
// 准备参数
OAuth2AccessTokenPageReqVO reqVO = new OAuth2AccessTokenPageReqVO();
reqVO.setUserId(10L);