diff --git a/hiver-admin/src/main/resources/application.yml b/hiver-admin/src/main/resources/application.yml
index c3edbcd8..4c127a6f 100644
--- a/hiver-admin/src/main/resources/application.yml
+++ b/hiver-admin/src/main/resources/application.yml
@@ -25,8 +25,8 @@ spring:
timeout-per-shutdown-phase: 10S
# 数据源
datasource:
- url: jdbc:mysql://154.8.162.157:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true
-# url: jdbc:mysql://8.140.198.243:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true
+# url: jdbc:mysql://154.8.162.157:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true
+ url: jdbc:mysql://8.140.198.243:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true
username: reddoor
# Jasypt加密 可到common-utils中找到JasyptUtil加解密工具类生成加密结果 格式为ENC(加密结果) 以下解密结果为123456
password: ENC(Zla4U4+yRLPhicvuX2TmiEgxEpzP4dk8BHzFDEtiEhwLQIIaftZrrEUJZce6efoe)
@@ -67,8 +67,8 @@ spring:
ddl-auto: update
# Redis 若设有密码自行添加配置password
redis:
- host: 154.8.162.157
-# host: 8.140.198.243
+# host: 154.8.162.157
+ host: 8.140.198.243
password: reddoor168
# 数据库索引 默认0
database: 1
@@ -338,7 +338,7 @@ ignored:
- /hiver/app/logisticsOrder/getLogisticsOrderDetail
- /hiver/app/customer/findByUserPhoneAndShopId
# 分享页获取店铺分类
- - app/productCategory/listByShopId
+ - /hiver/app/productCategory/listByShopId
# 临时增加
- /hiver/app/logisticsOrder/addLogisticsOrder
diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html
index 0e17e5c6..03c2ceec 100644
--- a/hiver-admin/test-output/test-report.html
+++ b/hiver-admin/test-output/test-report.html
@@ -35,7 +35,7 @@
Hiver
- 07, 2024 16:05:02
+ 08, 2024 15:39:34
@@ -84,7 +84,7 @@
passTest
-
16:05:02 / 0.017 secs
+
15:39:35 / 0.026 secs
@@ -92,9 +92,9 @@
#test-id=1
passTest
-
09.07.2024 16:05:02
-
09.07.2024 16:05:02
-
0.017 secs
+
09.08.2024 15:39:35
+
09.08.2024 15:39:35
+
0.026 secs
@@ -104,7 +104,7 @@
| Pass |
- 16:05:02 |
+ 15:39:35 |
Test passed
|
@@ -128,13 +128,13 @@
Started
-
07, 2024 16:05:02
+
08, 2024 15:39:34
Ended
-
07, 2024 16:05:02
+
08, 2024 15:39:35
diff --git a/hiver-core/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml b/hiver-core/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml
index 326d0939..de93444d 100644
--- a/hiver-core/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml
+++ b/hiver-core/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml
@@ -178,7 +178,7 @@
and create_time BETWEEN #{nowDate} AND #{afterDay}
-