更新数据源配置

pom.xml

@@ -149,6 +149,12 @@
             <version>${jwt.version}</version>
             <version>${jwt.version}</version>
         </dependency>
         </dependency>
 
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!--需要分布式session的话需要放开注释-->
         <!--需要分布式session的话需要放开注释-->
         <!--<dependency>-->
         <!--<dependency>-->
         <!--<groupId>org.springframework.session</groupId>-->
         <!--<groupId>org.springframework.session</groupId>-->

src/main/java/cn/stylefeng/guns/config/datasource/SingleDataSourceConfig.java

@@ -15,14 +15,10 @@
  */
  */
 package cn.stylefeng.guns.config.datasource;
 package cn.stylefeng.guns.config.datasource;
 
 
-import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.datascope.DataScopeInterceptor;
 import cn.stylefeng.roses.core.datascope.DataScopeInterceptor;
-import com.alibaba.druid.pool.DruidDataSource;
 import com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor;
 import com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor;
-import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -40,33 +36,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 public class SingleDataSourceConfig {
 public class SingleDataSourceConfig {
 
 
     /**
     /**
-     * druid配置
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "spring.datasource")
-    public DruidProperties druidProperties() {
-        return new DruidProperties();
-    }
-
-    /**
-     * 单数据源连接池配置
-     */
-    @Bean
-    public DruidDataSource dataSource(DruidProperties druidProperties) {
-        DruidDataSource dataSource = new DruidDataSource();
-        druidProperties.config(dataSource);
-        return dataSource;
-    }
-
-    /**
-     * mybatis-plus分页插件
-     */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
-    }
-
-    /**
      * 数据范围mybatis插件
      * 数据范围mybatis插件
      */
      */
     @Bean
     @Bean

src/main/java/cn/stylefeng/guns/config/web/ShiroConfig.java

@@ -192,7 +192,7 @@ public class ShiroConfig {
     public MethodInvokingFactoryBean methodInvokingFactoryBean(DefaultWebSecurityManager securityManager) {
     public MethodInvokingFactoryBean methodInvokingFactoryBean(DefaultWebSecurityManager securityManager) {
         MethodInvokingFactoryBean bean = new MethodInvokingFactoryBean();
         MethodInvokingFactoryBean bean = new MethodInvokingFactoryBean();
         bean.setStaticMethod("org.apache.shiro.SecurityUtils.setSecurityManager");
         bean.setStaticMethod("org.apache.shiro.SecurityUtils.setSecurityManager");
-        bean.setArguments(new Object[]{securityManager});
+        bean.setArguments(securityManager);
         return bean;
         return bean;
     }
     }