Dev

example/example-app/example-app-cmd-domain/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.47</version>
+        <version>3.4.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/example-app/example-app-cmd-meta/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.47</version>
+        <version>3.4.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/example-app/example-app-query/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.47</version>
+        <version>3.4.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/example-app/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.47</version>
+        <version>3.4.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

example/example-domain/example-domain-leave/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-domain</artifactId>
-        <version>3.4.47</version>
+        <version>3.4.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/example-domain/example-domain-user/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-domain</artifactId>
-        <version>3.4.47</version>
+        <version>3.4.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/example-domain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-       <version>3.4.47</version>
+       <version>3.4.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

example/example-infra/example-infra-flow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-       <version>3.4.47</version>
+       <version>3.4.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/example-infra/example-infra-jpa/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-        <version>3.4.47</version>
+        <version>3.4.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/example-infra/example-infra-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-        <version>3.4.47</version>
+        <version>3.4.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/example-infra/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.47</version>
+        <version>3.4.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

example/example-interface/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.47</version>
+        <version>3.4.49</version>
     </parent>
 
     <artifactId>example-interface</artifactId>

example/example-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.47</version>
+       <version>3.4.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/pom.xml

@@ -19,7 +19,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.4.47</version>
+    <version>3.4.49</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.4.47</version>
+    <version>3.4.49</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-       <version>3.4.47</version>
+       <version>3.4.49</version>
     </parent>
 
     <name>springboot-starter-data-authorization</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.47</version>
+       <version>3.4.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.47</version>
+       <version>3.4.49</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.47</version>
+       <version>3.4.49</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-       <version>3.4.47</version>
+       <version>3.4.49</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

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

