Skip to content

Commit d55bba4

Browse files
committed
Merge branch '1.2.x'
2 parents 763e1a9 + 1dda8aa commit d55bba4

File tree

7 files changed

+14
-34
lines changed

7 files changed

+14
-34
lines changed

app-builder/plugins/aipp-plugin/src/main/resources/application-prod.yml renamed to app-builder/plugins/aipp-plugin/src/main/resources/application.yml

File renamed without changes.

app-builder/plugins/flow-graph-db-driver/src/main/resources/application-prod.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

app-builder/plugins/flow-graph-db-driver/src/main/resources/application.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,9 @@ mybatis:
2929
mapper-locations: mapper/*Mapper.xml
3030

3131
forest:
32-
interface-package: modelengine.fit.jane.external
32+
interface-package: modelengine.fit.jane.external
33+
34+
corsfilter:
35+
priority: 50
36+
patterns: "/**"
37+
origin: ""

app-builder/plugins/task-new/src/main/resources/application-prod.yml renamed to app-builder/plugins/task-new/src/main/resources/application.yml

File renamed without changes.

app-builder/plugins/voice-text-adapter/src/main/resources/application-prod.yml renamed to app-builder/plugins/voice-text-adapter/src/main/resources/application.yml

File renamed without changes.

app-builder/waterflow/java/waterflow-service/src/main/resources/application-prod.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

app-builder/waterflow/java/waterflow-service/src/main/resources/application.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@ jane:
1818
isNeedFlowCallbackAdapt: false
1919
contextExpiredDays: 1
2020

21-
distributed-lock-provider: databaseDistributedLockProvider
21+
distributed-lock-provider: databaseDistributedLockProvider
22+
23+
modelengine:
24+
tenantId:
25+
ownTrace: false
26+
useLimit: true
27+
limit: 2
28+
operator:

0 commit comments

Comments
 (0)