Mr.qian 1 týždeň pred
rodič
commit
78ed76e17c

+ 49 - 12
cif-service/src/main/java/com/txz/cif/configurer/ShardingSphereConfig.java

@@ -8,6 +8,7 @@ import org.apache.shardingsphere.shardingjdbc.api.ShardingDataSourceFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.beans.factory.annotation.Value;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;
@@ -18,30 +19,66 @@ import java.util.Properties;
 @Configuration
 public class ShardingSphereConfig {
 
+    @Value("${sharding.datasource.ds0.driver-class-name}")
+    private String ds0DriverClassName;
+    
+    @Value("${sharding.datasource.ds0.jdbc-url}")
+    private String ds0JdbcUrl;
+    
+    @Value("${sharding.datasource.ds0.username}")
+    private String ds0Username;
+    
+    @Value("${sharding.datasource.ds0.password}")
+    private String ds0Password;
+    
+    @Value("${sharding.datasource.ds1.driver-class-name}")
+    private String ds1DriverClassName;
+    
+    @Value("${sharding.datasource.ds1.jdbc-url}")
+    private String ds1JdbcUrl;
+    
+    @Value("${sharding.datasource.ds1.username}")
+    private String ds1Username;
+    
+    @Value("${sharding.datasource.ds1.password}")
+    private String ds1Password;
+    
+    @Value("${sharding.datasource.dsdefault.driver-class-name}")
+    private String dsDefaultDriverClassName;
+    
+    @Value("${sharding.datasource.dsdefault.jdbc-url}")
+    private String dsDefaultJdbcUrl;
+    
+    @Value("${sharding.datasource.dsdefault.username}")
+    private String dsDefaultUsername;
+    
+    @Value("${sharding.datasource.dsdefault.password}")
+    private String dsDefaultPassword;
+
     @Bean("shardingDataSource")
     @Primary
     public DataSource shardingDataSource() throws SQLException {
         Map<String, DataSource> dataSourceMap = new HashMap<>();
 
         HikariDataSource dataSource0 = new HikariDataSource();
-        dataSource0.setDriverClassName("com.mysql.jdbc.Driver");
-        dataSource0.setJdbcUrl("jdbc:mysql://124.222.152.234:3306/cif_0?serverTimezone=GMT%2b8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false");
-        dataSource0.setUsername("root");
-        dataSource0.setPassword("hy123456");
+        dataSource0.setDriverClassName(ds0DriverClassName);
+        dataSource0.setJdbcUrl(ds0JdbcUrl);
+        dataSource0.setUsername(ds0Username);
+        dataSource0.setPassword(ds0Password);
         dataSourceMap.put("ds0", dataSource0);
 
         HikariDataSource dataSource1 = new HikariDataSource();
-        dataSource1.setDriverClassName("com.mysql.jdbc.Driver");
-        dataSource1.setJdbcUrl("jdbc:mysql://124.222.152.234:3306/cif_1?serverTimezone=GMT%2b8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false");
-        dataSource1.setUsername("root");
-        dataSource1.setPassword("hy123456");
+        dataSource1.setDriverClassName(ds1DriverClassName);
+        dataSource1.setJdbcUrl(ds1JdbcUrl);
+        dataSource1.setUsername(ds1Username);
+        dataSource1.setPassword(ds1Password);
         dataSourceMap.put("ds1", dataSource1);
 
         HikariDataSource dataSourceFault = new HikariDataSource();
-        dataSourceFault.setDriverClassName("com.mysql.jdbc.Driver");
-        dataSourceFault.setJdbcUrl("jdbc:mysql://124.222.152.234:3306/cif?serverTimezone=GMT%2b8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false");
-        dataSourceFault.setUsername("root");
-        dataSourceFault.setPassword("hy123456");
+        dataSourceFault.setDriverClassName(dsDefaultDriverClassName);
+        dataSourceFault.setJdbcUrl(dsDefaultJdbcUrl);
+        dataSourceFault.setUsername(dsDefaultUsername);
+        dataSourceFault.setPassword(dsDefaultPassword);
         dataSourceMap.put("dsdefault", dataSourceFault);
 
         if (dataSourceMap.isEmpty()) {

+ 17 - 1
cif-service/src/main/resources/bootstrap.properties

@@ -123,6 +123,7 @@ yp.wx.appid=wxf85cf793dbaa8a61
 
 logging.level.com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.grpc.netty.NettyClientHandler=off
 
+# nacos
 signature=false
 login.check=false
 #spring.zipkin.base-url=http://192.168.1.10:5595
@@ -180,4 +181,19 @@ tfpay.callbackurl=https://www.google.com
 tfpay.paymenturl=https://api.tfpay.org
 tfpay.withdrawurl=https://apiot.tfpay.org
 
-management.health.db.enabled=false
+management.health.db.enabled=false
+
+sharding.datasource.ds0.driver-class-name=com.mysql.jdbc.Driver
+sharding.datasource.ds0.jdbc-url=jdbc:mysql://124.222.152.234:3306/cif_0?serverTimezone=GMT%2b8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+sharding.datasource.ds0.username=root
+sharding.datasource.ds0.password=hy123456
+
+sharding.datasource.ds1.driver-class-name=com.mysql.jdbc.Driver
+sharding.datasource.ds1.jdbc-url=jdbc:mysql://124.222.152.234:3306/cif_1?serverTimezone=GMT%2b8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+sharding.datasource.ds1.username=root
+sharding.datasource.ds1.password=hy123456
+
+sharding.datasource.dsdefault.driver-class-name=com.mysql.jdbc.Driver
+sharding.datasource.dsdefault.jdbc-url=jdbc:mysql://124.222.152.234:3306/cif?serverTimezone=GMT%2b8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+sharding.datasource.dsdefault.username=root
+sharding.datasource.dsdefault.password=hy123456