兼容admin-common模块引用DruidDataSource的bug修改

cx-equipment/cx-equipment-server/src/main/java/com/rongwei/bsserver/sys/config/DruidConfig.java

@@ -0,0 +1,32 @@
+package com.rongwei.bsserver.sys.config;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DruidConfig {
+
+    @Value("${spring.datasource.dynamic.datasource.master.url}")
+    private String dbUrl;
+    @Value("${spring.datasource.dynamic.datasource.master.username}")
+    private String username;
+    @Value("${spring.datasource.dynamic.datasource.master.password}")
+    private String password;
+    @Value("${spring.datasource.dynamic.datasource.master.driver-class-name}")
+    private String driverClassName;
+
+    @Bean
+    public DruidDataSource druidDataSourceConfig(){
+        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
+        dataSource.setName("defaultDatasource");
+        dataSource.setUrl(dbUrl+"&allowMultiQueries=true");
+        dataSource.setUsername(username);
+        dataSource.setPassword(password);
+        dataSource.setDriverClassName(driverClassName);
+        return dataSource;
+    }
+
+}

cx-file/pom.xml

@@ -20,9 +20,9 @@
     </parent>-->
 
     <parent>
-        <artifactId>InControl</artifactId>
+        <artifactId>safe-produce</artifactId>
         <groupId>com.rongwei</groupId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <properties>

cx-question/cx-question-server/pom.xml

@@ -69,11 +69,11 @@
         </dependency>
 
         <!-- druid -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.github.drtrang</groupId>
             <artifactId>druid-spring-boot2-starter</artifactId>
             <version>1.1.10</version>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <build>

cx-question/cx-question-server/src/main/java/com/rongwei/businessServer/DruidConfig.java

@@ -0,0 +1,32 @@
+package com.rongwei.businessServer;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DruidConfig {
+
+    @Value("${spring.datasource.dynamic.datasource.master.url}")
+    private String dbUrl;
+    @Value("${spring.datasource.dynamic.datasource.master.username}")
+    private String username;
+    @Value("${spring.datasource.dynamic.datasource.master.password}")
+    private String password;
+    @Value("${spring.datasource.dynamic.datasource.master.driver-class-name}")
+    private String driverClassName;
+
+    @Bean
+    public DruidDataSource druidDataSourceConfig(){
+        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
+        dataSource.setName("defaultDatasource");
+        dataSource.setUrl(dbUrl+"&allowMultiQueries=true");
+        dataSource.setUsername(username);
+        dataSource.setPassword(password);
+        dataSource.setDriverClassName(driverClassName);
+        return dataSource;
+    }
+
+}