GroovyScript

Author: xlorne

springboot-starter-script/src/main/java/com/codingapi/springboot/script/AutoConfiguration.java

@@ -1,6 +1,8 @@
 package com.codingapi.springboot.script;
 
-import com.codingapi.springboot.script.runner.TempClearRunner;
+import com.codingapi.springboot.script.properties.GroovyScriptProperties;
+import com.codingapi.springboot.script.runner.GroovyScriptEngineRunner;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -10,8 +12,14 @@
 public class AutoConfiguration {
 
     @Bean
-    public TempClearRunner tempClearRunner() {
-        return new TempClearRunner();
+    public GroovyScriptEngineRunner tempClearRunner() {
+        return new GroovyScriptEngineRunner();
+    }
+
+    @Bean
+    @ConfigurationProperties(prefix = "codingapi.script")
+    public GroovyScriptProperties groovyScriptProperties(){
+        return new GroovyScriptProperties();
     }
 
 }

springboot-starter-script/src/main/java/com/codingapi/springboot/script/GroovyScript.java

@@ -1,10 +1,9 @@
 package com.codingapi.springboot.script;
 
-import com.codingapi.springboot.script.cache.TempGroovyScriptContext;
+import com.codingapi.springboot.script.temp.TempGroovyScriptContext;
 import com.codingapi.springboot.script.meta.GroovyMetadata;
 import com.codingapi.springboot.script.repository.GroovyScriptRepositoryContext;
-import com.codingapi.springboot.script.parser.GroovyMetadataParserService;
-import com.codingapi.springboot.script.strategy.GroovyMetadataGenerateStrategyContext;
+import com.codingapi.springboot.script.scanner.GroovyMetadataScannerUtils;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -155,7 +154,7 @@ public GroovyScript build() {
      * 临时存储
      * 数据将会定时清理
      */
-    public void temp(){
+    public void temp() {
         TempGroovyScriptContext.getInstance().save(this);
     }
 
@@ -173,19 +172,20 @@ public void save() {
     /**
      * 删除对象
      */
-    public void remove(){
+    public void remove() {
         GroovyScriptRepositoryContext.getInstance().delete(this.getKey());
         // 清理临时数据
         TempGroovyScriptContext.getInstance().remove(this.getKey());
     }
 
     /**
      * 复制对象
+     *
      * @param key 新的key
      * @return 脚本对象
      */
-    public GroovyScript copy(String key){
-        return new GroovyScript(key,script,description,method,returnType,binds,requests,typeOne,typeTwo,tag,remark,createTime,updateTime);
+    public GroovyScript copy(String key) {
+        return new GroovyScript(key, script, description, method, returnType, binds, requests, typeOne, typeTwo, tag, remark, createTime, updateTime);
     }
 
 
@@ -311,12 +311,7 @@ public <T> T invoke(TransactionMode transactionMode) {
      * 构建脚本元数据信息
      */
     public GroovyMetadata toMetadata() {
-        GroovyMetadata metadata = GroovyMetadataGenerateStrategyContext.getInstance().generate(this);
-        if (metadata != null) {
-            return metadata;
-        }
-        GroovyMetadataParserService groovyMetaDataParserService = new GroovyMetadataParserService(this);
-        return groovyMetaDataParserService.parser();
+        return GroovyMetadataScannerUtils.scanner(this);
     }
 
 

springboot-starter-script/src/main/java/com/codingapi/springboot/script/GroovyScriptRuntimeContext.java

@@ -1,5 +1,6 @@
 package com.codingapi.springboot.script;
 
+import com.codingapi.springboot.script.properties.PropertiesContext;
 import lombok.Getter;
 
 import java.util.Map;
@@ -9,12 +10,10 @@ public class GroovyScriptRuntimeContext {
     @Getter
     private final static GroovyScriptRuntimeContext instance = new GroovyScriptRuntimeContext();
 
-    public static final int DEFAULT_MAX_CACHE_SIZE = 10 * 1024;
-
     private final GroovyScriptRuntime scriptRuntime;
 
     private GroovyScriptRuntimeContext() {
-        int maxCacheSize = Integer.parseInt(System.getProperty("DEFAULT_MAX_CACHE_SIZE", String.valueOf(DEFAULT_MAX_CACHE_SIZE)));
+        int maxCacheSize = PropertiesContext.getInstance().getShellMaxCacheSize();
         System.out.println("GroovyScriptRuntimeContext max cache size:" + maxCacheSize);
         this.scriptRuntime = new GroovyScriptRuntime(maxCacheSize);
     }

springboot-starter-script/src/main/java/com/codingapi/springboot/script/annotation/GroovyScript.java

@@ -3,7 +3,7 @@
 import java.lang.annotation.*;
 
 /**
- *  脚本字段
+ *  脚本字段,用于获取对象下的脚本key数据
  */
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

springboot-starter-script/src/main/java/com/codingapi/springboot/script/annotation/ScriptFunction.java

@@ -20,9 +20,4 @@
      */
     String description() default "";
 
-    /**
-     * 参数
-     */
-    ScriptField[] parameters() default {};
-
 }

springboot-starter-script/src/main/java/com/codingapi/springboot/script/annotation/ScriptParameter.java

@@ -0,0 +1,23 @@
+package com.codingapi.springboot.script.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 脚本函数参数
+ */
+@Target({ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ScriptParameter {
+
+    /**
+     * 名称
+     */
+    String name() default "";
+
+    /**
+     * 描述
+     */
+    String description() default "";
+
+}

springboot-starter-script/src/main/java/com/codingapi/springboot/script/annotation/ScriptType.java

@@ -3,7 +3,7 @@
 import java.lang.annotation.*;
 
 /**
- * 脚本对象
+ * 脚本对象类型
  */
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)

springboot-starter-script/src/main/java/com/codingapi/springboot/script/cache/GroovyScriptCacheContext.java

@@ -3,6 +3,7 @@
 import com.codingapi.springboot.script.GroovyScript;
 import com.codingapi.springboot.script.meta.GroovyMetadata;
 import com.codingapi.springboot.script.repository.GroovyScriptRepositoryContext;
+import com.codingapi.springboot.script.temp.TempGroovyScriptContext;
 import lombok.Getter;
 
 import java.util.HashMap;
@@ -11,7 +12,7 @@
 import java.util.Map;
 
 /**
- * 脚本数据上下文管理对象
+ * 脚本数据缓存上下文管理对象
  */
 public class GroovyScriptCacheContext {
 
@@ -92,8 +93,9 @@ public int count() {
     public GroovyScript getGroovyScript(String key) {
         GroovyScript groovyScript = this.cache.get(key);
         if (groovyScript == null) {
+            // 临时的数据不存到cache对象下
             groovyScript = TempGroovyScriptContext.getInstance().getGroovyScript(key);
-            if(groovyScript==null) {
+            if (groovyScript == null) {
                 groovyScript = GroovyScriptRepositoryContext.getInstance().get(key);
                 if (groovyScript != null) {
                     this.cache.put(key, groovyScript);
@@ -131,23 +133,6 @@ public String getScript(String key) {
         return "";
     }
 
-
-    /**
-     * 获取脚本编辑信息
-     *
-     * @param key 脚本可以
-     */
-    public Map<String, Object> getEditorScript(String key) {
-        Map<String, Object> map = new HashMap<>();
-        GroovyScript script = this.getGroovyScript(key);
-        if (script != null) {
-            map.put("script", script.getScript());
-            map.put("metadata", script.toMetadata());
-        }
-        return map;
-    }
-
-
     /**
      * 批量加载脚本
      *

springboot-starter-script/src/main/java/com/codingapi/springboot/script/controller/GroovyScriptController.java

@@ -7,7 +7,7 @@
 import com.codingapi.springboot.script.GroovyScript;
 import com.codingapi.springboot.script.GroovyScriptRuntimeContext;
 import com.codingapi.springboot.script.cache.GroovyScriptCacheContext;
-import com.codingapi.springboot.script.cache.TempGroovyScriptContext;
+import com.codingapi.springboot.script.temp.TempGroovyScriptContext;
 import com.codingapi.springboot.script.meta.GroovyMetadata;
 import com.codingapi.springboot.script.pojo.ScriptCompileRequest;
 import com.codingapi.springboot.script.pojo.ScriptSaveRequest;

springboot-starter-script/src/main/java/com/codingapi/springboot/script/meta/GroovyMetadata.java

@@ -1,8 +1,7 @@
 package com.codingapi.springboot.script.meta;
 
 import com.codingapi.springboot.script.GroovyScript;
-import com.codingapi.springboot.script.annotation.ScriptType;
-import com.codingapi.springboot.script.parser.GroovyTypeParser;
+import com.codingapi.springboot.script.strategy.ScriptTypeMappingContext;
 import lombok.Getter;
 
 import java.util.ArrayList;
@@ -14,77 +13,49 @@
 /**
  * 脚本对象元数据结构
  */
+@Getter
 public class GroovyMetadata {
 
     /**
      * 请求参数
      */
-    @Getter
     private final List<GroovyField> requests;
 
     /**
      * 绑定参数
      */
-    @Getter
     private final List<GroovyField> binds;
 
     /**
      * 程序主函数名称
      */
-    @Getter
-    private String mainMethod;
+    private final String mainMethod;
 
     /**
      * 返回类型
      */
-    @Getter
-    private String returnType;
+    private final String returnType;
 
     /**
      * 字段类型
      */
-    @Getter
     private final Map<String, GroovyType> types;
 
     /**
      * 脚本说明
      */
-    @Getter
-    private String description;
-
-
-    private transient final GroovyScript groovyScript;
+    private final String description;
 
 
     public GroovyMetadata(GroovyScript groovyScript) {
-        this.groovyScript = groovyScript;
         this.types = new HashMap<>();
         this.requests = new ArrayList<>();
         this.binds = new ArrayList<>();
         this.description = groovyScript.getDescription();
         this.mainMethod = groovyScript.getMethod();
-        this.returnType = groovyScript.getReturnType().getSimpleName();
+        this.returnType = ScriptTypeMappingContext.getInstance().mapping(groovyScript.getReturnType()).getSimpleName();
     }
 
-    /**
-     * 通过class构建 脚本类型数据
-     *
-     * @param clazz class类型
-     */
-    public void buildType(Class<?> clazz) {
-        String dataType = clazz.getSimpleName();
-        GroovyType groovyType = this.types.get(dataType);
-        if (groovyType == null) {
-            GroovyTypeParser groovyTypeParser = new GroovyTypeParser(clazz, this);
-            groovyType = groovyTypeParser.parser(this.groovyScript);
-            groovyType.setDataType(dataType);
-            ScriptType scriptType = clazz.getAnnotation(ScriptType.class);
-            if (scriptType != null) {
-                groovyType.setDescription(scriptType.description());
-            }
-            this.put(dataType, groovyType);
-        }
-    }
 
     /**
      * 增加请求参数数据对象