diff --git a/pom.xml b/pom.xml
index 9ac2a48f729e979c9d641dabb922161ed8e0f4ca..20a2f7eb9865b4e4b4d4914077a19bdf4a28211b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
datacenter
1.0-SNAPSHOT
数据服务接口模块
- war
+ jar
1.8
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cb574a18d7d4ab04cec6f644c16d34e4b2af9338..3aa4b9745d424560896bbd74a7fd7b5fc7c05d78 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -23,7 +23,7 @@ spring:
# url: jdbc:postgresql://47.122.67.185:5432/postgres Nuan@200215
url: jdbc:postgresql://localhost:5432/postgres
username: postgres
- password: 200215
+ password: Nuan@200215
initialSize: 5
maxActive: 20
minIdle: 5
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index a315cd62f2760eec725fe1281d802142de001426..33ddd088111a26987a0fc1ca79b5ccab6b3d8bf5 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -38,7 +38,7 @@
-
+
-
+
@@ -70,7 +70,7 @@
false - logEvent 处理后不再向上传递给父类 logger 打印(解决日志重复输出)
(4)logger 节点配置的 level 必须高于或等于 Appender 中 ThresholdFilter 配置的 level,否则会出现信息丢失
-->
-
+
diff --git a/src/main/resources/mapper/changePoint.xml b/src/main/resources/mapper/changePoint.xml
index aada82de81171d01c5dd6995d6a1c93e641643ff..71528aad844c9de7bfcca111050a8628e2cf58d4 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
\ 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 0daad07474504a53bdf16836b66ce0bc0cc4d716..0d113d67864eb3c78f4111683bfd0061414ba1cf 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,17 +17,17 @@ 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
#getTaskMessageInfo
-taskMessageInfo=http://47.122.28.0:8087/api/getTaskMessageInfo
+taskMessageInfo=http://47.122.74.40:8087/api/getTaskMessageInfo
#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
@@ -37,4 +37,5 @@ liveChangePointURL=http://localhost:6000/process_json
djiurl=https://fh.dji.com
#modetype
-model_type=1
+model_type=0
+