From b6e685d83af9bb78ee5ce08eb3546dd2157cd7f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Tue, 27 Aug 2024 13:08:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix(=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90):?= =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E3=80=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=BC=93=E5=AD=98=E5=85=83=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 9a6751301d43b7314a32b0d3d5eb16e3020867bf) --- .../codegen/service/impl/GenTableServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java index ab52cbd41..c469e52bf 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java @@ -42,6 +42,7 @@ import lombok.RequiredArgsConstructor; import org.anyline.metadata.Column; import org.anyline.metadata.Database; import org.anyline.metadata.Table; +import org.anyline.proxy.CacheProxy; import org.anyline.proxy.ServiceProxy; import org.anyline.service.AnylineService; import org.jetbrains.annotations.NotNull; @@ -101,7 +102,8 @@ public class GenTableServiceImpl extends ServiceImpl i public List queryTableColumn(String dsName, String tableName) { // 手动切换数据源 DynamicDataSourceContextHolder.push(dsName); - return ServiceProxy.metadata().columns(tableName).values().stream().map(Column::getName).collect(Collectors.toList()); + CacheProxy.clear(); + return ServiceProxy.metadata().columns(tableName).values().stream().map(Column::getName).toList(); } /** @@ -115,6 +117,7 @@ public class GenTableServiceImpl extends ServiceImpl i public IPage queryTablePage(Page page, GenTable table) { // 手动切换数据源 DynamicDataSourceContextHolder.push(table.getDsName()); + CacheProxy.clear(); List
tableList = ServiceProxy.metadata().tables() .values().stream().filter(t -> { if (StrUtil.isBlank(table.getTableName())) { @@ -151,7 +154,8 @@ public class GenTableServiceImpl extends ServiceImpl i public List queryTableList(String dsName) { // 手动切换数据源 DynamicDataSourceContextHolder.push(dsName); - return ServiceProxy.metadata().tables().values().stream().map(Table::getName).collect(Collectors.toList()); + CacheProxy.clear(); + return ServiceProxy.metadata().tables().values().stream().map(Table::getName).toList(); } /** @@ -183,13 +187,14 @@ public class GenTableServiceImpl extends ServiceImpl i } @Transactional(rollbackFor = Exception.class) - public GenTable tableImport(String dsName, String tableName) { + protected GenTable tableImport(String dsName, String tableName) { // 手动切换数据源 DynamicDataSourceContextHolder.push(dsName); // 查询表是否存在 GenTable table = new GenTable(); // 从数据库获取表信息 + CacheProxy.clear(); AnylineService service = ServiceProxy.service(); Table tableMetadata = service.metadata().table(tableName); Database database = service.metadata().database(); From 59e2ce0b03025cb3ca2dff028ca3bf82e341c53b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Tue, 27 Aug 2024 21:31:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix(=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90):?= =?UTF-8?q?=20java8=20=E7=89=88=E6=9C=AC=E7=BC=96=E8=AF=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/codegen/service/impl/GenTableServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java index c469e52bf..57c73ccb0 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java @@ -103,7 +103,7 @@ public class GenTableServiceImpl extends ServiceImpl i // 手动切换数据源 DynamicDataSourceContextHolder.push(dsName); CacheProxy.clear(); - return ServiceProxy.metadata().columns(tableName).values().stream().map(Column::getName).toList(); + return ServiceProxy.metadata().columns(tableName).values().stream().map(Column::getName).collect(Collectors.toList()); } /** @@ -155,7 +155,7 @@ public class GenTableServiceImpl extends ServiceImpl i // 手动切换数据源 DynamicDataSourceContextHolder.push(dsName); CacheProxy.clear(); - return ServiceProxy.metadata().tables().values().stream().map(Table::getName).toList(); + return ServiceProxy.metadata().tables().values().stream().map(Table::getName).collect(Collectors.toList()); } /** @@ -187,7 +187,7 @@ public class GenTableServiceImpl extends ServiceImpl i } @Transactional(rollbackFor = Exception.class) - protected GenTable tableImport(String dsName, String tableName) { + public GenTable tableImport(String dsName, String tableName) { // 手动切换数据源 DynamicDataSourceContextHolder.push(dsName); From b74424463ac7d22e18e1a6ead3965c36da9bb8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Sun, 8 Sep 2024 16:34:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix(app):=20=E5=AF=BC=E8=88=AA=E6=A0=8F?= =?UTF-8?q?=E7=BC=96=E8=BE=91SQL=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AppTabbarController.java | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppTabbarController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppTabbarController.java index a7ceee904..7a596c8bc 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppTabbarController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppTabbarController.java @@ -27,26 +27,35 @@ import java.util.stream.Collectors; @SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class AppTabbarController { - private final AppTabbarService tabbarService; + private final AppTabbarService tabbarService; - /** - * 查询导航列表 - * @return R - */ - @Operation(summary = "查询导航列表", description = "查询导航列表") - @GetMapping("/list") - public R list() { - return R.ok(tabbarService.list()); - } + /** + * 查询导航列表 + * + * @return R + */ + @Operation(summary = "查询导航列表", description = "查询导航列表") + @GetMapping("/list") + public R list() { + return R.ok(tabbarService.list()); + } - @Operation(summary = "更新导航", description = "更新导航") - @PutMapping - public R update(@RequestBody List tabbarEntityList) { - // 删除不在新增范围的导航菜单 - List idList = tabbarService.list().stream().map(AppTabbarEntity::getId).collect(Collectors.toList()); - List newIdList = tabbarEntityList.stream().map(AppTabbarEntity::getId).collect(Collectors.toList()); - tabbarService.removeBatchByIds(CollUtil.subtractToList(idList, newIdList)); - return R.ok(tabbarService.saveOrUpdateBatch(tabbarEntityList)); - } + @Operation(summary = "更新导航", description = "更新导航") + @PutMapping + public R update(@RequestBody List tabbarEntityList) { + // 删除不在新增范围的导航菜单 + List idList = tabbarService.list().stream().map(AppTabbarEntity::getId).collect(Collectors.toList()); + List newIdList = tabbarEntityList.stream().map(AppTabbarEntity::getId).collect(Collectors.toList()); + + // 计算需要删除的 ID 列表 + List idsToRemove = CollUtil.subtractToList(idList, newIdList); + + // 如果有需要删除的菜单，则批量删除 + if (CollUtil.isNotEmpty(idsToRemove)) { + tabbarService.removeBatchByIds(idsToRemove); + } + + return R.ok(tabbarService.saveOrUpdateBatch(tabbarEntityList)); + } } From 7bb9a478328a70cc25ccab7d198c54548d5640ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Wed, 18 Sep 2024 11:45:36 +0800 Subject: [PATCH 4/5] upgrade(docker): register dockerfile from aliyun mirror --- pigx-register/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-register/Dockerfile b/pigx-register/Dockerfile index 7505001fb..257a09106 100755 --- a/pigx-register/Dockerfile +++ b/pigx-register/Dockerfile @@ -1,4 +1,4 @@ -FROM moxm/java:1.8-full +FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:1.8-full RUN mkdir -p /pigx-register From ff29fca159649fc6a9915d2416e3ff590c27d395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Wed, 18 Sep 2024 17:13:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?refactor(pom):=20=E9=BB=98=E8=AE=A4cloud=20?= =?UTF-8?q?profile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-app-server/pigx-app-server-biz/pom.xml | 3 +++ pigx-auth/pom.xml | 3 +++ pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml | 3 +++ pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml | 3 +++ pigx-upms/pigx-upms-biz/pom.xml | 3 +++ pigx-visual/pigx-daemon-elastic-job/pom.xml | 3 +++ pigx-visual/pigx-daemon-quartz/pom.xml | 6 ++++++ pigx-visual/pigx-mp-platform/pom.xml | 3 +++ pigx-visual/pigx-pay-platform/pom.xml | 3 +++ 9 files changed, 30 insertions(+) diff --git a/pigx-app-server/pigx-app-server-biz/pom.xml b/pigx-app-server/pigx-app-server-biz/pom.xml index d415c5aba..7af96a462 100644 --- a/pigx-app-server/pigx-app-server-biz/pom.xml +++ b/pigx-app-server/pigx-app-server-biz/pom.xml @@ -94,6 +94,9 @@ cloud + + true + diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 860887fd0..918b3b9be 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -110,6 +110,9 @@ cloud + + true + diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml index 90a1b380a..cf35d1df6 100644 --- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml +++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml @@ -126,6 +126,9 @@ cloud + + true + diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml index 8cd39935a..b0feb8af6 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml @@ -117,6 +117,9 @@ cloud + + true + diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index b93397a9a..3609b4617 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -188,6 +188,9 @@ cloud + + true + diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml index 3d67050f5..bcbe71b46 100644 --- a/pigx-visual/pigx-daemon-elastic-job/pom.xml +++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml @@ -96,6 +96,9 @@ cloud + + true + diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index e461db3e4..d3de136ac 100644 --- a/pigx-visual/pigx-daemon-quartz/pom.xml +++ b/pigx-visual/pigx-daemon-quartz/pom.xml @@ -104,6 +104,9 @@ cloud + + true + @@ -120,5 +123,8 @@ + + boot + diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml index 15d4b8e54..5a16e302e 100755 --- a/pigx-visual/pigx-mp-platform/pom.xml +++ b/pigx-visual/pigx-mp-platform/pom.xml @@ -123,6 +123,9 @@ cloud + + true + diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml index c4be72933..08a7507ee 100755 --- a/pigx-visual/pigx-pay-platform/pom.xml +++ b/pigx-visual/pigx-pay-platform/pom.xml @@ -146,6 +146,9 @@ cloud + + true +