From 30a470d3bfa5969d10609f0677a9a457c621bef3 Mon Sep 17 00:00:00 2001
From: GL65 <1297092748@qq.com>
Date: Mon, 3 Feb 2025 20:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=97=B6=E9=97=B4=E9=99=8D?=
 =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                            |  2 +-
 src/main/resources/application.yml                 |  2 +-
 src/main/resources/log4j2.xml                      |  6 +++---
 src/main/resources/mapper/changePoint.xml          |  2 +-
 .../resources/parameter/config/config.properties   | 14 ++++++++------
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9ac2a48..20a2f7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <artifactId>datacenter</artifactId>
     <version>1.0-SNAPSHOT</version>
     <description>数据服务接口模块</description>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
 
     <properties>
         <java.version>1.8</java.version>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c737629..e9cc8a9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -18,7 +18,7 @@ spring:
 #      url: jdbc:postgresql://121.41.18.46:5432/postgres
       url: jdbc:postgresql://localhost:5432/postgres
       username: postgres
-      password: 123456
+      password: Nuan@200215
       initialSize: 5
       maxActive: 20
       minIdle: 5
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index a315cd6..33ddd08 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -38,7 +38,7 @@
             <!-- 日志输出格式-文件 -->
             <PatternLayout pattern="${PATTERN_FILE}"/>
             <!-- 只输出level及以上级别的信息（onMatch），其他的拒绝（onMismatch） -->
-            <ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
+            <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
             <!-- 归档设置 -->
             <Policies>
                 <!-- 按时间间隔归档
@@ -56,7 +56,7 @@
 
     <Loggers>
         <!-- root配置日志的根节点 -->
-        <root level="info">
+        <root level="ERROR">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="RollingFile"/>
         </root>
@@ -70,7 +70,7 @@
                      false - logEvent 处理后不再向上传递给父类 logger 打印(解决日志重复输出)
                （4）logger 节点配置的 level 必须高于或等于 Appender 中 ThresholdFilter 配置的 level，否则会出现信息丢失
          -->
-        <logger name="com.uva" level="debug" additivity="false">
+        <logger name="com.uva" level="ERROR" additivity="false">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="RollingFile"/>
         </logger>
diff --git a/src/main/resources/mapper/changePoint.xml b/src/main/resources/mapper/changePoint.xml
index aada82d..71528aa 100644
--- a/src/main/resources/mapper/changePoint.xml
+++ b/src/main/resources/mapper/changePoint.xml
@@ -371,6 +371,6 @@
         where t.project_id = t1.project_id
           and t.id1=t2."id"
           and t.id2=t3."id"
-        order by t.project_id,t.id1
+        order by t.ddatetime1 desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/parameter/config/config.properties b/src/main/resources/parameter/config/config.properties
index a6f5372..5c237b7 100644
--- a/src/main/resources/parameter/config/config.properties
+++ b/src/main/resources/parameter/config/config.properties
@@ -1,9 +1,9 @@
-OSS_ACCESS_KEY_ID=LTAI5tRwkAZ7PHkxRn2Qx9jy
-OSS_ACCESS_KEY_SECRET=BBQZKagCaiWo6hQc7XilSTO7FeJTMu
+OSS_ACCESS_KEY_ID=LTAI5tMPhdtqTHqrL2DYHGsY
+OSS_ACCESS_KEY_SECRET=pxUIvOo5M5p8EmjHukUA7vdQyPGQ2j
 #endPoint
 endPoint=https://oss-cn-nanjing.aliyuncs.com
 #bucketName
-bucketName=nj-wsl-bucket
+bucketName=d-wsl
 #targetDataPath
 targetDataPath=D:\\mnt\\data
 #targetProductPath
@@ -17,15 +17,15 @@ picTempFile=D:\\mnt\\product\\temp\\abc.jpg
 #publishURL
 publishURL=http://localhost:8087/
 #websocket
-messageWebsocket=ws://47.122.28.0:8899/v1
+messageWebsocket=ws://47.122.74.40:8899/v1
 #live
-liveURL=rtmp://47.122.68.92:1935/live/
+liveURL=rtmp://47.122.74.40:1935/live/
 #drone-sn
 drone-sn=1581F6Q8D245600ET9G5
 #camera
 camera=81-0-0
 #livePic
-livePicURL=ws://47.122.68.92:8081/ws/push
+livePicURL=ws://47.122.74.40:8081/ws/push
 #liveDis
 liveDisURL=http://localhost:6000/process_image
 #upload
@@ -34,3 +34,5 @@ liveUpload = http://localhost:6000/upload
 liveChangePointURL=http://localhost:6000/process_json
 
 djiurl=https://fh.dji.com
+
+model_type=0
-- 
Gitee