Skip to content

Commit 80f6851

Browse files
surpercodehangsurpercodehang
authored
Merge branch 'ModelEngine-Group:3.5.x' into 3.5.x
2 parents b9f0f86 + 15bd15e commit 80f6851

File tree

185 files changed

+1002
-1033
lines changed

Some content is hidden

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

185 files changed

+1002
-1033
lines changed

‎.github/ISSUE_TEMPLATE/01_bug_report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ body:
3232
label: 版本信息 / Version Information
3333
description: 您使用的是哪个版本？/ Which version are you using?
3434
options:
35-
- "v3.5.1"
35+
- "v3.5.4"
3636
- "elsa-v0.4.1"
3737
- "其他 (请在下方说明) / Other (please specify below)"
3838
validations:

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div align="center">
22
<img src="docs/resources/fit-logo.png" alt="FIT Logo" width="395">
33

4-
# FIT Framework v3.5.4-SNAPSHOT
4+
# FIT Framework v3.5.5-SNAPSHOT
55

66
**Java 企业级 AI 开发框架，提供多语言函数引擎（FIT）、流式编排引擎（WaterFlow）及 Java 生态的 LangChain 替代方案（FEL）。原生 /
77
Spring 双模运行，支持插件热插拔与智能聚散部署，无缝统一大模型与业务系统。**

‎docs/framework/fit/java/articles/FIT框架：重新定义模块隔离与部署自由，让Swagger从生产环境“优雅消失”.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ FIT 框架默认配置`Swagger`功能插件，基于上面的操作步骤，访
108108

109109
若不希望部署`Swagger`插件，只需要在 FIT 内置插件目录中将`Swagger`插件移除：
110110

111-
首先结束`fit`进程，打开`build/plugins`，该目录存放了编译 FIT 框架后生成的所有内置插件，删除插件`fit-http-openapi3-swagger-3.5.4-SNAPSHOT.jar`，重新启动 FIT 框架，此时环境中并没有部署`Swagger`插件，访问 `http://localhost:8080/openapi.html` 将得到 404 响应：
111+
首先结束`fit`进程，打开`build/plugins`，该目录存放了编译 FIT 框架后生成的所有内置插件，删除插件`fit-http-openapi3-swagger-3.5.5-SNAPSHOT.jar`，重新启动 FIT 框架，此时环境中并没有部署`Swagger`插件，访问 `http://localhost:8080/openapi.html` 将得到 404 响应：
112112

