From 8a4810082529e48259ec332e034c05f1eea2399b Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期日, 14 一月 2024 12:24:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application-prod-druid.yml | 6 +++---
ruoyi-admin/src/main/resources/application-prod.yml | 21 ++++++++++++---------
ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java | 2 +-
ruoyi-admin/src/main/resources/application.yml | 4 +++-
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java | 8 ++++----
5 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java b/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
index 05531f7..1861639 100644
--- a/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
+++ b/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
@@ -83,9 +83,9 @@
String token = this.getToken();
res = (String) requestMethod.invoke(this.uavClient, this.host + url, token, data);
} catch (IllegalAccessException e) {
- System.out.println("doUavRequest 璁块棶澶辫触" + e.getMessage());
+ log.error("doUavRequest 璁块棶澶辫触" + e.getMessage());
} catch (InvocationTargetException e) {
- System.out.println("doUavRequest 鎵ц澶辫触" + e.getMessage());
+ log.error("doUavRequest 鎵ц澶辫触" + e.getMessage());
e.printStackTrace();
}
@@ -103,7 +103,7 @@
//楠岃瘉token鏈夋晥鎬�
try {
String res = uavClient.GET(this.host+"manage/api/v1/devices", token, "{}");
- System.out.println(res);
+ //System.out.println(res);
} catch (ForestNetworkException fe) {
if (fe.getStatusCode() == 401) {//token澶辨晥,閲嶆柊鐧诲綍
this.login();
@@ -122,7 +122,7 @@
log.debug("鐧诲綍鏃犱汉鏈哄閮ㄦ帴鍙�");
String codedPassword = this.Encrypt(password, salt);
String body = "{\"username\":\"" + username + "\",\"password\":\"" + codedPassword + "\"}";
- System.out.println("body:" + body);
+ log.debug("body:" + body);
try {
//uavClient.GET("logout", null, "{}");
String res = uavClient.POST(this.host+"login", null, body);
diff --git a/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java b/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java
index 427d056..70827a8 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java
@@ -8,7 +8,7 @@
@Service
public interface UavClient {
-
+///
@Get("${url}")
String GET(@Var("url") String url, @Header("x-auth-token") String token, @JSONBody String body);
diff --git a/ruoyi-admin/src/main/resources/application-prod-druid.yml b/ruoyi-admin/src/main/resources/application-prod-druid.yml
index 5801e33..c92a8a3 100644
--- a/ruoyi-admin/src/main/resources/application-prod-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-prod-druid.yml
@@ -6,9 +6,9 @@
# 涓诲簱鏁版嵁婧�
master:
driverClassName: org.postgresql.Driver
- url: jdbc:postgresql://112.98.126.2:35432/ry-vue?stringtype=unspecified&TimeZone=Asia/Shanghai
+ url: jdbc:postgresql://192.168.1.14:5432/ry-vue?stringtype=unspecified&TimeZone=Asia/Shanghai
username: postgres
- password: Yykj.2017
+ password: postgres
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -55,4 +55,4 @@
merge-sql: true
wall:
config:
- multi-statement-allow: true
\ No newline at end of file
+ multi-statement-allow: true
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 6185a26..97b38c7 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -20,7 +20,7 @@
# knife4j澧炲己鍔熻兘,寮�鍚悗涓嬮潰鍙傛暟鎵嶇敓鏁�
enable: true
#鏄惁涓虹敓浜фā寮� 椤圭洰閮ㄥ睘鏃朵负true 闃叉鎺ュ彛鏆撮湶
- production: true
+ production: false
# 閰嶇疆鐢ㄦ埛瀵嗙爜
basic:
enable: true
@@ -43,23 +43,26 @@
sy: info
# minio閰嶇疆
minio:
- enabled: false
- endpoint: http://192.168.5.229:9001
+ enabled: true
+ endpoint: http://192.168.1.14:9001
accessKey: admin
secretKey: xzx12345
- path: F:/DATA
+ path: G:/DATA
#娴佸獟浣撹浆鐮佹湇鍔″櫒
mediamtx:
enabled: true
- host: 192.168.5.229
+ host: 192.168.1.14
software_decoding: true
#mqtt
mqtt:
- host: tcp://192.168.5.229:1883
- clientId: server229
+ host: tcp://192.168.1.14:1883
+ clientId: server14
username: admin
password: xzx12345
- topic: minioEvent,apponekey,camera,external,radarWellData
+ topic: minioEvent,radar,stealelec,tube,camera,external,accessControl,apponekey,digitization3,radarForceGuide
timeout: 100
keepalive: 60
- enabled: true
\ No newline at end of file
+ enabled: true
+#涓変竴杞﹁締寮�鍏�
+syCar:
+ enabled: true
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b403f23..486d791 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -29,6 +29,8 @@
secret: abcdefghijklmnopqrstuvwxyz
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
expireTime: 30
+ # 鏄惁鍏佽璐︽埛澶氱粓绔悓鏃剁櫥褰� (true 鍏佽/ false 涓嶅厑璁�)
+ soloLogin: true
# MyBatis閰嶇疆
#mybatis:
# # 鎼滅储鎸囧畾鍖呭埆鍚�
@@ -133,5 +135,5 @@
max-wait: -1ms
# 婵�娲婚厤缃枃浠�
profiles:
- active: dev-druid,dev
+ active: prod-druid,prod
--
Gitblit v1.9.3