From 37fd5447c3b7bfdd3d1b31f8d68c6750471f178c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 27 八月 2025 16:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 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 fb36ed1..cba014e 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
@@ -53,12 +53,6 @@
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
threadPool:
class: org.quartz.simpl.SimpleThreadPool
threadCount: 10
@@ -112,7 +106,7 @@
# 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶�
initial-size: 5
min-idle: 5
- maxActive: 1000
+ maxActive: 20
# 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
maxWait: 60000
# 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
@@ -132,13 +126,13 @@
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:sqlserver://192.168.1.123:1433;databasename=lx_iot_mdc
- username: sa
- password: 123
- driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ url: jdbc:mysql://127.0.0.1:3306/lx_iot_mdc?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
#redis 閰嶇疆
redis:
- database: 5
+ database: 0
host: 127.0.0.1
port: 6379
password: ''
@@ -155,7 +149,7 @@
table-underline: true
configuration:
# 杩欎釜閰嶇疆浼氬皢鎵ц鐨剆ql鎵撳嵃鍑烘潵锛屽湪寮�鍙戞垨娴嬭瘯鐨勬椂鍊欏彲浠ョ敤
- #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 杩斿洖绫诲瀷涓篗ap,鏄剧ずnull瀵瑰簲鐨勫瓧娈�
call-setters-on-nulls: true
#jeecg涓撶敤閰嶇疆
@@ -167,7 +161,8 @@
# 绛惧悕瀵嗛挜涓�(鍓嶅悗绔涓�鑷达紝姝ｅ紡鍙戝竷璇疯嚜琛屼慨鏀�)
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
# 绛惧悕鎷︽埅鎺ュ彛
- signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
+ # signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
+ signUrls: /sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
#local銆乵inio銆乤lioss
uploadType: local
# 鍓嶇璁块棶鍦板潃
@@ -180,21 +175,20 @@
#webapp鏂囦欢璺緞
webapp: C://opt//upFiles
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 +197,7 @@
bucketName: otatest
#澶у睆鎶ヨ〃鍙傛暟璁剧疆
jmreport:
- mode: prod
+ mode: dev
#鏁版嵁瀛楀吀鏄惁杩涜saas鏁版嵁闅旂锛岃嚜宸辩湅鑷繁鐨勫瓧鍏�
saas: false
#鏄惁闇�瑕佹牎楠宼oken
@@ -241,7 +235,7 @@
#寮�鍚敓浜х幆澧冨睆钄�
production: false
basic:
- enable: true
+ enable: false
username: jeecg
password: jeecg1314
#绗笁鏂圭櫥褰�
@@ -292,29 +286,36 @@
# appSecret
client-secret: ??
agent-id: ??
+webservice:
+ url: http://localhost:8081/services/EquipmentService?wsdl
+ namespace: http://service.server.webservice.example.com
+ statusMethod: equipmentStatus
+ rateMethod: equipmentRate
mqtt:
- host: tcp://192.168.1.123:1883
- clientId: mqtt_manage_platform
+ host: tcp://127.0.0.1:1883
+ clientId: mqtt_manage_platform_dev
username: admin
- password: public
+ password: lxzn1688
timeout: 30000
keepalive: 300
- clientUrl: http://192.168.1.123:18083/api/v5/clients
+ clientUrl: http://127.0.0.1:18083/api/v5/clients
#API鎺堟潈KEY
- apiKey: fb5d13d541c4ebd9
+ apiKey: 45204bbc6befd831
#API鎺堟潈瀵嗛挜
- secretKey: J9A4pFcUyYzyo6uhFh6AKcVBi7xHcUgcNoNMCWylrCHE
+ secretKey: bs7mFjE6qhr39AhC4VWjByUphVxm9Af9CWlvuGJO3coxdM
#椹卞姩鏂囦欢鍦板潃
-drive: D:\\iot\\configuration\\DriveConfig.xml
-script: D:\\iot\\configuration\\FunctionConfig.xml
+drive: /iot/configuration/DriveConfig.xml
+script: /iot/configuration/FunctionConfig.xml
#ftp杩炴帴鍦板潃
ftp:
LOCAL_CHARSET: GBK
SERVER_CHARSET: ISO-8859-1
- ftpHost: 192.168.1.123
+ ftpHost: 10.0.221.200
ftpPort: 21
ftpUserName: admin
ftpPassword: lx@2024
- address: D:/iot/
+ address: /iot/
#鏁版嵁搴� MySql | SqlServer
-databaseType: SqlServer
\ No newline at end of file
+databaseType: MySql
+#鎿嶄綔绯荤粺 kylin | windows
+operatingSystem: kylin
\ No newline at end of file
--
Gitblit v1.9.3