From 0abccf5e570dce53a802bca4ce25118dd900692c Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 23 二月 2024 14:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application-dev.yml | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 83a4fca..97be1dc 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -2,6 +2,17 @@
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
port: 8080
+ ssl:
+ # 寮�鍚疕TTPS锛屽苟閰嶇疆鑷鍚嶈瘉涔�
+ enabled: true
+ #绉橀挜搴撴枃浠跺悕绉帮紝鍗充笂闈㈢敓鎴愮殑鑷鍚嶈瘉涔�
+ key-store: classpath:keystore
+ # 鐢熸垚绉橀挜搴撴枃浠剁殑瀵嗙爜
+ key-store-password: 123456
+ # 绉橀挜搴撶被鍨嬶紙JKS涓簀dk鐨刱eytool宸ュ叿榛樿鐢熸垚鐨勭閽ュ簱绫诲瀷锛�
+ key-store-type: JKS
+ # 绉橀挜鍒悕
+ key-alias: tomcat
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -18,23 +29,24 @@
# 鏃ュ織閰嶇疆
logging:
level:
- com.ruoyi.common.filter.MyI18nInterceptor: debug
+ com.ruoyi.common.filter.MyI18nInterceptor: info
authorize: info
minio: info
- hikSdk: debug
- dhSdk: debug
- sdk: debug
- vtdu: debug
+ hikSdk: info
+ dhSdk: info
+ sdk: info
+ vtdu: info
stealAlarm: info
websocket: info
- patrolInspectionTask: info
- mqtt: info
+ patrolInspectionTask: debug
+ mqtt: debug
guideQueue: debug
rongCloud: info
- cmd: info
+ cmd: debug
+ alarm: debug
uav: info
- sy: debug
- mqttCar: debug
+ sy: info
+ mqttCar: info
## knife4j閰嶇疆
knife4j:
# knife4j澧炲己鍔熻兘,寮�鍚悗涓嬮潰鍙傛暟鎵嶇敓鏁�
@@ -61,7 +73,7 @@
#鍏ㄩ儴涓婚锛歮inioEvent,radar,stealelec,tube,camera,external,accessControl,apponekey,digitization3
mqtt:
host: tcp://192.168.2.15:1883
- clientId: Server-227
+ clientId: Server
username: admin
password: admin
topic: minioEvent,radar,stealelec,tube,camera,external,accessControl,apponekey,digitization3,radarForceGuide
@@ -70,4 +82,4 @@
enabled: true
#涓変竴杞﹁締寮�鍏�
syCar:
- enabled: true
\ No newline at end of file
+ enabled: true
--
Gitblit v1.9.3