liu 8 月之前
父節點
當前提交
71dbe8b25b

File diff suppressed because it is too large
+ 4654 - 0
db/tcwm.log.2025-10-10.0


File diff suppressed because it is too large
+ 6977 - 0
db/tcwm.log.2025-10-12.13.30


+ 10 - 8
src/main/resources/application-mysql8.yml

@@ -22,8 +22,9 @@ spring:
             stat-view-servlet:
                 enabled: true
                 url-pattern: /druid/*
-                #login-username: admin
-                #login-password: admin
+                login-username: CH
+                login-password: CH_2025@.
+                allow: ""
             filter:
                 stat:
                     log-slow-sql: true
@@ -33,9 +34,9 @@ spring:
                     config:
                         multi-statement-allow: true
     redis:
-        host: 172.16.20.103
+        host: 172.16.20.108
         port: 6379
-        password: ch_wm_redis_2025@.
+        password: chuanghai_2024.
         database: 3
         timeout: 5000
         jedis:
@@ -45,12 +46,11 @@ spring:
                 min-idle: 0
                 max-idle: 10
                 max-wait: -1
-# 接口数据加密
 secure-api:
     # 开启SecureApi功能,如果为false则其余配置项均不生效
     enabled: true
     # 开启加解密日志打印,会打印出接口名、加密模式、算法、明文和密文等信息
-    show-log: false
+    show-log: true
     url-safe: true
     # 加密模式,common和session_key可选,session_key是会话密钥模式,用于每次请求都使用不同的密钥,需要前端配合
     mode: common
@@ -82,6 +82,8 @@ secure-api:
             - /v2/api-docs
             - /swagger-resources/**
             - /webjars/**
+            - /app/tbindent/droneAirReceiving
+            - /app/tbindent/droneAirDelivery
             - /back/open
     # 需要解密的接口路径匹配,遵循spring boot拦截器的正则规则,留空或者不配置代表不使用url匹配,只对注解的接口、参数、字段进行解密
     decrypt-url:
@@ -116,9 +118,9 @@ mp:
 sftp:
     username: export
     password: Waimai2024#
-    host: 172.16.20.105
+    host: 172.16.20.108
     port: 22
-#查询备用数据库
+
 dynamic:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://172.22.45.21:3306/tcwm2.5?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&serverTimezone=CTT&useAffectedRows=true

+ 8 - 9
src/main/resources/mapper/order/OrderMapper.xml

@@ -799,18 +799,17 @@
             value DESC
     </select>
     <select id="temp" resultType="com.sqx.modules.order.entity.TbOrder">
-        SELECT * FROM `tb_order`
-        WHERE order_id in (
+
         SELECT
-            order_id
+        *
         FROM
-            tb_indent
+        `tcwm2.5`.`tb_order`
         WHERE
-            create_time > '2025-10-09 00:00:00'
-            AND create_time <![CDATA[ <= ]]> '2025-10-09 13:00:00'
-            AND finish_time IS NULL
-            AND indent_state = '6'
-        )
+        `pay_time` > '2025-10-12 00:00:00'
+        AND `status` = '3'
+        AND `pay_time` <![CDATA[ <= ]]> '2025-10-12 15:00:00'
+        AND `trade_no` IS NOT NULL
+
     </select>
 
 </mapper>