Merge branch 'energy-manage-chy2'

energy-manage-service/src/main/resources/application.properties

@@ -1,4 +1,38 @@
-######################自定义配置文件######################
+#============================应用配置=========================================
+# 项目环境
+spring.profiles.active = @profiles.active@
+# 应用名称
+spring.application.name = energy-manage-service
+# 服务端口
+server.port = 16200
+# 上下文路径
+server.servlet.context-path = /energy-manage-service/
+
+#=============================tomcat配置=======================================
+#uri编码格式
+server.tomcat.uri-encoding = UTF-8
+# 最大连接数
+server.tomcat.max-connections=100000
+# 最小空闲线程数
+server.tomcat.threads.min-spare=100
+# 最大线程数
+server.tomcat.threads.max=800
+# 当tomcat启动线程达到最大时，允许的最大排队请求个数
+server.tomcat.accept-count = 1000
+# server.tomcat.basedir = /opt/projecttmp
+server.maxHttpHeaderSize = 8192
+#请求数据量
+server.tomcat.max-http-form-post-size = 200MB
+#超时时间
+server.tomcat.connection-timeout = 180000
+
+
+#=============================日志配置=======================================
 # 日志路径(环境)
 path.log = @profiles.active@
-spring.banner.location=classpath:banner/banner.txt
+# debug - sql显示
+logging.level.com.energy.manage.service.mappers= debug
+
+#=============================banner配置=======================================
+#banner路径
+spring.banner.location=classpath:banner/banner.txt

energy-manage-service/src/main/resources/bootstrap.properties

@@ -1,73 +1,143 @@
-server.port = 16200
-server.servlet.context-path = /energy-manage-service/
-server.tomcat.uri-encoding = UTF-8
-# 最大连接数
-server.tomcat.max-connections=100000
-# 最小空闲线程数
-server.tomcat.threads.min-spare=100
-# 最大线程数
-server.tomcat.threads.max=800
-# 当tomcat启动线程达到最大时，允许的最大排队请求个数
-server.tomcat.accept-count = 1000
-# server.tomcat.basedir = /opt/projecttmp
-server.maxHttpHeaderSize = 8192
-#请求数据量
-server.tomcat.max-http-form-post-size = 200MB
-#超时时间
-server.tomcat.connection-timeout = 180000
-# 应用名称
-spring.application.name = energy-manage-service
-# 自定义配置文件上传
-spring.servlet.multipart.enabled = true
-spring.servlet.multipart.max-file-size = 314572800
-spring.servlet.multipart.max-request-size= 1048576000
-# 全局时间格式转化
-#spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-#spring.jackson.time-zone=GMT+8
-spring.jackson.serialization.write-dates-as-timestamps=true
-# 指定开发环境-由maven控制多环境
-spring.profiles.active = @profiles.active@
+#=============================数据库配置=======================================
+#数据源类型
+spring.datasource.type = com.alibaba.druid.pool.DruidDataSource
+#驱动
+spring.datasource.druid.driver-class-name = com.mysql.cj.jdbc.Driver
+#连接地址
+spring.datasource.druid.url = jdbc:mysql://192.168.50.233:3306/energy?useUnicode=true&characterEncoding=UTF-8&     allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false&allowPublicKeyRetrieval=true
+#用户名
+spring.datasource.druid.username = admin
+#密码
+spring.datasource.druid.password = admin123456
+#初始化大小
+spring.datasource.druid.initial-size = 30
+#最小
+spring.datasource.druid.min-idle = 20
+#最大
+spring.datasource.druid.max-active = 300
+#获取连接等待的超时时间
+spring.datasource.druid.max-wait = 600000
+#间隔多久进行一次检测,检测需要关闭的链接
+spring.datasource.druid.time-between-eviction-runs-millis = 60000
+#一个链接在池中最小生存时间
+spring.datasource.druid.min-evictable-idle-time-millis = 3000000
+##配置连接在池中的最大生存时间
+#spring.datasource.druid.max-evictable-idle-time-millis = 400000
+spring.datasource.druid.validation-query = SELECT 'x'
+spring.datasource.druid.test-on-borrow = false
+spring.datasource.druid.test-on-return = false
+## 启用空闲连接检测，以便回收
+spring.datasource.druid.test-while-idle = true
+## 打开PSCache，并且指定每个连接上PSCache的大小
+spring.datasource.druid.pool-prepared-statements = false
+spring.datasource.druid.max-pool-prepared-statement-per-connection-size = 20
+spring.datasource.druid.remove-abandoned = true
+spring.datasource.druid.remove-abandoned-timeout = 7200
+spring.datasource.druid.log-abandoned = false
 
-# nacos 配置
+#============================redis配置=========================================
+#最大空闲连接数
+spring.redis.jedis.pool.max-idle = 100
+#最小空闲连接数
+spring.redis.jedis.pool.min-idle = 10
+#最大连接数
+spring.redis.jedis.pool.max-active = 1000
+#最大等待时间ms
+spring.redis.jedis.pool.max-wait = 100000
+#数据库
+spring.redis.database = 1
+spring.redis.host = 192.168.50.233
+spring.redis.port = 6379
+spring.redis.password = 123456
+
+#============================nacos配置=========================================
 spring.cloud.nacos.config.server-addr = 192.168.50.234:8848
 spring.cloud.nacos.config.namespace = 79c42a7a-2c7d-4dcf-8a2c-b334271e2191
 spring.cloud.nacos.config.prefix = application
 spring.cloud.nacos.config.file-extension = properties
 spring.cloud.nacos.config.group = @profiles.active@
