Skip to content

Commit 64c7cca

Browse files
author
lixin_33
committed
[app-builder] Implementing text concatenate node based on fit framework
1 parent 016f11c commit 64c7cca

30 files changed

Lines changed: 53 additions & 59 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ fit start -Dfit.profiles.active=prod
189189
190190
> 这里直接使用了 `fit` 命令，该命令请参考 `fit-framework` 项目的[指导手册](https://github.com/ModelEngine-Group/fit-framework/blob/main/docs/framework/fit/java/quick-start-guide/03.%20%E4%BD%BF%E7%94%A8%E6%8F%92%E4%BB%B6%E7%9A%84%E7%83%AD%E6%8F%92%E6%8B%94%E8%83%BD%E5%8A%9B.md)。
191191
>
192-
> 当前，`app-platform` 使用了 `fit` 的 3.5.1 版本，因此，如果采用手动编译，需要在 `fit-framework` 仓库中切换到 `v3.5.1` 标签处进行编译构建操作。
192+
> 当前，`app-platform` 使用了 `fit` 的 3.5.3 版本，因此，如果采用手动编译，需要在 `fit-framework` 仓库中切换到 `v3.5.3` 标签处进行编译构建操作。
193193
194194
---------
195195

‎app-builder/plugins/aipp-classify-question/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>org.fitframework.plugin</groupId>
6868
<artifactId>fit-message-serializer-json-jackson</artifactId>
69-
<version>3.5.1</version>
69+
<version>3.5.3</version>
7070
<scope>test</scope>
7171
</dependency>
7272
<dependency>

‎app-builder/plugins/aipp-extractor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>org.fitframework.plugin</groupId>
6363
<artifactId>fit-message-serializer-json-jackson</artifactId>
64-
<version>3.5.1</version>
64+
<version>3.5.3</version>
6565
<scope>test</scope>
6666
</dependency>
6767
<dependency>

‎app-builder/plugins/aipp-http-call/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>org.fitframework.plugin</groupId>
5151
<artifactId>fit-message-serializer-json-jackson</artifactId>
52-
<version>3.5.1</version>
52+
<version>3.5.3</version>
5353
<scope>test</scope>
5454
</dependency>
5555
<dependency>

‎app-builder/plugins/aipp-loop-tool/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<plugin>
102102
<groupId>org.fitframework.fel</groupId>
103103
<artifactId>tool-maven-plugin</artifactId>
104-
<version>3.5.1</version>
104+
<version>3.5.3</version>
105105
<executions>
106106
<execution>
107107
<id>build-tool</id>

‎app-builder/plugins/aipp-parallel-tool/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<plugin>
114114
<groupId>org.fitframework.fel</groupId>
115115
<artifactId>tool-maven-plugin</artifactId>
116-
<version>3.5.1</version>
116+
<version>3.5.3</version>
117117
<executions>
118118
<execution>
119119
<id>build-tool</id>

‎app-builder/plugins/aipp-plugin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<dependency>
167167
<groupId>org.fitframework.plugin</groupId>
168168
<artifactId>fit-message-serializer-json-jackson</artifactId>
169-
<version>3.5.1</version>
169+
<version>3.5.3</version>
170170
<scope>test</scope>
171171
</dependency>
172172
<dependency>
@@ -315,7 +315,7 @@
315315
<plugin>
316316
<groupId>org.fitframework.fel</groupId>
317317
<artifactId>tool-maven-plugin</artifactId>
318-
<version>3.5.1</version>
318+
<version>3.5.3</version>
319319
<executions>
320320
<execution>
321321
<id>build-tool</id>

‎app-builder/plugins/aipp-rewriter/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>org.fitframework.plugin</groupId>
6464
<artifactId>fit-message-serializer-json-jackson</artifactId>
65-
<version>3.5.1</version>
65+
<version>3.5.3</version>
6666
<scope>test</scope>
6767
</dependency>
6868
<dependency>

‎app-builder/plugins/aipp-template-render/src/main/java/modelengine/fit/jade/aipp/template/render/TemplateServiceImpl.java‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@
66

77
package modelengine.fit.jade.aipp.template.render;
88

9+
import static modelengine.fitframework.util.ObjectUtils.nullIf;
10+
911
import modelengine.fitframework.annotation.Component;
12+
import modelengine.fitframework.parameterization.ParameterizationMode;
13+
import modelengine.fitframework.parameterization.ParameterizedString;
14+
import modelengine.fitframework.parameterization.ParameterizedStringResolver;
1015

16+
import java.util.Collections;
1117
import java.util.Map;
12-
import java.util.regex.Matcher;
13-
import java.util.regex.Pattern;
1418

1519
/**
1620
* {@link TemplateService} 的实现类。
@@ -20,28 +24,18 @@
2024
*/
2125
@Component
2226
public class TemplateServiceImpl implements TemplateService {
23-
private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("\\{\\{\\s*(\\w+)\\s*}}");
24-
2527
@Override
2628
public String renderTemplate(String template, Map<String, Object> args) {
2729
if (template == null) {
2830
return null;
2931
}
30-
3132
if (args == null) {
3233
args = Map.of();
3334
}
34-
35-
Matcher matcher = PLACEHOLDER_PATTERN.matcher(template);
36-
StringBuilder sb = new StringBuilder();
37-
38-
while (matcher.find()) {
39-
String key = matcher.group(1);
40-
Object value = args.getOrDefault(key, "");
41-
matcher.appendReplacement(sb, Matcher.quoteReplacement(String.valueOf(value)));
42-
}
43-
matcher.appendTail(sb);
44-
45-
return sb.toString();
35+
Map<String, Object> params = nullIf(args, Collections.emptyMap());
36+
ParameterizedStringResolver resolver =
37+
ParameterizedStringResolver.create("{{", "}}", '/', ParameterizationMode.LENIENT_EMPTY);
38+
ParameterizedString parameterizedString = resolver.resolve(template);
39+
return parameterizedString.format(params, null);
4640
}
4741
}

‎app-builder/plugins/aipp-variable-aggregation/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>org.fitframework.plugin</groupId>
4141
<artifactId>fit-message-serializer-json-jackson</artifactId>
42-
<version>3.5.1</version>
42+
<version>3.5.3</version>
4343
<scope>test</scope>
4444
</dependency>
4545
<dependency>

0 commit comments

Comments
 (0)