From 26fc652d33fb82a75d6ec7771ca50ee414b21723 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 11 一月 2022 16:58:47 +0800
Subject: [PATCH] update 统一代码间隔符
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java | 95 ++++++++---------------------------------------
1 files changed, 16 insertions(+), 79 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
index f6abac1..6f7a82e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
@@ -1,91 +1,30 @@
package com.ruoyi.framework.config;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.sql.DataSource;
+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.context.properties.ConfigurationProperties;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
-import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
-import com.alibaba.druid.util.Utils;
-import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.config.properties.DruidProperties;
-import com.ruoyi.framework.datasource.DynamicDataSource;
+
+import javax.servlet.*;
+import java.io.IOException;
/**
* druid 閰嶇疆澶氭暟鎹簮
- *
+ *
* @author ruoyi
*/
@Configuration
-public class DruidConfig
-{
- @Bean
- @ConfigurationProperties("spring.datasource.druid.master")
- public DataSource masterDataSource(DruidProperties druidProperties)
- {
- DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
- return druidProperties.dataSource(dataSource);
- }
-
- @Bean
- @ConfigurationProperties("spring.datasource.druid.slave")
- @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
- public DataSource slaveDataSource(DruidProperties druidProperties)
- {
- DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
- return druidProperties.dataSource(dataSource);
- }
-
- @Bean(name = "dynamicDataSource")
- @Primary
- public DynamicDataSource dataSource(DataSource masterDataSource)
- {
- Map<Object, Object> targetDataSources = new HashMap<>();
- targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
- setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
- return new DynamicDataSource(masterDataSource, targetDataSources);
- }
-
- /**
- * 璁剧疆鏁版嵁婧�
- *
- * @param targetDataSources 澶囬�夋暟鎹簮闆嗗悎
- * @param sourceName 鏁版嵁婧愬悕绉�
- * @param beanName bean鍚嶇О
- */
- public void setDataSource(Map<Object, Object> targetDataSources, String sourceName, String beanName)
- {
- try
- {
- DataSource dataSource = SpringUtils.getBean(beanName);
- targetDataSources.put(sourceName, dataSource);
- }
- catch (Exception e)
- {
- }
- }
+public class DruidConfig {
/**
* 鍘婚櫎鐩戞帶椤甸潰搴曢儴鐨勫箍鍛�
*/
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({"rawtypes", "unchecked"})
@Bean
@ConditionalOnProperty(name = "spring.datasource.druid.statViewServlet.enabled", havingValue = "true")
- public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties)
- {
+ public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties) {
// 鑾峰彇web鐩戞帶椤甸潰鐨勫弬鏁�
DruidStatProperties.StatViewServlet config = properties.getStatViewServlet();
// 鎻愬彇common.js鐨勯厤缃矾寰�
@@ -93,19 +32,17 @@
String commonJsPattern = pattern.replaceAll("\\*", "js/common.js");
final String filePath = "support/http/resources/js/common.js";
// 鍒涘缓filter杩涜杩囨护
- Filter filter = new Filter()
- {
+ Filter filter = new Filter() {
@Override
- public void init(javax.servlet.FilterConfig filterConfig) throws ServletException
- {
+ public void init(javax.servlet.FilterConfig filterConfig) throws ServletException {
}
+
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws IOException, ServletException
- {
+ throws IOException, ServletException {
chain.doFilter(request, response);
// 閲嶇疆缂撳啿鍖猴紝鍝嶅簲澶翠笉浼氳閲嶇疆
- response.resetBuffer();
+// response.resetBuffer();
// 鑾峰彇common.js
String text = Utils.readFromResource(filePath);
// 姝ｅ垯鏇挎崲banner, 闄ゅ幓搴曢儴鐨勫箍鍛婁俊鎭�
@@ -113,9 +50,9 @@
text = text.replaceAll("powered.*?shrek.wang</a>", "");
response.getWriter().write(text);
}
+
@Override
- public void destroy()
- {
+ public void destroy() {
}
};
FilterRegistrationBean registrationBean = new FilterRegistrationBean();
--
Gitblit v1.9.3