Prechádzať zdrojové kódy

DynamicDataSource更名为MagicDynamicDataSource

mxd 4 rokov pred
rodič
commit
66204bcafc

+ 1 - 0
src/main/java/org/ssssssss/magicapi/config/DynamicDataSource.java

@@ -13,6 +13,7 @@ import java.util.*;
 /**
  * 动态数据源
  */
+@Deprecated
 public class DynamicDataSource {
 
     private static Logger logger = LoggerFactory.getLogger(DynamicDataSource.class);

+ 14 - 0
src/main/java/org/ssssssss/magicapi/config/MagicDynamicDataSource.java

@@ -0,0 +1,14 @@
+package org.ssssssss.magicapi.config;
+
+import javax.sql.DataSource;
+
+public class MagicDynamicDataSource extends DynamicDataSource {
+
+	public void setDefault(DataSource dataSource) {
+		put(dataSource);
+	}
+
+	public void add(String dataSourceName, DataSource dataSource) {
+		put(dataSourceName, dataSource);
+	}
+}

+ 4 - 4
src/main/java/org/ssssssss/magicapi/functions/DatabaseQuery.java

@@ -7,7 +7,7 @@ import org.springframework.jdbc.datasource.DataSourceUtils;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import org.ssssssss.magicapi.cache.SqlCache;
-import org.ssssssss.magicapi.config.DynamicDataSource;
+import org.ssssssss.magicapi.config.MagicDynamicDataSource;
 import org.ssssssss.magicapi.config.DynamicDataSource.DataSourceNode;
 import org.ssssssss.magicapi.config.MagicModule;
 import org.ssssssss.magicapi.dialect.Dialect;
@@ -37,7 +37,7 @@ import java.util.function.Function;
 public class DatabaseQuery extends HashMap<String, DatabaseQuery> implements MagicModule {
 
 	@UnableCall
-	private DynamicDataSource dynamicDataSource;
+	private MagicDynamicDataSource dynamicDataSource;
 
 	@UnableCall
 	private DataSourceNode dataSourceNode;
@@ -64,7 +64,7 @@ public class DatabaseQuery extends HashMap<String, DatabaseQuery> implements Mag
 
 	}
 
-	public DatabaseQuery(DynamicDataSource dynamicDataSource) {
+	public DatabaseQuery(MagicDynamicDataSource dynamicDataSource) {
 		this.dynamicDataSource = dynamicDataSource;
 		this.dataSourceNode = dynamicDataSource.getDataSource();
 	}
@@ -85,7 +85,7 @@ public class DatabaseQuery extends HashMap<String, DatabaseQuery> implements Mag
 	}
 
 	@UnableCall
-	public void setDynamicDataSource(DynamicDataSource dynamicDataSource) {
+	public void setDynamicDataSource(MagicDynamicDataSource dynamicDataSource) {
 		this.dynamicDataSource = dynamicDataSource;
 	}