From 6c969a63dd17d30efc1ef13adc46893798df2601 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 三月 2023 09:44:45 +0800
Subject: [PATCH] 去除druid数据库连接池，使用spring支持的hikari
---
/dev/null | 24 ------------
src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java | 2 -
src/main/java/com/genersoft/iot/vmp/conf/GlobalResponseAdvice.java | 5 --
src/main/resources/all-application.yml | 39 +++----------------
pom.xml | 8 +--
5 files changed, 11 insertions(+), 67 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7cf44e7..5628ab3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,11 +123,9 @@
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
- <!-- druid鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>1.2.11</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<!-- mysql鏁版嵁搴� -->
@@ -294,7 +292,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.3.5.RELEASE</version>
+ <version>2.7.2</version>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
diff --git a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java b/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
index eab2207..886d6fa 100644
--- a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
+++ b/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp;
-import com.genersoft.iot.vmp.conf.druid.EnableDruidSupport;
import com.genersoft.iot.vmp.utils.GitUtil;
import com.genersoft.iot.vmp.utils.SpringBeanFactory;
import org.slf4j.Logger;
@@ -25,7 +24,6 @@
@ServletComponentScan("com.genersoft.iot.vmp.conf")
@SpringBootApplication
@EnableScheduling
-@EnableDruidSupport
public class VManageBootstrap extends SpringBootServletInitializer {
private final static Logger logger = LoggerFactory.getLogger(VManageBootstrap.class);
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/GlobalResponseAdvice.java b/src/main/java/com/genersoft/iot/vmp/conf/GlobalResponseAdvice.java
index 05f7481..c8b84fe 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/GlobalResponseAdvice.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/GlobalResponseAdvice.java
@@ -10,13 +10,10 @@
import org.springframework.core.MethodParameter;
import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
-
-import java.util.List;
/**
* 鍏ㄥ眬缁熶竴杩斿洖缁撴灉
@@ -63,7 +60,7 @@
* @return
*/
@Bean
- public HttpMessageConverters custHttpMessageConverter() {
+ public HttpMessageConverters fast() {
return new HttpMessageConverters(new FastJsonHttpMessageConverter());
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/druid/DruidConfiguration.java b/src/main/java/com/genersoft/iot/vmp/conf/druid/DruidConfiguration.java
deleted file mode 100644
index 12f6e63..0000000
--- a/src/main/java/com/genersoft/iot/vmp/conf/druid/DruidConfiguration.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.genersoft.iot.vmp.conf.druid;
-
-import com.alibaba.druid.support.http.StatViewServlet;
-import com.alibaba.druid.support.http.WebStatFilter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.annotation.Bean;
-
-import javax.servlet.Filter;
-import javax.servlet.Servlet;
-
-/**
- * druid鐩戞帶閰嶇疆
- * @author
- */
-public class DruidConfiguration {
-
- @Value("${rj-druid-manage.allow:127.0.0.1}")
- private String allow;
-
- @Value("${rj-druid-manage.deny:}")
- private String deny;
-
- @Value("${rj-druid-manage.loginUsername:admin}")
- private String loginUsername;
-
- @Value("${rj-druid-manage.loginPassword:admin}")
- private String loginPassword;
-
- @Value("${rj-druid-manage.resetEnable:false}")
- private String resetEnable;
-
- /**
- * druid鐩戞帶椤甸潰寮�鍚�
- */
- @Bean
- public ServletRegistrationBean druidServlet() {
- ServletRegistrationBean<Servlet> servletRegistrationBean = new ServletRegistrationBean<>(new StatViewServlet(), "/druid/*");
- // IP鐧藉悕鍗�
- servletRegistrationBean.addInitParameter("allow", allow);
- // IP榛戝悕鍗�(鍏卞悓瀛樺湪鏃讹紝deny浼樺厛浜巃llow)
- servletRegistrationBean.addInitParameter("deny", deny);
- //鎺у埗鍙扮鐞嗙敤鎴�
- servletRegistrationBean.addInitParameter("loginUsername", loginUsername);
- servletRegistrationBean.addInitParameter("loginPassword", loginPassword);
- //鏄惁鑳藉閲嶇疆鏁版嵁 绂佺敤HTML椤甸潰涓婄殑鈥淩eset All鈥濆姛鑳�
- servletRegistrationBean.addInitParameter("resetEnable", resetEnable);
- return servletRegistrationBean;
- }
-
- /**
- * druid url鐩戞帶閰嶇疆
- */
- @Bean
- public FilterRegistrationBean filterRegistrationBean() {
- FilterRegistrationBean<Filter> filterRegistrationBean = new FilterRegistrationBean<>(new WebStatFilter());
- filterRegistrationBean.addUrlPatterns("/*");
- filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*");
- return filterRegistrationBean;
- }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/druid/EnableDruidSupport.java b/src/main/java/com/genersoft/iot/vmp/conf/druid/EnableDruidSupport.java
deleted file mode 100644
index 5fd710b..0000000
--- a/src/main/java/com/genersoft/iot/vmp/conf/druid/EnableDruidSupport.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.genersoft.iot.vmp.conf.druid;
-
-import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.context.annotation.Import;
-
-import java.lang.annotation.*;
-
-/**
- * druid鐩戞帶鏀寔娉ㄨВ
- *
- * @author
- * {@link DruidConfiguration} druid鐩戞帶椤甸潰瀹夊叏閰嶇疆鏀寔
- * {@link ServletComponentScan} druid鐩戞帶椤甸潰闇�瑕佹壂鎻弒ervlet
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@Import({
- DruidConfiguration.class,
-})
-@ServletComponentScan
-public @interface EnableDruidSupport {
-}
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 8bc4d95..bfa4bcf 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -30,44 +30,19 @@
poolMaxWait: 5
# [蹇呴�塢 jdbc鏁版嵁搴撻厤缃�
datasource:
- type: com.alibaba.druid.pool.DruidDataSource
+ type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/wvp2?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true
username: root
password: root123
- druid:
+ hikari:
+ connection-timeout: 20000 # 鏄鎴风绛夊緟杩炴帴姹犺繛鎺ョ殑鏈�澶ф绉掓暟
initialSize: 10 # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
- maxActive: 200 # 杩炴帴姹犳渶澶ц繛鎺ユ暟
- minIdle: 5 # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
- maxWait: 60000 # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂达紝鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗锛岀己鐪佸惎鐢ㄥ叕骞抽攣锛屽苟鍙戞晥鐜囦細鏈夋墍涓嬮檷锛屽鏋滈渶瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣銆�
- keepAlive: true # 杩炴帴姹犱腑鐨刴inIdle鏁伴噺浠ュ唴鐨勮繛鎺ワ紝绌洪棽鏃堕棿瓒呰繃minEvictableIdleTimeMillis锛屽垯浼氭墽琛宬eepAlive鎿嶄綔銆�
- validationQuery: select 1 # 妫�娴嬭繛鎺ユ槸鍚︽湁鏁坰ql锛岃姹傛槸鏌ヨ璇彞锛屽父鐢╯elect 'x'銆傚鏋渧alidationQuery涓簄ull锛宼estOnBorrow銆乼estOnReturn銆乼estWhileIdle閮戒笉浼氳捣浣滅敤銆�
- testWhileIdle: true # 寤鸿閰嶇疆涓簍rue锛屼笉褰卞搷鎬ц兘锛屽苟涓斾繚璇佸畨鍏ㄦ�с�傜敵璇疯繛鎺ョ殑鏃跺�欐娴嬶紝濡傛灉绌洪棽鏃堕棿澶т簬timeBetweenEvictionRunsMillis锛屾墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堛��
- testOnBorrow: false # 鐢宠杩炴帴鏃舵墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢�ц兘銆�
- testOnReturn: false # 褰掕繕杩炴帴鏃舵墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢�ц兘銆�
- poolPreparedStatements: false # 鏄惁闁嬪暉PSCache锛屼甫涓旀寚瀹氭瘡鍊嬮�ｇ窔涓奝SCache鐨勫ぇ灏�
- timeBetweenEvictionRunsMillis: 60000 # 閰嶇疆闁撻殧澶氫箙鎵嶉�茶涓�娆℃娓紝妾㈡脯闇�瑕侀棞闁夌殑绌洪枓閫ｇ窔锛屽柈浣嶆槸姣
- minEvictableIdleTimeMillis: 300000 # 閰嶇疆涓�鍊嬮�ｇ窔鍦ㄦ睜涓渶灏忕敓瀛樼殑鏅傞枔锛屽柈浣嶆槸姣
- filters: stat,slf4j # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛岀洃鎺х粺璁＄敤鐨刦ilter:sta, 鏃ュ織鐢ㄧ殑filter:log4j
- useGlobalDataSourceStat: true # 鍚堝苟澶氫釜DruidDataSource鐨勭洃鎺ф暟鎹�
- # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
- connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=1000
- #stat-view-servlet.url-pattern: /admin/druid/*
+ maximum-pool-size: 200 # 杩炴帴姹犳渶澶ц繛鎺ユ暟
+ minimum-idle: 5 # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
+ idle-timeout: 300000 # 鍏佽杩炴帴鍦ㄨ繛鎺ユ睜涓┖闂茬殑鏈�闀挎椂闂达紙浠ユ绉掍负鍗曚綅锛�
+ max-lifetime: 1200000 # 鏄睜涓繛鎺ュ叧闂悗鐨勬渶闀跨敓鍛藉懆鏈燂紙浠ユ绉掍负鍗曚綅)
-# druid绠＄悊鐩戞帶椤甸潰鐨勪竴浜涢厤缃�
-rj-druid-manage:
- allow: # 璁块棶druid鐩戞帶椤甸潰鐨処P鐧藉悕鍗�
- deny: 192.168.1.100 # 璁块棶druid鐩戞帶椤甸潰IP榛戝悕鍗�
- loginUsername: rjAdmin # 璁块棶druid鐩戞帶椤甸潰璐﹀彿
- loginPassword: rj@2022 # 璁块棶druid鐩戞帶椤甸潰瀵嗙爜
-
-#mybatis:
-# configuration:
-# # 杩欎釜閰嶇疆浼氬皢鎵ц鐨剆ql鎵撳嵃鍑烘潵锛屽湪寮�鍙戞垨娴嬭瘯鐨勬椂鍊欏彲浠ョ敤
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-# # 杩斿洖绫诲瀷涓篗ap,鏄剧ずnull瀵瑰簲鐨勫瓧娈�
-# call-setters-on-nulls: true
-## [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙ｈ皟鐢ㄩ兘鏄繖涓鍙�
# [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙ｈ皟鐢ㄩ兘鏄繖涓鍙�
server:
--
Gitblit v1.8.0