diff --git a/magic-api-plugins/magic-api-plugin-redis/src/main/java/org/ssssssss/magicapi/redis/MagicRedisConfiguration.java b/magic-api-plugins/magic-api-plugin-redis/src/main/java/org/ssssssss/magicapi/redis/MagicRedisConfiguration.java index 096eeb27..09229689 100644 --- a/magic-api-plugins/magic-api-plugin-redis/src/main/java/org/ssssssss/magicapi/redis/MagicRedisConfiguration.java +++ b/magic-api-plugins/magic-api-plugin-redis/src/main/java/org/ssssssss/magicapi/redis/MagicRedisConfiguration.java @@ -10,7 +10,6 @@ import org.ssssssss.magicapi.core.config.MagicAPIProperties; import org.ssssssss.magicapi.core.config.MagicPluginConfiguration; import org.ssssssss.magicapi.core.config.Resource; import org.ssssssss.magicapi.core.model.Plugin; -import org.ssssssss.magicapi.core.resource.RedisResource; @Configuration public class MagicRedisConfiguration implements MagicPluginConfiguration { diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/resource/RedisResource.java b/magic-api-plugins/magic-api-plugin-redis/src/main/java/org/ssssssss/magicapi/redis/RedisResource.java similarity index 95% rename from magic-api/src/main/java/org/ssssssss/magicapi/core/resource/RedisResource.java rename to magic-api-plugins/magic-api-plugin-redis/src/main/java/org/ssssssss/magicapi/redis/RedisResource.java index 09cf6521..79176316 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/core/resource/RedisResource.java +++ b/magic-api-plugins/magic-api-plugin-redis/src/main/java/org/ssssssss/magicapi/redis/RedisResource.java @@ -1,4 +1,4 @@ -package org.ssssssss.magicapi.core.resource; +package org.ssssssss.magicapi.redis; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,6 +6,8 @@ import org.springframework.data.redis.core.Cursor; import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.ScanOptions; import org.springframework.data.redis.core.StringRedisTemplate; +import org.ssssssss.magicapi.core.resource.KeyValueResource; +import org.ssssssss.magicapi.core.resource.Resource; import java.nio.charset.StandardCharsets; import java.util.*; diff --git a/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/starter/MagicAPITaskConfiguration.java b/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/starter/MagicAPITaskConfiguration.java index b26e1e76..59d8a550 100644 --- a/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/starter/MagicAPITaskConfiguration.java +++ b/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/starter/MagicAPITaskConfiguration.java @@ -14,7 +14,7 @@ import org.ssssssss.magicapi.task.web.MagicTaskController; @Configuration @EnableScheduling -public class MagicAPITaskConfiguration implements MagicPluginConfiguration{ +public class MagicAPITaskConfiguration implements MagicPluginConfiguration { @Bean @ConditionalOnMissingBean @@ -30,7 +30,7 @@ public class MagicAPITaskConfiguration implements MagicPluginConfiguration{ @Override public Plugin plugin() { - return new Plugin("定时任务", "magic-task.1.0.0.iife.js"); + return new Plugin("定时任务", "MagicTask", "magic-task.1.0.0.iife.js"); } @Override diff --git a/magic-api-spring-boot-starter/pom.xml b/magic-api-spring-boot-starter/pom.xml index 26b17e17..7e298975 100644 --- a/magic-api-spring-boot-starter/pom.xml +++ b/magic-api-spring-boot-starter/pom.xml @@ -18,16 +18,6 @@ spring-boot-starter provided - - org.springframework.boot - spring-boot-starter-data-redis - provided - - - org.springframework.boot - spring-boot-starter-data-mongodb - provided - org.springframework.boot spring-boot-starter-web @@ -60,5 +50,10 @@ spring-boot-starter-jdbc provided + + org.springframework.boot + spring-boot-configuration-processor + true + diff --git a/magic-api/pom.xml b/magic-api/pom.xml index 2808c7a6..75e5534c 100644 --- a/magic-api/pom.xml +++ b/magic-api/pom.xml @@ -26,16 +26,6 @@ org.springframework.boot spring-boot-starter-websocket - - org.springframework.boot - spring-boot-starter-data-redis - provided - - - org.springframework.boot - spring-boot-starter-data-mongodb - provided - org.springframework.boot spring-boot-starter-web diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/model/Plugin.java b/magic-api/src/main/java/org/ssssssss/magicapi/core/model/Plugin.java index 71937f45..9edcfefc 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/core/model/Plugin.java +++ b/magic-api/src/main/java/org/ssssssss/magicapi/core/model/Plugin.java @@ -5,15 +5,21 @@ public class Plugin { /** * 插件名 */ - private String name; + private final String name; + + /** + * js全局变量名 + */ + private String globalName; /** * js文件名 */ private String javascriptFilename; - public Plugin(String name, String javascriptFilename) { + public Plugin(String name, String globalName, String javascriptFilename) { this.name = name; + this.globalName = globalName; this.javascriptFilename = javascriptFilename; } @@ -25,15 +31,11 @@ public class Plugin { return name; } - public void setName(String name) { - this.name = name; - } - public String getJavascriptFilename() { return javascriptFilename; } - public void setJavascriptFilename(String javascriptFilename) { - this.javascriptFilename = javascriptFilename; + public String getGlobalName() { + return globalName; } }