113113
``` json
114114
{
@@ -126,7 +126,7 @@ FIT 框架默认配置`Swagger`功能插件，基于上面的操作步骤，访
126126

127127
很简单，答案就是用户插件目录：
128128

129-
以`Swagger`插件为例，将`framework/fit/java/fit-builtin/plugins/fit-http-openapi3-swagger/target/fit-http-openapi3-swagger-3.5.4-SNAPSHOT.jar`复制到正在运行的`fit`进程的用户插件目录中，即可立刻实现`Swagger`功能，而在使用结束后，可以随时卸载，无需重启进程。
129+
以`Swagger`插件为例，将`framework/fit/java/fit-builtin/plugins/fit-http-openapi3-swagger/target/fit-http-openapi3-swagger-3.5.5-SNAPSHOT.jar`复制到正在运行的`fit`进程的用户插件目录中，即可立刻实现`Swagger`功能，而在使用结束后，可以随时卸载，无需重启进程。
130130

131131
> 注意，位于`build/plugins`下的插件属于 FIT 启动的内置插件，包含了 FIT 框架提供的一系列功能，并不支持运行时热插拔，用户需要在运行前将无需部署的插件删除。
132132
>

‎docs/framework/fit/java/quick-start-guide/01. 构建基础 Web 应用.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ mvn clean install
5454
<java.version>17</java.version>
5555

5656
<!-- FIT version -->
57-
<fit.version>3.5.4-SNAPSHOT</fit.version>
57+
<fit.version>3.5.5-SNAPSHOT</fit.version>
5858

5959
<!-- Maven plugin versions -->
6060
<maven.compiler.version>3.11.0</maven.compiler.version>

‎docs/framework/fit/java/quick-start-guide/02. 构建插件式 Web 应用.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ mvn clean install
5858
<java.version>17</java.version>
5959

6060
<!-- FIT version -->
61-
<fit.version>3.5.4-SNAPSHOT</fit.version>
61+
<fit.version>3.5.5-SNAPSHOT</fit.version>
6262

6363
<!-- Maven plugin versions -->
6464
<maven.compiler.version>3.11.0</maven.compiler.version>
@@ -162,7 +162,7 @@ public interface Weather {
162162
<java.version>17</java.version>
163163

164164
<!-- FIT version -->
165-
<fit.version>3.5.4-SNAPSHOT</fit.version>
165+
<fit.version>3.5.5-SNAPSHOT</fit.version>
166166

167167
<!-- Maven plugin versions -->
168168
<maven.compiler.version>3.11.0</maven.compiler.version>
@@ -286,7 +286,7 @@ public class DefaultWeather implements Weather {
286286
<java.version>17</java.version>
287287

288288
<!-- FIT version -->
289-
<fit.version>3.5.4-SNAPSHOT</fit.version>
289+
<fit.version>3.5.5-SNAPSHOT</fit.version>
290290

291291
<!-- Maven plugin versions -->
292292
<maven.compiler.version>3.11.0</maven.compiler.version>
@@ -410,7 +410,7 @@ public class OtherWeather implements Weather {
410410
<java.version>17</java.version>
411411

412412
<!-- FIT version -->
413-
<fit.version>3.5.4-SNAPSHOT</fit.version>
413+
<fit.version>3.5.5-SNAPSHOT</fit.version>
414414

415415
<!-- Maven plugin versions -->
416416
<maven.compiler.version>3.11.0</maven.compiler.version>
@@ -555,7 +555,7 @@ public class AssistantController {
555555
<java.version>17</java.version>
556556

557557
<!-- FIT version -->
558-
<fit.version>3.5.4-SNAPSHOT</fit.version>
558+
<fit.version>3.5.5-SNAPSHOT</fit.version>
559559

560560
<!-- Maven plugin versions -->
561561
<maven.compiler.version>3.11.0</maven.compiler.version>
@@ -644,7 +644,7 @@ public class AssistantController {
644644
<java.version>17</java.version>
645645

646646
<!-- FIT version -->
647-
<fit.version>3.5.4-SNAPSHOT</fit.version>
647+
<fit.version>3.5.5-SNAPSHOT</fit.version>
648648

649649
<!-- Maven plugin versions -->
650650
<maven.compiler.version>3.11.0</maven.compiler.version>

‎docs/framework/fit/java/quick-start-guide/03. 使用插件的热插拔能力.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ mvn clean install
5757
<java.version>17</java.version>
5858

5959
<!-- FIT version -->
60-
<fit.version>3.5.4-SNAPSHOT</fit.version>
60+
<fit.version>3.5.5-SNAPSHOT</fit.version>
6161

6262
<!-- Maven plugin versions -->
6363
<maven.compiler.version>3.11.0</maven.compiler.version>
@@ -159,7 +159,7 @@ public interface Weather {
159159
<java.version>17</java.version>
160160

161161
<!-- FIT version -->
162-
<fit.version>3.5.4-SNAPSHOT</fit.version>
162+
<fit.version>3.5.5-SNAPSHOT</fit.version>
163163

164164
<!-- Maven plugin versions -->
165165
<maven.compiler.version>3.11.0</maven.compiler.version>
@@ -293,7 +293,7 @@ public class AssistantController {
293293
<java.version>17</java.version>
294294

295295
<!-- FIT version -->
296-
<fit.version>3.5.4-SNAPSHOT</fit.version>
296+
<fit.version>3.5.5-SNAPSHOT</fit.version>
297297

298298
<!-- Maven plugin versions -->
299299
<maven.compiler.version>3.11.0</maven.compiler.version>
@@ -417,7 +417,7 @@ public class DefaultWeather implements Weather {
417417
<java.version>17</java.version>
418418

419419
<!-- FIT version -->
420-
<fit.version>3.5.4-SNAPSHOT</fit.version>
420+
<fit.version>3.5.5-SNAPSHOT</fit.version>
421421

422422
<!-- Maven plugin versions -->
423423
<maven.compiler.version>3.11.0</maven.compiler.version>
@@ -543,7 +543,7 @@ mvn clean install
543543
打开 bash 窗口，并进入到用户插件目录，即 `D:\demo\custom`，输入命令 `fit start`，其中 `start` 表示应用的启动；
544544

545545
```
546-
Running command: java -D"plugin.fit.dynamic.plugin.directory=/d/WorkSpace/custom" -jar fit-discrete-launcher-3.5.4-SNAPSHOT.jar
546+
Running command: java -D"plugin.fit.dynamic.plugin.directory=/d/WorkSpace/custom" -jar fit-discrete-launcher-3.5.5-SNAPSHOT.jar
547547
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.discrete.DiscreteFitRuntime] Prepare to start FIT application...
548548
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.discrete.DiscreteFitRuntime] FIT application started.
549549
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [registry-client-thread-0] [modelengine.fit.service.RegistryClient] Register fitables successfully. All fitable services are ready.

