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-prod.yml | 79 +++++++++++++++++++++++++++------------ 1 files changed, 54 insertions(+), 25 deletions(-) diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml index 424cb23..32dc42f 100644 --- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml +++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml @@ -52,13 +52,12 @@ instanceName: MyScheduler instanceId: AUTO jobStore: - selectWithLockSQL: SELECT* FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ? - # class: org.springframework.scheduling.quartz.LocalDataSourceJobStore - # driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate - # tablePrefix: QRTZ_ - # isClustered: true - # misfireThreshold: 12000 - # clusterCheckinInterval: 15000 + class: org.springframework.scheduling.quartz.LocalDataSourceJobStore + driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate + tablePrefix: QRTZ_ + isClustered: true + misfireThreshold: 12000 + clusterCheckinInterval: 15000 threadPool: class: org.quartz.simpl.SimpleThreadPool threadCount: 10 @@ -70,7 +69,6 @@ time-zone: GMT+8 jpa: open-in-view: false - database-platform: org.hibernate.dialect.SQLServerDialect aop: proxy-target-class: true #閰嶇疆freemarker @@ -112,7 +110,7 @@ # 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶� initial-size: 5 min-idle: 5 - maxActive: 1000 + maxActive: 20 # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂� maxWait: 60000 # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣 @@ -127,21 +125,27 @@ 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:sqlserver://localhost:1433;databasename=LXZN_TEST_COMMON - username: sa - password: 123 - driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver + 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 + username: root + password: root + driver-class-name: com.mysql.cj.jdbc.Driver + # 澶氭暟鎹簮閰嶇疆 + #multi-datasource1: + #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + #username: root + #password: root + #driver-class-name: com.mysql.cj.jdbc.Driver #redis 閰嶇疆 redis: - database: 0 + database: 10 host: 127.0.0.1 port: 6379 - password: +# password: '123456' #mybatis plus 璁剧疆 mybatis-plus: mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml @@ -176,25 +180,24 @@ app: http://localhost:8051 path: #鏂囦欢涓婁紶鏍圭洰褰� 璁剧疆 - upload: C://opt//upFiles + upload: /opt/upFiles #webapp鏂囦欢璺緞 - webapp: C://opt//upFiles + webapp: /opt/webapp shiro: - excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo + excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #闃块噷浜憃ss瀛樺偍鍜屽ぇ楸肩煭淇$閽ラ厤缃� oss: accessKey: ?? secretKey: ?? endpoint: oss-cn-beijing.aliyuncs.com bucketName: jeecgdev - staticDomain: https://static.jeecg.com - # ElasticSearch 璁剧疆 + # ElasticSearch 6璁剧疆 elasticsearch: cluster-name: jeecg-ES cluster-nodes: 127.0.0.1:9200 check-enabled: false # 鍦ㄧ嚎棰勮鏂囦欢鏈嶅姟鍣ㄥ湴鍧�閰嶇疆 - file-view-domain: http://fileview.jeecg.com + file-view-domain: 127.0.0.1:8012 # minio鏂囦欢涓婁紶 minio: minio_url: http://minio.jeecg.com @@ -203,7 +206,7 @@ bucketName: otatest #澶у睆鎶ヨ〃鍙傛暟璁剧疆 jmreport: - mode: prod + mode: dev #鏁版嵁瀛楀吀鏄惁杩涜saas鏁版嵁闅旂锛岃嚜宸辩湅鑷繁鐨勫瓧鍏� saas: false #鏄惁闇�瑕佹牎楠宼oken @@ -241,7 +244,7 @@ #寮�鍚敓浜х幆澧冨睆钄� production: false basic: - enable: true + enable: false username: jeecg password: jeecg1314 #绗笁鏂圭櫥褰� @@ -291,4 +294,30 @@ client-id: ?? # appSecret client-secret: ?? - agent-id: ?? \ No newline at end of file + agent-id: ?? +mqtt: + host: tcp://10.10.10.98:1883 + clientId: mqtt_manage_platform_dev + username: admin + password: public + timeout: 30000 + keepalive: 300 + clientUrl: http://10.10.10.98:18083/api/v5/clients + #API鎺堟潈KEY + apiKey: 47f5b38274a6084e + #API鎺堟潈瀵嗛挜 + secretKey: CAQ9A2PkFs4kKcOdbd7xx9caonv16mt5xYxYdfqFkHAIK +#椹卞姩鏂囦欢鍦板潃 +drive: /iot/configuration/DriveConfig.xml +script: /iot/configuration/FunctionConfig.xml +#ftp杩炴帴鍦板潃 +ftp: + LOCAL_CHARSET: GBK + SERVER_CHARSET: ISO-8859-1 + ftpHost: 10.10.10.98 + ftpPort: 21 + ftpUserName: admin + ftpPassword: lx@2024 + address: /iot/ +#鏁版嵁搴� MySql | SqlServer +databaseType: MySql \ No newline at end of file -- Gitblit v1.9.3