update 更新 dataSource 数据源, 由 druid 修改为 hikari, 更新相关配置 ;

pom.xml

@@ -20,7 +20,6 @@
         <java.version>1.8</java.version>
         <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
         <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
-        <druid.version>1.2.12</druid.version>
         <springdoc.version>1.6.12</springdoc.version>
         <poi.version>5.2.3</poi.version>
         <easyexcel.version>3.1.1</easyexcel.version>
@@ -72,13 +71,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- 阿里数据库连接池 -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>druid-spring-boot-starter</artifactId>
-                <version>${druid.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.springdoc</groupId>
                 <artifactId>springdoc-openapi-webmvc-core</artifactId>

ruoyi-admin/src/main/resources/application-dev.yml

@@ -33,7 +33,7 @@ xxl.job:
 --- # 数据源配置
 spring:
   datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
+    type: com.zaxxer.hikari.HikariDataSource
     # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
     dynamic:
       # 性能分析插件(有性能损耗 不建议生产环境使用)
@@ -51,11 +51,12 @@ spring:
           url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
           password: root
+          type: ${spring.datasource.type}
         # 从库数据源
         slave:
           lazy: true
           driverClassName: com.mysql.cj.jdbc.Driver
-          url:
+          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username:
           password:
 #        oracle:
@@ -75,51 +76,21 @@ spring:
 #          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
 #          username: SA
 #          password: root
-      druid:
+      hikari:
-        # 初始连接数
-        initialSize: 5
-        # 最小连接池数量
-        minIdle: 10
-        # 最大连接池数量
-        maxActive: 20
         # 配置获取连接等待超时的时间
-        maxWait: 60000
+        connection-timeout: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        # 空闲连接存活最大时间，默认10分钟
-        timeBetweenEvictionRunsMillis: 60000
+        idle-timeout: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
-        minEvictableIdleTimeMillis: 300000
+        max-lifetime: 900000
-        # 配置一个连接在池中最大生存的时间，单位是毫秒
+        # 最大连接池数量，默认是10
-        maxEvictableIdleTimeMillis: 900000
+        max-pool-size: 20
-        # 配置检测连接是否有效
+        # 最小连接池数量
-        validationQuery: SELECT 1
+        min-idle: 10
-        testWhileIdle: true
+        # 连接测试query（配置检测连接是否有效）
-        testOnBorrow: false
+        connection-test-query: SELECT 1
-        testOnReturn: false
+        # 此属性控制从池返回的连接的默认自动提交行为，默认值：true
-        # 注意这个值和druid原生不一致，默认启动了stat
+        is-auto-commit: true
-        filters: stat
-
---- # druid 配置
-spring.datasource.druid:
-  webStatFilter:
-    enabled: true
-  statViewServlet:
-    enabled: true
-    # 设置白名单，不填则允许所有访问
-    allow:
-    url-pattern: /druid/*
-    # 控制台管理用户名和密码
-    login-username: ruoyi
-    login-password: 123456
-  filter:
-    stat:
-      enabled: true
-      # 慢SQL记录
-      log-slow-sql: true
-      slow-sql-millis: 1000
-      merge-sql: true
-    wall:
-      config:
-        multi-statement-allow: true
 
 --- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
 spring:

ruoyi-framework/pom.xml

@@ -40,12 +40,6 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
-        <!-- 阿里数据库连接池 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-        </dependency>
-
         <!-- sql性能分析插件 -->
         <dependency>
             <groupId>p6spy</groupId>

ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java

@@ -1,63 +0,0 @@
-package com.ruoyi.framework.config;
-
-import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
-import com.alibaba.druid.util.Utils;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.servlet.*;
-import java.io.IOException;
-
-/**
- * druid 配置多数据源
- *
- * @author ruoyi
- */
-@Configuration
-public class DruidConfig {
-
-    /**
-     * 去除监控页面底部的广告
-     */
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    @Bean
-    @ConditionalOnProperty(name = "spring.datasource.druid.statViewServlet.enabled", havingValue = "true")
-    public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties) {
-        // 获取web监控页面的参数
-        DruidStatProperties.StatViewServlet config = properties.getStatViewServlet();
-        // 提取common.js的配置路径
-        String pattern = config.getUrlPattern() != null ? config.getUrlPattern() : "/druid/*";
-        String commonJsPattern = pattern.replaceAll("\\*", "js/common.js");
-        final String filePath = "support/http/resources/js/common.js";
-        // 创建filter进行过滤
-        Filter filter = new Filter() {
-            @Override
-            public void init(javax.servlet.FilterConfig filterConfig) throws ServletException {
-            }
-
-            @Override
-            public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-                throws IOException, ServletException {
-                chain.doFilter(request, response);
-                // 重置缓冲区，响应头不会被重置
-//                response.resetBuffer();
-                // 获取common.js
-                String text = Utils.readFromResource(filePath);
-                // 正则替换banner, 除去底部的广告信息
-                text = text.replaceAll("<a.*?banner\"></a><br/>", "");
-                text = text.replaceAll("powered.*?shrek.wang</a>", "");
-                response.getWriter().write(text);
-            }
-
-            @Override
-            public void destroy() {
-            }
-        };
-        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
-        registrationBean.setFilter(filter);
-        registrationBean.addUrlPatterns(commonJsPattern);
-        return registrationBean;
-    }
-}

script/docker/docker-compose.yml

@@ -105,7 +105,7 @@ services:
     environment:
       # 时区上海
       TZ: Asia/Shanghai
-      SERVER_PORT: 8080
+      SERVER_PORT: 9595
     volumes:
       # 配置文件
       - /docker/server1/logs/:/ruoyi/server/logs/