From c4948017824b1efa71faeb163e3609bec91f5719 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期五, 15 八月 2025 10:02:00 +0800
Subject: [PATCH] MDC,IOT合并

---
 lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
index 3871bb1..0b3c4a6 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
@@ -125,14 +125,14 @@
         poolPreparedStatements: true
         maxPoolPreparedStatementPerConnectionSize: 20
         # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛屽幓鎺夊悗鐩戞帶鐣岄潰sql鏃犳硶缁熻锛�'wall'鐢ㄤ簬闃茬伀澧�
-        filters: stat,wall,slf4j
+        filters: stat,slf4j
         # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/lxzn_mdc_zf?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://192.168.1.118:3306/lxzn_mdc_zf?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: 123456
+          password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 澶氭暟鎹簮閰嶇疆
           #multi-datasource1:
@@ -145,7 +145,7 @@
     database: 10
     host: 127.0.0.1
     port: 6379
-    password: '123456'
+#    password: '123456'
 #mybatis plus 璁剧疆
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
@@ -295,3 +295,29 @@
       # appSecret
       client-secret: ??
       agent-id: ??
+mqtt:
+  host: tcp://192.168.1.123:1883
+  clientId: mqtt_manage_platform_dev
+  username: admin
+  password: public
+  timeout: 30000
+  keepalive: 300
+  clientUrl: http://192.168.1.123:18083/api/v5/clients
+  #API鎺堟潈KEY
+  apiKey: fb5d13d541c4ebd9
+  #API鎺堟潈瀵嗛挜
+  secretKey: J9A4pFcUyYzyo6uhFh6AKcVBi7xHcUgcNoNMCWylrCHE
+#椹卞姩鏂囦欢鍦板潃
+drive: /iot/configuration/DriveConfig.xml
+script: /iot/configuration/FunctionConfig.xml
+#ftp杩炴帴鍦板潃
+ftp:
+  LOCAL_CHARSET: GBK
+  SERVER_CHARSET: ISO-8859-1
+  ftpHost: 10.0.221.200
+  ftpPort: 21
+  ftpUserName: admin
+  ftpPassword: lx@2024
+  address: /iot/
+#鏁版嵁搴� MySql | SqlServer
+databaseType: MySql
\ No newline at end of file

--
Gitblit v1.9.3