Merge remote-tracking branch 'origin/dev' into dev-ty1.2

2026-08-21 15:47:44 +08:00
parent 000092952f 19857686aa
commit 8704df738c
11 changed files with 23 additions and 23 deletions
@@ -278,7 +278,7 @@ public class LeaseApplicationService {
     * 货主租赁明细
     * 定时任务：每天凌晨1点执行，计算前一天的货主租赁明细
     */
-//    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 0 1 * * ?")
    public void shipperLeaseDetails() {
        log.info("开始执行货主租赁明细定时任务");
        // 计算前一天的日期，将时间设置为当天的0点0分0秒，只保留日期部分
@@ -14,18 +14,18 @@ spring:
    nacos:
      discovery:
 #        server-addr: 127.0.0.1:8848
-        server-addr: 10.33.0.129:6010
+#        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.102.192.30:6848
+        server-addr: 10.102.192.30:6848
        username: nacos
        password: manhuoda@2023
        #线上正式环境
 #        server-addr: 10.102.192.105:6848
      config:
 #        server-addr: 127.0.0.1:8848
-        server-addr: 10.33.0.129:6010
+#        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.102.192.30:6848
+        server-addr: 10.102.192.30:6848
        username: nacos
        password: manhuoda@2023
        #线上正式环境