Skip to content

Commit e005dc8

Browse files
committed
update version
1 parent f1231c3 commit e005dc8

9 files changed

Lines changed: 46 additions & 19 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<groupId>com.codingapi.springboot</groupId>
1717
<artifactId>springboot-parent</artifactId>
18-
<version>2.10.48</version>
18+
<version>2.10.49</version>
1919

2020
<url>https://github.com/codingapi/springboot-framewrok</url>
2121
<name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>2.10.48</version>
9+
<version>2.10.49</version>
1010
</parent>
1111

1212
<name>springboot-starter-data-authorization</name>

springboot-starter-data-fast/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-parent</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>2.10.48</version>
8+
<version>2.10.49</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

springboot-starter-flow/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>2.10.48</version>
9+
<version>2.10.49</version>
1010
</parent>
1111

1212
<name>springboot-starter-flow</name>

springboot-starter-security/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>2.10.48</version>
9+
<version>2.10.49</version>
1010
</parent>
1111

1212
<artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.codingapi.springboot</groupId>
77
<artifactId>springboot-parent</artifactId>
8-
<version>2.10.48</version>
8+
<version>2.10.49</version>
99
</parent>
1010
<artifactId>springboot-starter</artifactId>
1111

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ public class GroovyMetadata {
4444
*/
4545
private final Map<String, GroovyType> types;
4646

47+
/**
48+
* 脚本说明
49+
*/
50+
@Setter
51+
private String description;
52+
4753

4854
public GroovyMetadata() {
4955
this.types = new HashMap<>();
@@ -53,6 +59,7 @@ public GroovyMetadata() {
5359

5460
/**
5561
* 通过class构建 脚本类型数据
62+
*
5663
* @param clazz class类型
5764
*/
5865
public void buildType(Class<?> clazz) {
@@ -63,7 +70,7 @@ public void buildType(Class<?> clazz) {
6370
groovyType = groovyTypeParser.parser();
6471
groovyType.setDataType(dataType);
6572
ScriptType scriptType = clazz.getAnnotation(ScriptType.class);
66-
if(scriptType!=null) {
73+
if (scriptType != null) {
6774
groovyType.setDescription(scriptType.description());
6875
}
6976
this.put(dataType, groovyType);
@@ -72,6 +79,7 @@ public void buildType(Class<?> clazz) {
7279

7380
/**
7481
* 增加请求参数数据对象
82+
*
7583
* @param request 请求参数
7684
*/
7785
public void addRequest(GroovyField request) {
@@ -80,26 +88,29 @@ public void addRequest(GroovyField request) {
8088

8189
/**
8290
* 更新流程类型数据
83-
* @param dataType 数据类型
91+
*
92+
* @param dataType 数据类型
8493
* @param groovyType 脚本类型
8594
*/
86-
public void put(String dataType,GroovyType groovyType){
95+
public void put(String dataType, GroovyType groovyType) {
8796
this.types.put(dataType, groovyType);
8897
}
8998

9099

91100
/**
92101
* 获取流程类型数据
102+
*
93103
* @param dataType 数据类型
94104
* @return 脚本类型
95105
*/
96-
public GroovyType getType(String dataType){
106+
public GroovyType getType(String dataType) {
97107
return this.types.get(dataType);
98108
}
99109

100110

101111
/**
102112
* 增加绑定数据对象
113+
*
103114
* @param bind 绑定数据
104115
*/
105116
public void addBind(GroovyField bind) {

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

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ public class GroovyRunningScript<T> {
2626
*/
2727
private final String script;
2828

29+
/**
30+
* 脚本说明
31+
*/
32+
private final String description;
33+
2934
/**
3035
* 返回数据类型
3136
*/
@@ -47,37 +52,46 @@ public class GroovyRunningScript<T> {
4752
private GroovyMetadata metadata;
4853

4954

50-
public GroovyRunningScript(String method, String script, Class<T> returnType, List<GroovyBindObject> binds, List<GroovyBindObject> requests) {
55+
public GroovyRunningScript(String method, String script, String description, Class<T> returnType, List<GroovyBindObject> binds, List<GroovyBindObject> requests) {
5156
this.method = method;
5257
this.script = script;
58+
this.description = description;
5359
this.returnType = returnType;
5460
this.requests = requests;
5561
this.binds = binds;
5662
}
5763

58-
public GroovyRunningScript(String method, String script, Class<T> returnType, GroovyBindObjectBuilder bindBuilder, GroovyBindObjectBuilder requestBuilder) {
59-
this(method, script, returnType, bindBuilder != null ? bindBuilder.build() : null, requestBuilder != null ? requestBuilder.build() : null);
64+
public GroovyRunningScript(String method, String script, String description, Class<T> returnType, GroovyBindObjectBuilder bindBuilder, GroovyBindObjectBuilder requestBuilder) {
65+
this(method, script, description, returnType, bindBuilder != null ? bindBuilder.build() : null, requestBuilder != null ? requestBuilder.build() : null);
6066
}
6167

6268

63-
public GroovyRunningScript(String method, String script, Class<T> returnType, GroovyBindObjectBuilder requestBuilder) {
64-
this(method, script, returnType, null, requestBuilder);
69+
public GroovyRunningScript(String method, String script, String description, Class<T> returnType, GroovyBindObjectBuilder requestBuilder) {
70+
this(method, script, description, returnType, null, requestBuilder);
6571
}
6672

67-
public GroovyRunningScript(String script, Class<T> returnType, GroovyBindObjectBuilder bindBuilder, GroovyBindObjectBuilder requestBuilder) {
68-
this("run", script, returnType, bindBuilder, requestBuilder);
73+
public GroovyRunningScript(String script, Class<T> returnType, GroovyBindObjectBuilder bindBuilder, GroovyBindObjectBuilder requestBuilder) {
74+
this("run", script, null, returnType, bindBuilder, requestBuilder);
6975
}
7076

71-
public GroovyRunningScript(String script, Class<T> returnType, GroovyBindObjectBuilder requestBuilder) {
77+
public GroovyRunningScript(String script, String description, Class<T> returnType, GroovyBindObjectBuilder bindBuilder, GroovyBindObjectBuilder requestBuilder) {
78+
this("run", script, description, returnType, bindBuilder, requestBuilder);
79+
}
80+
81+
public GroovyRunningScript(String script,String description, Class<T> returnType, GroovyBindObjectBuilder requestBuilder) {
7282
this("run", script, returnType, null, requestBuilder);
7383
}
7484

85+
public GroovyRunningScript(String script,Class<T> returnType, GroovyBindObjectBuilder requestBuilder) {
86+
this("run", script,null, returnType, null, requestBuilder);
87+
}
88+
7589
/**
7690
* 获取参数
7791
*/
7892
public Object[] getParams() {
7993
List<Object> objects = new ArrayList<>();
80-
if(this.requests!=null) {
94+
if (this.requests != null) {
8195
for (GroovyBindObject bindObject : this.requests) {
8296
objects.add(bindObject.getObject());
8397
}
@@ -87,6 +101,7 @@ public Object[] getParams() {
87101

88102
/**
89103
* 重新设置脚本元数据信息
104+
*
90105
* @param metadata 脚本元数据信息
91106
*/
92107
public void resetMetadata(GroovyMetadata metadata) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public GroovyMetadataParserService(GroovyRunningScript<?> script) {
2121
this.script = script;
2222
this.groovyMetadata = new GroovyMetadata();
2323
this.groovyMetadata.setMainMethod(script.getMethod());
24+
this.groovyMetadata.setDescription(script.getDescription());
2425
}
2526

2627

0 commit comments

Comments
 (0)