From 5f17ed6c37dee9d669c2f0d9c285f74b582e6f75 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 5 Nov 2024 14:03:39 +0800 Subject: [PATCH 1/8] =?UTF-8?q?perf(X-Pack):=20=E6=9D=83=E9=99=90=E9=85=8D?= =?UTF-8?q?=E7=BD=AE-=E5=A2=9E=E5=8A=A0=E7=8B=AC=E7=AB=8B=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- .../io/dataease/api/permissions/auth/vo/PermissionItem.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/de-xpack b/de-xpack index 22928ead8f..9b96136877 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 22928ead8f23a94c5dc96fdf35ce4ac2f49fe856 +Subproject commit 9b96136877d95f5e02477002cdbe513c9fecfc59 diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionItem.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionItem.java index 8e5f2d4a0d..ffe384643b 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionItem.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/vo/PermissionItem.java @@ -25,4 +25,6 @@ public class PermissionItem implements Serializable { private DataSetColumnPermissionsDTO columnPermissions; @Schema(description = "行权限") private DataSetRowPermissionsTreeDTO rowPermissions; + @Schema(description = "独立权重") + private int ext; } From a017717ffbc79c56c2cfb6722c4534b847e43021 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 5 Nov 2024 14:04:25 +0800 Subject: [PATCH 2/8] =?UTF-8?q?perf(X-Pack):=20=E6=9D=83=E9=99=90=E9=85=8D?= =?UTF-8?q?=E7=BD=AE-=E5=A2=9E=E5=8A=A0=E7=8B=AC=E7=AB=8B=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=8A=82=E7=82=B9-=E6=9B=B4=E6=96=B0submodule?= =?UTF-8?q?=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de-xpack b/de-xpack index 9b96136877..295fa85299 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 9b96136877d95f5e02477002cdbe513c9fecfc59 +Subproject commit 295fa8529903679ea55cca6dfc3801964e6094d5 From cf097b2e2be3851b8d71e1a3cbf96bcfe9458a1f Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 7 Nov 2024 14:16:54 +0800 Subject: [PATCH 3/8] =?UTF-8?q?perf(X-Pack):=20=E6=9D=83=E9=99=90=E7=9F=A9?= =?UTF-8?q?=E9=98=B5=E7=8B=AC=E7=AB=8B=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de-xpack b/de-xpack index 295fa85299..200f285db5 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 295fa8529903679ea55cca6dfc3801964e6094d5 +Subproject commit 200f285db59b37119a216fd58df1843dd1786491 From c52ece8b8c22f9955f0440c7a8ee3b8e0bcfb81b Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 8 Nov 2024 09:31:40 +0800 Subject: [PATCH 4/8] =?UTF-8?q?perf(X-Pack):=20=E6=9D=83=E9=99=90=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + de-xpack | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4cf03103c2..947d74e4bc 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ core/core-frontend/src/assets/fsSvg.html /extensions/ .vite/ /core/backend/ +/classpath:substitule.json diff --git a/de-xpack b/de-xpack index 200f285db5..4d93274d78 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 200f285db59b37119a216fd58df1843dd1786491 +Subproject commit 4d93274d7827eaaa8cc043fc5ed1278475f9c6f7 From 19ed9e32404c9d403899e6c667384b90f05c3228 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 8 Nov 2024 14:05:00 +0800 Subject: [PATCH 5/8] =?UTF-8?q?perf(X-Pack):=20=E6=8E=88=E6=9D=83=E7=9F=A9?= =?UTF-8?q?=E9=98=B5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de-xpack b/de-xpack index 4d93274d78..24fa12149c 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 4d93274d7827eaaa8cc043fc5ed1278475f9c6f7 +Subproject commit 24fa12149cf9fc0ff1f5bb13ff59b1fb104a660a From bb53616f8acf447ab6db7b649150b0f637f4130f Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 12 Nov 2024 17:03:59 +0800 Subject: [PATCH 6/8] =?UTF-8?q?perf(X-Pack):=20=E6=8E=88=E6=9D=83=E7=9F=A9?= =?UTF-8?q?=E9=98=B5=E7=8B=AC=E7=AB=8B=E8=8A=82=E7=82=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de-xpack b/de-xpack index 24fa12149c..cf0b8f353f 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 24fa12149cf9fc0ff1f5bb13ff59b1fb104a660a +Subproject commit cf0b8f353ffb88c1c00c92a1d6d44cfa3e38bd43 From 36c6d84298ea6ef17fed714c4dac1cc9bc356430 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 12 Nov 2024 17:30:29 +0800 Subject: [PATCH 7/8] =?UTF-8?q?perf:=20typos=E6=8B=BC=E5=86=99=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sdk/common/src/main/java/io/dataease/utils/SnowFlake.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/common/src/main/java/io/dataease/utils/SnowFlake.java b/sdk/common/src/main/java/io/dataease/utils/SnowFlake.java index e820f58e13..4d0b44e22f 100644 --- a/sdk/common/src/main/java/io/dataease/utils/SnowFlake.java +++ b/sdk/common/src/main/java/io/dataease/utils/SnowFlake.java @@ -26,7 +26,7 @@ public class SnowFlake { */ private final static long MACHINE_LEFT = SEQUENCE_BIT; private final static long DATACENTER_LEFT = SEQUENCE_BIT + MACHINE_BIT; - private final static long TIMESTMP_LEFT = DATACENTER_LEFT + DATACENTER_BIT; + private final static long TIMESTAMP_LEFT = DATACENTER_LEFT + DATACENTER_BIT; private long datacenterId; //数据中心 private long machineId; //机器标识 @@ -69,7 +69,7 @@ public class SnowFlake { lastStmp = currStmp; - return (currStmp - START_STMP) << TIMESTMP_LEFT //时间戳部分 + return (currStmp - START_STMP) << TIMESTAMP_LEFT //时间戳部分 | datacenterId << DATACENTER_LEFT //数据中心部分 | machineId << MACHINE_LEFT //机器标识部分 | sequence; //序列号部分 From 88fb1c0ec9e7118d773b234c7b051b0ed62236c8 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 12 Nov 2024 17:35:51 +0800 Subject: [PATCH 8/8] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4=E9=9D=9E?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-backend/pom.xml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml index 01cc073fe2..0c2596d5a1 100644 --- a/core/core-backend/pom.xml +++ b/core/core-backend/pom.xml @@ -131,22 +131,6 @@ flexmark-all ${flexmark.version} - - - io.dataease - xpack-base - ${project.version} - - - io.dataease - xpack-permissions - ${project.version} - - - io.dataease - xpack-sync - ${project.version} -