Skip to content

Commit 9a558ae

Browse files
committed
Merge branch '1.2.x'
2 parents 8e14d5f + e67fde8 commit 9a558ae

File tree

56 files changed

+323
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+323
-259
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ fit start -Dfit.profiles.active=prod
112112

113113
> 这里直接使用了 `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)
114114
>
115-
> 当前,`app-platform` 使用了 `fit` 的 3.5.0-M4 版本,因此,如果采用手动编译,需要在 `fit-framework` 仓库中切换到 `v3.5.0-M4` 标签处进行编译构建操作。
115+
> 当前,`app-platform` 使用了 `fit` 的 3.5.0-M5 版本,因此,如果采用手动编译,需要在 `fit-framework` 仓库中切换到 `v3.5.0-M5` 标签处进行编译构建操作。
116116
117117
---------
118118

app-builder/jane/dynamic-form-genericable/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<dependency>
2020
<groupId>org.fitframework</groupId>
2121
<artifactId>fit-api</artifactId>
22-
<version>3.5.0-M4</version>
22+
<version>3.5.0-M5</version>
2323
</dependency>
2424
<dependency>
2525
<groupId>org.fitframework</groupId>
2626
<artifactId>fit-util</artifactId>
27-
<version>3.5.0-M4</version>
27+
<version>3.5.0-M5</version>
2828
</dependency>
2929
<dependency>
3030
<groupId>modelengine.fit.jane</groupId>
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>org.fitframework.service</groupId>
3636
<artifactId>fit-http-classic</artifactId>
37-
<version>3.5.0-M4</version>
37+
<version>3.5.0-M5</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>org.projectlombok</groupId>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<dependency>
158158
<groupId>org.fitframework.plugin</groupId>
159159
<artifactId>fit-message-serializer-json-jackson</artifactId>
160-
<version>3.5.0-M4</version>
160+
<version>3.5.0-M5</version>
161161
<scope>test</scope>
162162
</dependency>
163163
<dependency>
@@ -306,7 +306,7 @@
306306
<plugin>
307307
<groupId>org.fitframework.fel</groupId>
308308
<artifactId>tool-maven-plugin</artifactId>
309-
<version>3.5.0-M4</version>
309+
<version>3.5.0-M5</version>
310310
<executions>
311311
<execution>
312312
<id>build-tool</id>

app-builder/jane/plugins/aipp-websocket-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>org.fitframework.plugin</groupId>
6565
<artifactId>fit-message-serializer-json-jackson</artifactId>
66-
<version>3.5.0-M4</version>
66+
<version>3.5.0-M5</version>
6767
<scope>test</scope>
6868
</dependency>
6969
</dependencies>

app-builder/jane/task-new/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<plugin>
9999
<groupId>org.fitframework.fel</groupId>
100100
<artifactId>tool-maven-plugin</artifactId>
101-
<version>3.5.0-M4</version>
101+
<version>3.5.0-M5</version>
102102
<executions>
103103
<execution>
104104
<id>build-tool</id>

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.0-M4</version>
69+
<version>3.5.0-M5</version>
7070
<scope>test</scope>
7171
</dependency>
7272
<dependency>

app-builder/plugins/aipp-document-extract-node/src/test/java/modelengine/fit/jade/aipp/document/extractor/ExtractorTest.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,16 @@
1313
import static org.mockito.ArgumentMatchers.eq;
1414
import static org.mockito.Mockito.when;
1515

16-
import modelengine.fel.tool.model.transfer.ToolData;
17-
import modelengine.fel.tool.service.ToolExecuteService;
18-
import modelengine.jade.store.service.ToolService;
19-
import modelengine.jade.voice.service.VoiceService;
20-
2116
import modelengine.fel.core.chat.ChatMessage;
2217
import modelengine.fel.core.chat.ChatModel;
2318
import modelengine.fel.core.chat.support.AiMessage;
19+
import modelengine.fel.tool.model.transfer.ToolData;
20+
import modelengine.fel.tool.service.ToolExecuteService;
2421
import modelengine.fitframework.flowable.Choir;
2522
import modelengine.fitframework.test.annotation.FitTestWithJunit;
2623
import modelengine.fitframework.test.annotation.Mock;
24+
import modelengine.jade.store.service.ToolService;
25+
import modelengine.jade.voice.service.VoiceService;
2726

2827
import org.junit.jupiter.api.DisplayName;
2928
import org.junit.jupiter.api.Test;
@@ -38,8 +37,7 @@
3837
* @author 兰宇晨
3938
* @since 2025-01-16
4039
*/
41-
@FitTestWithJunit(
42-
includeClasses = {BaseExtractor.class, AudioExtractor.class, ImageExtractor.class, TextExtractor.class})
40+
@FitTestWithJunit(includeClasses = {AudioExtractor.class, ImageExtractor.class, TextExtractor.class})
4341
public class ExtractorTest {
4442
private BaseExtractor baseExtractor;
4543

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.0-M4</version>
64+
<version>3.5.0-M5</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.0-M4</version>
52+
<version>3.5.0-M5</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.0-M4</version>
104+
<version>3.5.0-M5</version>
105105
<executions>
106106
<execution>
107107
<id>build-tool</id>

0 commit comments

Comments
 (0)