diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java index 47003b5a4..d71b0d137 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java @@ -71,18 +71,7 @@ public class DictTableWhiteListHandlerImpl implements IDictTableWhiteListHandler @Override public boolean isPassBySql(String sql) { - Select select = null; - - try { - select = (Select) CCJSqlParserUtil.parse(sql, (parser) -> { - parser.withSquareBracketQuotation(true); - }); - } catch (JSQLParserException var10) { - JSQLParserException jsqlParserException = var10; - jsqlParserException.printStackTrace(); - } - - String tableName = ((Table)((PlainSelect)select.getSelectBody()).getFromItem()).getName(); + String tableName = MiniDaoUtil.parseTable(sql); List> parsedMap = null; try { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java index beee8a92a..7b8fd4c58 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java @@ -1,56 +1,56 @@ -//// -//// Source code recreated from a .class file by IntelliJ IDEA -//// (powered by Fernflower decompiler) -//// // -//package org.springframework.boot.autoconfigure.mongo; +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by Fernflower decompiler) // -//import com.mongodb.MongoClientSettings; -//import com.mongodb.client.MongoClient; -//import org.springframework.beans.factory.ObjectProvider; -//import org.springframework.boot.autoconfigure.AutoConfiguration; -//import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -//import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -//import org.springframework.boot.context.properties.EnableConfigurationProperties; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.context.annotation.Primary; -//import org.springframework.core.env.Environment; -// -//import java.util.List; -//import java.util.stream.Collectors; -// -//@Primary -//@AutoConfiguration -//@ConditionalOnClass({MongoClient.class}) -//@ConditionalOnProperty(name = "spring.data.mongodb.uri", havingValue = "", matchIfMissing = false) -//@EnableConfigurationProperties({MongoProperties.class}) -//@ConditionalOnMissingBean( -// type = {"org.springframework.data.mongodb.MongoDatabaseFactory"} -//) -//public class MongoAutoConfiguration { -// public MongoAutoConfiguration() { -// } -// -// @Bean -// @ConditionalOnMissingBean({MongoClient.class}) -// public MongoClient mongo(ObjectProvider builderCustomizers, MongoClientSettings settings) { -// return (MongoClient)(new MongoClientFactory((List)builderCustomizers.orderedStream().collect(Collectors.toList()))).createMongoClient(settings); -// } -// -// @Configuration( -// proxyBeanMethods = false -// ) -// @ConditionalOnMissingBean({MongoClientSettings.class}) -// static class MongoClientSettingsConfiguration { -// MongoClientSettingsConfiguration() { -// } -// -// @Bean -// MongoClientSettings mongoClientSettings() { -// return MongoClientSettings.builder().build(); -// } -// -// } -//} \ No newline at end of file + +package org.springframework.boot.autoconfigure.mongo; + +import com.mongodb.MongoClientSettings; +import com.mongodb.client.MongoClient; +import org.springframework.beans.factory.ObjectProvider; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.core.env.Environment; + +import java.util.List; +import java.util.stream.Collectors; + +@Primary +@AutoConfiguration +@ConditionalOnClass({MongoClient.class}) +@ConditionalOnProperty(name = "spring.data.mongodb.uri", havingValue = "", matchIfMissing = false) +@EnableConfigurationProperties({MongoProperties.class}) +@ConditionalOnMissingBean( + type = {"org.springframework.data.mongodb.MongoDatabaseFactory"} +) +public class MongoAutoConfiguration { + public MongoAutoConfiguration() { + } + + @Bean + @ConditionalOnMissingBean({MongoClient.class}) + public MongoClient mongo(ObjectProvider builderCustomizers, MongoClientSettings settings) { + return (MongoClient)(new MongoClientFactory((List)builderCustomizers.orderedStream().collect(Collectors.toList()))).createMongoClient(settings); + } + + @Configuration( + proxyBeanMethods = false + ) + @ConditionalOnMissingBean({MongoClientSettings.class}) + static class MongoClientSettingsConfiguration { + MongoClientSettingsConfiguration() { + } + + @Bean + MongoClientSettings mongoClientSettings() { + return MongoClientSettings.builder().build(); + } + + } +} \ No newline at end of file