fix(common): 雪花算法id

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MyBatisPlusConfig.java

@@ -19,14 +19,15 @@ public class MyBatisPlusConfig {
      * @return
      */
     @Bean
-    public GlobalConfig globalConfig(MybatisPlusProperties mybatisPlusProperties) {
+    public GlobalConfig globalConfig(MybatisPlusProperties mybatisPlusProperties, MetaHandler metaHandler, MybatisSqlInjector mybatisSqlInjector) {
         GlobalConfig globalConfig = mybatisPlusProperties.getGlobalConfig();
-        if(globalConfig == null) {
+        if (globalConfig == null) {
             globalConfig = new GlobalConfig();
         }
-        if(globalConfig.getMetaObjectHandler() == null){
-            globalConfig.setMetaObjectHandler(new MetaHandler());
+        if (globalConfig.getMetaObjectHandler() == null) {
+            globalConfig.setMetaObjectHandler(metaHandler);
         }
+        globalConfig.setSqlInjector(mybatisSqlInjector);
         return globalConfig;
     }
 
@@ -45,4 +46,9 @@ public class MyBatisPlusConfig {
     public PermissionInterceptor permissionInterceptor() {
         return new PermissionInterceptor();
     }
+
+    @Bean
+    public MybatisSqlInjector mybatisSqlInjector() {
+        return new MybatisSqlInjector();
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/DataSourceConfiguration.java

@@ -45,27 +45,15 @@ public class DataSourceConfiguration {
     }
 
     @Bean(name = "sqlSessionFactory")
-    @Autowired
-    public SqlSessionFactory sqlSessionFactoryBean(DataSource dataSourceProxy, PaginationInterceptor paginationInterceptor, MetaHandler metaHandler, MybatisPlusProperties mybatisPlusProperties) throws Exception {
+    public SqlSessionFactory sqlSessionFactoryBean(DataSource dataSourceProxy, PaginationInterceptor paginationInterceptor, MybatisPlusProperties mybatisPlusProperties,GlobalConfig globalConfig) throws Exception {
         MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
         bean.setDataSource(dataSourceProxy);
         ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
         bean.setMapperLocations(resolver.getResources("classpath*:mapper/*.xml"));
         bean.setConfigurationProperties(mybatisPlusProperties.getConfigurationProperties());
-        GlobalConfig globalConfig = mybatisPlusProperties.getGlobalConfig();
-        if(globalConfig == null) {
-            globalConfig = new GlobalConfig();
-        }
-        globalConfig.setSqlInjector(new MybatisSqlInjector());
-        globalConfig.setMetaObjectHandler(metaHandler);
         bean.setGlobalConfig(globalConfig);
         Interceptor[] plugins = {paginationInterceptor};
         bean.setPlugins(plugins);
         return bean.getObject();
     }
-
-    @Bean
-    public MetaHandler metaHandler() {
-        return new MetaHandler();
-    }
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/DataSourceConfiguration.java

@@ -45,27 +45,16 @@ public class DataSourceConfiguration {
     }
 
     @Bean(name = "sqlSessionFactory")
-    @Autowired
-    public SqlSessionFactory sqlSessionFactoryBean(DataSource dataSourceProxy, PaginationInterceptor paginationInterceptor, MetaHandler metaHandler, MybatisPlusProperties mybatisPlusProperties) throws Exception {
+    public SqlSessionFactory sqlSessionFactoryBean(DataSource dataSourceProxy, PaginationInterceptor paginationInterceptor, MybatisPlusProperties mybatisPlusProperties,GlobalConfig globalConfig) throws Exception {
         MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
         bean.setDataSource(dataSourceProxy);
         ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
         bean.setMapperLocations(resolver.getResources("classpath*:mapper/*.xml"));
         bean.setConfigurationProperties(mybatisPlusProperties.getConfigurationProperties());
-        GlobalConfig globalConfig = mybatisPlusProperties.getGlobalConfig();
-        if(globalConfig == null) {
-            globalConfig = new GlobalConfig();
-        }
-        globalConfig.setSqlInjector(new MybatisSqlInjector());
-        globalConfig.setMetaObjectHandler(metaHandler);
         bean.setGlobalConfig(globalConfig);
         Interceptor[] plugins = {paginationInterceptor};
         bean.setPlugins(plugins);
         return bean.getObject();
     }
 
-    @Bean
-    public MetaHandler metaHandler() {
-        return new MetaHandler();
-    }
 }

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/config/DataSourceConfiguration.java

@@ -44,24 +44,15 @@ public class DataSourceConfiguration {
     }
 
     @Bean(name = "sqlSessionFactory")
-    @Autowired
-    public SqlSessionFactory sqlSessionFactoryBean(DataSource dataSourceProxy, PaginationInterceptor paginationInterceptor, MetaHandler metaHandler, MybatisPlusProperties mybatisPlusProperties) throws Exception {
+    public SqlSessionFactory sqlSessionFactoryBean(DataSource dataSourceProxy, PaginationInterceptor paginationInterceptor, MybatisPlusProperties mybatisPlusProperties,GlobalConfig globalConfig) throws Exception {
         MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
         bean.setDataSource(dataSourceProxy);
         ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
         bean.setMapperLocations(resolver.getResources("classpath*:mapper/*.xml"));
         bean.setConfigurationProperties(mybatisPlusProperties.getConfigurationProperties());
-        GlobalConfig globalConfig = new GlobalConfig();
-        globalConfig.setSqlInjector(new MybatisSqlInjector());
-        globalConfig.setMetaObjectHandler(metaHandler);
         bean.setGlobalConfig(globalConfig);
         Interceptor[] plugins = {paginationInterceptor};
         bean.setPlugins(plugins);
         return bean.getObject();
     }
-
-    @Bean
-    public MetaHandler metaHandler() {
-        return new MetaHandler();
-    }
 }