From 43f46c3801b0aa8544a1703e4f1a27ecc8db22b8 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Sat, 13 Jan 2024 16:17:51 +0800
Subject: [PATCH] 修改生产配置文件和无人机日志
---
ruoyi-admin/src/main/resources/application-prod-druid.yml | 6 +++---
ruoyi-admin/src/main/resources/application-prod.yml | 21 ++++++++++++---------
ruoyi-admin/src/main/resources/application.yml | 4 +++-
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java | 8 ++++----
4 files changed, 22 insertions(+), 17 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/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