From 517c3919c2e66749ce5ba3b6f015f34b1ecd885a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Thu, 20 Jun 2024 15:25:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=BB=86=E8=8A=82=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- das/src/main/resources/application-dev.yml | 35 +++++----------------- das/src/main/resources/application-prd.yml | 34 +++++---------------- das/src/main/resources/application.yml | 22 +------------- 3 files changed, 15 insertions(+), 76 deletions(-) diff --git a/das/src/main/resources/application-dev.yml b/das/src/main/resources/application-dev.yml index 5079dbd5..754095a9 100644 --- a/das/src/main/resources/application-dev.yml +++ b/das/src/main/resources/application-dev.yml @@ -1,34 +1,13 @@ spring: - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: url: jdbc:postgresql://192.168.109.102:5432/das - # url: jdbc:p6spy:mysql://81.69.43.78:3306/cloud-demo?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 username: das password: qwaszx12 - driver-class-name: org.postgresql.Driver - #使用Druid - type: com.alibaba.druid.pool.DruidDataSource - # # redis相关配置 - redis: - host: 127.0.0.1 - database: 0 - port: 6379 - password: - lettuce: - pool: - # 连接池最大连接数，负值表示没有限制 - max-active: 100 - # 连接池最大阻塞等待时间 -1 表示没有限制 - max-wait: -1ms - # 连接池中最大空闲连接 - max-idle: 10 - # 连接池中最小空闲连接 - min-idle: 5 - # 连接超时时间（毫秒） - timeout: 5000 - # 指定客户端 - client-type: lettuce - -aesKey: b6967ee87b86d85a + data: + redis: + host: 127.0.0.1 + database: 0 + port: 6379 + password: + client-type: lettuce diff --git a/das/src/main/resources/application-prd.yml b/das/src/main/resources/application-prd.yml index 499a15ce..b9320756 100644 --- a/das/src/main/resources/application-prd.yml +++ b/das/src/main/resources/application-prd.yml @@ -1,33 +1,13 @@ spring: - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: url: jdbc:postgresql://192.168.109.102:5432/das - # url: jdbc:p6spy:mysql://81.69.43.78:3306/cloud-demo?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 username: das password: qwaszx12 - driver-class-name: org.postgresql.Driver - #使用Druid - type: com.alibaba.druid.pool.DruidDataSource - # # redis相关配置 - redis: - host: 127.0.0.1 - database: 0 - port: 6379 - password: - lettuce: - pool: - # 连接池最大连接数，负值表示没有限制 - max-active: 100 - # 连接池最大阻塞等待时间 -1 表示没有限制 - max-wait: -1ms - # 连接池中最大空闲连接 - max-idle: 10 - # 连接池中最小空闲连接 - min-idle: 5 - # 连接超时时间（毫秒） - timeout: 5000 - # 指定客户端 - client-type: lettuce - + data: + redis: + host: 127.0.0.1 + database: 0 + port: 6379 + password: + client-type: lettuce \ No newline at end of file diff --git a/das/src/main/resources/application.yml b/das/src/main/resources/application.yml index 34129916..59715711 100644 --- a/das/src/main/resources/application.yml +++ b/das/src/main/resources/application.yml @@ -38,27 +38,6 @@ spring: date-format: yyyy-MM-dd HH:mm:ss # 指定默认包含的熟悉，NON_NULL表示只序列化非空属性 default-property-inclusion: non_null - - # Failed to start bean 'documentationPluginsBootstrapper'; nested exception is java.lang.NullPointerException - # 因为Springfox 使用的路径匹配是基于AntPathMatcher的，而Spring Boot 2.6.X使用的是PathPatternMatcher - mvc: - pathmatch: - matching-strategy: ant_path_matcher - # 相当于 @DateTimeFormat - format: - date: yyyy-MM-dd - date-time: yyyy-MM-dd HH:mm:ss - # 允许mvc抛出404异常 - throw-exception-if-no-handler-found: true - # 关闭spring自带的映射，会导致swagger也不能访问，需指定swagger的静态资源处理 - web: - resources: - add-mappings: false - # 资源信息 - messages: - # 国际化资源文件路径 - basename: i18n.messages - encoding: UTF-8 # 配置文件上传大小限制 servlet: multipart: @@ -100,3 +79,4 @@ captcha: verify-type: calculate expire: 120 +aesKey: b6967ee87b86d85a \ No newline at end of file