代码优化

src/main/java/org/ssssssss/magicapi/config/WebUIController.java

@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-import org.ssssssss.magicapi.functions.DatabaseQuery;
+import org.ssssssss.magicapi.functions.SQLExecutor;
 import org.ssssssss.magicapi.logging.MagicLoggerContext;
 import org.ssssssss.magicapi.model.JsonBean;
 import org.ssssssss.magicapi.provider.ApiServiceProvider;
@@ -65,7 +65,7 @@ public class WebUIController {
 
 	public WebUIController() {
 		// 给前端添加代码提示
-		MagicScriptEngine.addScriptClass(DatabaseQuery.class);
+		MagicScriptEngine.addScriptClass(SQLExecutor.class);
 		MagicScriptEngine.addScriptClass(MagicAPIService.class);
 	}
 
@@ -212,7 +212,7 @@ public class WebUIController {
 	public JsonBean<Map<String, Map<String, ScriptClass>>> classes() {
 		Map<String, ScriptClass> classMap = MagicScriptEngine.getScriptClassMap();
 		classMap.putAll(MagicModuleLoader.getModules());
-		ScriptClass db = classMap.get(DatabaseQuery.class.getName());
+		ScriptClass db = classMap.get(SQLExecutor.class.getName());
 		if (db != null) {
 			List<ScriptClass.ScriptAttribute> attributes =  new ArrayList<>();
 			// 给与前台动态数据源提示

src/main/java/org/ssssssss/magicapi/functions/RedisFunctions.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * redis模块
  */
-public class RedisFunctions extends HashMap<String, DatabaseQuery> implements MagicModule, DynamicMethod {
+public class RedisFunctions implements MagicModule, DynamicMethod {
 
 	@Override
 	public String getModuleName() {

src/main/java/org/ssssssss/magicapi/functions/DatabaseQuery.java → src/main/java/org/ssssssss/magicapi/functions/SQLExecutor.java

@@ -30,7 +30,7 @@ import java.util.function.Function;
 /**
  * 数据库查询模块
  */
-public class DatabaseQuery extends HashMap<String, DatabaseQuery> implements MagicModule {
+public class SQLExecutor extends HashMap<String, SQLExecutor> implements MagicModule {
 
 	@UnableCall
 	private MagicDynamicDataSource dynamicDataSource;
@@ -56,11 +56,11 @@ public class DatabaseQuery extends HashMap<String, DatabaseQuery> implements Mag
 	@UnableCall
 	private long ttl;
 
-	public DatabaseQuery() {
+	public SQLExecutor() {
 
 	}
 
-	public DatabaseQuery(MagicDynamicDataSource dynamicDataSource) {
+	public SQLExecutor(MagicDynamicDataSource dynamicDataSource) {
 		this.dynamicDataSource = dynamicDataSource;
 		this.dataSourceNode = dynamicDataSource.getDataSource();
 	}
@@ -106,16 +106,16 @@ public class DatabaseQuery extends HashMap<String, DatabaseQuery> implements Mag
 	}
 
 	@UnableCall
-	public DatabaseQuery cloneQuery() {
-		DatabaseQuery query = new DatabaseQuery();
-		query.setDynamicDataSource(this.dynamicDataSource);
-		query.setDataSourceNode(this.dataSourceNode);
-		query.setPageProvider(this.pageProvider);
-		query.setRowMapper(this.rowMapper);
-		query.setSqlCache(this.sqlCache);
-		query.setTtl(this.ttl);
-		query.setResultProvider(this.resultProvider);
-		return query;
+	public SQLExecutor cloneSQLExecutor() {
+		SQLExecutor sqlExecutor = new SQLExecutor();
+		sqlExecutor.setDynamicDataSource(this.dynamicDataSource);
+		sqlExecutor.setDataSourceNode(this.dataSourceNode);
+		sqlExecutor.setPageProvider(this.pageProvider);
+		sqlExecutor.setRowMapper(this.rowMapper);
+		sqlExecutor.setSqlCache(this.sqlCache);
+		sqlExecutor.setTtl(this.ttl);
+		sqlExecutor.setResultProvider(this.resultProvider);
+		return sqlExecutor;
 	}
 
 	/**
@@ -168,11 +168,11 @@ public class DatabaseQuery extends HashMap<String, DatabaseQuery> implements Mag
 	 * @return
 	 */
 	@Comment("使用缓存")
-	public DatabaseQuery cache(@Comment("缓存名") String cacheName, @Comment("过期时间") long ttl) {
+	public SQLExecutor cache(@Comment("缓存名") String cacheName, @Comment("过期时间") long ttl) {
 		if (cacheName == null) {
 			return this;
 		}
-		DatabaseQuery query = cloneQuery();
+		SQLExecutor query = cloneSQLExecutor();
 		query.setCacheName(cacheName);
 		query.setTtl(ttl);
 		return query;
@@ -185,7 +185,7 @@ public class DatabaseQuery extends HashMap<String, DatabaseQuery> implements Mag
 	 * @return
 	 */
 	@Comment("使用缓存，过期时间采用默认配置")
-	public DatabaseQuery cache(@Comment("缓存名") String cacheName) {
+	public SQLExecutor cache(@Comment("缓存名") String cacheName) {
 		return cache(cacheName, 0);
 	}
 
@@ -193,14 +193,14 @@ public class DatabaseQuery extends HashMap<String, DatabaseQuery> implements Mag
 	 * 数据源切换
 	 */
 	@Override
-	public DatabaseQuery get(Object key) {
-		DatabaseQuery query = cloneQuery();
+	public SQLExecutor get(Object key) {
+		SQLExecutor sqlExecutor = cloneSQLExecutor();
 		if (key == null) {
-			query.setDataSourceNode(dynamicDataSource.getDataSource());
+			sqlExecutor.setDataSourceNode(dynamicDataSource.getDataSource());
 		} else {
-			query.setDataSourceNode(dynamicDataSource.getDataSource(key.toString()));
+			sqlExecutor.setDataSourceNode(dynamicDataSource.getDataSource(key.toString()));
 		}
-		return query;
+		return sqlExecutor;
 	}