Merge remote-tracking branch 'origin/master'

Lius

2025-08-27 37fd5447c3b7bfdd3d1b31f8d68c6750471f178c

 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:
    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    # 返回类型为Map,显示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、minio、alioss
  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/**
  #阿里云oss存储和大鱼短信秘钥配置
  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
    #是否需要校验token
@@ -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
databaseType: MySql
#操作系统 kylin | windows
operatingSystem: kylin