插件优化

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 {

magic-api/src/main/java/org/ssssssss/magicapi/core/resource/RedisResource.java → magic-api-plugins/magic-api-plugin-redis/src/main/java/org/ssssssss/magicapi/redis/RedisResource.java

-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.*;

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

magic-api-spring-boot-starter/pom.xml

@@ -18,16 +18,6 @@
             <artifactId>spring-boot-starter</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-mongodb</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -60,5 +50,10 @@
             <artifactId>spring-boot-starter-jdbc</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 </project>

magic-api/pom.xml

@@ -26,16 +26,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-mongodb</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

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;
 	}
 }