From 99af0bcbe4ead7e853826175ff0a24cb143026a8 Mon Sep 17 00:00:00 2001 From: shao1121353141 <> Date: Wed, 27 Sep 2023 10:17:54 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=A8=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E5=88=86=E7=BB=84=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/app/impl/AppGroupRepositoryCustomizedImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java index 622d33d5..618f491b 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java @@ -121,7 +121,7 @@ public class AppGroupRepositoryCustomizedImpl implements AppGroupRepositoryCusto Map paramMap = new HashMap<>(16); paramMap.put("subjectIds", getAccessPolicysubjectIdsByUserId(userId)); //@formatter:off - StringBuilder builder = new StringBuilder("SELECT `group`.id_, `group`.name_, `group`.code_, `group`.type_, `group`.create_time, `group`.remark_, IFNULL( ass.app_count, 0) AS app_count FROM app_group `group` LEFT JOIN(SELECT aga.group_id, COUNT(*) AS `app_count` FROM app_group_association aga INNER JOIN app ON aga.app_id = app.id_ AND app.is_deleted = 0 INNER JOIN app_access_policy app_acce ON app.id_ = app_acce.app_id and app_acce.is_deleted = 0 WHERE aga.is_deleted = 0 and (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = '"+ALL_ACCESS.getCode()+ "') GROUP BY aga.group_id ) ass ON `group`.id_ = ass.group_id WHERE is_deleted = '0'"); + StringBuilder builder = new StringBuilder("SELECT `group`.id_, `group`.name_, `group`.code_, `group`.type_, `group`.create_time, `group`.remark_, IFNULL( ass.app_count, 0) AS app_count FROM app_group `group` LEFT JOIN(SELECT aga.group_id, COUNT(DISTINCT aga.id_) AS `app_count` FROM app_group_association aga LEFT JOIN app ON aga.app_id = app.id_ AND app.is_deleted = 0 LEFT JOIN app_access_policy app_acce ON app.id_ = app_acce.app_id and app_acce.is_deleted = 0 WHERE aga.is_deleted = 0 and (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = '"+ALL_ACCESS.getCode()+ "') GROUP BY aga.group_id ) ass ON `group`.id_ = ass.group_id WHERE is_deleted = '0'"); //分组名称 if (StringUtils.isNoneBlank(query.getName())) { builder.append(" AND `group`.name_ like '%").append(query.getName()).append("%'"); From e5a8f3b0bf2b9dcb07c9308d4bb50b402c63016e Mon Sep 17 00:00:00 2001 From: shao1121353141 <> Date: Thu, 28 Sep 2023 17:34:26 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 02d72d6e..de0ee04e 100644 --- a/README.md +++ b/README.md @@ -111,6 +111,8 @@ + 山东爱特云翔信息技术有限公司 + 北京中科生活服务有限公司 + 四维世景北京(科技)有限公司 ++ 抹香鲸跨境电子商务有限公司 ++ 杭州天象聚合信息技术有限公司 ## 微信公众号 From 97c7b7c70318a37471996ea8037063aa09c7d11b Mon Sep 17 00:00:00 2001 From: shao1121353141 <> Date: Thu, 28 Sep 2023 23:36:47 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/impl/AppGroupRepositoryCustomizedImpl.java | 6 +++--- .../repository/app/impl/AppRepositoryCustomizedImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java index 93f20020..18712d8a 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java @@ -117,7 +117,7 @@ public class AppGroupRepositoryCustomizedImpl implements AppGroupRepositoryCusto public List getAppGroupList(Long userId, AppGroupQuery query) { //@formatter:on Map paramMap = new HashMap<>(16); - paramMap.put("subjectIds", getAccessPolicysubjectIdsByUserId(userId)); + paramMap.put("subjectIds", getSubjectIds(userId)); //@formatter:off StringBuilder builder = new StringBuilder("SELECT `group`.id_, `group`.name_, `group`.code_, `group`.type_, `group`.create_time, `group`.remark_, IFNULL( ass.app_count, 0) AS app_count FROM app_group `group` LEFT JOIN(SELECT aga.group_id, COUNT(DISTINCT aga.id_) AS `app_count` FROM app_group_association aga LEFT JOIN app ON aga.app_id = app.id_ AND app.is_deleted = 0 LEFT JOIN app_access_policy app_acce ON app.id_ = app_acce.app_id and app_acce.is_deleted = 0 WHERE aga.is_deleted = 0 and (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = '"+ALL_ACCESS.getCode()+ "') GROUP BY aga.group_id ) ass ON `group`.id_ = ass.group_id WHERE is_deleted = '0'"); //分组名称 @@ -148,7 +148,7 @@ public class AppGroupRepositoryCustomizedImpl implements AppGroupRepositoryCusto public Long getAppCount(String groupId, Long userId) { //@formatter:on Map paramMap = new HashMap<>(16); - paramMap.put("subjectIds", getAccessPolicysubjectIdsByUserId(userId)); + paramMap.put("subjectIds", getSubjectIds(userId)); //@formatter:off StringBuilder builder = new StringBuilder("SELECT COUNT(DISTINCT app.id_) FROM app LEFT JOIN app_access_policy app_acce ON app.id_ = app_acce.app_id AND app_acce.is_deleted = '0' LEFT JOIN app_group_association ass ON app.id_ = ass.app_id AND ass.is_deleted = '0' WHERE app.is_enabled = 1 AND app.is_deleted = '0' AND (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = '"+ALL_ACCESS.getCode()+"')"); builder.append(" AND ass.group_id = ").append(groupId); @@ -164,7 +164,7 @@ public class AppGroupRepositoryCustomizedImpl implements AppGroupRepositoryCusto * @param userId {@link Long} * @return {@link List} */ - private List getAccessPolicysubjectIdsByUserId(Long userId){ + private List getSubjectIds(Long userId){ //@formatter:on List list = Lists.newArrayList(); //当前用户加入的用户组Id diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java index 86f222c4..da5fa783 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java @@ -66,7 +66,7 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized { @Override public Page getAppList(Long userId, GetAppListQuery query, Pageable pageable) { Map paramMap = new HashMap<>(16); - paramMap.put("subjectIds", getAccessPolicysubjectIdsByUserId(userId)); + paramMap.put("subjectIds", getSubjectIds(userId)); //@formatter:off StringBuilder builder = new StringBuilder("SELECT DISTINCT app.* FROM app LEFT JOIN app_access_policy app_acce ON app.id_ = app_acce.app_id AND app_acce.is_deleted = '0' LEFT JOIN app_group_association ass ON app.id_ = ass.app_id AND ass.is_deleted = '0' WHERE app.is_enabled = 1 AND app.is_deleted = '0' AND (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = '"+ALL_ACCESS.getCode()+"')"); //用户名 @@ -139,7 +139,7 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized { public Long getAppCount(Long userId) { //@formatter:on Map paramMap = new HashMap<>(16); - paramMap.put("subjectIds", getAccessPolicysubjectIdsByUserId(userId)); + paramMap.put("subjectIds", getSubjectIds(userId)); StringBuilder builder = new StringBuilder( "SELECT COUNT(DISTINCT app.id_) FROM app LEFT JOIN app_access_policy app_acce ON app.id_ = app_acce.app_id AND app_acce.is_deleted = '0' WHERE app.is_enabled = 1 AND app.is_deleted = '0' AND (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = '" + ALL_ACCESS.getCode() + "')"); @@ -154,7 +154,7 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized { * @param userId {@link Long} * @return {@link List} */ - private List getAccessPolicysubjectIdsByUserId(Long userId){ + private List getSubjectIds(Long userId){ //@formatter:on List list = Lists.newArrayList(); //当前用户加入的用户组Id From 7b66a81fcc5f8d85d1fd23ba79ae638ebc5911b7 Mon Sep 17 00:00:00 2001 From: shao1121353141 <> Date: Mon, 30 Oct 2023 10:37:10 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index de0ee04e..0a2f856f 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,9 @@ + 四维世景北京(科技)有限公司 + 抹香鲸跨境电子商务有限公司 + 杭州天象聚合信息技术有限公司 ++ 烟台派创软件有限公司 ++ 四川小仙信息技术有限公司 ++ 成都益新臣辉科技有限公司 ## 微信公众号 From 980ede63bea3bd4e8a9bfc18d5db8a91fe508ce1 Mon Sep 17 00:00:00 2001 From: shao1121353141 <> Date: Fri, 3 Nov 2023 16:23:30 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0a2f856f..3d99ff7d 100644 --- a/README.md +++ b/README.md @@ -116,6 +116,7 @@ + 烟台派创软件有限公司 + 四川小仙信息技术有限公司 + 成都益新臣辉科技有限公司 ++ 贵州南智云数字产业发展有限公司 ## 微信公众号 From 1e93133e6e645f3e08f5450d8197329659d8ad66 Mon Sep 17 00:00:00 2001 From: shao1121353141 <> Date: Mon, 6 Nov 2023 19:38:36 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c6e4578b..347d1215 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,7 @@ + 四川小仙信息技术有限公司 + 成都益新臣辉科技有限公司 + 贵州南智云数字产业发展有限公司 ++ 青岛南邮信息技术有限公司 ## 微信公众号 From 9d19e1ed7bdaebe4c9022b0118d3fbf6a3f4a46d Mon Sep 17 00:00:00 2001 From: shao1121353141 <> Date: Tue, 7 Nov 2023 17:57:26 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 347d1215..7f6fcf76 100644 --- a/README.md +++ b/README.md @@ -118,6 +118,7 @@ + 成都益新臣辉科技有限公司 + 贵州南智云数字产业发展有限公司 + 青岛南邮信息技术有限公司 ++ 福州创汇科技有限公司 ## 微信公众号 From 800156732b6cc382b19580c9b9421e68cb6eec69 Mon Sep 17 00:00:00 2001 From: shao1121353141 <> Date: Thu, 28 Dec 2023 21:20:58 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 71f481d6..d1c216c0 100644 --- a/README.md +++ b/README.md @@ -122,6 +122,9 @@ + 杭州群核信息技术有限公司 + 深圳市佳信捷智慧物联有限公司 + 南京优达创信息技术有限公司 ++ 西安恒德天云信息技术有限公司 ++ 北京盛云致臻智能科技有限公司 ++ 大连车联信息技术有限公司 ## 微信公众号 From c84bced48a71e1562d3444af4d8062158cffc125 Mon Sep 17 00:00:00 2001 From: shao1121353141 <> Date: Sun, 7 Jan 2024 22:32:43 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../session/ClusterSessionRegistryImpl.java | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/eiam-core/src/main/java/cn/topiam/employee/core/security/session/ClusterSessionRegistryImpl.java b/eiam-core/src/main/java/cn/topiam/employee/core/security/session/ClusterSessionRegistryImpl.java index c5178ec7..cb948c8c 100644 --- a/eiam-core/src/main/java/cn/topiam/employee/core/security/session/ClusterSessionRegistryImpl.java +++ b/eiam-core/src/main/java/cn/topiam/employee/core/security/session/ClusterSessionRegistryImpl.java @@ -108,30 +108,33 @@ public class ClusterSessionRegistryImpl Date: Sun, 7 Jan 2024 22:40:47 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../session/ClusterSessionRegistryImpl.java | 54 ++++++++++--------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/eiam-core/src/main/java/cn/topiam/employee/core/security/session/ClusterSessionRegistryImpl.java b/eiam-core/src/main/java/cn/topiam/employee/core/security/session/ClusterSessionRegistryImpl.java index cb948c8c..dd2ec35e 100644 --- a/eiam-core/src/main/java/cn/topiam/employee/core/security/session/ClusterSessionRegistryImpl.java +++ b/eiam-core/src/main/java/cn/topiam/employee/core/security/session/ClusterSessionRegistryImpl.java @@ -25,6 +25,7 @@ import java.util.*; import java.util.stream.Collectors; import org.apache.commons.collections4.CollectionUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.data.redis.core.Cursor; import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisOperations; @@ -109,30 +110,8 @@ public class ClusterSessionRegistryImpl