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 | 189 +++++++++++++++++++++-------------------------- 1 files changed, 85 insertions(+), 104 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 7f5dd11..97be1dc 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -1,104 +1,85 @@ -# 寮�鍙戠幆澧冮厤缃� -server: - # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080 - port: 8080 - servlet: - # 搴旂敤鐨勮闂矾寰� - context-path: / - tomcat: - # tomcat鐨刄RI缂栫爜 - uri-encoding: UTF-8 - # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100 - accept-count: 1000 - threads: - # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200 - max: 800 - # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10 - min-spare: 100 -# Spring閰嶇疆 -spring: - # redis 閰嶇疆 - redis: - # 鍦板潃 - host: 127.0.0.1 - # 绔彛锛岄粯璁や负6379 - port: 6379 - # 鏁版嵁搴撶储寮� - database: 0 - # 瀵嗙爜 - password: - # 杩炴帴瓒呮椂鏃堕棿 - timeout: 10s - lettuce: - pool: - # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺� - min-idle: 0 - # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺� - max-idle: 8 - # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁� - max-active: 8 - # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級 - max-wait: -1ms -# 鏃ュ織閰嶇疆 -logging: - level: - authorize: info - minio: info - hikSdk: debug - dhSdk: debug - sdk: debug - vtdu: debug - stealAlarm: info - websocket: info - patrolInspectionTask: info - mqtt: debug - guideQueue: debug - rongCloud: info - cmd: info - uav: info - sy: info - - -# webrtc-streamer閰嶇疆 -webrtc: - enabled: false - host: 127.0.0.1:8000 -# minio閰嶇疆 -minio: - enabled: false - endpoint: http://192.168.2.15:9001 - accessKey: admin - secretKey: xzx12345 - path: G:/DATA -# forest閰嶇疆 -forest: - backend: okhttp3 # 鍚庣HTTP妗嗘灦锛堥粯璁や负 okhttp3锛� - max-connections: 1000 # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堥粯璁や负 500锛� - max-route-connections: 500 # 姣忎釜璺敱鐨勬渶澶ц繛鎺ユ暟锛堥粯璁や负 500锛� - max-request-queue-size: 100 # [鑷獀1.5.22鐗堟湰璧峰彲鐢╙ 鏈�澶ц姹傜瓑寰呴槦鍒楀ぇ灏� - max-async-thread-size: 300 # [鑷獀1.5.21鐗堟湰璧峰彲鐢╙ 鏈�澶у紓姝ョ嚎绋嬫暟 - max-async-queue-size: 16 # [鑷獀1.5.22鐗堟湰璧峰彲鐢╙ 鏈�澶у紓姝ョ嚎绋嬫睜闃熷垪澶у皬 - timeout: 3000 # [宸蹭笉鎺ㄨ崘浣跨敤] 璇锋眰瓒呮椂鏃堕棿锛屽崟浣嶄负姣锛堥粯璁や负 3000锛� - connect-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛屽崟浣嶄负姣锛堥粯璁や负 timeout锛� - read-timeout: 3000 # 鏁版嵁璇诲彇瓒呮椂鏃堕棿锛屽崟浣嶄负姣锛堥粯璁や负 timeout锛� - max-retry-count: 0 # 璇锋眰澶辫触鍚庨噸璇曟鏁帮紙榛樿涓� 0 娆′笉閲嶈瘯锛� - ssl-protocol: TLS # 鍗曞悜楠岃瘉鐨凥TTPS鐨勯粯璁LS鍗忚锛堥粯璁や负 TLS锛� - log-enabled: true # 鎵撳紑鎴栧叧闂棩蹇楋紙榛樿涓� true锛� - log-request: true # 鎵撳紑/鍏抽棴Forest璇锋眰鏃ュ織锛堥粯璁や负 true锛� - log-response-status: true # 鎵撳紑/鍏抽棴Forest鍝嶅簲鐘舵�佹棩蹇楋紙榛樿涓� true锛� - log-response-content: true # 鎵撳紑/鍏抽棴Forest鍝嶅簲鍐呭鏃ュ織锛堥粯璁や负 false锛� - async-mode: platform # [鑷獀1.5.27鐗堟湰璧峰彲鐢╙ 寮傛妯″紡锛堥粯璁や负 platform锛� -#娴佸獟浣撹浆鐮佹湇鍔″櫒 -mediamtx: - enabled: true - host: 192.168.1.227 -#mqtt -mqtt: - host: tcp://192.168.2.15:1883 - clientId: Server-2271 - username: admin - password: admin - topic: minioEvent,radar - timeout: 100 - keepalive: 60 - enabled: true \ No newline at end of file +# 寮�鍙戠幆澧冮厤缃� +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: / + tomcat: + # tomcat鐨刄RI缂栫爜 + uri-encoding: UTF-8 + # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100 + accept-count: 1000 + threads: + # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200 + max: 800 + # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10 + min-spare: 100 +# 鏃ュ織閰嶇疆 +logging: + level: + com.ruoyi.common.filter.MyI18nInterceptor: info + authorize: info + minio: info + hikSdk: info + dhSdk: info + sdk: info + vtdu: info + stealAlarm: info + websocket: info + patrolInspectionTask: debug + mqtt: debug + guideQueue: debug + rongCloud: info + cmd: debug + alarm: debug + uav: info + sy: info + mqttCar: info +## knife4j閰嶇疆 +knife4j: + # knife4j澧炲己鍔熻兘,寮�鍚悗涓嬮潰鍙傛暟鎵嶇敓鏁� + enable: true + #鏄惁涓虹敓浜фā寮� 椤圭洰閮ㄥ睘鏃朵负true 闃叉鎺ュ彛鏆撮湶 + production: false + # 閰嶇疆鐢ㄦ埛瀵嗙爜 + basic: + enable: false + username: admin + password: ardkj12345 +# minio閰嶇疆 +minio: + enabled: false + endpoint: http://192.168.2.15:9001 + accessKey: admin + secretKey: xzx12345 + path: D:/DATA +#娴佸獟浣撹浆鐮佹湇鍔″櫒 +mediamtx: + enabled: true + host: 192.168.1.227 +#mqtt +#鍏ㄩ儴涓婚锛歮inioEvent,radar,stealelec,tube,camera,external,accessControl,apponekey,digitization3 +mqtt: + host: tcp://192.168.2.15:1883 + clientId: Server + username: admin + password: admin + topic: minioEvent,radar,stealelec,tube,camera,external,accessControl,apponekey,digitization3,radarForceGuide + timeout: 100 + keepalive: 60 + enabled: true +#涓変竴杞﹁締寮�鍏� +syCar: + enabled: true -- Gitblit v1.9.3