0027005599 2 سال پیش
والد
کامیت
9eb36a4497

+ 6 - 65
jeecg-module-system/jeecg-system-start/src/main/resources/application-ybprod.yml

@@ -63,7 +63,6 @@ spring:
             threadCount: 10
             threadPriority: 5
             threadsInheritContextClassLoaderOfInitializingThread: true
-  #json 时间戳统一转换
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -71,25 +70,17 @@ spring:
     open-in-view: false
   aop:
     proxy-target-class: true
-  #配置freemarker
   freemarker:
-    # 设置模板后缀名
     suffix: .ftl
-    # 设置文档类型
     content-type: text/html
-    # 设置页面编码格式
     charset: UTF-8
-    # 设置页面缓存
     cache: false
     prefer-file-system-access: false
-    # 设置ftl文件路径
     template-loader-path:
       - classpath:/templates
     template_update_delay: 0
-  # 设置静态文件路径,js,css等
   mvc:
     static-path-pattern: /**
-    #Spring Boot 2.6+后映射匹配的默认策略已从AntPathMatcher更改为PathPatternParser,需要手动指定为ant-path-matcher
     pathmatch:
       matching-strategy: ant_path_matcher
   resource:
@@ -106,28 +97,20 @@ spring:
       web-stat-filter:
         enabled: true
     dynamic:
-      druid: # 全局druid参数,绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
-        # 连接池的配置信息
-        # 初始化大小,最小,最大
+      druid:
         initial-size: 5
         min-idle: 5
         maxActive: 20
-        # 配置获取连接等待超时的时间
         maxWait: 60000
-        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
         timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间,单位是毫秒
         minEvictableIdleTimeMillis: 300000
         validationQuery: SELECT 1
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
-        # 打开PSCache,并且指定每个连接上PSCache的大小
         poolPreparedStatements: true
         maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
         filters: stat,wall,slf4j
-        # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
@@ -135,82 +118,53 @@ spring:
           username: root
           password: 123456
           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: 8
     host: 10.100.3.58
     port: 6379
     password: 'Ll123456'
-#mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
   global-config:
-    # 关闭MP3.0自带的banner
     banner: false
     db-config:
-      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
       id-type: AUTO
-      # 默认数据库表下划线命名
       table-underline: true
   configuration:
-    # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用
-    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
-#jeecg专用配置
 minidao:
   base-package: org.jeecg.modules.jmreport.*
 jeecg:
-  # 是否启用安全模式
   safeMode: false
-  # 签名密钥串(前后端要一致,正式发布请自行修改)
   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
-  #local、minio、alioss
   uploadType: local
-  # 前端访问地址
   domainUrl:
     pc: http://localhost:3100
     app: http://localhost:8051
   path:
-    #文件上传根目录 设置
     upload: classpath:static/
-    #webapp文件路径
     webapp: classpath:static/
   shiro:
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/his/check/**
-  #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
     secretKey: ??
     endpoint: oss-cn-beijing.aliyuncs.com
     bucketName: jeecgdev
-  # ElasticSearch 6设置
   elasticsearch:
     cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
     check-enabled: false
-  # 在线预览文件服务器地址配置
   file-view-domain: http://fileview.jeecg.com
-  # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com
     minio_name: ??
     minio_pass: ??
     bucketName: otatest
-  #大屏报表参数设置
   jmreport:
     mode: dev
-    #数据字典是否进行saas数据隔离,自己看自己的字典
     saas: false
-  #xxl-job配置
   xxljob:
     enabled: false
     adminAddresses: http://127.0.0.1:9080/xxl-job-admin
@@ -221,30 +175,24 @@ jeecg:
     port: 30007
     logPath: logs/jeecg/job/jobhandler/
     logRetentionDays: 30
-  #分布式锁配置
   redisson:
     address: 127.0.0.1:6379
     password:
     type: STANDALONE
     enabled: true
-#cas单点登录
 cas:
   prefixUrl: http://cas.example.org:8443/cas
-#Mybatis输出sql日志
 logging:
   level:
     org.jeecg.modules.system.mapper: info
 #swagger
 knife4j:
-  #开启增强配置
   enable: true
-  #开启生产环境屏蔽
   production: false
   basic:
     enable: false
     username: jeecg
     password: jeecg1314
-#第三方登录
 justauth:
   enabled: true
   type:
@@ -269,34 +217,27 @@ justauth:
     type: default
     prefix: 'demo::'
     timeout: 1h
-#第三方APP对接
 third-app:
   enabled: false
   type:
-    #企业微信
     WECHAT_ENTERPRISE:
       enabled: false
       #CORP_ID
       client-id: ??
       #SECRET
       client-secret: ??
-      #自建应用id
       agent-id: ??
-      #自建应用秘钥(新版企微需要配置)
       # agent-app-secret: ??
-    #钉钉
     DINGTALK:
       enabled: false
-      # appKey
       client-id: ??
-      # appSecret
       client-secret: ??
       agent-id: ??
 
 cdr:
   threadpool:
-    corePoolSize: 8 # 核心线程数
-    maxPoolSize: 20 # 设置最大线程数
-    keepAliveSeconds: 300 # 设置线程活跃时间
-    queueCapacity: 100 # 设置队列容量
-    prefixName: async-service- # 线程名称前缀
+    corePoolSize: 8
+    maxPoolSize: 20
+    keepAliveSeconds: 300
+    queueCapacity: 100
+    prefixName: async-service-

+ 3 - 13
jeecg-module-system/jeecg-system-start/src/main/resources/application.yml

@@ -3,22 +3,12 @@ spring:
     name: jeecg-system
   profiles:
     active: dev
-
-
 cdr:
-
-  threadpool: #线程池配置
-
+  threadpool:
     corePoolSize: 6
-
     maxPoolSize: 100
-
     keepAliveSeconds: 60
-
     queueCapacity: 500
-
   record:
-
-    batchSize: 10000 #记录批次,达到这个数量就进行数据发送,不用等到全部解析
-
-    bigFileSize: 10000 #单位是M
+    batchSize: 10000
+    bigFileSize: 10000