Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-07-27 38a2db2a4b3a67e27d874f0f2fdb64cff3325ccf

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java

@@ -79,6 +79,20 @@
        return ds;
    }

    @Autowired
    @Primary
    @Bean(name = "dsEquipment")
    public AtomikosDataSourceBean dsEquipment(Environment env) {
        AtomikosDataSourceBean ds = new AtomikosDataSourceBean();
        Properties prop = build(env, "spring.datasource.equipment.");
        ds.setXaDataSourceClassName(datasourceClass);
//        ds.setXaDataSourceClassName("com.alibaba.druid.pool.xa.DruidXADataSource");
        ds.setUniqueResourceName("equipment");
        ds.setPoolSize(2);
        ds.setXaProperties(prop);
        return ds;
    }


    /**
     * 注入事物管理器
@@ -162,4 +176,4 @@
        return wallFilter;
    }

}
}