@@ -27,6 +27,12 @@ public class GroovyMetadata {
      */
     private final List<GroovyField> binds;
 
+    /**
+     * 程序主函数名称
+     */
+    @Setter
+    private String mainMethod;
+
     /**
      * 返回类型
      */
@@ -38,6 +44,12 @@ public class GroovyMetadata {
      */
     private final Map<String, GroovyType> types;
 
+    /**
+     * 脚本说明
+     */
+    @Setter
+    private String description;
+
 
     public GroovyMetadata() {
         this.types = new HashMap<>();
@@ -47,6 +59,7 @@ public GroovyMetadata() {
 
     /**
      * 通过class构建 脚本类型数据
+     *
      * @param clazz class类型
      */
     public void buildType(Class<?> clazz) {
@@ -57,7 +70,7 @@ public void buildType(Class<?> clazz) {
             groovyType = groovyTypeParser.parser();
             groovyType.setDataType(dataType);
             ScriptType scriptType = clazz.getAnnotation(ScriptType.class);
-            if(scriptType!=null) {
+            if (scriptType != null) {
                 groovyType.setDescription(scriptType.description());
             }
             this.put(dataType, groovyType);
@@ -66,6 +79,7 @@ public void buildType(Class<?> clazz) {
 
     /**
      * 增加请求参数数据对象
+     *
      * @param request 请求参数
      */
     public void addRequest(GroovyField request) {
@@ -74,26 +88,29 @@ public void addRequest(GroovyField request) {
 
     /**
      * 更新流程类型数据
-     * @param dataType 数据类型
+     *
+     * @param dataType   数据类型
      * @param groovyType 脚本类型
      */
-    public void put(String dataType,GroovyType groovyType){
+    public void put(String dataType, GroovyType groovyType) {
         this.types.put(dataType, groovyType);
     }
 
 
     /**
      * 获取流程类型数据
+     *
      * @param dataType 数据类型
      * @return 脚本类型
      */
-    public GroovyType getType(String dataType){
+    public GroovyType getType(String dataType) {
         return this.types.get(dataType);
     }
 
 
     /**
      * 增加绑定数据对象
+     *
      * @param bind 绑定数据
      */
     public void addBind(GroovyField bind) {

springboot-starter/src/main/java/com/codingapi/springboot/framework/script/request/GroovyRunningScript.java

@@ -26,6 +26,11 @@ public class GroovyRunningScript<T> {
      */
     private final String script;
 
+    /**
+     * 脚本说明
+     */
+    private final String description;
+
     /**
      * 返回数据类型
      */
@@ -47,37 +52,46 @@ public class GroovyRunningScript<T> {
     private GroovyMetadata metadata;
 
 
-    public GroovyRunningScript(String method, String script, Class<T> returnType, List<GroovyBindObject> binds, List<GroovyBindObject> requests) {
+    public GroovyRunningScript(String method, String script, String description, Class<T> returnType, List<GroovyBindObject> binds, List<GroovyBindObject> requests) {
         this.method = method;
         this.script = script;
+        this.description = description;
         this.returnType = returnType;
         this.requests = requests;
         this.binds = binds;
     }
 
-    public GroovyRunningScript(String method, String script, Class<T> returnType, GroovyBindObjectBuilder bindBuilder, GroovyBindObjectBuilder requestBuilder) {
-        this(method, script, returnType, bindBuilder != null ? bindBuilder.build() : null, requestBuilder != null ? requestBuilder.build() : null);
+    public GroovyRunningScript(String method, String script, String description, Class<T> returnType, GroovyBindObjectBuilder bindBuilder, GroovyBindObjectBuilder requestBuilder) {
+        this(method, script, description, returnType, bindBuilder != null ? bindBuilder.build() : null, requestBuilder != null ? requestBuilder.build() : null);
     }
 
 
-    public GroovyRunningScript(String method, String script, Class<T> returnType, GroovyBindObjectBuilder requestBuilder) {
-        this(method, script, returnType, null, requestBuilder);
+    public GroovyRunningScript(String method, String script, String description, Class<T> returnType, GroovyBindObjectBuilder requestBuilder) {
+        this(method, script, description, returnType, null, requestBuilder);
     }
 
-    public GroovyRunningScript(String script, Class<T> returnType, GroovyBindObjectBuilder bindBuilder, GroovyBindObjectBuilder requestBuilder) {
-        this("run", script, returnType, bindBuilder, requestBuilder);
+    public GroovyRunningScript(String script,  Class<T> returnType, GroovyBindObjectBuilder bindBuilder, GroovyBindObjectBuilder requestBuilder) {
+        this("run", script, null, returnType, bindBuilder, requestBuilder);
     }
 
-    public GroovyRunningScript(String script, Class<T> returnType, GroovyBindObjectBuilder requestBuilder) {
+    public GroovyRunningScript(String script, String description, Class<T> returnType, GroovyBindObjectBuilder bindBuilder, GroovyBindObjectBuilder requestBuilder) {
+        this("run", script, description, returnType, bindBuilder, requestBuilder);
+    }
+
+    public GroovyRunningScript(String script,String description, Class<T> returnType, GroovyBindObjectBuilder requestBuilder) {
         this("run", script, returnType, null, requestBuilder);
     }
 
+    public GroovyRunningScript(String script,Class<T> returnType, GroovyBindObjectBuilder requestBuilder) {
+        this("run", script,null, returnType, null, requestBuilder);
+    }
+
     /**
      * 获取参数
      */
     public Object[] getParams() {
         List<Object> objects = new ArrayList<>();
-        if(this.requests!=null) {
+        if (this.requests != null) {
             for (GroovyBindObject bindObject : this.requests) {
                 objects.add(bindObject.getObject());
             }
@@ -87,6 +101,7 @@ public Object[] getParams() {
 
     /**
      * 重新设置脚本元数据信息
+     *
      * @param metadata 脚本元数据信息
      */
     public void resetMetadata(GroovyMetadata metadata) {

springboot-starter/src/main/java/com/codingapi/springboot/framework/script/service/GroovyMetadataParserService.java

@@ -20,6 +20,8 @@ public class GroovyMetadataParserService {
     public GroovyMetadataParserService(GroovyRunningScript<?> script) {
         this.script = script;
         this.groovyMetadata = new GroovyMetadata();
+        this.groovyMetadata.setMainMethod(script.getMethod());
+        this.groovyMetadata.setDescription(script.getDescription());
     }
 
 

springboot-starter/src/test/java/com/codingapi/springboot/framework/script/GroovyScriptRunningContextTest.java

@@ -1,7 +1,6 @@
 package com.codingapi.springboot.framework.script;
 
 import com.alibaba.fastjson.JSON;
-import com.codingapi.springboot.framework.script.meta.GroovyMetadata;
 import com.codingapi.springboot.framework.script.request.GroovyBindObjectBuilder;
 import com.codingapi.springboot.framework.script.request.GroovyRunningScript;
 import com.codingapi.springboot.framework.script.request.MyScriptRequest;