-spring.cloud.nacos.config.extension-configs[0].data-id=analysis.json
-spring.cloud.nacos.config.extension-configs[0].group=@profiles.active@
-spring.cloud.nacos.config.extension-configs[0].refresh=true
+
+#============================kafka配置=========================================
+#kafka
+#spring.kafka.bootstrap-servers=192.168.50.234:9092
+#spring.kafka.producer.batch-size=16384
+#spring.kafka.producer.acks=all
+#spring.kafka.producer.retries=3
+#消费者
+#spring.kafka.consumer.bootstrapServers=192.168.50.234:9092
+#spring.kafka.consumer.topics=xxxx
+#spring.kafka.consumer.groupId=energy-manage
+#spring.kafka.consumer.sessionTimeOut=30000
+#spring.kafka.consumer.enableAutoCommit=false
+#spring.kafka.consumer.autoCommitInterval=1000
+#spring.kafka.consumer.maxPollRecords=50
+#spring.kafka.consumer.maxPollInterval=300000
+#spring.kafka.consumer.keyDeserializer=org.apache.kafka.common.serialization.StringDeserializer
+#spring.kafka.consumer.valueDeserializer=org.apache.kafka.common.serialization.StringDeserializer
+#spring.kafka.consumer.autoOffsetReset=latest
+#spring.kafka.consumer.heartbeatInterval=10000
+#监听
+#spring.kafka.listener.type=batch
+#spring.kafka.listener.ack-mode=batch
+
+#============================minio配置=========================================
+minio.endpoint= http://192.168.50.234:6900
+minio.accessKey= 6VkF2ul6X7udr7RLsG2W
+minio.secretKey= jtBuqZ80biRWQf6sbwzDQJwHtEBicPjkZBtvjTrA
+minio.bucketName= bucket-zhzn
+
+#============================xxl-job配置=========================================
+xxl.job.admin.addresses = http://192.168.50.234:16800/xxl-job-admin
+xxl.job.admin.accessToken =
+xxl.job.executor.appname = xxl-job-executor-dev
+xxl.job.executor.address =
+xxl.job.executor.ip =
+xxl.job.executor.port = 9999
+xxl.job.executor.logpath = /usr/local/logs/xxl
+xxl.job.executor.logretentiondays = 30
 
 
-# debug - sql显示
-logging.level.com.energy.manage.service.mappers= debug
+#============================mybatis配置=========================================
+#扫描mapper.xml
+mybatis.mapper-locations = classpath*:mybatis/**/*.xml
+mybatis.type-aliases-package = com.energy.manage.common.po
+mybatis.configuration.mapUnderscoreToCamelCase = true
+#sql打印
+mybatis.configuration.log-impl = org.apache.ibatis.logging.stdout.StdOutImpl
+#mappers 多个接口时逗号隔开
+mapper.mappers = com.energy.manage.common.mapper.MyMapper
+mapper.not-empty =false
+mapper.identity = MYSQL
+#分页
+pagehelper.helperDialect = mysql
+pagehelper.reasonable = true
+pagehelper.supportMethodsArguments = true
 
-# 接口文档
+#============================swagger配置=========================================
+#http://localhost:16200/energy-manage-service/doc.html
 knife4j.enable=true
 
-spring.jackson.date-format = yyyy-MM-dd HH:mm
-spring.jackson.time-zone= GMT+8
+#============================文件上传配置=========================================
+# 自定义配置文件上传
+spring.servlet.multipart.enabled = true
+spring.servlet.multipart.max-file-size = 314572800
+spring.servlet.multipart.max-request-size= 1048576000
 
+#上传文件模板
 template.bzpower = http://192.168.50.234:6900/bucket-zhzn/template/%E6%A0%87%E5%87%86%E5%8A%9F%E7%8E%87%E6%9B%B2%E7%BA%BF%E6%A8%A1%E7%89%88.xlsx
 template.htpower = http://192.168.50.234:6900/bucket-zhzn/template/%E5%90%88%E5%90%8C%E5%8A%9F%E7%8E%87%E6%9B%B2%E7%BA%BF%E6%A8%A1%E7%89%88.xlsx
 template.field = http://192.168.50.234:6900/bucket-zhzn/template/%E9%A3%8E%E5%9C%BA%E8%A1%A8%E6%A8%A1%E7%89%88.xlsx
 template.draught = http://192.168.50.234:6900/bucket-zhzn/template/%E9%A3%8E%E6%9C%BA%E8%A1%A8%E6%A8%A1%E7%89%88.xlsx
 
+#============================json配置=========================================
+# 全局时间格式转化
+#spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+#spring.jackson.time-zone=GMT+8
+spring.jackson.date-format = yyyy-MM-dd HH:mm
+spring.jackson.time-zone= GMT+8
+spring.jackson.serialization.write-dates-as-timestamps=true
 
-
-
-
-
-#xxl-job
-#xxl.job.admin.addresses = http://192.168.50.234:16800/xxl-job-admin
-#xxl.job.admin.accessToken = default_token
-#xxl.job.executor.appname = xxl-job-executor
-#xxl.job.executor.address =
-#xxl.job.executor.ip =
-#xxl.job.executor.port = 9999
-#xxl.job.executor.logpath = /usr/local/logs/xxl
-#xxl.job.executor.logretentiondays = 30
-
+#============================登录拦截器配置=========================================
 #拦截器是否生效
 energy.login.enabled=true