From f6129f8629611462b62eb454386befba841d3d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=9F=E6=98=9F=E7=9A=84=E5=A4=A9=E7=A9=BA?=
<1015074735@qq.com>
Date: Wed, 7 May 2025 09:50:57 +0800
Subject: [PATCH 01/41] =?UTF-8?q?fix:=E5=B0=86=E8=AF=B7=E6=B1=82=E7=9A=84?=
=?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4=E4=B8=BA?=
=?UTF-8?q?30=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
console-ui/src/service/base/index.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/console-ui/src/service/base/index.ts b/console-ui/src/service/base/index.ts
index 2a68f71f..8b32d6d9 100644
--- a/console-ui/src/service/base/index.ts
+++ b/console-ui/src/service/base/index.ts
@@ -5,7 +5,7 @@ function createRequestInstance() {
// 创建实例
const instance = axios.create({
baseURL: '',
- timeout: 10000,
+ timeout: 30000,
headers: {},
});
--
Gitee
From 0eb3c99ba702c866ae66fdfbe39a602791dedfb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=9F=E6=98=9F=E7=9A=84=E5=A4=A9=E7=A9=BA?=
<1015074735@qq.com>
Date: Wed, 7 May 2025 17:07:11 +0800
Subject: [PATCH 02/41] =?UTF-8?q?fix:=E8=A1=A5=E5=85=85JavaScript=E7=9A=84?=
=?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BD=BF=E7=94=A8=E8=AF=B4=E6=98=8E=E6=96=87?=
=?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docs/docs/.vuepress/config.ts | 2 +-
docs/docs/notes/guide/user/nodes/code-node.md | 27 +++++++++++++++++--
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/docs/docs/.vuepress/config.ts b/docs/docs/.vuepress/config.ts
index 7f239f8e..5340f6b6 100644
--- a/docs/docs/.vuepress/config.ts
+++ b/docs/docs/.vuepress/config.ts
@@ -10,7 +10,7 @@ export default defineUserConfig({
description: 'juggle是一个可用于微服务接口编排,BFF层,第三方系统对接,私有化定制等场景的完整解决方案',
head:[
['link', { rel: 'icon', href: '/images/favicon.ico' }],
- ['meta', { name: 'keywords', content: 'juggle,微服务接口编排,bff,定制化开发,流程编排,低代码,AI,零代码'}],
+ ['meta', { name: 'keywords', content: 'juggle,微服务接口编排,bff,定制化开发,流程编排,连接器,低代码,AI,零代码'}],
[
"script",
{},
diff --git a/docs/docs/notes/guide/user/nodes/code-node.md b/docs/docs/notes/guide/user/nodes/code-node.md
index f804dd6a..bfb75fe0 100644
--- a/docs/docs/notes/guide/user/nodes/code-node.md
+++ b/docs/docs/notes/guide/user/nodes/code-node.md
@@ -24,7 +24,7 @@ permalink: /docs/guide/user/nodes/code-node/
#### a.支持脚本代码
-Juggle的代码节点支持Groovy,JavaScript,Python等多种语言代码。
+Juggle的代码节点支持Groovy,JavaScript,Python,Java等多种语言代码。
#### 1.Groovy示例
@@ -55,4 +55,27 @@ def user = jsonSlurper.parseText(userStr)
println(user.name);
```
-**Groovy新手教程:**https://cloud.tencent.com/developer/chapter/18236
\ No newline at end of file
+**Groovy新手教程:**https://cloud.tencent.com/developer/chapter/18236
+
+
+
+#### 2.JavaScript示例
+
+在代码节点也允许通过JavaScript脚本来增强流程的能力,下面将详细介绍如何使用JavaScript脚本
+
+##### a.在JavaScript代码中获取和设置流程变量
+
+在JavaScript脚本中通过$var.getVariableValue('变量key')来获取具体的变量,通过$var.setVariableValue('变量key',值);来对变量进行赋值。
+
+```javascript
+// 获取变量
+// var env_name = $var.getVariableValue('变量key');
+// 设置变量
+// $var.setVariableValue('变量key',值);
+
+//例子如下:
+//获取入参变量input_name
+var userName = $var.getVariableValue('input_name')
+//将出参变量的值设置成6666
+$var.setVariableValue('output_userName',6666)
+```
\ No newline at end of file
--
Gitee
From 7065a90bc6bcffd2732c669bb07aa0b244e4b56c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=9F=E6=98=9F=E7=9A=84=E5=A4=A9=E7=A9=BA?=
<1015074735@qq.com>
Date: Thu, 8 May 2025 16:31:14 +0800
Subject: [PATCH 03/41] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3=E6=B5=8F=E8=A7=88?=
=?UTF-8?q?=E5=99=A8=E6=94=BE=E5=A4=A7=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C?=
=?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=9A=90=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
console-ui/src/views/flow/define/FlowDefineTable.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/console-ui/src/views/flow/define/FlowDefineTable.vue b/console-ui/src/views/flow/define/FlowDefineTable.vue
index 94f50e10..d6e2d346 100644
--- a/console-ui/src/views/flow/define/FlowDefineTable.vue
+++ b/console-ui/src/views/flow/define/FlowDefineTable.vue
@@ -50,7 +50,7 @@ function goDesignPage(flowDefinitionId: number, flowKey: string) {
异步
-
+
--
Gitee
From f45ba3f9e96e23d2c0c1dd8404a1ab6519db1bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=9F=E6=98=9F=E7=9A=84=E5=A4=A9=E7=A9=BA?=
<1015074735@qq.com>
Date: Thu, 8 May 2025 16:46:54 +0800
Subject: [PATCH 04/41] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?=
=?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docs/docs/notes/changelog/1.x/2025-4-27-juggle-1.3.1-issue.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/docs/notes/changelog/1.x/2025-4-27-juggle-1.3.1-issue.md b/docs/docs/notes/changelog/1.x/2025-4-27-juggle-1.3.1-issue.md
index e0b40aed..7bfddaea 100644
--- a/docs/docs/notes/changelog/1.x/2025-4-27-juggle-1.3.1-issue.md
+++ b/docs/docs/notes/changelog/1.x/2025-4-27-juggle-1.3.1-issue.md
@@ -1,5 +1,5 @@
---
-title: juggle v1.3.1版本 - 2025/4/27 (待发布)
+title: juggle v1.3.1版本 - 2025/4/27
createTime: 2025/03/06 15:44:32
permalink: /changelog/1.x/juggle-1.3.1.html
---
--
Gitee
From 6a13620bf0b1ca5ba8c8e1ff93097fa26f407e95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=8E=E5=A4=A9=E7=9A=84=E5=9C=B0=E5=B9=B3=E7=BA=BF?=
<305123882@qq.com>
Date: Sat, 10 May 2025 23:58:22 +0800
Subject: [PATCH 05/41] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E5=88=86?=
=?UTF-8?q?=E7=B1=BB=E8=BF=87=E6=BB=A4=E5=99=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/common/ClassifyFilter.vue | 110 ++++++++++++++++++
1 file changed, 110 insertions(+)
create mode 100644 console-ui/src/components/common/ClassifyFilter.vue
diff --git a/console-ui/src/components/common/ClassifyFilter.vue b/console-ui/src/components/common/ClassifyFilter.vue
new file mode 100644
index 00000000..94e0db58
--- /dev/null
+++ b/console-ui/src/components/common/ClassifyFilter.vue
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+ {{ item.title }} :
+
+
暂无数据 ~
+
+
+ -
+
+
+
+
+ {{ option.label }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
--
Gitee
From de24011b547f4dad249e46768ae0476117ef1d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=8E=E5=A4=A9=E7=9A=84=E5=9C=B0=E5=B9=B3=E7=BA=BF?=
<305123882@qq.com>
Date: Sun, 11 May 2025 18:12:07 +0800
Subject: [PATCH 06/41] =?UTF-8?q?fix:=20=E6=A8=A1=E6=9D=BF=E5=B8=82?=
=?UTF-8?q?=E5=9C=BA=E5=92=8C=E5=A5=97=E4=BB=B6=E5=B8=82=E5=9C=BA=EF=BC=8C?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=86=E7=B1=BB=E6=98=BE=E7=A4=BA=E6=95=88?=
=?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/common/ClassifyFilter.vue | 74 +++++++++++++++++--
.../src/service/module/suiteMarketService.ts | 16 +++-
.../service/module/templateMarketService.ts | 16 +++-
console-ui/src/views/market/SuiteMarket.vue | 41 +++++-----
.../src/views/market/TemplateMarket.vue | 40 +++++-----
5 files changed, 140 insertions(+), 47 deletions(-)
diff --git a/console-ui/src/components/common/ClassifyFilter.vue b/console-ui/src/components/common/ClassifyFilter.vue
index 94e0db58..90f546a8 100644
--- a/console-ui/src/components/common/ClassifyFilter.vue
+++ b/console-ui/src/components/common/ClassifyFilter.vue
@@ -74,14 +74,14 @@ const select = (item: SelectDataProps, option: OptionsProps) => {
-
-
-
+
+
+
{{ item.title }} :
-
暂无数据 ~
+
暂无数据 ~
-
+
- {
\ No newline at end of file
diff --git a/console-ui/src/service/module/suiteMarketService.ts b/console-ui/src/service/module/suiteMarketService.ts
index 698036eb..9255228a 100644
--- a/console-ui/src/service/module/suiteMarketService.ts
+++ b/console-ui/src/service/module/suiteMarketService.ts
@@ -3,7 +3,21 @@ import { ResponseResult } from '@/service/base';
import {SuiteMarketInfo} from '@/typings';
export async function querySuiteMarketClassifyList() {
- return suiteMarketAPI.querySuiteMarketClassifyList();
+ const res = await suiteMarketAPI.querySuiteMarketClassifyList();
+ if (res.success) {
+ const suiteClassifyFilter = {
+ title: "套件分类",
+ key: "suiteClassify",
+ options : [{label: "全部",value: ""},
+ ...res.result.map(item => ({
+ value: item.id,
+ label: item.classifyName
+ }))]
+ }
+ return suiteClassifyFilter;
+ } else {
+ return null;
+ }
}
export async function querySuiteMarketList(params: Parameters[0]) {
diff --git a/console-ui/src/service/module/templateMarketService.ts b/console-ui/src/service/module/templateMarketService.ts
index 11b44901..31eb5c75 100644
--- a/console-ui/src/service/module/templateMarketService.ts
+++ b/console-ui/src/service/module/templateMarketService.ts
@@ -3,7 +3,21 @@ import { ResponseResult } from '@/service/base';
import { TemplateMarketInfo} from '@/typings';
export async function queryTemplateMarketClassifyList() {
- return templateMarketAPI.queryTemplateMarketClassifyList();
+ const res = await templateMarketAPI.queryTemplateMarketClassifyList();
+ if (res.success) {
+ const suiteClassifyFilter = {
+ title: "模板分类",
+ key: "templateClassify",
+ options : [{label: "全部",value: ""},
+ ...res.result.map(item => ({
+ value: item.id,
+ label: item.classifyName
+ }))]
+ }
+ return suiteClassifyFilter;
+ } else {
+ return null;
+ }
}
export async function queryTemplateMarketList(params: Parameters[0]) {
diff --git a/console-ui/src/views/market/SuiteMarket.vue b/console-ui/src/views/market/SuiteMarket.vue
index 899891ce..210111c9 100644
--- a/console-ui/src/views/market/SuiteMarket.vue
+++ b/console-ui/src/views/market/SuiteMarket.vue
@@ -4,13 +4,14 @@ import { suiteMarketService } from '@/service';
import {ref} from 'vue';
import {Search} from "@element-plus/icons-vue";
import { reactive } from 'vue';
+import ClassifyFilter from "@/components/common/ClassifyFilter.vue";
const router = useRouter();
const suiteMarketList = ref[]>([]);
-const suiteMarketClassifyList = ref[]>([]);
const pageNum = ref(1);
const loading = ref(false);
const noMoreSuite = ref(false);
+const filterData = ref([]);
const filterValue = reactive({
suiteName: '',
suiteClassifyId: null,
@@ -19,13 +20,15 @@ const filterValue = reactive({
querySuiteMarketClassifyList();
querySuiteMarketList();
-async function changeSuiteClassify(){
+async function changeSuiteName(){
noMoreSuite.value = false;
suiteMarketList.value = [];
await querySuiteMarketList();
}
-async function changeSuiteName(){
+
+async function changeFilter(val:any){
+ filterValue.suiteClassifyId = val.suiteClassify;
noMoreSuite.value = false;
suiteMarketList.value = [];
await querySuiteMarketList();
@@ -69,9 +72,9 @@ async function querySuiteMarketList() {
}
async function querySuiteMarketClassifyList() {
- const res = await suiteMarketService.querySuiteMarketClassifyList();
- if (res.success) {
- suiteMarketClassifyList.value = res.result;
+ const suiteClassifyFilter = await suiteMarketService.querySuiteMarketClassifyList();
+ if(suiteClassifyFilter != null){
+ filterData.value.push(suiteClassifyFilter);
}
}
@@ -89,24 +92,14 @@ function goToSuiteMarketDetail(suiteId: number) {
-
-
-
-
+
@@ -132,7 +125,15 @@ function goToSuiteMarketDetail(suiteId: number) {
padding: 20px;
.suite-filter {
+ display: flex;
+ justify-content: center;
margin-bottom: 20px;
+ flex-direction: column;
+ align-items: center;
+ .suite-filter-name {
+ width: 500px;
+ margin-bottom: 13px;
+ }
}
.el-col {
diff --git a/console-ui/src/views/market/TemplateMarket.vue b/console-ui/src/views/market/TemplateMarket.vue
index d1955f65..2817c4c8 100644
--- a/console-ui/src/views/market/TemplateMarket.vue
+++ b/console-ui/src/views/market/TemplateMarket.vue
@@ -4,13 +4,14 @@ import {templateMarketService} from '@/service';
import {ref} from 'vue';
import {Search} from "@element-plus/icons-vue";
import { reactive } from 'vue';
+import ClassifyFilter from "@/components/common/ClassifyFilter.vue";
const router = useRouter();
const templateMarketList = ref[]>([]);
-const templateMarketClassifyList = ref[]>([]);
const pageNum = ref(1);
const loading = ref(false);
const noMoreTemplate = ref(false);
+const filterData = ref([]);
const filterValue = reactive({
templateName: '',
templateClassifyId: null,
@@ -20,13 +21,14 @@ const filterValue = reactive({
queryTemplateMarketClassifyList();
queryTemplateMarketList();
-async function changeTemplateClassify(){
+async function changeTemplateName(){
noMoreTemplate.value = false;
templateMarketList.value = [];
await queryTemplateMarketList();
}
-async function changeTemplateName(){
+async function changeFilter(val:any){
+ filterValue.templateClassifyId = val.templateClassify;
noMoreTemplate.value = false;
templateMarketList.value = [];
await queryTemplateMarketList();
@@ -70,9 +72,9 @@ async function queryTemplateMarketList() {
}
async function queryTemplateMarketClassifyList() {
- const res = await templateMarketService.queryTemplateMarketClassifyList();
- if (res.success) {
- templateMarketClassifyList.value = res.result;
+ const templateClassifyFilter = await templateMarketService.queryTemplateMarketClassifyList();
+ if(templateClassifyFilter != null){
+ filterData.value.push(templateClassifyFilter);
}
}
@@ -90,24 +92,14 @@ function goToTemplateMarketDetail(templateId: number) {
-
-
-
-
+
@@ -138,7 +130,15 @@ function goToTemplateMarketDetail(templateId: number) {
padding: 20px;
.template-filter {
+ display: flex;
+ justify-content: center;
margin-bottom: 20px;
+ flex-direction: column;
+ align-items: center;
+ .template-filter-name {
+ width: 500px;
+ margin-bottom: 13px;
+ }
}
.el-col {
--
Gitee
From b622155702869b886aeb8e65cda7845a3b11d6d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=8E=E5=A4=A9=E7=9A=84=E5=9C=B0=E5=B9=B3=E7=BA=BF?=
<305123882@qq.com>
Date: Sun, 11 May 2025 23:03:15 +0800
Subject: [PATCH 07/41] =?UTF-8?q?fix:=20=E6=A8=A1=E6=9D=BF=E5=B8=82?=
=?UTF-8?q?=E5=9C=BA=E5=92=8C=E5=A5=97=E4=BB=B6=E5=B8=82=E5=9C=BA=EF=BC=8C?=
=?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=A5=97=E4=BB=B6=E7=9A=84=E5=88=86=E7=B1=BB?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=B2=A1=E6=9C=89=E5=A5=97=E4=BB=B6=E7=9A=84?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
console-ui/src/views/market/SuiteMarket.vue | 3 ++-
console-ui/src/views/market/TemplateMarket.vue | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/console-ui/src/views/market/SuiteMarket.vue b/console-ui/src/views/market/SuiteMarket.vue
index 210111c9..89207803 100644
--- a/console-ui/src/views/market/SuiteMarket.vue
+++ b/console-ui/src/views/market/SuiteMarket.vue
@@ -101,7 +101,7 @@ function goToSuiteMarketDetail(suiteId: number) {
/>
-
+
diff --git a/console-ui/src/views/market/TemplateMarket.vue b/console-ui/src/views/market/TemplateMarket.vue
index 2817c4c8..671cd472 100644
--- a/console-ui/src/views/market/TemplateMarket.vue
+++ b/console-ui/src/views/market/TemplateMarket.vue
@@ -101,7 +101,7 @@ function goToTemplateMarketDetail(templateId: number) {
/>
-
+
--
Gitee
From d4ffe719ae37ed03dbe6dcae5de18583ba1bedd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=8E=E5=A4=A9=E7=9A=84=E5=9C=B0=E5=B9=B3=E7=BA=BF?=
<305123882@qq.com>
Date: Sun, 18 May 2025 16:51:45 +0800
Subject: [PATCH 08/41] =?UTF-8?q?fix:=20=E8=A7=84=E8=8C=83=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E7=9A=84=E8=AF=B7=E6=B1=82=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../constants/ApplicationConstants.java | 2 ++
console-ui/src/const/application.ts | 3 +++
console-ui/src/service/api/api.ts | 19 ++++++++++---------
console-ui/src/service/api/common.ts | 3 ++-
console-ui/src/service/api/dataSource.ts | 15 ++++++++-------
console-ui/src/service/api/flow.ts | 7 ++++---
console-ui/src/service/api/flowDefine.ts | 17 +++++++++--------
console-ui/src/service/api/flowVersion.ts | 11 ++++++-----
console-ui/src/service/api/object.ts | 13 +++++++------
console-ui/src/service/api/order.ts | 5 +++--
console-ui/src/service/api/suite.ts | 11 ++++++-----
console-ui/src/service/api/suiteMarket.ts | 9 +++++----
console-ui/src/service/api/templateMarket.ts | 11 ++++++-----
console-ui/src/service/api/token.ts | 9 +++++----
console-ui/src/service/api/user.ts | 5 +++--
console-ui/vite.config.ts | 2 +-
.../api/DataTypeInfoController.java | 3 ++-
.../controller/api/ObjectController.java | 3 ++-
.../controller/api/OrderController.java | 3 ++-
.../controller/api/UserController.java | 3 ++-
.../api/flow/FlowDefinitionController.java | 3 ++-
.../api/flow/FlowInfoController.java | 3 ++-
.../api/flow/FlowVersionController.java | 3 ++-
.../api/market/TemplateController.java | 3 ++-
.../controller/api/suite/ApiController.java | 3 ++-
.../controller/api/suite/SuiteController.java | 3 ++-
.../api/system/DataSourceController.java | 3 ++-
.../api/system/TokenController.java | 3 ++-
28 files changed, 104 insertions(+), 74 deletions(-)
create mode 100644 console-ui/src/const/application.ts
diff --git a/common/src/main/java/net/somta/juggle/common/constants/ApplicationConstants.java b/common/src/main/java/net/somta/juggle/common/constants/ApplicationConstants.java
index b26928ca..1b3d6cea 100644
--- a/common/src/main/java/net/somta/juggle/common/constants/ApplicationConstants.java
+++ b/common/src/main/java/net/somta/juggle/common/constants/ApplicationConstants.java
@@ -7,6 +7,8 @@ public class ApplicationConstants {
public static final String JUGGLE_SERVER_VERSION = "/v1";
+ public static final String JUGGLE_API_PREFIX = "/api" + JUGGLE_SERVER_VERSION;
+
public static final String JUGGLE_OPEN_API_PREFIX = "/open" + JUGGLE_SERVER_VERSION;
/**
diff --git a/console-ui/src/const/application.ts b/console-ui/src/const/application.ts
new file mode 100644
index 00000000..6006d27f
--- /dev/null
+++ b/console-ui/src/const/application.ts
@@ -0,0 +1,3 @@
+
+export const JUGGLE_SERVER_VERSION = "/v1";
+export const JUGGLE_API_PREFIX = "/api" + JUGGLE_SERVER_VERSION;
\ No newline at end of file
diff --git a/console-ui/src/service/api/api.ts b/console-ui/src/service/api/api.ts
index 33323e48..9fe50541 100644
--- a/console-ui/src/service/api/api.ts
+++ b/console-ui/src/service/api/api.ts
@@ -1,5 +1,6 @@
import type { ApiInfo } from '@/typings';
import { request, type ResponsePageResult, type ResponseResult } from '../base';
+import {JUGGLE_API_PREFIX} from "@/const/application.ts";
export async function listQuery(params: {
pageNum: number;
@@ -8,7 +9,7 @@ export async function listQuery(params: {
apiName?: string;
apiUrl?: string;
}): ResponsePageResult {
- return request.post('/v1/api/page', params);
+ return request.post(JUGGLE_API_PREFIX+'/api/page', params);
}
export async function listAdd(params: {
@@ -19,7 +20,7 @@ export async function listAdd(params: {
apiRequestType: string;
apiRequestContentType: string;
}): ResponseResult {
- return request.post('/v1/api/add', params);
+ return request.post(JUGGLE_API_PREFIX+'/api/add', params);
}
export async function listUpdate(params: {
@@ -31,29 +32,29 @@ export async function listUpdate(params: {
apiRequestType?: string;
apiRequestContentType?: string;
}): ResponseResult {
- return request.put('/v1/api/update', params);
+ return request.put(JUGGLE_API_PREFIX+'/api/update', params);
}
export async function listDelete(id: number): ResponseResult {
- return request.delete(`/v1/api/delete/${id}`);
+ return request.delete(JUGGLE_API_PREFIX+`/api/delete/${id}`);
}
export async function queryApiInfo(id: number): ResponseResult {
- return request.get(`/v1/api/info/${id}`);
+ return request.get(JUGGLE_API_PREFIX+`/api/info/${id}`);
}
export async function queryApiInfoByCode(apiCode: string): ResponseResult {
- return request.get(`/v1/api/info/code/${apiCode}`);
+ return request.get(JUGGLE_API_PREFIX+`/api/info/code/${apiCode}`);
}
export function debugApi(apiId: number, params: { headerData: any; inputParamData: any }): ResponseResult {
- return request.post(`/v1/api/debug/${apiId}`, params);
+ return request.post(JUGGLE_API_PREFIX+`/api/debug/${apiId}`, params);
}
export async function getApiListBySuiteId(suiteId: number): ResponseResult {
- return request.post(`/v1/api/getApiListBySuiteId/${suiteId}`);
+ return request.post(JUGGLE_API_PREFIX+`/api/getApiListBySuiteId/${suiteId}`);
}
export async function getApiListBySuiteCode(suiteCode: string): ResponseResult {
- return request.post(`/v1/api/getApiListBySuiteCode/${suiteCode}`);
+ return request.post(JUGGLE_API_PREFIX+`/api/getApiListBySuiteCode/${suiteCode}`);
}
diff --git a/console-ui/src/service/api/common.ts b/console-ui/src/service/api/common.ts
index 04d4f601..b7823a19 100644
--- a/console-ui/src/service/api/common.ts
+++ b/console-ui/src/service/api/common.ts
@@ -1,5 +1,6 @@
import { request, ResponseResult } from '@/service/base';
+import {JUGGLE_API_PREFIX} from "@/const/application.ts";
export function listDataType(): ResponseResult {
- return request.get('/v1/dataType/list');
+ return request.get(JUGGLE_API_PREFIX+'/dataType/list');
}
diff --git a/console-ui/src/service/api/dataSource.ts b/console-ui/src/service/api/dataSource.ts
index 5b3b9b5d..dd3806f1 100644
--- a/console-ui/src/service/api/dataSource.ts
+++ b/console-ui/src/service/api/dataSource.ts
@@ -1,4 +1,5 @@
import { request, ResponsePageResult, type ResponseResult } from '@/service/base';
+import {JUGGLE_API_PREFIX} from "@/const/application.ts";
export async function addDataSource(params: {
dataSourceName: string;
@@ -14,11 +15,11 @@ export async function addDataSource(params: {
maxPoolSize: number;
queryTimeout: number;
}): ResponseResult {
- return request.post(`/v1/datasource/add`, params);
+ return request.post(JUGGLE_API_PREFIX+`/datasource/add`, params);
}
export async function deleteDataSourceById(datasourceId: number): ResponseResult {
- return request.delete(`/v1/datasource/delete/${datasourceId}`);
+ return request.delete(JUGGLE_API_PREFIX+`/datasource/delete/${datasourceId}`);
}
export async function updateDataSourceById(params: {
@@ -36,21 +37,21 @@ export async function updateDataSourceById(params: {
maxPoolSize: number;
queryTimeout: number;
}): ResponseResult {
- return request.put(`/v1/datasource/update`, params);
+ return request.put(JUGGLE_API_PREFIX+`/datasource/update`, params);
}
export async function queryDataSourceInfo(dataSourceId: number): ResponsePageResult {
- return request.get('/v1/datasource/info/' + dataSourceId);
+ return request.get(JUGGLE_API_PREFIX+'/datasource/info/' + dataSourceId);
}
export async function dataSourceList(): ResponsePageResult {
- return request.get('/v1/datasource/list');
+ return request.get(JUGGLE_API_PREFIX+'/datasource/list');
}
export async function dataSourcePage(params: { pageNum: number; pageSize: number }): ResponsePageResult {
- return request.post('/v1/datasource/page', params);
+ return request.post(JUGGLE_API_PREFIX+'/datasource/page', params);
}
export async function connectDataSource(dataSourceId: number): ResponsePageResult {
- return request.get('/v1/datasource/connect/' + dataSourceId);
+ return request.get(JUGGLE_API_PREFIX+'/datasource/connect/' + dataSourceId);
}
diff --git a/console-ui/src/service/api/flow.ts b/console-ui/src/service/api/flow.ts
index b39f7434..92e0e27f 100644
--- a/console-ui/src/service/api/flow.ts
+++ b/console-ui/src/service/api/flow.ts
@@ -1,13 +1,14 @@
import { request, ResponsePageResult, ResponseResult } from '@/service/base';
+import {JUGGLE_API_PREFIX} from "@/const/application.ts";
export function updateFlowStatus(flowId: number, flowStatus: number): ResponsePageResult {
- return request.put('/v1/flow/status', { flowId: flowId, flowStatus: flowStatus });
+ return request.put(JUGGLE_API_PREFIX+'/flow/status', { flowId: flowId, flowStatus: flowStatus });
}
export async function flowPage(params: { pageNum: number; pageSize: number; flowName?: string; flowType?: string }): ResponsePageResult {
- return request.post('/v1/flow/page', params);
+ return request.post(JUGGLE_API_PREFIX+'/flow/page', params);
}
export async function deleteFlow(id: number): ResponseResult {
- return request.delete(`/v1/flow/delete/${id}`);
+ return request.delete(JUGGLE_API_PREFIX+`/flow/delete/${id}`);
}
diff --git a/console-ui/src/service/api/flowDefine.ts b/console-ui/src/service/api/flowDefine.ts
index 627ffd54..3fcb5c6a 100644
--- a/console-ui/src/service/api/flowDefine.ts
+++ b/console-ui/src/service/api/flowDefine.ts
@@ -1,6 +1,7 @@
import { request, type ResponsePageResult, type ResponseResult } from '../base';
import { FlowDefineInfo, InputParams, OutputParams } from '@/typings';
import { FlowVariable } from '@/views/flow/design';
+import {JUGGLE_API_PREFIX} from "@/const/application.ts";
export async function addDefineInfo(params: {
flowName: string;
@@ -9,19 +10,19 @@ export async function addDefineInfo(params: {
flowInputParams?: InputParams[];
flowOutputParams?: OutputParams[];
}): ResponseResult {
- return request.post(`/v1/flow/definition/add`, params);
+ return request.post(JUGGLE_API_PREFIX+`/flow/definition/add`, params);
}
export async function getDefineInfo(id: number): ResponseResult {
- return request.get(`/v1/flow/definition/info/${id}`);
+ return request.get(JUGGLE_API_PREFIX+`/flow/definition/info/${id}`);
}
export async function flowDefinePage(params: { pageNum: number; pageSize: number; flowName?: string; flowType?: string }): ResponsePageResult {
- return request.post('/v1/flow/definition/page', params);
+ return request.post(JUGGLE_API_PREFIX+'/flow/definition/page', params);
}
export async function deleteFlowDefine(id: number): ResponseResult {
- return request.delete(`/v1/flow/definition/delete/${id}`);
+ return request.delete(JUGGLE_API_PREFIX+`/flow/definition/delete/${id}`);
}
export async function updateDefineInfo(params: {
@@ -32,15 +33,15 @@ export async function updateDefineInfo(params: {
flowInputParams?: InputParams[];
flowOutputParams?: OutputParams[];
}): ResponseResult {
- return request.put(`/v1/flow/definition/update`, params);
+ return request.put(JUGGLE_API_PREFIX+`/flow/definition/update`, params);
}
export async function saveFlowContent(params: { id: number; flowContent: string; flowVariables?: FlowVariable[] }): ResponseResult {
- return request.put('/v1/flow/definition/save', params);
+ return request.put(JUGGLE_API_PREFIX+'/flow/definition/save', params);
}
export function deployFlowDefine(params: { flowDefinitionId: string; flowDeployVersion: string; flowVersionRemark: string }): ResponsePageResult {
- return request.post('/v1/flow/definition/deploy', params);
+ return request.post(JUGGLE_API_PREFIX+'/flow/definition/deploy', params);
}
export async function debugFlow(
@@ -49,5 +50,5 @@ export async function debugFlow(
flowData?: Record;
}
): ResponseResult {
- return request.post(`/v1/flow/definition/debug/${flowKey}`, triggerData);
+ return request.post(JUGGLE_API_PREFIX+`/flow/definition/debug/${flowKey}`, triggerData);
}
diff --git a/console-ui/src/service/api/flowVersion.ts b/console-ui/src/service/api/flowVersion.ts
index c8bd3e7b..b05603ed 100644
--- a/console-ui/src/service/api/flowVersion.ts
+++ b/console-ui/src/service/api/flowVersion.ts
@@ -1,21 +1,22 @@
import { request, ResponsePageResult, ResponseResult } from '@/service/base';
+import {JUGGLE_API_PREFIX} from "@/const/application.ts";
export function getLatestDeployVersion(flowId: number): ResponsePageResult {
- return request.get('/v1/flow/version/latest/' + flowId);
+ return request.get(JUGGLE_API_PREFIX+'/flow/version/latest/' + flowId);
}
export function updateFlowVersionStatus(flowVersionId: number, flowVersionStatus: number): ResponsePageResult {
- return request.put('/v1/flow/version/status', { flowVersionId: flowVersionId, flowVersionStatus: flowVersionStatus });
+ return request.put(JUGGLE_API_PREFIX+'/flow/version/status', { flowVersionId: flowVersionId, flowVersionStatus: flowVersionStatus });
}
export async function flowVersionPage(params: { pageNum: number; pageSize: number; flowId: number; flowVersionStatus?: number }): ResponsePageResult {
- return request.post('/v1/flow/version/page', params);
+ return request.post(JUGGLE_API_PREFIX+'/flow/version/page', params);
}
export async function deleteFlowVersion(id: number): ResponseResult {
- return request.delete(`/v1/flow/version/delete/${id}`);
+ return request.delete(JUGGLE_API_PREFIX+`/flow/version/delete/${id}`);
}
export async function getAsyncFlowResult(flowInstanceId: string): ResponseResult {
- return request.get(`/v1/flow/version/getAsyncFlowResult/${flowInstanceId}`);
+ return request.get(JUGGLE_API_PREFIX+`/flow/version/getAsyncFlowResult/${flowInstanceId}`);
}
diff --git a/console-ui/src/service/api/object.ts b/console-ui/src/service/api/object.ts
index ca6b45df..34d4e21a 100644
--- a/console-ui/src/service/api/object.ts
+++ b/console-ui/src/service/api/object.ts
@@ -1,5 +1,6 @@
import { request, ResponsePageResult, type ResponseResult } from '@/service/base';
import { ObjectInfo, ObjectProperty } from '@/typings';
+import {JUGGLE_API_PREFIX} from "@/const/application.ts";
export async function addObject(params: {
objectKey: string;
@@ -7,11 +8,11 @@ export async function addObject(params: {
objectDesc?: string;
props?: ObjectProperty[];
}): ResponseResult {
- return request.post(`/v1/object/add`, params);
+ return request.post(JUGGLE_API_PREFIX+`/object/add`, params);
}
export async function deleteObjectById(objectId: number): ResponseResult {
- return request.delete(`/v1/object/delete/${objectId}`);
+ return request.delete(JUGGLE_API_PREFIX+`/object/delete/${objectId}`);
}
export async function updateObjectById(params: {
@@ -20,20 +21,20 @@ export async function updateObjectById(params: {
objectDesc?: string;
props?: ObjectProperty[];
}): ResponseResult {
- return request.put(`/v1/object/update`, params);
+ return request.put(JUGGLE_API_PREFIX+`/object/update`, params);
}
export async function queryObjectInfo(objectId: number): ResponseResult {
- return request.get(`/v1/object/info/${objectId}`);
+ return request.get(JUGGLE_API_PREFIX+`/object/info/${objectId}`);
}
export async function isExistObjectKey(params: {
id: number | null;
objectKey: string;
}): ResponseResult {
- return request.post(`/v1/object/exist/key`,params);
+ return request.post(JUGGLE_API_PREFIX+`/object/exist/key`,params);
}
export async function objectPage(params: { pageNum: number; pageSize: number; objectName?: string }): ResponsePageResult {
- return request.post('/v1/object/page', params);
+ return request.post(JUGGLE_API_PREFIX+'/object/page', params);
}
diff --git a/console-ui/src/service/api/order.ts b/console-ui/src/service/api/order.ts
index 57d59f8b..9b961298 100644
--- a/console-ui/src/service/api/order.ts
+++ b/console-ui/src/service/api/order.ts
@@ -1,16 +1,17 @@
import { request, type ResponseResult } from '@/service/base';
import {CreateOrder} from "@/typings";
+import {JUGGLE_API_PREFIX} from "@/const/application.ts";
export async function createOrder(params: {
orderName: string;
orderType: number;
goodsId: number;
}): ResponseResult {
- return request.post(`/v1/order/createOrder`, params);
+ return request.post(JUGGLE_API_PREFIX+`/order/createOrder`, params);
}
export async function getOrderPayStatus(orderNo: string): ResponseResult {
- return request.get(`/v1/order/getOrderPayStatus/${orderNo}`);
+ return request.get(JUGGLE_API_PREFIX+`/order/getOrderPayStatus/${orderNo}`);
}
diff --git a/console-ui/src/service/api/suite.ts b/console-ui/src/service/api/suite.ts
index c273b05d..3a56b51f 100644
--- a/console-ui/src/service/api/suite.ts
+++ b/console-ui/src/service/api/suite.ts
@@ -1,21 +1,22 @@
import { request, type ResponsePageResult, type ResponseResult } from '../base';
+import {JUGGLE_API_PREFIX} from "@/const/application.ts";
export async function addSuite(params: { suiteCode: string; suiteName: string; suiteDesc: string }): ResponseResult {
- return request.post('/v1/suite/add', params);
+ return request.post(JUGGLE_API_PREFIX+'/suite/add', params);
}
export async function deleteSuite(id: number): ResponseResult {
- return request.delete(`/v1/suite/delete/${id}`);
+ return request.delete(JUGGLE_API_PREFIX+`/suite/delete/${id}`);
}
export async function updateSuite(params: { id: string; suiteCode: string; suiteName: string; suiteDesc: string }): ResponseResult {
- return request.put('/v1/suite/update', params);
+ return request.put(JUGGLE_API_PREFIX+'/suite/update', params);
}
export async function suitePage(params: { pageNum: number; pageSize: number; suiteName?: string }): ResponsePageResult {
- return request.post('/v1/suite/page', params);
+ return request.post(JUGGLE_API_PREFIX+'/suite/page', params);
}
export async function suiteList(): ResponseResult {
- return request.get('/v1/suite/list');
+ return request.get(JUGGLE_API_PREFIX+'/suite/list');
}
diff --git a/console-ui/src/service/api/suiteMarket.ts b/console-ui/src/service/api/suiteMarket.ts
index f9bf5c79..09f8a0f8 100644
--- a/console-ui/src/service/api/suiteMarket.ts
+++ b/console-ui/src/service/api/suiteMarket.ts
@@ -1,7 +1,8 @@
import { request, type ResponseResult } from '../base';
+import {JUGGLE_API_PREFIX} from "@/const/application.ts";
export async function querySuiteMarketClassifyList(): ResponseResult {
- return request.post('/v1/suite/market/classify');
+ return request.post(JUGGLE_API_PREFIX+'/suite/market/classify');
}
export async function querySuiteMarketList(params: {
@@ -10,15 +11,15 @@ export async function querySuiteMarketList(params: {
suiteName: string;
suiteClassifyId: number|null;
}): ResponseResult {
- return request.post('/v1/suite/market',params);
+ return request.post(JUGGLE_API_PREFIX+'/suite/market',params);
}
export async function querySuiteMarketDetail(suiteId: number): ResponseResult {
- return request.get('/v1/suite/market/info/' + suiteId);
+ return request.get(JUGGLE_API_PREFIX+'/suite/market/info/' + suiteId);
}
export async function installSuiteMarket(suiteId: number,bill?:string): ResponseResult {
- return request.post('/v1/suite/market/install', {
+ return request.post(JUGGLE_API_PREFIX+'/suite/market/install', {
suiteId: suiteId,
bill: bill
});
diff --git a/console-ui/src/service/api/templateMarket.ts b/console-ui/src/service/api/templateMarket.ts
index 12293aab..357c601a 100644
--- a/console-ui/src/service/api/templateMarket.ts
+++ b/console-ui/src/service/api/templateMarket.ts
@@ -1,7 +1,8 @@
import { request, type ResponseResult } from '../base';
+import {JUGGLE_API_PREFIX} from "@/const/application.ts";
export async function queryTemplateMarketClassifyList(): ResponseResult {
- return request.post('/v1/template/market/classify');
+ return request.post(JUGGLE_API_PREFIX+'/template/market/classify');
}
export async function queryTemplateMarketList(params: {
@@ -10,20 +11,20 @@ export async function queryTemplateMarketList(params: {
templateName: string;
templateClassifyId: number|null;
}): ResponseResult {
- return request.post('/v1/template/market',params);
+ return request.post(JUGGLE_API_PREFIX+'/template/market',params);
}
export async function queryTemplateMarketDetail(templateId: number): ResponseResult {
- return request.get('/v1/template/market/info/' + templateId);
+ return request.get(JUGGLE_API_PREFIX+'/template/market/info/' + templateId);
}
export async function useTemplateMarket(templateId: number,bill?:string): ResponseResult {
- return request.post('/v1/template/market/use', {
+ return request.post(JUGGLE_API_PREFIX+'/template/market/use', {
templateId: templateId,
bill: bill
});
}
export function queryRecommendTemplateList(templateId: number): ResponseResult {
- return request.get('/v1/template/market/recommend/'+templateId);
+ return request.get(JUGGLE_API_PREFIX+'/template/market/recommend/'+templateId);
}
diff --git a/console-ui/src/service/api/token.ts b/console-ui/src/service/api/token.ts
index 62fbd27c..6583c9c1 100644
--- a/console-ui/src/service/api/token.ts
+++ b/console-ui/src/service/api/token.ts
@@ -1,17 +1,18 @@
import { request, ResponsePageResult, type ResponseResult } from '@/service/base';
+import {JUGGLE_API_PREFIX} from "@/const/application.ts";
export async function addToken(tokenDesc: string): ResponseResult {
- return request.post(`/v1/token/add`, tokenDesc);
+ return request.post(JUGGLE_API_PREFIX+`/token/add`, tokenDesc);
}
export async function deleteTokenById(tokenId: number): ResponseResult {
- return request.delete(`/v1/token/delete/${tokenId}`);
+ return request.delete(JUGGLE_API_PREFIX+`/token/delete/${tokenId}`);
}
export async function updateTokenById(params: { id: number; tokenDesc: string }): ResponseResult {
- return request.put(`/v1/token/update`, params);
+ return request.put(JUGGLE_API_PREFIX+`/token/update`, params);
}
export async function tokenPage(params: { pageNum: number; pageSize: number }): ResponsePageResult {
- return request.post('/v1/token/page', params);
+ return request.post(JUGGLE_API_PREFIX+'/token/page', params);
}
diff --git a/console-ui/src/service/api/user.ts b/console-ui/src/service/api/user.ts
index e0d3ff61..a686d624 100644
--- a/console-ui/src/service/api/user.ts
+++ b/console-ui/src/service/api/user.ts
@@ -1,7 +1,8 @@
import { request, type ResponseResult } from '@/service/base';
+import {JUGGLE_API_PREFIX} from "@/const/application.ts";
export function login(data: { userName: string; password: string }): ResponseResult {
- return request.post('/v1/user/login', data);
+ return request.post(JUGGLE_API_PREFIX+'/user/login', data);
}
export function logout() {}
@@ -9,5 +10,5 @@ export function logout() {}
export function check() {}
export function getProductInfo(): ResponseResult {
- return request.get('/v1/user/product/info');
+ return request.get(JUGGLE_API_PREFIX+'/user/product/info');
}
\ No newline at end of file
diff --git a/console-ui/vite.config.ts b/console-ui/vite.config.ts
index 2b42ae98..cad21ea9 100644
--- a/console-ui/vite.config.ts
+++ b/console-ui/vite.config.ts
@@ -23,7 +23,7 @@ export default defineConfig(({ mode }) => {
open: true,
host: '0.0.0.0',
proxy: {
- '^/v(d*)': env.VITE_API_PROXY,
+ '^/api': env.VITE_API_PROXY,
'^/open': env.VITE_API_PROXY
}
}
diff --git a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/DataTypeInfoController.java b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/DataTypeInfoController.java
index 39095b30..98b531a8 100644
--- a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/DataTypeInfoController.java
+++ b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/DataTypeInfoController.java
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
+import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_API_PREFIX;
import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERVER_VERSION;
/**
@@ -33,7 +34,7 @@ import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERV
*/
@Tag(name = "数据类型接口")
@RestController
-@RequestMapping(JUGGLE_SERVER_VERSION + "/dataType")
+@RequestMapping(JUGGLE_API_PREFIX + "/dataType")
public class DataTypeInfoController {
private final IDataTypeInfoService dataTypeInfoService;
diff --git a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/ObjectController.java b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/ObjectController.java
index fe0af290..d290f4b0 100644
--- a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/ObjectController.java
+++ b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/ObjectController.java
@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
+import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_API_PREFIX;
import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERVER_VERSION;
import static net.somta.juggle.console.domain.object.enums.ObjectErrorEnum.OBJECT_KEY_EXIST;
@@ -39,7 +40,7 @@ import static net.somta.juggle.console.domain.object.enums.ObjectErrorEnum.OBJEC
*/
@Tag(name = "对象接口")
@RestController
-@RequestMapping(JUGGLE_SERVER_VERSION + "/object")
+@RequestMapping(JUGGLE_API_PREFIX + "/object")
public class ObjectController {
private final IObjectService objectService;
diff --git a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/OrderController.java b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/OrderController.java
index ba075ba6..375764f9 100644
--- a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/OrderController.java
+++ b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/OrderController.java
@@ -26,6 +26,7 @@ import net.somta.juggle.console.interfaces.param.OrderParam;
import org.springframework.web.bind.annotation.*;
+import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_API_PREFIX;
import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERVER_VERSION;
@@ -35,7 +36,7 @@ import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERV
*/
@Tag(name = "订单接口")
@RestController
-@RequestMapping(JUGGLE_SERVER_VERSION + "/order")
+@RequestMapping(JUGGLE_API_PREFIX + "/order")
public class OrderController {
private final IOrderService orderService;
diff --git a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/UserController.java b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/UserController.java
index de16b931..9f83a184 100644
--- a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/UserController.java
+++ b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/UserController.java
@@ -40,6 +40,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_API_PREFIX;
import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERVER_VERSION;
@@ -49,7 +50,7 @@ import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERV
*/
@Tag(name = "用户接口")
@RestController
-@RequestMapping(JUGGLE_SERVER_VERSION + "/user")
+@RequestMapping(JUGGLE_API_PREFIX + "/user")
public class UserController {
private final IUserService userService;
diff --git a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/flow/FlowDefinitionController.java b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/flow/FlowDefinitionController.java
index 5ab1bebd..b7587ccc 100644
--- a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/flow/FlowDefinitionController.java
+++ b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/flow/FlowDefinitionController.java
@@ -37,6 +37,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*;
+import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_API_PREFIX;
import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERVER_VERSION;
import static net.somta.juggle.console.domain.flow.definition.enums.FlowDefinitionErrorEnum.*;
import static net.somta.juggle.console.domain.flow.flowinfo.enums.FlowErrorEnum.*;
@@ -48,7 +49,7 @@ import static net.somta.juggle.console.domain.flow.flowinfo.enums.FlowErrorEnum.
**/
@Tag(name = "流程定义接口")
@RestController
-@RequestMapping(JUGGLE_SERVER_VERSION + "/flow/definition")
+@RequestMapping(JUGGLE_API_PREFIX + "/flow/definition")
public class FlowDefinitionController {
private final static Logger logger = LoggerFactory.getLogger(FlowDefinitionController.class);
diff --git a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/flow/FlowInfoController.java b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/flow/FlowInfoController.java
index 64b36b8b..17158a00 100644
--- a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/flow/FlowInfoController.java
+++ b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/flow/FlowInfoController.java
@@ -26,6 +26,7 @@ import net.somta.juggle.console.interfaces.param.flow.FlowInfoPageParam;
import net.somta.juggle.console.application.service.flow.IFlowInfoService;
import org.springframework.web.bind.annotation.*;
+import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_API_PREFIX;
import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERVER_VERSION;
/**
@@ -34,7 +35,7 @@ import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERV
*/
@Tag(name = "流程信息接口")
@RestController
-@RequestMapping(JUGGLE_SERVER_VERSION + "/flow")
+@RequestMapping(JUGGLE_API_PREFIX + "/flow")
public class FlowInfoController {
private final IFlowInfoService flowInfoService;
diff --git a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/flow/FlowVersionController.java b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/flow/FlowVersionController.java
index dff44180..a1938d4d 100644
--- a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/flow/FlowVersionController.java
+++ b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/flow/FlowVersionController.java
@@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Map;
+import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_API_PREFIX;
import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERVER_VERSION;
import static net.somta.juggle.console.domain.flow.flowinfo.enums.FlowErrorEnum.*;
import static net.somta.juggle.console.domain.flow.version.enums.FlowVersionErrorEnum.ENABLE_FLOW_NOT_DELETE;
@@ -46,7 +47,7 @@ import static net.somta.juggle.console.domain.flow.version.enums.FlowVersionErro
*/
@Tag(name = "流程版本接口")
@RestController
-@RequestMapping(JUGGLE_SERVER_VERSION + "/flow/version/")
+@RequestMapping(JUGGLE_API_PREFIX + "/flow/version/")
public class FlowVersionController {
private final IFlowVersionService flowVersionService;
diff --git a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/market/TemplateController.java b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/market/TemplateController.java
index c7c91b39..d054ce43 100644
--- a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/market/TemplateController.java
+++ b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/market/TemplateController.java
@@ -14,11 +14,12 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
+import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_API_PREFIX;
import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERVER_VERSION;
@Tag(name = "模板接口")
@RestController
-@RequestMapping(JUGGLE_SERVER_VERSION + "/template")
+@RequestMapping(JUGGLE_API_PREFIX + "/template")
public class TemplateController {
private final ITemplateService templateService;
diff --git a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/suite/ApiController.java b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/suite/ApiController.java
index 74c75dd0..3006402d 100644
--- a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/suite/ApiController.java
+++ b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/suite/ApiController.java
@@ -38,6 +38,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
+import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_API_PREFIX;
import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERVER_VERSION;
import static net.somta.juggle.console.domain.suite.api.enums.ApiErrorEnum.API_NOT_EDIT_ERROR;
import static net.somta.juggle.console.domain.suite.suiteinfo.enums.SuiteErrorEnum.SUITE_IS_EXIST_ERROR;
@@ -48,7 +49,7 @@ import static net.somta.juggle.console.domain.suite.suiteinfo.enums.SuiteErrorEn
*/
@Tag(name = "API接口")
@RestController
-@RequestMapping(JUGGLE_SERVER_VERSION + "/api")
+@RequestMapping(JUGGLE_API_PREFIX + "/api")
public class ApiController {
private final IApiService apiService;
diff --git a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/suite/SuiteController.java b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/suite/SuiteController.java
index f2bf7f35..5b4dd3d0 100644
--- a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/suite/SuiteController.java
+++ b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/suite/SuiteController.java
@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
+import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_API_PREFIX;
import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERVER_VERSION;
/**
@@ -39,7 +40,7 @@ import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERV
*/
@Tag(name = "套件接口")
@RestController
-@RequestMapping(JUGGLE_SERVER_VERSION + "/suite")
+@RequestMapping(JUGGLE_API_PREFIX + "/suite")
public class SuiteController {
private final ISuiteService suiteService;
private final IApiService apiService;
diff --git a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/system/DataSourceController.java b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/system/DataSourceController.java
index 0e59066c..5cc76515 100644
--- a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/system/DataSourceController.java
+++ b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/system/DataSourceController.java
@@ -14,11 +14,12 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
+import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_API_PREFIX;
import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERVER_VERSION;
@Tag(name = "数据源接口")
@RestController
-@RequestMapping(JUGGLE_SERVER_VERSION + "/datasource")
+@RequestMapping(JUGGLE_API_PREFIX + "/datasource")
public class DataSourceController {
private final IDataSourceService dataSourceService;
diff --git a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/system/TokenController.java b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/system/TokenController.java
index 1df42ca8..9e790a8c 100644
--- a/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/system/TokenController.java
+++ b/console/src/main/java/net/somta/juggle/console/interfaces/controller/api/system/TokenController.java
@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
+import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_API_PREFIX;
import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERVER_VERSION;
/**
@@ -38,7 +39,7 @@ import static net.somta.juggle.common.constants.ApplicationConstants.JUGGLE_SERV
*/
@Tag(name = "令牌接口")
@RestController
-@RequestMapping(JUGGLE_SERVER_VERSION + "/token")
+@RequestMapping(JUGGLE_API_PREFIX + "/token")
public class TokenController {
private final ITokenService tokenService;
--
Gitee
From 594ead8e9f76fbffdffe0158fb5f1cd8e4976bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=9F=E6=98=9F=E7=9A=84=E5=A4=A9=E7=A9=BA?=
<1015074735@qq.com>
Date: Mon, 19 May 2025 20:13:15 +0800
Subject: [PATCH 09/41] =?UTF-8?q?fix:=E5=BC=80=E6=94=BE=E6=9B=B4=E5=A4=9A?=
=?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=B1=A0=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=EF=BC=8C=E8=BF=9B=E4=B8=80=E6=AD=A5=E6=8F=90=E5=8D=87juggle?=
=?UTF-8?q?=E7=9A=84=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../configuration/MyBatisConfiguration.java | 12 +++++++
.../src/main/resources/application.properties | 6 ++++
.../data/application-default.properties | 6 ++++
.../1.x/2025-6-27-juggle-1.3.2-issue.md | 36 +++++++++++++++++++
4 files changed, 60 insertions(+)
create mode 100644 docs/docs/notes/changelog/1.x/2025-6-27-juggle-1.3.2-issue.md
diff --git a/console/src/main/java/net/somta/juggle/console/configuration/MyBatisConfiguration.java b/console/src/main/java/net/somta/juggle/console/configuration/MyBatisConfiguration.java
index 5155d7f9..d81ba275 100644
--- a/console/src/main/java/net/somta/juggle/console/configuration/MyBatisConfiguration.java
+++ b/console/src/main/java/net/somta/juggle/console/configuration/MyBatisConfiguration.java
@@ -52,6 +52,15 @@ public class MyBatisConfiguration {
@Value("${spring.datasource.password:juggle}")
private String password;
+ @Value("${spring.datasource.maximum-pool-size:100}")
+ private Integer maximumPoolSize;
+
+ @Value("${spring.datasource.minimum-idle:10}")
+ private Integer minimumIdle;
+
+ @Value("${spring.datasource.idle-timeout:60000}")
+ private Integer idleTimeout;
+
@Bean
public DataSource dataSource() {
HikariDataSource dataSource = new HikariDataSource();
@@ -59,6 +68,9 @@ public class MyBatisConfiguration {
dataSource.setJdbcUrl(url);
dataSource.setUsername(username);
dataSource.setPassword(password);
+ dataSource.setMaximumPoolSize(maximumPoolSize);
+ dataSource.setMinimumIdle(minimumIdle);
+ dataSource.setIdleTimeout(idleTimeout);
return dataSource;
}
diff --git a/console/src/main/resources/application.properties b/console/src/main/resources/application.properties
index bce903d6..c6a11c5d 100644
--- a/console/src/main/resources/application.properties
+++ b/console/src/main/resources/application.properties
@@ -15,6 +15,12 @@ spring.h2.console.path=/h2-console
#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/juggle?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false
#spring.datasource.username=root
#spring.datasource.password=123456
+#datasource pool max connection count
+spring.datasource.maximum-pool-size=100
+#datasource pool min idle connection count
+spring.datasource.minimum-idle=10
+#The maximum amount of time that a connection is allowed to sit idle in the pool
+spring.datasource.idle-timeout=60000
##Basic Config##
#juggle.api-key=e543283fa34c4a9f9f76bcc3c3f31905
diff --git a/console/src/main/resources/data/application-default.properties b/console/src/main/resources/data/application-default.properties
index 62cc955a..4882aaa1 100644
--- a/console/src/main/resources/data/application-default.properties
+++ b/console/src/main/resources/data/application-default.properties
@@ -15,6 +15,12 @@ spring.h2.console.path=/h2-console
#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/juggle?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false
#spring.datasource.username=root
#spring.datasource.password=123456
+#datasource pool max connection count
+spring.datasource.maximum-pool-size=100
+#datasource pool min idle connection count
+spring.datasource.minimum-idle=10
+#The maximum amount of time that a connection is allowed to sit idle in the pool
+spring.datasource.idle-timeout=60000
##Redis Cache##
#juggle.cache.cache-type="redis"
diff --git a/docs/docs/notes/changelog/1.x/2025-6-27-juggle-1.3.2-issue.md b/docs/docs/notes/changelog/1.x/2025-6-27-juggle-1.3.2-issue.md
new file mode 100644
index 00000000..0ed4aa1b
--- /dev/null
+++ b/docs/docs/notes/changelog/1.x/2025-6-27-juggle-1.3.2-issue.md
@@ -0,0 +1,36 @@
+---
+title: juggle v1.3.2版本 - 2025/6/27 (待发布)
+createTime: 2025/05/06 15:44:32
+permalink: /changelog/1.x/juggle-1.3.2.html
+---
+# 1.3.1版本 - 2025/04/27
+该版本主要修复了一些新的bug,优化交互逻辑,提升用户体验,新增了多个套件,满足更多的业务场景需求。
+变更详情:
+
+### Feature
+
+●
+
+●
+
+●
+
+●
+
+### Enhancement&Refactor
+
+● 暴露出更多配置供使用者配置,如连接池的最大连接数,最小连接数,超时时间等通过这些配置进一步提高Juggle的运行性能。
+
+●
+
+●
+
+### BugFix
+
+●
+
+●
+
+●
+
+
--
Gitee
From 17367a6b45afe925391da62a73a2958e91196403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=9F=E6=98=9F=E7=9A=84=E5=A4=A9=E7=A9=BA?=
<1015074735@qq.com>
Date: Wed, 21 May 2025 14:11:14 +0800
Subject: [PATCH 10/41] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=BC=93=E5=AD=98=EF=BC=8C=E6=8F=90=E5=8D=87?=
=?UTF-8?q?=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../constants/ApplicationConstants.java | 2 ++
.../version/view/FlowVersionInfoView.java | 10 ++++++
.../mapper/flow/FlowVersionMapper.java | 3 ++
.../flow/FlowVersionRepositoryImpl.java | 33 +++++++++++++++++--
.../resources/mybatis/FlowVersionMapper.xml | 16 +++++++++
pom.xml | 2 +-
6 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/common/src/main/java/net/somta/juggle/common/constants/ApplicationConstants.java b/common/src/main/java/net/somta/juggle/common/constants/ApplicationConstants.java
index 1b3d6cea..4deecde6 100644
--- a/common/src/main/java/net/somta/juggle/common/constants/ApplicationConstants.java
+++ b/common/src/main/java/net/somta/juggle/common/constants/ApplicationConstants.java
@@ -11,6 +11,8 @@ public class ApplicationConstants {
public static final String JUGGLE_OPEN_API_PREFIX = "/open" + JUGGLE_SERVER_VERSION;
+ public static final String COLON = ":";
+
/**
* 应用统一前缀
*/
diff --git a/console/src/main/java/net/somta/juggle/console/domain/flow/version/view/FlowVersionInfoView.java b/console/src/main/java/net/somta/juggle/console/domain/flow/version/view/FlowVersionInfoView.java
index 3a76eee9..1adbff0f 100644
--- a/console/src/main/java/net/somta/juggle/console/domain/flow/version/view/FlowVersionInfoView.java
+++ b/console/src/main/java/net/somta/juggle/console/domain/flow/version/view/FlowVersionInfoView.java
@@ -12,6 +12,8 @@ public class FlowVersionInfoView {
private String flowType;
+ private String flowVersion;
+
private Integer flowVersionStatus;
private String flowContent;
@@ -55,6 +57,14 @@ public class FlowVersionInfoView {
this.flowType = flowType;
}
+ public String getFlowVersion() {
+ return flowVersion;
+ }
+
+ public void setFlowVersion(String flowVersion) {
+ this.flowVersion = flowVersion;
+ }
+
public Integer getFlowVersionStatus() {
return flowVersionStatus;
}
diff --git a/console/src/main/java/net/somta/juggle/console/infrastructure/mapper/flow/FlowVersionMapper.java b/console/src/main/java/net/somta/juggle/console/infrastructure/mapper/flow/FlowVersionMapper.java
index e48a4ca7..21739b57 100644
--- a/console/src/main/java/net/somta/juggle/console/infrastructure/mapper/flow/FlowVersionMapper.java
+++ b/console/src/main/java/net/somta/juggle/console/infrastructure/mapper/flow/FlowVersionMapper.java
@@ -14,10 +14,13 @@ public interface FlowVersionMapper extends IBaseMapper {
int deleteFlowVersionByFlowId(Long flowId);
+ FlowVersionInfoView queryFlowVersionInfoById(Long flowVersionId);
+
FlowVersionInfoView queryFlowVersionInfoByKey(FlowVersionQueryVO flowVersionQueryVo);
List queryFlowVersionList(FlowVersionQueryVO flowVersionQueryVO);
String queryLatestVersion(String flowKey);
+
}
diff --git a/console/src/main/java/net/somta/juggle/console/infrastructure/repository/flow/FlowVersionRepositoryImpl.java b/console/src/main/java/net/somta/juggle/console/infrastructure/repository/flow/FlowVersionRepositoryImpl.java
index c710bee4..0d74e551 100644
--- a/console/src/main/java/net/somta/juggle/console/infrastructure/repository/flow/FlowVersionRepositoryImpl.java
+++ b/console/src/main/java/net/somta/juggle/console/infrastructure/repository/flow/FlowVersionRepositoryImpl.java
@@ -16,7 +16,10 @@ along with this program; if not, visit flowVersionCache = Caffeine.newBuilder()
+ .expireAfterAccess(24, TimeUnit.HOURS)
+ .initialCapacity(5)
+ .maximumSize(300)
+ .build();
+
private final FlowVersionMapper flowVersionMapper;
public FlowVersionRepositoryImpl(FlowVersionMapper flowVersionMapper) {
@@ -43,6 +55,11 @@ public class FlowVersionRepositoryImpl implements IFlowVersionRepository {
@Override
public void deleteFlowVersionById(Long flowVersionId) {
+ FlowVersionInfoView flowVersion = flowVersionMapper.queryFlowVersionInfoById(flowVersionId);
+ if(flowVersion != null){
+ String flowCacheKey = flowVersion.getFlowKey() + COLON + flowVersion.getFlowVersion();
+ flowVersionCache.invalidate(flowCacheKey);
+ }
FlowVersionPO flowVersionPo = new FlowVersionPO();
flowVersionPo.setId(flowVersionId);
flowVersionPo.setDeleted(1);
@@ -53,6 +70,10 @@ public class FlowVersionRepositoryImpl implements IFlowVersionRepository {
public Boolean updateFlowVersion(FlowVersionAO flowVersionAo) {
FlowVersionPO flowVersionPo = IFlowVersionConverter.IMPL.aoToPo(flowVersionAo);
flowVersionMapper.update(flowVersionPo);
+ if(flowVersionAo.getFlowVersionStatusEnum() == FlowVersionStatusEnum.ENABLE){
+ String flowCacheKey = flowVersionAo.getFlowKey() + COLON + flowVersionAo.getFlowVersion();
+ flowVersionCache.invalidate(flowCacheKey);
+ }
return true;
}
@@ -64,16 +85,24 @@ public class FlowVersionRepositoryImpl implements IFlowVersionRepository {
@Override
public FlowVersionAO getFlowVersionInfo(Long flowVersionId) {
FlowVersionPO flowVersionPo = flowVersionMapper.queryById(flowVersionId);
- FlowVersionAO flowVersionAo = IFlowVersionConverter.IMPL.poToAo(flowVersionPo);
- return flowVersionAo;
+ return IFlowVersionConverter.IMPL.poToAo(flowVersionPo);
}
@Override
public FlowVersionInfoView queryFlowVersionInfoByKey(String flowKey, String flowVersion) {
+ String flowCacheKey = flowKey + COLON + flowVersion;
+ FlowVersionInfoView cacheFlowVersionInfoView =flowVersionCache.getIfPresent(flowCacheKey);
+ if(cacheFlowVersionInfoView != null){
+ return cacheFlowVersionInfoView;
+ }
+
FlowVersionQueryVO flowVersionQueryVo = new FlowVersionQueryVO();
flowVersionQueryVo.setFlowKey(flowKey);
flowVersionQueryVo.setFlowVersion(flowVersion);
FlowVersionInfoView flowVersionInfoView = flowVersionMapper.queryFlowVersionInfoByKey(flowVersionQueryVo);
+ if(flowVersionInfoView != null){
+ flowVersionCache.put(flowCacheKey,flowVersionInfoView);
+ }
return flowVersionInfoView;
}
diff --git a/console/src/main/resources/mybatis/FlowVersionMapper.xml b/console/src/main/resources/mybatis/FlowVersionMapper.xml
index 0ffdf351..d1fe4860 100644
--- a/console/src/main/resources/mybatis/FlowVersionMapper.xml
+++ b/console/src/main/resources/mybatis/FlowVersionMapper.xml
@@ -13,11 +13,27 @@
from t_flow_info i inner join t_flow_version v on i.id = v.flow_id where v.deleted = 0 and i.flow_key = #{flowKey}
+
+