‎docs/framework/fit/java/quick-start-guide/04. 实现应用之间的服务调用.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ mvn clean install
5252
<java.version>17</java.version>
5353

5454
<!-- FIT version -->
55-
<fit.version>3.5.4-SNAPSHOT</fit.version>
55+
<fit.version>3.5.5-SNAPSHOT</fit.version>
5656

5757
<!-- Maven plugin versions -->
5858
<maven.compiler.version>3.11.0</maven.compiler.version>
@@ -154,7 +154,7 @@ public interface Weather {
154154
<java.version>17</java.version>
155155

156156
<!-- FIT version -->
157-
<fit.version>3.5.4-SNAPSHOT</fit.version>
157+
<fit.version>3.5.5-SNAPSHOT</fit.version>
158158

159159
<!-- Maven plugin versions -->
160160
<maven.compiler.version>3.11.0</maven.compiler.version>
@@ -334,7 +334,7 @@ public class RegistryCenterStarter {
334334
<java.version>17</java.version>
335335
336336
<!-- FIT version -->
337-
<fit.version>3.5.4-SNAPSHOT</fit.version>
337+
<fit.version>3.5.5-SNAPSHOT</fit.version>
338338
339339
<!-- Maven plugin versions -->
340340
<maven.compiler.version>3.11.0</maven.compiler.version>
@@ -534,7 +534,7 @@ public class DefaultWeatherStarter {
534534
<java.version>17</java.version>
535535
536536
<!-- FIT version -->
537-
<fit.version>3.5.4-SNAPSHOT</fit.version>
537+
<fit.version>3.5.5-SNAPSHOT</fit.version>
538538
539539
<!-- Maven plugin versions -->
540540
<maven.compiler.version>3.11.0</maven.compiler.version>
@@ -760,35 +760,35 @@ java -jar target/assistant-1.0-SNAPSHOT.jar
760760
- registry-center 的启动日志：
761761
762762
```
763-
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.direct.DirectFitRuntime] Prepare to start FIT application... [version=3.5.4-SNAPSHOT]
763+
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.direct.DirectFitRuntime] Prepare to start FIT application... [version=3.5.5-SNAPSHOT]
764764
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fit.http.server.handler.ReflectibleHttpHandlerRegistry] Register http handler group successfully. [group=modelengine.fit.http.openapi3.swagger.DocumentController]
765765
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fit.http.server.handler.ReflectibleHttpHandlerRegistry] Register http handler group successfully. [group=modelengine.fit.http.server.handler.OptionsHttpHandler]
766766
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fit.http.server.handler.ReflectibleHttpHandlerRegistry] Register http handler group successfully. [group=modelengine.fit.http.server.handler.StaticResourceHttpHandler]
767767
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fit.http.server.handler.ReflectibleHttpHandlerRegistry] Register http handler group successfully. [group=modelengine.fit.service.RegistryListener]
768768
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fit.http.server.handler.ReflectibleHttpHandlerRegistry] Register http handler group successfully. [group=modelengine.fit.service.CheckController]
769-
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.direct.DirectFitRuntime] FIT application started. [version=3.5.4-SNAPSHOT]
769+
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.direct.DirectFitRuntime] FIT application started. [version=3.5.5-SNAPSHOT]
770770
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [registry-client-thread-0] [modelengine.fit.service.RegistryClient] Register fitables successfully. All fitable services are ready.
771771
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [netty-http-server-thread-0] [modelengine.fit.http.server.netty.NettyHttpClassicServer] Start netty http server successfully. [httpPort=8090]
772772
```
773773
774774
- default-weather 的启动日志：
775775
776776
```
777-
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.direct.DirectFitRuntime] Prepare to start FIT application... [version=3.5.4-SNAPSHOT]
778-
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.direct.DirectFitRuntime] FIT application started. [version=3.5.4-SNAPSHOT]
777+
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.direct.DirectFitRuntime] Prepare to start FIT application... [version=3.5.5-SNAPSHOT]
778+
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.direct.DirectFitRuntime] FIT application started. [version=3.5.5-SNAPSHOT]
779779
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [netty-http-server-thread-0] [modelengine.fit.http.server.netty.NettyHttpClassicServer] Start netty http server successfully. [httpPort=8081]
780780
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [registry-client-thread-0] [modelengine.fit.service.RegistryClient] Register fitables successfully. All fitable services are ready.
781781
```
782782
783783
- assistant 的启动日志：
784784
785785
```
786-
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.direct.DirectFitRuntime] Prepare to start FIT application... [version=3.5.4-SNAPSHOT]
786+
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.direct.DirectFitRuntime] Prepare to start FIT application... [version=3.5.5-SNAPSHOT]
787787
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fit.http.server.handler.ReflectibleHttpHandlerRegistry] Register http handler group successfully. [group=modelengine.fit.demo4.controller.AssistantController]
788788
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fit.http.server.handler.ReflectibleHttpHandlerRegistry] Register http handler group successfully. [group=modelengine.fit.http.server.handler.OptionsHttpHandler]
789789
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fit.http.server.handler.ReflectibleHttpHandlerRegistry] Register http handler group successfully. [group=modelengine.fit.http.server.handler.StaticResourceHttpHandler]
790790
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fit.http.server.handler.ReflectibleHttpHandlerRegistry] Register http handler group successfully. [group=modelengine.fit.service.RegistryListener]
791-
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.direct.DirectFitRuntime] FIT application started. [version=3.5.4-SNAPSHOT]
791+
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.direct.DirectFitRuntime] FIT application started. [version=3.5.5-SNAPSHOT]
792792
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [netty-http-server-thread-0] [modelengine.fit.http.server.netty.NettyHttpClassicServer] Start netty http server successfully. [httpPort=8080]
793793
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [registry-client-thread-0] [modelengine.fit.service.RegistryClient] Register fitables successfully. All fitable services are ready.
794794
```

‎docs/framework/fit/java/user-guide-book/04. Web MVC 能力.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ mvn clean install
324324
打开 bash 窗口，并进入到自定义的用户插件目录，输入命令 `fit start`，其中 `start` 表示应用的启动；
325325

326326
```
327-
Running command: java -D"plugin.fit.dynamic.plugin.directory=/d/WorkSpace/custom" -jar fit-discrete-launcher-3.5.4-SNAPSHOT.jar
327+
Running command: java -D"plugin.fit.dynamic.plugin.directory=/d/WorkSpace/custom" -jar fit-discrete-launcher-3.5.5-SNAPSHOT.jar
328328
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.discrete.DiscreteFitRuntime] Prepare to start FIT application...
329329
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [main] [modelengine.fitframework.runtime.discrete.DiscreteFitRuntime] FIT application started.
330330
[yyyy-MM-dd hh:mm:ss.SSS] [INFO ] [registry-client-thread-0] [modelengine.fit.service.RegistryClient] Register fitables successfully. All fitable services are ready.

‎examples/fel-example/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<java.version>1.8</java.version>
1717

1818
<!-- Framework versions -->
19-
<fit.version>3.5.4-SNAPSHOT</fit.version>
20-
<fel.version>3.5.4-SNAPSHOT</fel.version>
19+
<fit.version>3.5.5-SNAPSHOT</fit.version>
20+
<fel.version>3.5.5-SNAPSHOT</fel.version>
2121

2222
<!-- Maven plugin versions -->
2323
<maven.antrun.version>3.1.0</maven.antrun.version>

‎examples/fit-example/01-simple-web-app/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<java.version>17</java.version>
1313

1414
<!-- FIT version -->
15-
<fit.version>3.5.4-SNAPSHOT</fit.version>
15+
<fit.version>3.5.5-SNAPSHOT</fit.version>
1616

1717
<!-- Maven plugin versions -->
1818
<maven.compiler.version>3.14.0</maven.compiler.version>

0 commit comments

Comments
 (0)