From bb31852e573e5c161bf8444b26c591b364df7e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Fri, 5 Sep 2025 04:45:04 +0800 Subject: [PATCH 01/13] =?UTF-8?q?exception=20=E7=9B=B8=E5=85=B3=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E8=B0=83=E6=95=B4=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/feign/RemoteAuthorityDetailsService.java | 4 ++-- .../module/strategy/feign/RemoteSocialDetailsService.java | 4 ++-- .../module/strategy/feign/RemoteUserDetailsService.java | 2 +- .../service/HerodotusRemotePermissionDetailsService.java | 6 +++--- .../service/HerodotusRemoteUserDetailsService.java | 8 ++++---- .../autoconfigure/processor/MonomerCorsFilter.java | 2 +- .../dante/gateway/filter/GlobalCertificationFilter.java | 4 ++-- .../dante/gateway/filter/GlobalSqlInjectionFilter.java | 4 ++-- .../org/dromara/dante/gateway/utils/WebFluxUtils.java | 2 +- .../dante/upms/controller/AuthorizationController.java | 2 +- .../dromara/dante/upms/service/AuthorizationService.java | 2 +- .../domain/base/{BaseEntity.java => BaseBpmnEntity.java} | 4 ++-- .../dromara/dante/bpmn/logic/domain/debezium/Message.java | 4 ++-- .../dromara/dante/bpmn/logic/domain/debezium/Payload.java | 4 ++-- .../org/dromara/dante/bpmn/logic/entity/ActIdGroup.java | 4 ++-- .../dromara/dante/bpmn/logic/entity/ActIdMembership.java | 4 ++-- .../org/dromara/dante/bpmn/logic/entity/ActIdTenant.java | 4 ++-- .../dante/bpmn/logic/entity/ActIdTenantMember.java | 4 ++-- .../org/dromara/dante/bpmn/logic/entity/ActIdUser.java | 4 ++-- .../dante/bpmn/logic/processor/AbstractProcessor.java | 4 ++-- 20 files changed, 38 insertions(+), 38 deletions(-) rename services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/base/{BaseEntity.java => BaseBpmnEntity.java} (92%) diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteAuthorityDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteAuthorityDetailsService.java index a5bd69fc..4f9fcab9 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteAuthorityDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteAuthorityDetailsService.java @@ -25,9 +25,9 @@ package org.dromara.dante.module.strategy.feign; -import org.dromara.dante.module.common.ServiceNameConstants; -import cn.herodotus.engine.assistant.definition.domain.Result; +import cn.herodotus.engine.core.definition.domain.Result; import cn.herodotus.engine.supplier.upms.logic.entity.security.SysPermission; +import org.dromara.dante.module.common.ServiceNameConstants; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java index 46ee16e8..96eec1a9 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java @@ -25,11 +25,11 @@ package org.dromara.dante.module.strategy.feign; -import org.dromara.dante.module.common.ServiceNameConstants; -import cn.herodotus.engine.assistant.definition.domain.Result; import cn.herodotus.engine.assistant.definition.domain.oauth2.AccessPrincipal; +import cn.herodotus.engine.core.definition.domain.Result; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; import cn.herodotus.engine.rest.core.annotation.Inner; +import org.dromara.dante.module.common.ServiceNameConstants; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.PathVariable; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java index f0f7ea19..8c81700c 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java @@ -25,8 +25,8 @@ package org.dromara.dante.module.strategy.feign; +import cn.herodotus.engine.core.definition.domain.Result; import org.dromara.dante.module.common.ServiceNameConstants; -import cn.herodotus.engine.assistant.definition.domain.Result; import cn.herodotus.engine.rest.core.annotation.Inner; import cn.herodotus.engine.supplier.upms.logic.entity.security.SysUser; import org.springframework.cloud.openfeign.FeignClient; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemotePermissionDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemotePermissionDetailsService.java index 5b6ce4d8..3f02f615 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemotePermissionDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemotePermissionDetailsService.java @@ -25,12 +25,12 @@ package org.dromara.dante.module.strategy.service; -import org.dromara.dante.module.strategy.definition.AbstractStrategyPermissionDetailsService; -import org.dromara.dante.module.strategy.feign.RemoteAuthorityDetailsService; -import cn.herodotus.engine.assistant.definition.domain.Result; +import cn.herodotus.engine.core.definition.domain.Result; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusPermission; import cn.herodotus.engine.supplier.upms.logic.entity.security.SysPermission; import org.apache.commons.collections4.CollectionUtils; +import org.dromara.dante.module.strategy.definition.AbstractStrategyPermissionDetailsService; +import org.dromara.dante.module.strategy.feign.RemoteAuthorityDetailsService; import java.util.ArrayList; import java.util.List; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java index 2a320445..807f2689 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java @@ -25,13 +25,13 @@ package org.dromara.dante.module.strategy.service; -import org.dromara.dante.module.strategy.definition.AbstractStrategyUserDetailsService; -import org.dromara.dante.module.strategy.feign.RemoteSocialDetailsService; -import org.dromara.dante.module.strategy.feign.RemoteUserDetailsService; -import cn.herodotus.engine.assistant.definition.domain.Result; import cn.herodotus.engine.assistant.definition.domain.oauth2.AccessPrincipal; +import cn.herodotus.engine.core.definition.domain.Result; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; import cn.herodotus.engine.supplier.upms.logic.entity.security.SysUser; +import org.dromara.dante.module.strategy.definition.AbstractStrategyUserDetailsService; +import org.dromara.dante.module.strategy.feign.RemoteSocialDetailsService; +import org.dromara.dante.module.strategy.feign.RemoteUserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; /** diff --git a/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/processor/MonomerCorsFilter.java b/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/processor/MonomerCorsFilter.java index 44d1aad6..75b7f2cd 100644 --- a/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/processor/MonomerCorsFilter.java +++ b/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/processor/MonomerCorsFilter.java @@ -26,7 +26,7 @@ package org.dromara.dante.monomer.autoconfigure.processor; import cn.herodotus.engine.assistant.core.utils.http.HeaderUtils; -import cn.herodotus.engine.assistant.definition.constants.SymbolConstants; +import cn.herodotus.engine.core.definition.constant.SymbolConstants; import com.google.common.net.HttpHeaders; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; diff --git a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java index 4876290d..977c0bcf 100644 --- a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java +++ b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java @@ -27,8 +27,8 @@ package org.dromara.dante.gateway.filter; import cn.herodotus.engine.assistant.core.utils.http.HeaderUtils; import cn.herodotus.engine.assistant.definition.constants.BaseConstants; -import cn.herodotus.engine.assistant.definition.constants.ErrorCodes; -import cn.herodotus.engine.assistant.definition.domain.Result; +import cn.herodotus.engine.core.definition.constant.ErrorCodes; +import cn.herodotus.engine.core.definition.domain.Result; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalSqlInjectionFilter.java b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalSqlInjectionFilter.java index d2563b78..e34c1824 100644 --- a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalSqlInjectionFilter.java +++ b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalSqlInjectionFilter.java @@ -26,8 +26,8 @@ package org.dromara.dante.gateway.filter; import cn.herodotus.engine.assistant.core.utils.protect.SqlInjectionUtils; -import cn.herodotus.engine.assistant.definition.constants.ErrorCodes; -import cn.herodotus.engine.assistant.definition.domain.Result; +import cn.herodotus.engine.core.definition.constant.ErrorCodes; +import cn.herodotus.engine.core.definition.domain.Result; import io.netty.buffer.ByteBufAllocator; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings; diff --git a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/utils/WebFluxUtils.java b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/utils/WebFluxUtils.java index 369f6207..0353d61b 100644 --- a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/utils/WebFluxUtils.java +++ b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/utils/WebFluxUtils.java @@ -26,7 +26,7 @@ package org.dromara.dante.gateway.utils; import cn.herodotus.engine.assistant.core.json.jackson2.utils.Jackson2Utils; -import cn.herodotus.engine.assistant.definition.domain.Result; +import cn.herodotus.engine.core.definition.domain.Result; import org.apache.commons.lang3.Strings; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferUtils; diff --git a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/controller/AuthorizationController.java b/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/controller/AuthorizationController.java index ebfb6be6..e09a74f1 100644 --- a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/controller/AuthorizationController.java +++ b/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/controller/AuthorizationController.java @@ -25,7 +25,7 @@ package org.dromara.dante.upms.controller; -import cn.herodotus.engine.assistant.definition.domain.Result; +import cn.herodotus.engine.core.definition.domain.Result; import jakarta.validation.constraints.NotNull; import org.apache.commons.collections4.MapUtils; import org.dromara.dante.upms.service.AuthorizationService; diff --git a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/service/AuthorizationService.java b/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/service/AuthorizationService.java index c8562faa..ac0cd4c6 100644 --- a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/service/AuthorizationService.java +++ b/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/service/AuthorizationService.java @@ -26,9 +26,9 @@ package org.dromara.dante.upms.service; import cn.herodotus.engine.assistant.definition.support.RestApiTemplate; +import cn.hutool.v7.core.codec.binary.Base64; import cn.zhxu.data.TypeRef; import cn.zhxu.okhttps.OkHttps; -import cn.hutool.v7.core.codec.binary.Base64; import org.springframework.stereotype.Service; import java.util.Map; diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/base/BaseEntity.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/base/BaseBpmnEntity.java similarity index 92% rename from services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/base/BaseEntity.java rename to services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/base/BaseBpmnEntity.java index 803954da..a955571b 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/base/BaseEntity.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/base/BaseBpmnEntity.java @@ -25,7 +25,7 @@ package org.dromara.dante.bpmn.logic.domain.base; -import cn.herodotus.engine.assistant.definition.domain.base.Entity; +import cn.herodotus.engine.core.definition.domain.BaseEntity; import jakarta.persistence.MappedSuperclass; /** @@ -35,5 +35,5 @@ import jakarta.persistence.MappedSuperclass; * @date : 2021/7/20 18:56 */ @MappedSuperclass -public abstract class BaseEntity implements Entity { +public abstract class BaseBpmnEntity implements BaseEntity { } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/debezium/Message.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/debezium/Message.java index 1e2d2161..8ca13685 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/debezium/Message.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/debezium/Message.java @@ -26,7 +26,7 @@ package org.dromara.dante.bpmn.logic.domain.debezium; import com.google.common.base.MoreObjects; -import org.dromara.dante.bpmn.logic.domain.base.BaseEntity; +import org.dromara.dante.bpmn.logic.domain.base.BaseBpmnEntity; import java.io.Serializable; @@ -36,7 +36,7 @@ import java.io.Serializable; * @author : gengwei.zheng * @date : 2021/7/20 19:03 */ -public class Message implements Serializable { +public class Message implements Serializable { private Field schema; private Payload payload; diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/debezium/Payload.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/debezium/Payload.java index bf02c35a..7c5b6800 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/debezium/Payload.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/domain/debezium/Payload.java @@ -29,7 +29,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; -import org.dromara.dante.bpmn.logic.domain.base.BaseEntity; +import org.dromara.dante.bpmn.logic.domain.base.BaseBpmnEntity; import java.io.Serializable; import java.util.Date; @@ -40,7 +40,7 @@ import java.util.Date; * @author : gengwei.zheng * @date : 2021/7/20 19:01 */ -public class Payload implements Serializable { +public class Payload implements Serializable { private T before; diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdGroup.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdGroup.java index c0c2627a..0086be09 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdGroup.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdGroup.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; -import org.dromara.dante.bpmn.logic.domain.base.BaseEntity; +import org.dromara.dante.bpmn.logic.domain.base.BaseBpmnEntity; import org.dromara.dante.bpmn.logic.generator.ActIdGroupIdGenerator; /** @@ -44,7 +44,7 @@ import org.dromara.dante.bpmn.logic.generator.ActIdGroupIdGenerator; @Schema(name = "Camunda 组") @Entity @Table(name = "act_id_group", indexes = {@Index(name = "act_id_group_id_idx", columnList = "id_")}) -public class ActIdGroup extends BaseEntity { +public class ActIdGroup extends BaseBpmnEntity { @JSONField(name = "department_id") @JsonProperty("department_id") diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdMembership.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdMembership.java index 5f0fd995..b1410626 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdMembership.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdMembership.java @@ -31,7 +31,7 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; -import org.dromara.dante.bpmn.logic.domain.base.BaseEntity; +import org.dromara.dante.bpmn.logic.domain.base.BaseBpmnEntity; /** *

Description: 工作流人员和组关系

@@ -47,7 +47,7 @@ import org.dromara.dante.bpmn.logic.domain.base.BaseEntity; @Index(name = "act_id_membership_uid_idx", columnList = "user_id_"), @Index(name = "act_id_membership_gid_idx", columnList = "group_id_") }) -public class ActIdMembership extends BaseEntity { +public class ActIdMembership extends BaseBpmnEntity { @Id @JSONField(name = "employee_id") diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenant.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenant.java index 23893ce9..06573435 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenant.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenant.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; -import org.dromara.dante.bpmn.logic.domain.base.BaseEntity; +import org.dromara.dante.bpmn.logic.domain.base.BaseBpmnEntity; import org.dromara.dante.bpmn.logic.generator.ActIdTenantIdGenerator; /** @@ -42,7 +42,7 @@ import org.dromara.dante.bpmn.logic.generator.ActIdTenantIdGenerator; @Schema(name = "Camunda租户") @Entity @Table(name = "act_id_tenant", indexes = {@Index(name = "act_id_tenant_id_idx", columnList = "id_")}) -public class ActIdTenant extends BaseEntity { +public class ActIdTenant extends BaseBpmnEntity { @JSONField(name = "organization_id") @JsonProperty("organization_id") diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenantMember.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenantMember.java index 5d8b7d78..c5ec3ed5 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenantMember.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenantMember.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; -import org.dromara.dante.bpmn.logic.domain.base.BaseEntity; +import org.dromara.dante.bpmn.logic.domain.base.BaseBpmnEntity; import org.dromara.dante.bpmn.logic.generator.ActIdTenantMemberIdGenerator; /** @@ -49,7 +49,7 @@ import org.dromara.dante.bpmn.logic.generator.ActIdTenantMemberIdGenerator; @Index(name = "act_id_tenant_member_gid_idx", columnList = "group_id_"), @Index(name = "act_id_tenant_member_eid_idx", columnList = "user_id_") }) -public class ActIdTenantMember extends BaseEntity { +public class ActIdTenantMember extends BaseBpmnEntity { @JSONField(name = "ownership_id") @JsonProperty("ownership_id") diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdUser.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdUser.java index 3e50cf1b..70ac1694 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdUser.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdUser.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; -import org.dromara.dante.bpmn.logic.domain.base.BaseEntity; +import org.dromara.dante.bpmn.logic.domain.base.BaseBpmnEntity; import org.dromara.dante.bpmn.logic.generator.ActIdUserIdGenerator; import java.util.Date; @@ -46,7 +46,7 @@ import java.util.Date; @Schema(name = "Camunda用户") @Entity @Table(name = "act_id_user", indexes = {@Index(name = "act_id_user_id_idx", columnList = "id_")}) -public class ActIdUser extends BaseEntity { +public class ActIdUser extends BaseBpmnEntity { @JSONField(name = "employee_id") @JsonProperty("employee_id") diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/processor/AbstractProcessor.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/processor/AbstractProcessor.java index 40f1a580..008e843d 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/processor/AbstractProcessor.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/processor/AbstractProcessor.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.type.TypeFactory; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.dromara.dante.bpmn.logic.domain.base.BaseEntity; +import org.dromara.dante.bpmn.logic.domain.base.BaseBpmnEntity; import org.dromara.dante.bpmn.logic.domain.debezium.Message; import org.dromara.dante.bpmn.logic.domain.enums.DebeziumEvent; import org.slf4j.Logger; @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; * @author : gengwei.zheng * @date : 2021/7/20 15:41 */ -public abstract class AbstractProcessor { +public abstract class AbstractProcessor { private static final Logger log = LoggerFactory.getLogger(AbstractProcessor.class); -- Gitee From c61de9a3c1f41eee2552f8fdbeb3e1c399065fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Fri, 5 Sep 2025 05:33:49 +0800 Subject: [PATCH 02/13] =?UTF-8?q?assistant-definition=20=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processor/SecurityMetadataDistributeProcessor.java | 2 +- .../social/processor/DefaultSocialAuthenticationHandler.java | 4 ++-- .../module/strategy/feign/RemoteSocialDetailsService.java | 2 +- .../strategy/service/HerodotusLocalUserDetailsService.java | 4 ++-- .../strategy/service/HerodotusRemoteUserDetailsService.java | 2 +- .../dante/gateway/filter/GlobalCertificationFilter.java | 2 +- .../org/dromara/dante/upms/service/AuthorizationService.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java index 3d6cc7e0..5be0af8c 100644 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java +++ b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java @@ -25,9 +25,9 @@ package org.dromara.dante.module.metadata.processor; +import cn.herodotus.engine.core.foundation.exception.transaction.TransactionalRollbackException; import org.dromara.dante.module.metadata.converter.SysAttributeToSecurityAttributeConverter; import org.dromara.dante.module.metadata.converter.SysInterfacesToSysAttributesConverter; -import cn.herodotus.engine.assistant.core.exception.transaction.TransactionalRollbackException; import cn.herodotus.engine.message.core.definition.strategy.StrategyEventManager; import cn.herodotus.engine.message.core.logic.domain.RequestMapping; import cn.herodotus.engine.oauth2.authorization.processor.SecurityMetadataSourceAnalyzer; diff --git a/modules/dante-module-social/src/main/java/org/dromara/dante/module/social/processor/DefaultSocialAuthenticationHandler.java b/modules/dante-module-social/src/main/java/org/dromara/dante/module/social/processor/DefaultSocialAuthenticationHandler.java index 653b98ba..364fee87 100644 --- a/modules/dante-module-social/src/main/java/org/dromara/dante/module/social/processor/DefaultSocialAuthenticationHandler.java +++ b/modules/dante-module-social/src/main/java/org/dromara/dante/module/social/processor/DefaultSocialAuthenticationHandler.java @@ -28,7 +28,7 @@ package org.dromara.dante.module.social.processor; import cn.herodotus.engine.access.all.processor.AccessHandlerStrategyFactory; import cn.herodotus.engine.access.core.definition.AccessUserDetails; import cn.herodotus.engine.access.core.exception.AccessIdentityVerificationFailedException; -import cn.herodotus.engine.assistant.definition.domain.oauth2.AccessPrincipal; +import cn.herodotus.engine.core.identity.domain.AccessPrincipal; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; import cn.herodotus.engine.oauth2.core.definition.domain.SocialUserDetails; import cn.herodotus.engine.oauth2.core.definition.handler.AbstractSocialAuthenticationHandler; @@ -39,10 +39,10 @@ import cn.herodotus.engine.supplier.upms.logic.entity.security.SysSocialUser; import cn.herodotus.engine.supplier.upms.logic.entity.security.SysUser; import cn.herodotus.engine.supplier.upms.logic.service.security.SysSocialUserService; import cn.herodotus.engine.supplier.upms.logic.service.security.SysUserService; +import cn.hutool.v7.core.bean.BeanUtil; import com.google.common.collect.ImmutableSet; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import cn.hutool.v7.core.bean.BeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.convert.converter.Converter; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java index 96eec1a9..4251fa0f 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java @@ -25,8 +25,8 @@ package org.dromara.dante.module.strategy.feign; -import cn.herodotus.engine.assistant.definition.domain.oauth2.AccessPrincipal; import cn.herodotus.engine.core.definition.domain.Result; +import cn.herodotus.engine.core.identity.domain.AccessPrincipal; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; import cn.herodotus.engine.rest.core.annotation.Inner; import org.dromara.dante.module.common.ServiceNameConstants; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalUserDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalUserDetailsService.java index ea9c6917..7a15116c 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalUserDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalUserDetailsService.java @@ -25,12 +25,12 @@ package org.dromara.dante.module.strategy.service; -import org.dromara.dante.module.strategy.definition.AbstractStrategyUserDetailsService; -import cn.herodotus.engine.assistant.definition.domain.oauth2.AccessPrincipal; +import cn.herodotus.engine.core.identity.domain.AccessPrincipal; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; import cn.herodotus.engine.oauth2.core.definition.handler.SocialAuthenticationHandler; import cn.herodotus.engine.supplier.upms.logic.entity.security.SysUser; import cn.herodotus.engine.supplier.upms.logic.service.security.SysUserService; +import org.dromara.dante.module.strategy.definition.AbstractStrategyUserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; /** diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java index 807f2689..6660e124 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java @@ -25,8 +25,8 @@ package org.dromara.dante.module.strategy.service; -import cn.herodotus.engine.assistant.definition.domain.oauth2.AccessPrincipal; import cn.herodotus.engine.core.definition.domain.Result; +import cn.herodotus.engine.core.identity.domain.AccessPrincipal; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; import cn.herodotus.engine.supplier.upms.logic.entity.security.SysUser; import org.dromara.dante.module.strategy.definition.AbstractStrategyUserDetailsService; diff --git a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java index 977c0bcf..d983a67e 100644 --- a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java +++ b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java @@ -26,7 +26,7 @@ package org.dromara.dante.gateway.filter; import cn.herodotus.engine.assistant.core.utils.http.HeaderUtils; -import cn.herodotus.engine.assistant.definition.constants.BaseConstants; +import cn.herodotus.engine.core.definition.constant.BaseConstants; import cn.herodotus.engine.core.definition.constant.ErrorCodes; import cn.herodotus.engine.core.definition.domain.Result; import jakarta.annotation.Resource; diff --git a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/service/AuthorizationService.java b/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/service/AuthorizationService.java index ac0cd4c6..492a0939 100644 --- a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/service/AuthorizationService.java +++ b/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/service/AuthorizationService.java @@ -25,7 +25,7 @@ package org.dromara.dante.upms.service; -import cn.herodotus.engine.assistant.definition.support.RestApiTemplate; +import cn.herodotus.engine.core.definition.support.RestApiTemplate; import cn.hutool.v7.core.codec.binary.Base64; import cn.zhxu.data.TypeRef; import cn.zhxu.okhttps.OkHttps; -- Gitee From 08304d615206ad820f091cae19b7d0fb4058be5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Fri, 5 Sep 2025 22:55:59 +0800 Subject: [PATCH 03/13] =?UTF-8?q?assistant=20=E7=9B=B8=E5=85=B3=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E8=BF=81=E7=A7=BB=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/dante-module-common/pom.xml | 2 +- .../RemoteChangeUserStatusListener.java | 2 +- .../RemoteRequestMappingGatherListener.java | 4 +-- .../DistributedArchitectureConfiguration.java | 27 ++++++++++--------- .../MonocoqueArchitectureConfiguration.java | 11 ++++---- .../feign/RemoteSocialDetailsService.java | 2 +- .../feign/RemoteUserDetailsService.java | 2 +- .../processor/MonomerCorsFilter.java | 2 +- .../AuthorizationServerAutoConfiguration.java | 4 +-- platform/dante-cloud-gateway/pom.xml | 20 +++++--------- .../gateway/config/GatewayConfiguration.java | 4 +-- .../filter/GlobalCertificationFilter.java | 2 +- .../filter/GlobalSqlInjectionFilter.java | 2 +- .../dante/gateway/utils/WebFluxUtils.java | 2 +- platform/dante-cloud-monitor/pom.xml | 2 +- .../upms/service/AuthorizationService.java | 2 +- .../logic/processor/AbstractProcessor.java | 2 +- 17 files changed, 43 insertions(+), 49 deletions(-) diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml index b688483a..25d2e0b3 100644 --- a/modules/dante-module-common/pom.xml +++ b/modules/dante-module-common/pom.xml @@ -40,7 +40,7 @@ cn.herodotus.engine - assistant-core + core-foundation diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteChangeUserStatusListener.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteChangeUserStatusListener.java index a06c01a6..46c9fb49 100644 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteChangeUserStatusListener.java +++ b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteChangeUserStatusListener.java @@ -25,7 +25,7 @@ package org.dromara.dante.module.metadata.listener; -import cn.herodotus.engine.assistant.core.json.jackson2.utils.Jackson2Utils; +import cn.herodotus.engine.core.definition.utils.Jackson2Utils; import cn.herodotus.engine.data.core.enums.DataItemStatus; import cn.herodotus.engine.message.core.logic.domain.UserStatus; import cn.herodotus.engine.oauth2.resource.autoconfigure.bus.RemoteChangeUserStatusEvent; diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteRequestMappingGatherListener.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteRequestMappingGatherListener.java index 0da3da95..9e9e6be3 100644 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteRequestMappingGatherListener.java +++ b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteRequestMappingGatherListener.java @@ -25,12 +25,12 @@ package org.dromara.dante.module.metadata.listener; -import org.dromara.dante.module.metadata.processor.RequestMappingStoreProcessor; -import cn.herodotus.engine.assistant.core.json.jackson2.utils.Jackson2Utils; +import cn.herodotus.engine.core.definition.utils.Jackson2Utils; import cn.herodotus.engine.message.core.logic.domain.RequestMapping; import cn.herodotus.engine.oauth2.resource.autoconfigure.bus.RemoteRequestMappingGatherEvent; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; +import org.dromara.dante.module.metadata.processor.RequestMappingStoreProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/DistributedArchitectureConfiguration.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/DistributedArchitectureConfiguration.java index 4db778d8..383eeb5e 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/DistributedArchitectureConfiguration.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/DistributedArchitectureConfiguration.java @@ -25,6 +25,17 @@ package org.dromara.dante.module.strategy.config; +import cn.herodotus.engine.core.foundation.condition.ConditionalOnArchitecture; +import cn.herodotus.engine.core.foundation.enums.Architecture; +import cn.herodotus.engine.core.foundation.enums.DataAccessStrategy; +import cn.herodotus.engine.oauth2.core.definition.handler.SocialAuthenticationHandler; +import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyPermissionDetailsService; +import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyUserDetailsService; +import cn.herodotus.engine.supplier.upms.logic.configuration.SupplierUpmsLogicConfiguration; +import cn.herodotus.engine.supplier.upms.logic.service.security.SysPermissionService; +import cn.herodotus.engine.supplier.upms.logic.service.security.SysUserService; +import cn.herodotus.engine.web.core.condition.ConditionalOnDataAccessStrategy; +import jakarta.annotation.PostConstruct; import org.dromara.dante.module.social.config.SocialModuleConfiguration; import org.dromara.dante.module.strategy.feign.RemoteAuthorityDetailsService; import org.dromara.dante.module.strategy.feign.RemoteSocialDetailsService; @@ -33,16 +44,6 @@ import org.dromara.dante.module.strategy.service.HerodotusLocalPermissionDetails import org.dromara.dante.module.strategy.service.HerodotusLocalUserDetailsService; import org.dromara.dante.module.strategy.service.HerodotusRemotePermissionDetailsService; import org.dromara.dante.module.strategy.service.HerodotusRemoteUserDetailsService; -import cn.herodotus.engine.oauth2.core.definition.handler.SocialAuthenticationHandler; -import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyPermissionDetailsService; -import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyUserDetailsService; -import cn.herodotus.engine.rest.condition.annotation.ConditionalOnDistributedArchitecture; -import cn.herodotus.engine.rest.condition.annotation.ConditionalOnLocalDataAccess; -import cn.herodotus.engine.rest.condition.annotation.ConditionalOnRemoteDataAccess; -import cn.herodotus.engine.supplier.upms.logic.configuration.SupplierUpmsLogicConfiguration; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysPermissionService; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysUserService; -import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -58,7 +59,7 @@ import org.springframework.context.annotation.Import; * @date : 2022/2/1 21:26 */ @Configuration(proxyBeanMethods = false) -@ConditionalOnDistributedArchitecture +@ConditionalOnArchitecture(Architecture.DISTRIBUTED) public class DistributedArchitectureConfiguration { private static final Logger log = LoggerFactory.getLogger(DistributedArchitectureConfiguration.class); @@ -69,7 +70,7 @@ public class DistributedArchitectureConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnLocalDataAccess + @ConditionalOnDataAccessStrategy(DataAccessStrategy.LOCAL) @Import({SupplierUpmsLogicConfiguration.class, SocialModuleConfiguration.class}) static class DataAccessStrategyLocalConfiguration { @@ -90,7 +91,7 @@ public class DistributedArchitectureConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnRemoteDataAccess + @ConditionalOnDataAccessStrategy(DataAccessStrategy.REMOTE) @EnableFeignClients(basePackages = {"org.dromara.dante.module.strategy.feign"}) static class DataAccessStrategyRemoteConfiguration { diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/MonocoqueArchitectureConfiguration.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/MonocoqueArchitectureConfiguration.java index b057c9e3..7997eaac 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/MonocoqueArchitectureConfiguration.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/MonocoqueArchitectureConfiguration.java @@ -25,17 +25,18 @@ package org.dromara.dante.module.strategy.config; -import org.dromara.dante.module.social.config.SocialModuleConfiguration; -import org.dromara.dante.module.strategy.service.HerodotusLocalPermissionDetailsService; -import org.dromara.dante.module.strategy.service.HerodotusLocalUserDetailsService; +import cn.herodotus.engine.core.foundation.condition.ConditionalOnArchitecture; +import cn.herodotus.engine.core.foundation.enums.Architecture; import cn.herodotus.engine.oauth2.core.definition.handler.SocialAuthenticationHandler; import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyPermissionDetailsService; import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyUserDetailsService; -import cn.herodotus.engine.rest.condition.annotation.ConditionalOnMonocoqueArchitecture; import cn.herodotus.engine.supplier.upms.logic.configuration.SupplierUpmsLogicConfiguration; import cn.herodotus.engine.supplier.upms.logic.service.security.SysPermissionService; import cn.herodotus.engine.supplier.upms.logic.service.security.SysUserService; import jakarta.annotation.PostConstruct; +import org.dromara.dante.module.social.config.SocialModuleConfiguration; +import org.dromara.dante.module.strategy.service.HerodotusLocalPermissionDetailsService; +import org.dromara.dante.module.strategy.service.HerodotusLocalUserDetailsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -50,7 +51,7 @@ import org.springframework.context.annotation.Import; * @date : 2022/2/1 21:27 */ @Configuration(proxyBeanMethods = false) -@ConditionalOnMonocoqueArchitecture +@ConditionalOnArchitecture(Architecture.MONOCOQUE) @Import({SupplierUpmsLogicConfiguration.class, SocialModuleConfiguration.class}) public class MonocoqueArchitectureConfiguration { diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java index 4251fa0f..bb82dca6 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java @@ -25,10 +25,10 @@ package org.dromara.dante.module.strategy.feign; +import cn.herodotus.engine.core.definition.annotation.Inner; import cn.herodotus.engine.core.definition.domain.Result; import cn.herodotus.engine.core.identity.domain.AccessPrincipal; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; -import cn.herodotus.engine.rest.core.annotation.Inner; import org.dromara.dante.module.common.ServiceNameConstants; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java index 8c81700c..7e38be7e 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java @@ -25,9 +25,9 @@ package org.dromara.dante.module.strategy.feign; +import cn.herodotus.engine.core.definition.annotation.Inner; import cn.herodotus.engine.core.definition.domain.Result; import org.dromara.dante.module.common.ServiceNameConstants; -import cn.herodotus.engine.rest.core.annotation.Inner; import cn.herodotus.engine.supplier.upms.logic.entity.security.SysUser; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; diff --git a/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/processor/MonomerCorsFilter.java b/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/processor/MonomerCorsFilter.java index 75b7f2cd..d859f7a9 100644 --- a/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/processor/MonomerCorsFilter.java +++ b/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/processor/MonomerCorsFilter.java @@ -25,8 +25,8 @@ package org.dromara.dante.monomer.autoconfigure.processor; -import cn.herodotus.engine.assistant.core.utils.http.HeaderUtils; import cn.herodotus.engine.core.definition.constant.SymbolConstants; +import cn.herodotus.engine.web.core.utils.HeaderUtils; import com.google.common.net.HttpHeaders; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; diff --git a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java index 6e9e185d..33c9538f 100644 --- a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java +++ b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java @@ -25,7 +25,7 @@ package org.dromara.dante.authentication.autoconfigure; -import cn.herodotus.engine.assistant.core.utils.ResourceResolver; +import cn.herodotus.engine.core.foundation.utils.ResourceResolverUtils; import cn.herodotus.engine.oauth2.authentication.configurer.OAuth2AuthenticationProviderConfigurer; import cn.herodotus.engine.oauth2.authentication.customizer.OAuth2FormLoginConfigurerCustomizer; import cn.herodotus.engine.oauth2.authentication.properties.OAuth2AuthenticationProperties; @@ -136,7 +136,7 @@ public class AuthorizationServerAutoConfiguration { KeyPair keyPair = null; if (jwk.getCertificate() == Certificate.CUSTOM) { try { - Resource[] resource = ResourceResolver.getResources(jwk.getJksKeyStore()); + Resource[] resource = ResourceResolverUtils.getResources(jwk.getJksKeyStore()); if (ArrayUtils.isNotEmpty(resource)) { KeyStoreKeyFactory keyStoreKeyFactory = new KeyStoreKeyFactory(resource[0], jwk.getJksStorePassword().toCharArray()); keyPair = keyStoreKeyFactory.getKeyPair(jwk.getJksKeyAlias(), jwk.getJksKeyPassword().toCharArray()); diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml index 409af6ac..20915269 100644 --- a/platform/dante-cloud-gateway/pom.xml +++ b/platform/dante-cloud-gateway/pom.xml @@ -39,21 +39,13 @@ - org.springdoc - springdoc-openapi-starter-webflux-ui - - - org.springframework.cloud - spring-cloud-starter-gateway-server-webflux - - - org.springframework.boot - spring-boot-starter-webflux + cn.herodotus.engine + web-core - org.springframework.boot - spring-boot-starter-actuator + cn.herodotus.engine + reactive-container-spring-boot-starter @@ -67,8 +59,8 @@ - org.springframework.boot - spring-boot-starter-thymeleaf + org.springframework.cloud + spring-cloud-starter-gateway-server-webflux diff --git a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java index 25228c97..5eb1157b 100644 --- a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java +++ b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java @@ -25,7 +25,7 @@ package org.dromara.dante.gateway.config; -import cn.herodotus.engine.assistant.core.annotation.ConditionalOnSwaggerEnabled; +import cn.herodotus.engine.web.core.condition.ConditionalOnSwagger; import org.dromara.dante.gateway.handler.RefreshRoutesListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -90,7 +90,7 @@ public class GatewayConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnSwaggerEnabled + @ConditionalOnSwagger static class GatewaySwaggerConfiguration { @Bean diff --git a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java index d983a67e..b2ff830c 100644 --- a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java +++ b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java @@ -25,10 +25,10 @@ package org.dromara.dante.gateway.filter; -import cn.herodotus.engine.assistant.core.utils.http.HeaderUtils; import cn.herodotus.engine.core.definition.constant.BaseConstants; import cn.herodotus.engine.core.definition.constant.ErrorCodes; import cn.herodotus.engine.core.definition.domain.Result; +import cn.herodotus.engine.web.core.utils.HeaderUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalSqlInjectionFilter.java b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalSqlInjectionFilter.java index e34c1824..945e2552 100644 --- a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalSqlInjectionFilter.java +++ b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalSqlInjectionFilter.java @@ -25,9 +25,9 @@ package org.dromara.dante.gateway.filter; -import cn.herodotus.engine.assistant.core.utils.protect.SqlInjectionUtils; import cn.herodotus.engine.core.definition.constant.ErrorCodes; import cn.herodotus.engine.core.definition.domain.Result; +import cn.herodotus.engine.core.foundation.utils.SqlInjectionUtils; import io.netty.buffer.ByteBufAllocator; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings; diff --git a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/utils/WebFluxUtils.java b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/utils/WebFluxUtils.java index 0353d61b..bbf71ef3 100644 --- a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/utils/WebFluxUtils.java +++ b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/utils/WebFluxUtils.java @@ -25,8 +25,8 @@ package org.dromara.dante.gateway.utils; -import cn.herodotus.engine.assistant.core.json.jackson2.utils.Jackson2Utils; import cn.herodotus.engine.core.definition.domain.Result; +import cn.herodotus.engine.core.definition.utils.Jackson2Utils; import org.apache.commons.lang3.Strings; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferUtils; diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index 52fe21dd..433e235b 100644 --- a/platform/dante-cloud-monitor/pom.xml +++ b/platform/dante-cloud-monitor/pom.xml @@ -40,7 +40,7 @@ cn.herodotus.engine - web-server-spring-boot-starter + servlet-container-spring-boot-starter org.dromara.dante diff --git a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/service/AuthorizationService.java b/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/service/AuthorizationService.java index 492a0939..adecb722 100644 --- a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/service/AuthorizationService.java +++ b/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/service/AuthorizationService.java @@ -59,7 +59,7 @@ public class AuthorizationService implements RestApiTemplate { .addUrlPara("redirect_uri", "http://192.168.101.10:8847/dante-cloud-upms/open/authorized") .post() .getBody() - .toBean(new TypeRef>() { + .toBean(new TypeRef<>() { }); } } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/processor/AbstractProcessor.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/processor/AbstractProcessor.java index 008e843d..94d8dde9 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/processor/AbstractProcessor.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/processor/AbstractProcessor.java @@ -25,7 +25,7 @@ package org.dromara.dante.bpmn.logic.processor; -import cn.herodotus.engine.assistant.core.json.jackson2.utils.Jackson2Utils; +import cn.herodotus.engine.core.definition.utils.Jackson2Utils; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.type.TypeFactory; import org.apache.commons.lang3.ObjectUtils; -- Gitee From 7bfcc971f3503f68d333c95be5e2d2865d68f23f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Sun, 7 Sep 2025 01:26:38 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E9=87=8D=E6=9E=84=20access=20=E5=92=8C?= =?UTF-8?q?=20upms=20=E7=9B=B8=E5=85=B3=E5=AD=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BB=A5=E5=AE=9E=E7=8E=B0=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 - dependencies/pom.xml | 5 - modules/dante-module-metadata/pom.xml | 7 +- .../config/MetadataModuleConfiguration.java | 7 +- ...AttributeToSecurityAttributeConverter.java | 4 +- ...SysInterfacesToSysAttributesConverter.java | 4 +- .../LocalChangeUserStatusListener.java | 2 +- .../RemoteChangeUserStatusListener.java | 2 +- .../listener/SysAttributeChangeListener.java | 6 +- .../SecurityMetadataDistributeProcessor.java | 12 +- modules/dante-module-social/pom.xml | 52 ------ .../config/SocialModuleConfiguration.java | 63 -------- .../DefaultSocialAuthenticationHandler.java | 148 ------------------ modules/dante-module-strategy/pom.xml | 4 +- .../DistributedArchitectureConfiguration.java | 12 +- .../MonocoqueArchitectureConfiguration.java | 12 +- ...tractStrategyPermissionDetailsService.java | 2 +- .../AbstractStrategyUserDetailsService.java | 4 +- .../feign/RemoteAuthorityDetailsService.java | 2 +- .../feign/RemoteUserDetailsService.java | 2 +- ...erodotusLocalPermissionDetailsService.java | 4 +- .../HerodotusLocalUserDetailsService.java | 6 +- ...rodotusRemotePermissionDetailsService.java | 2 +- .../HerodotusRemoteUserDetailsService.java | 2 +- modules/pom.xml | 1 - .../dante/upms/config/UpmsConfiguration.java | 6 +- 26 files changed, 44 insertions(+), 328 deletions(-) delete mode 100644 modules/dante-module-social/pom.xml delete mode 100644 modules/dante-module-social/src/main/java/org/dromara/dante/module/social/config/SocialModuleConfiguration.java delete mode 100644 modules/dante-module-social/src/main/java/org/dromara/dante/module/social/processor/DefaultSocialAuthenticationHandler.java diff --git a/README.md b/README.md index f7302aaa..a6b5e09a 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,6 @@ dante-cloud ├── module -- 依赖组件半成品拼装工程 ├ ├── dante-module-common -- Module 相关模块公共辅助代码模块 ├ ├── dante-module-metadata -- 权限元数据同步模块 -├ ├── dante-module-social -- 社交登录模块 ├ ├── dante-module-strategy -- UAA 核心数据访问策略模块 ├ └── dante-monomer-autoconfigure -- 单体版自动配置模块 ├── packages -- 基础核心Starter diff --git a/dependencies/pom.xml b/dependencies/pom.xml index f59fbf52..a6977f0e 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -105,11 +105,6 @@ ${project.version} - - org.dromara.dante - dante-module-social - ${project.version} - org.dromara.dante dante-module-metadata diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml index e7a2a522..bb33b80b 100644 --- a/modules/dante-module-metadata/pom.xml +++ b/modules/dante-module-metadata/pom.xml @@ -38,14 +38,9 @@ dante-module-metadata - - org.dromara.dante - dante-module-social - - cn.herodotus.engine - supplier-sdk-upms-rest + rest-module-servlet-upms diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/config/MetadataModuleConfiguration.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/config/MetadataModuleConfiguration.java index cf37abde..5bd2f89c 100644 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/config/MetadataModuleConfiguration.java +++ b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/config/MetadataModuleConfiguration.java @@ -25,13 +25,12 @@ package org.dromara.dante.module.metadata.config; -import cn.herodotus.engine.supplier.upms.rest.configuration.SupplierUpmsRestConfiguration; +import cn.herodotus.engine.rest.servlet.upms.annotation.EnableHerodotusRestServletUpms; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; /** *

Description: UpmsRest配置类

@@ -44,9 +43,7 @@ import org.springframework.context.annotation.Import; "org.dromara.dante.module.metadata.processor", "org.dromara.dante.module.metadata.listener", }) -@Import({ - SupplierUpmsRestConfiguration.class -}) +@EnableHerodotusRestServletUpms public class MetadataModuleConfiguration { private static final Logger log = LoggerFactory.getLogger(MetadataModuleConfiguration.class); diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysAttributeToSecurityAttributeConverter.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysAttributeToSecurityAttributeConverter.java index 5fc1528c..ebcf9910 100644 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysAttributeToSecurityAttributeConverter.java +++ b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysAttributeToSecurityAttributeConverter.java @@ -25,9 +25,9 @@ package org.dromara.dante.module.metadata.converter; +import cn.herodotus.engine.logic.upms.entity.security.SysAttribute; +import cn.herodotus.engine.logic.upms.entity.security.SysPermission; import cn.herodotus.engine.oauth2.core.definition.domain.SecurityAttribute; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysAttribute; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysPermission; import org.apache.commons.collections4.CollectionUtils; import org.springframework.core.convert.converter.Converter; import org.springframework.util.StringUtils; diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysInterfacesToSysAttributesConverter.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysInterfacesToSysAttributesConverter.java index bcaf3afc..ce77f58c 100644 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysInterfacesToSysAttributesConverter.java +++ b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysInterfacesToSysAttributesConverter.java @@ -25,8 +25,8 @@ package org.dromara.dante.module.metadata.converter; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysAttribute; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysInterface; +import cn.herodotus.engine.logic.upms.entity.security.SysAttribute; +import cn.herodotus.engine.logic.upms.entity.security.SysInterface; import org.apache.commons.collections4.CollectionUtils; import org.springframework.core.convert.converter.Converter; diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/LocalChangeUserStatusListener.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/LocalChangeUserStatusListener.java index 52a46f1c..ff6a70a1 100644 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/LocalChangeUserStatusListener.java +++ b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/LocalChangeUserStatusListener.java @@ -26,9 +26,9 @@ package org.dromara.dante.module.metadata.listener; import cn.herodotus.engine.data.core.enums.DataItemStatus; +import cn.herodotus.engine.logic.upms.service.security.SysUserService; import cn.herodotus.engine.message.core.logic.domain.UserStatus; import cn.herodotus.engine.message.core.logic.event.ChangeUserStatusEvent; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysUserService; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteChangeUserStatusListener.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteChangeUserStatusListener.java index 46c9fb49..a9b2f6de 100644 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteChangeUserStatusListener.java +++ b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteChangeUserStatusListener.java @@ -27,9 +27,9 @@ package org.dromara.dante.module.metadata.listener; import cn.herodotus.engine.core.definition.utils.Jackson2Utils; import cn.herodotus.engine.data.core.enums.DataItemStatus; +import cn.herodotus.engine.logic.upms.service.security.SysUserService; import cn.herodotus.engine.message.core.logic.domain.UserStatus; import cn.herodotus.engine.oauth2.resource.autoconfigure.bus.RemoteChangeUserStatusEvent; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysUserService; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/SysAttributeChangeListener.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/SysAttributeChangeListener.java index 993cdfd1..2cf3223f 100644 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/SysAttributeChangeListener.java +++ b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/SysAttributeChangeListener.java @@ -25,10 +25,10 @@ package org.dromara.dante.module.metadata.listener; -import org.dromara.dante.module.metadata.processor.SecurityMetadataDistributeProcessor; -import cn.herodotus.engine.supplier.upms.logic.domain.event.SysAttributeChangeEvent; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysAttribute; +import cn.herodotus.engine.logic.upms.domain.event.SysAttributeChangeEvent; +import cn.herodotus.engine.logic.upms.entity.security.SysAttribute; import org.apache.commons.lang3.ObjectUtils; +import org.dromara.dante.module.metadata.processor.SecurityMetadataDistributeProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationListener; diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java index 5be0af8c..0ba00dd3 100644 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java +++ b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java @@ -26,19 +26,19 @@ package org.dromara.dante.module.metadata.processor; import cn.herodotus.engine.core.foundation.exception.transaction.TransactionalRollbackException; -import org.dromara.dante.module.metadata.converter.SysAttributeToSecurityAttributeConverter; -import org.dromara.dante.module.metadata.converter.SysInterfacesToSysAttributesConverter; +import cn.herodotus.engine.logic.upms.entity.security.SysAttribute; +import cn.herodotus.engine.logic.upms.entity.security.SysInterface; +import cn.herodotus.engine.logic.upms.service.security.SysAttributeService; +import cn.herodotus.engine.logic.upms.service.security.SysInterfaceService; import cn.herodotus.engine.message.core.definition.strategy.StrategyEventManager; import cn.herodotus.engine.message.core.logic.domain.RequestMapping; import cn.herodotus.engine.oauth2.authorization.processor.SecurityMetadataSourceAnalyzer; import cn.herodotus.engine.oauth2.core.definition.domain.SecurityAttribute; import cn.herodotus.engine.oauth2.resource.autoconfigure.bus.RemoteSecurityMetadataSyncEvent; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysAttribute; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysInterface; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysAttributeService; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysInterfaceService; import com.google.common.collect.ImmutableList; import org.apache.commons.collections4.CollectionUtils; +import org.dromara.dante.module.metadata.converter.SysAttributeToSecurityAttributeConverter; +import org.dromara.dante.module.metadata.converter.SysInterfacesToSysAttributesConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.convert.converter.Converter; diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml deleted file mode 100644 index 9f6643b5..00000000 --- a/modules/dante-module-social/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - 4.0.0 - - - modules - org.dromara.dante - 3.5.5.2 - - - dante-module-social - - - - cn.herodotus.engine - supplier-sdk-upms-logic - - - - cn.herodotus.engine - access-sdk-all - - - - \ No newline at end of file diff --git a/modules/dante-module-social/src/main/java/org/dromara/dante/module/social/config/SocialModuleConfiguration.java b/modules/dante-module-social/src/main/java/org/dromara/dante/module/social/config/SocialModuleConfiguration.java deleted file mode 100644 index e86f70b7..00000000 --- a/modules/dante-module-social/src/main/java/org/dromara/dante/module/social/config/SocialModuleConfiguration.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.module.social.config; - -import org.dromara.dante.module.social.processor.DefaultSocialAuthenticationHandler; -import cn.herodotus.engine.access.all.configuration.AccessAllConfiguration; -import jakarta.annotation.PostConstruct; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - - -/** - *

Description: UPMS 社交配置

- * - * @author : gengwei.zheng - * @date : 2022/2/2 17:05 - */ -@Configuration(proxyBeanMethods = false) -@Import({AccessAllConfiguration.class}) -public class SocialModuleConfiguration { - - private static final Logger log = LoggerFactory.getLogger(SocialModuleConfiguration.class); - - @PostConstruct - public void postConstruct() { - log.info("[Herodotus] |- SDK [Module Upms Social] Auto Configure."); - } - - @Bean - @ConditionalOnMissingBean - public DefaultSocialAuthenticationHandler defaultSocialAuthenticationHandler() { - DefaultSocialAuthenticationHandler defaultSocialAuthenticationHandler = new DefaultSocialAuthenticationHandler(); - log.trace("[Herodotus] |- Bean [Default Social Authentication Handler] Auto Configure."); - return defaultSocialAuthenticationHandler; - } -} diff --git a/modules/dante-module-social/src/main/java/org/dromara/dante/module/social/processor/DefaultSocialAuthenticationHandler.java b/modules/dante-module-social/src/main/java/org/dromara/dante/module/social/processor/DefaultSocialAuthenticationHandler.java deleted file mode 100644 index 364fee87..00000000 --- a/modules/dante-module-social/src/main/java/org/dromara/dante/module/social/processor/DefaultSocialAuthenticationHandler.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.module.social.processor; - -import cn.herodotus.engine.access.all.processor.AccessHandlerStrategyFactory; -import cn.herodotus.engine.access.core.definition.AccessUserDetails; -import cn.herodotus.engine.access.core.exception.AccessIdentityVerificationFailedException; -import cn.herodotus.engine.core.identity.domain.AccessPrincipal; -import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; -import cn.herodotus.engine.oauth2.core.definition.domain.SocialUserDetails; -import cn.herodotus.engine.oauth2.core.definition.handler.AbstractSocialAuthenticationHandler; -import cn.herodotus.engine.oauth2.core.exception.SocialCredentialsParameterBindingFailedException; -import cn.herodotus.engine.oauth2.core.exception.UsernameAlreadyExistsException; -import cn.herodotus.engine.supplier.upms.logic.converter.SysUserToHerodotusUserConverter; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysSocialUser; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysUser; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysSocialUserService; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysUserService; -import cn.hutool.v7.core.bean.BeanUtil; -import com.google.common.collect.ImmutableSet; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.convert.converter.Converter; - -/** - *

Description: 社交登录默认处理器。

- * - * @author : gengwei.zheng - * @date : 2022/1/26 23:44 - */ -public class DefaultSocialAuthenticationHandler extends AbstractSocialAuthenticationHandler { - - @Autowired - private SysUserService sysUserService; - @Autowired - private SysSocialUserService sysSocialUserService; - @Autowired - private AccessHandlerStrategyFactory accessHandlerStrategyFactory; - - private final Converter toUser; - - public DefaultSocialAuthenticationHandler() { - this.toUser = new SysUserToHerodotusUserConverter(); - } - - @Override - public SocialUserDetails identity(String source, AccessPrincipal accessPrincipal) throws AccessIdentityVerificationFailedException { - AccessUserDetails accessUserDetails = accessHandlerStrategyFactory.findAccessUserDetails(source, accessPrincipal); - - if (BeanUtil.isNotEmpty(accessUserDetails)) { - SysSocialUser sysSocialUser = new SysSocialUser(); - BeanUtil.copyProperties(accessUserDetails, sysSocialUser); - return sysSocialUser; - } - - throw new AccessIdentityVerificationFailedException("Access Identity Verification Failed!"); - } - - @Override - public SocialUserDetails isUserExist(SocialUserDetails socialUserDetails) { - String uuid = socialUserDetails.getUuid(); - String source = socialUserDetails.getSource(); - if (StringUtils.isNotBlank(uuid) && StringUtils.isNotBlank(source)) { - return sysSocialUserService.findByUuidAndSource(uuid, source); - } - - return null; - } - - @Override - public HerodotusUser register(SocialUserDetails socialUserDetails) throws UsernameAlreadyExistsException { - return sysUserService.registerUserDetails(socialUserDetails); - } - - @Override - public void binding(String userId, SocialUserDetails socialUserDetails) throws SocialCredentialsParameterBindingFailedException { - if (socialUserDetails instanceof SysSocialUser sysSocialUser) { - SysUser sysUser = new SysUser(); - sysUser.setUserId(userId); - sysSocialUser.setUsers(ImmutableSet.builder().add(sysUser).build()); - sysSocialUserService.saveAndFlush(sysSocialUser); - } - } - - @Override - public void additionalRegisterOperation(HerodotusUser herodotusUserDetails, SocialUserDetails socialUserDetails) { - - } - - @Override - public HerodotusUser signIn(SocialUserDetails socialUserDetails) { - if (socialUserDetails instanceof SysSocialUser sysSocialUser) { - SysUser sysUser = sysSocialUser.getUsers().stream().findFirst().orElse(null); - if (ObjectUtils.isNotEmpty(sysUser)) { - return toUser.convert(sysUser); - } else { - return null; - } - } - - return null; - } - - @Override - public void additionalSignInOperation(HerodotusUser herodotusUserDetails, SocialUserDetails newSocialUserDetails, SocialUserDetails oldSocialUserDetails) { - if (newSocialUserDetails instanceof SysSocialUser newSysSocialUser && oldSocialUserDetails instanceof SysSocialUser oldSysSocialUser) { - setSocialUserInfo(oldSysSocialUser, newSysSocialUser.getAccessToken(), newSysSocialUser.getExpireIn(), newSysSocialUser.getRefreshToken(), newSysSocialUser.getRefreshTokenExpireIn(), newSysSocialUser.getScope(), newSysSocialUser.getTokenType(), newSysSocialUser.getUid(), newSysSocialUser.getOpenId(), newSysSocialUser.getAccessCode(), newSysSocialUser.getUnionId()); - sysSocialUserService.saveAndFlush(oldSysSocialUser); - } - } - - protected void setSocialUserInfo(SysSocialUser sysSocialUser, String accessToken, Integer expireIn, String refreshToken, Integer refreshTokenExpireIn, String scope, String tokenType, String uid, String openId, String accessCode, String unionId) { - sysSocialUser.setAccessToken(accessToken); - sysSocialUser.setExpireIn(expireIn); - sysSocialUser.setRefreshToken(refreshToken); - sysSocialUser.setRefreshTokenExpireIn(refreshTokenExpireIn); - sysSocialUser.setScope(scope); - sysSocialUser.setTokenType(tokenType); - sysSocialUser.setUid(uid); - sysSocialUser.setOpenId(openId); - sysSocialUser.setAccessCode(accessCode); - sysSocialUser.setUnionId(unionId); - } -} diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml index 266e7f8b..f275fc95 100644 --- a/modules/dante-module-strategy/pom.xml +++ b/modules/dante-module-strategy/pom.xml @@ -43,8 +43,8 @@ rest-sdk-condition - org.dromara.dante - dante-module-social + cn.herodotus.engine + logic-module-upms diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/DistributedArchitectureConfiguration.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/DistributedArchitectureConfiguration.java index 383eeb5e..9986bef3 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/DistributedArchitectureConfiguration.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/DistributedArchitectureConfiguration.java @@ -28,15 +28,14 @@ package org.dromara.dante.module.strategy.config; import cn.herodotus.engine.core.foundation.condition.ConditionalOnArchitecture; import cn.herodotus.engine.core.foundation.enums.Architecture; import cn.herodotus.engine.core.foundation.enums.DataAccessStrategy; -import cn.herodotus.engine.oauth2.core.definition.handler.SocialAuthenticationHandler; +import cn.herodotus.engine.logic.upms.annotation.EnableHerodotusLogicUpms; +import cn.herodotus.engine.logic.upms.definition.SocialAuthenticationHandler; +import cn.herodotus.engine.logic.upms.service.security.SysPermissionService; +import cn.herodotus.engine.logic.upms.service.security.SysUserService; import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyPermissionDetailsService; import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyUserDetailsService; -import cn.herodotus.engine.supplier.upms.logic.configuration.SupplierUpmsLogicConfiguration; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysPermissionService; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysUserService; import cn.herodotus.engine.web.core.condition.ConditionalOnDataAccessStrategy; import jakarta.annotation.PostConstruct; -import org.dromara.dante.module.social.config.SocialModuleConfiguration; import org.dromara.dante.module.strategy.feign.RemoteAuthorityDetailsService; import org.dromara.dante.module.strategy.feign.RemoteSocialDetailsService; import org.dromara.dante.module.strategy.feign.RemoteUserDetailsService; @@ -50,7 +49,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; /** *

Description: 分布式架构配置

@@ -71,7 +69,7 @@ public class DistributedArchitectureConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnDataAccessStrategy(DataAccessStrategy.LOCAL) - @Import({SupplierUpmsLogicConfiguration.class, SocialModuleConfiguration.class}) + @EnableHerodotusLogicUpms static class DataAccessStrategyLocalConfiguration { @Bean diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/MonocoqueArchitectureConfiguration.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/MonocoqueArchitectureConfiguration.java index 7997eaac..a7ba29d8 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/MonocoqueArchitectureConfiguration.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/MonocoqueArchitectureConfiguration.java @@ -27,14 +27,13 @@ package org.dromara.dante.module.strategy.config; import cn.herodotus.engine.core.foundation.condition.ConditionalOnArchitecture; import cn.herodotus.engine.core.foundation.enums.Architecture; -import cn.herodotus.engine.oauth2.core.definition.handler.SocialAuthenticationHandler; +import cn.herodotus.engine.logic.upms.annotation.EnableHerodotusLogicUpms; +import cn.herodotus.engine.logic.upms.definition.SocialAuthenticationHandler; +import cn.herodotus.engine.logic.upms.service.security.SysPermissionService; +import cn.herodotus.engine.logic.upms.service.security.SysUserService; import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyPermissionDetailsService; import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyUserDetailsService; -import cn.herodotus.engine.supplier.upms.logic.configuration.SupplierUpmsLogicConfiguration; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysPermissionService; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysUserService; import jakarta.annotation.PostConstruct; -import org.dromara.dante.module.social.config.SocialModuleConfiguration; import org.dromara.dante.module.strategy.service.HerodotusLocalPermissionDetailsService; import org.dromara.dante.module.strategy.service.HerodotusLocalUserDetailsService; import org.slf4j.Logger; @@ -42,7 +41,6 @@ import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; /** *

Description: 单体式架构配置

@@ -52,7 +50,7 @@ import org.springframework.context.annotation.Import; */ @Configuration(proxyBeanMethods = false) @ConditionalOnArchitecture(Architecture.MONOCOQUE) -@Import({SupplierUpmsLogicConfiguration.class, SocialModuleConfiguration.class}) +@EnableHerodotusLogicUpms public class MonocoqueArchitectureConfiguration { private static final Logger log = LoggerFactory.getLogger(MonocoqueArchitectureConfiguration.class); diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyPermissionDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyPermissionDetailsService.java index 0da2d341..a1f528ab 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyPermissionDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyPermissionDetailsService.java @@ -25,9 +25,9 @@ package org.dromara.dante.module.strategy.definition; +import cn.herodotus.engine.logic.upms.entity.security.SysPermission; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusPermission; import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyPermissionDetailsService; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysPermission; import java.util.List; import java.util.stream.Collectors; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyUserDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyUserDetailsService.java index 61857412..60413ea2 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyUserDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyUserDetailsService.java @@ -25,10 +25,10 @@ package org.dromara.dante.module.strategy.definition; +import cn.herodotus.engine.logic.upms.converter.SysUserToHerodotusUserConverter; +import cn.herodotus.engine.logic.upms.entity.security.SysUser; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyUserDetailsService; -import cn.herodotus.engine.supplier.upms.logic.converter.SysUserToHerodotusUserConverter; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysUser; import org.apache.commons.lang3.ObjectUtils; import org.springframework.core.convert.converter.Converter; import org.springframework.security.core.AuthenticationException; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteAuthorityDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteAuthorityDetailsService.java index 4f9fcab9..8cbeb0bd 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteAuthorityDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteAuthorityDetailsService.java @@ -26,7 +26,7 @@ package org.dromara.dante.module.strategy.feign; import cn.herodotus.engine.core.definition.domain.Result; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysPermission; +import cn.herodotus.engine.logic.upms.entity.security.SysPermission; import org.dromara.dante.module.common.ServiceNameConstants; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java index 7e38be7e..e03e3bad 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java @@ -27,8 +27,8 @@ package org.dromara.dante.module.strategy.feign; import cn.herodotus.engine.core.definition.annotation.Inner; import cn.herodotus.engine.core.definition.domain.Result; +import cn.herodotus.engine.logic.upms.entity.security.SysUser; import org.dromara.dante.module.common.ServiceNameConstants; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysUser; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalPermissionDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalPermissionDetailsService.java index bc6a0a8c..4d056143 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalPermissionDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalPermissionDetailsService.java @@ -25,10 +25,10 @@ package org.dromara.dante.module.strategy.service; +import cn.herodotus.engine.logic.upms.entity.security.SysPermission; +import cn.herodotus.engine.logic.upms.service.security.SysPermissionService; import org.dromara.dante.module.strategy.definition.AbstractStrategyPermissionDetailsService; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusPermission; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysPermission; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysPermissionService; import org.apache.commons.collections4.CollectionUtils; import java.util.ArrayList; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalUserDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalUserDetailsService.java index 7a15116c..2c491c59 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalUserDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalUserDetailsService.java @@ -26,10 +26,10 @@ package org.dromara.dante.module.strategy.service; import cn.herodotus.engine.core.identity.domain.AccessPrincipal; +import cn.herodotus.engine.logic.upms.definition.SocialAuthenticationHandler; +import cn.herodotus.engine.logic.upms.entity.security.SysUser; +import cn.herodotus.engine.logic.upms.service.security.SysUserService; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; -import cn.herodotus.engine.oauth2.core.definition.handler.SocialAuthenticationHandler; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysUser; -import cn.herodotus.engine.supplier.upms.logic.service.security.SysUserService; import org.dromara.dante.module.strategy.definition.AbstractStrategyUserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemotePermissionDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemotePermissionDetailsService.java index 3f02f615..9c3abf15 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemotePermissionDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemotePermissionDetailsService.java @@ -26,8 +26,8 @@ package org.dromara.dante.module.strategy.service; import cn.herodotus.engine.core.definition.domain.Result; +import cn.herodotus.engine.logic.upms.entity.security.SysPermission; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusPermission; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysPermission; import org.apache.commons.collections4.CollectionUtils; import org.dromara.dante.module.strategy.definition.AbstractStrategyPermissionDetailsService; import org.dromara.dante.module.strategy.feign.RemoteAuthorityDetailsService; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java index 6660e124..bf48e9a8 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java +++ b/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java @@ -27,8 +27,8 @@ package org.dromara.dante.module.strategy.service; import cn.herodotus.engine.core.definition.domain.Result; import cn.herodotus.engine.core.identity.domain.AccessPrincipal; +import cn.herodotus.engine.logic.upms.entity.security.SysUser; import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; -import cn.herodotus.engine.supplier.upms.logic.entity.security.SysUser; import org.dromara.dante.module.strategy.definition.AbstractStrategyUserDetailsService; import org.dromara.dante.module.strategy.feign.RemoteSocialDetailsService; import org.dromara.dante.module.strategy.feign.RemoteUserDetailsService; diff --git a/modules/pom.xml b/modules/pom.xml index de26f60b..60c87203 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -66,7 +66,6 @@ dante-module-common - dante-module-social dante-module-metadata dante-module-strategy dante-monomer-autoconfigure diff --git a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/config/UpmsConfiguration.java b/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/config/UpmsConfiguration.java index 3c4a0a60..e3b3013b 100644 --- a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/config/UpmsConfiguration.java +++ b/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/config/UpmsConfiguration.java @@ -25,10 +25,9 @@ package org.dromara.dante.upms.config; -import cn.herodotus.engine.supplier.upms.logic.configuration.SupplierUpmsLogicConfiguration; +import cn.herodotus.engine.logic.upms.config.LogicUpmsConfiguration; import jakarta.annotation.PostConstruct; import org.dromara.dante.module.metadata.config.MetadataModuleConfiguration; -import org.dromara.dante.module.social.config.SocialModuleConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Configuration; @@ -42,8 +41,7 @@ import org.springframework.context.annotation.Import; */ @Configuration(proxyBeanMethods = false) @Import({ - SupplierUpmsLogicConfiguration.class, - SocialModuleConfiguration.class, + LogicUpmsConfiguration.class, MetadataModuleConfiguration.class }) public class UpmsConfiguration { -- Gitee From 11c7fac6c7e180f37c9dde7c1b5fe50183c00f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Sun, 7 Sep 2025 18:18:07 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=A0=B8=E5=BF=83?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=B0=83=E6=95=B4=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autoconfigure/DefaultSecurityAutoConfiguration.java | 2 +- .../dromara/dante/gateway/config/GatewayConfiguration.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java index d4a9e4a6..ea1ee849 100644 --- a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java +++ b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java @@ -25,7 +25,7 @@ package org.dromara.dante.authentication.autoconfigure; -import cn.herodotus.engine.captcha.core.processor.CaptchaRendererFactory; +import cn.herodotus.engine.core.foundation.support.captcha.CaptchaRendererFactory; import cn.herodotus.engine.oauth2.authentication.configurer.OAuth2FormLoginSecureConfigurer; import cn.herodotus.engine.oauth2.authentication.properties.OAuth2AuthenticationProperties; import cn.herodotus.engine.oauth2.authentication.response.DefaultOAuth2AuthenticationEventPublisher; diff --git a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java index 5eb1157b..fe40ec68 100644 --- a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java +++ b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java @@ -25,7 +25,7 @@ package org.dromara.dante.gateway.config; -import cn.herodotus.engine.web.core.condition.ConditionalOnSwagger; +import cn.herodotus.engine.web.core.condition.ConditionalOnSwaggerEnabled; import org.dromara.dante.gateway.handler.RefreshRoutesListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -90,7 +90,7 @@ public class GatewayConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnSwagger + @ConditionalOnSwaggerEnabled static class GatewaySwaggerConfiguration { @Bean -- Gitee From 7c2c0bda1ed8f7092fbb2c5f5a31cc23e264c8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Wed, 10 Sep 2025 00:17:43 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=AF=B9=E9=BD=90=E5=90=84=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E5=8F=8A=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E6=80=9D=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 88 ++++++++++-- dependencies/pom.xml | 12 +- ...AttributeToSecurityAttributeConverter.java | 69 ---------- ...SysInterfacesToSysAttributesConverter.java | 71 ---------- .../LocalChangeUserStatusListener.java | 67 --------- .../LocalRequestMappingGatherListener.java | 70 ---------- .../RemoteChangeUserStatusListener.java | 75 ---------- .../listener/SysAttributeChangeListener.java | 65 --------- .../RequestMappingStoreProcessor.java | 60 -------- .../SecurityMetadataDistributeProcessor.java | 129 ------------------ modules/dante-monomer-autoconfigure/pom.xml | 19 +-- .../processor/MonomerCorsFilter.java | 5 +- modules/pom.xml | 2 - .../pom.xml | 9 +- ...ArchitectureStrategyAutoConfiguration.java | 55 -------- .../AuthenticationAutoConfiguration.java | 48 ------- .../AuthorizationServerAutoConfiguration.java | 38 ++---- .../DefaultSecurityAutoConfiguration.java | 45 ++---- ...ot.autoconfigure.AutoConfiguration.imports | 2 - .../pom.xml | 9 +- ...uthorizationServletAutoConfiguration.java} | 21 ++- ...ot.autoconfigure.AutoConfiguration.imports | 1 + packages/pom.xml | 4 +- .../pom.xml | 18 ++- .../DistributedArchitectureConfiguration.java | 44 +++--- .../MonocoqueArchitectureConfiguration.java | 17 +-- ...tractStrategyPermissionDetailsService.java | 6 +- .../AbstractStrategyUserDetailsService.java | 6 +- ...FeignStrategyPermissionDetailsService.java | 12 +- .../FeignStrategyUserDetailsService.java | 14 +- .../api}/RemoteAuthorityDetailsService.java | 2 +- .../api}/RemoteSocialDetailsService.java | 4 +- .../feign/api}/RemoteUserDetailsService.java | 2 +- ...LocalStrategyPermissionDetailsService.java | 10 +- .../LocalStrategyUserDetailsService.java | 10 +- ...ot.autoconfigure.AutoConfiguration.imports | 27 ++++ .../pom.xml | 9 +- .../RpcServerUpmsAutoConfiguration.java | 27 ++-- .../feign/SocialSignInController.java | 73 +++++----- ...ot.autoconfigure.AutoConfiguration.imports | 26 ++++ .../ServiceAutoConfiguration.java | 48 ------- ...ot.autoconfigure.AutoConfiguration.imports | 2 - .../filter/GlobalCertificationFilter.java | 8 +- platform/dante-cloud-message/pom.xml | 8 +- .../dante/message/MessageApplication.java | 4 +- platform/dante-cloud-monitor/pom.xml | 2 + platform/dante-cloud-upms/pom.xml | 6 +- .../dromara/dante/upms/UpmsApplication.java | 3 - .../dante/upms/config/UpmsConfiguration.java | 55 -------- services/dante-cloud-bpmn-ability/pom.xml | 2 +- services/dante-cloud-bpmn-logic/pom.xml | 5 +- .../repository/ActIdGroupRepository.java | 4 +- .../repository/ActIdMembershipRepository.java | 4 +- .../ActIdTenantMemberRepository.java | 4 +- .../repository/ActIdTenantRepository.java | 4 +- .../logic/repository/ActIdUserRepository.java | 4 +- .../bpmn/logic/service/ActIdGroupService.java | 8 +- .../logic/service/ActIdMembershipService.java | 8 +- .../service/ActIdTenantMemberService.java | 8 +- .../logic/service/ActIdTenantService.java | 8 +- .../bpmn/logic/service/ActIdUserService.java | 8 +- services/dante-cloud-oss-ability/pom.xml | 2 +- 62 files changed, 387 insertions(+), 1089 deletions(-) delete mode 100644 modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysAttributeToSecurityAttributeConverter.java delete mode 100644 modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysInterfacesToSysAttributesConverter.java delete mode 100644 modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/LocalChangeUserStatusListener.java delete mode 100644 modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/LocalRequestMappingGatherListener.java delete mode 100644 modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteChangeUserStatusListener.java delete mode 100644 modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/SysAttributeChangeListener.java delete mode 100644 modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/RequestMappingStoreProcessor.java delete mode 100644 modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java delete mode 100644 packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/ArchitectureStrategyAutoConfiguration.java delete mode 100644 packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthenticationAutoConfiguration.java rename packages/{service-spring-boot-starter => authorization-servlet-spring-boot-starter}/pom.xml (87%) rename packages/{service-spring-boot-starter/src/main/java/org/dromara/dante/service/autoconfigure/ResourceServerAutoConfiguration.java => authorization-servlet-spring-boot-starter/src/main/java/org/dromara/dante/authorization/servlet/autoconfigure/AuthorizationServletAutoConfiguration.java} (68%) create mode 100644 packages/authorization-servlet-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {modules/dante-module-strategy => packages/rpc-client-uaa-spring-boot-starter}/pom.xml (85%) rename {modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config => packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure}/DistributedArchitectureConfiguration.java (62%) rename {modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config => packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure}/MonocoqueArchitectureConfiguration.java (81%) rename {modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy => packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure}/definition/AbstractStrategyPermissionDetailsService.java (90%) rename {modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy => packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure}/definition/AbstractStrategyUserDetailsService.java (91%) rename modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemotePermissionDetailsService.java => packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/FeignStrategyPermissionDetailsService.java (79%) rename modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java => packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/FeignStrategyUserDetailsService.java (79%) rename {modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign => packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/api}/RemoteAuthorityDetailsService.java (96%) rename {modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign => packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/api}/RemoteSocialDetailsService.java (94%) rename {modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign => packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/api}/RemoteUserDetailsService.java (96%) rename modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalPermissionDetailsService.java => packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/local/LocalStrategyPermissionDetailsService.java (82%) rename modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalUserDetailsService.java => packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/local/LocalStrategyUserDetailsService.java (84%) create mode 100644 packages/rpc-client-uaa-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {modules/dante-module-metadata => packages/rpc-server-upms-spring-boot-starter}/pom.xml (91%) rename modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/config/MetadataModuleConfiguration.java => packages/rpc-server-upms-spring-boot-starter/src/main/java/org/dromara/dante/rpc/server/upms/autoconfigure/RpcServerUpmsAutoConfiguration.java (72%) rename modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteRequestMappingGatherListener.java => packages/rpc-server-upms-spring-boot-starter/src/main/java/org/dromara/dante/rpc/server/upms/autoconfigure/feign/SocialSignInController.java (33%) create mode 100644 packages/rpc-server-upms-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 packages/service-spring-boot-starter/src/main/java/org/dromara/dante/service/autoconfigure/ServiceAutoConfiguration.java delete mode 100644 packages/service-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/config/UpmsConfiguration.java diff --git a/README.md b/README.md index a6b5e09a..c455960a 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,7 @@ Dante Cloud 并未使用任何复杂难懂或难以上手掌握的技术，项 - **数字转型用户**：如果您的业务复杂度上升到一定阶段、或者您正在考虑进行数字化转型，可以直接选择使用微服务版本，不用再为“基础组件碎片化，需花大量时间整合、踩坑版本兼容”等问题而苦恼。 - **复杂项目用户**：可以直接选择微服务版本，节省大量前期搭建基础设施、解决通用技术问题的时间，直接聚焦于业务开发。 - **初创团队用户**：可以先使用单体版进行开发，只要代码放置规范、模块划分合理，后期可以根据需要无缝迁移至微服务架构 +- **技术尝鲜用户**：项目使用中力争生态圈中较新的技术或者组件，而不拘泥局限于常规成熟的技术内容，目标是探索新型技术并用其来为业务的创新服务。喜欢技术尝鲜的用户可以尝鲜使用。 - **学习提升用户**：本项目集成了成熟的技术选型、优雅的代码设计和清晰的领域划分，编码风格和代码设计一直也在极尽努力尽量与 Spring 生态的标准规范用法保持一致，是深入学习掌握 Spring 生态各组件的优秀案例 > 想要从传统项目转型至微服务项目的用户，**建议详细阅读《企业IT架构转型之道：阿里巴巴中台战略思想与架构实战》一书（可以先读前几章）之后再上手本项目！** @@ -116,22 +117,24 @@ Dante Cloud 已通过由第三方进行的软件出厂安全测试以及等保 ## [5]、工程结构 -``` +### 1. 主工程结构 + +```shell dante-cloud ├── configurations -- 配置文件脚本和统一Docker build上下文目录 ├── dependencies -- 工程Maven顶级依赖，统一控制版本和依赖 -├── module -- 依赖组件半成品拼装工程 +├── module -- 依赖组件半成品拼装工程(可以再此建立业务代码模块，以模块的形式实现代码的共享以及架构的切换) ├ ├── dante-module-common -- Module 相关模块公共辅助代码模块 -├ ├── dante-module-metadata -- 权限元数据同步模块 -├ ├── dante-module-strategy -- UAA 核心数据访问策略模块 ├ └── dante-monomer-autoconfigure -- 单体版自动配置模块 ├── packages -- 基础核心Starter -├ ├── authorization-spring-boot-starter -- OAuth2 认证基础Starter，主要用于 UAA 认证服务器以及单体版 Dante Cloud -├ ├── facility-spring-boot-starter -- 基础设施切换依赖starter -├ └── service-spring-boot-starter -- 平台接入应用服务通用 Starter +├ ├── authentication-spring-boot-starter -- OAuth2 授权服务器自动配置 Starter(主要用于 UAA 认证服务器以及单体版 Dante Cloud) +├ ├── authorization-servlet-spring-boot-starter -- 阻塞式 OAuth2 资源服务器自动配置 Starter(除了 Monitor 等特殊服务以外，所有服务均需依赖) +├ ├── facility-spring-boot-starter -- 基础设施切换依赖 Starter +├ ├── rpc-client-uaa-spring-boot-starter -- 服务间通信客户端自动配置 Starter(UAA 作为客户端端访问其它服务) +├ └── rpc-server-upms-spring-boot-starter -- 服务间通信服务端自动配置 Starter(UPMS 作为服务端为其它服务提供访问) ├── platform -- 平台核心服务 -├ ├── dante-cloud-gateway -- 服务网关 -├ ├── dante-cloud-message -- 消息服务 +├ ├── dante-cloud-gateway -- 统一网关服务 +├ ├── dante-cloud-message -- 系统消息服务 ├ ├── dante-cloud-monitor -- Spring Boot Admin 监控服务 ├ ├── dante-cloud-upms -- 统一权限管理系统服务 ├ └── dante-cloud-uaa -- 账户管理和统一认证模块 @@ -142,6 +145,73 @@ dante-cloud └── └── dante-monomer-application -- Dante Cloud 单体版应用模块 ``` +### 2. 组件库结构 + +```shell +dante-engine +├── dependencies -- 工程 Maven 顶级依赖，统一控制版本和依赖 +├── engine-assistant -- 辅助功能模块 +├ ├── assistant-access -- 第三方登录接入辅助功能模块 +├ └── assistant-captcha -- 验证码辅助功能模块 +├── engine-cache -- 缓存功能模块 +├ ├── cache-core -- 缓存通用代码模块 +├ ├── cache-module-caffeine -- Caffeine 缓存功能封装模块 +├ ├── cache-module-jetcache -- JetCache 缓存功能封装模块 +├ ├── cache-module-redis -- Redis 缓存功能封装模块 +├ └── cache-module-redisson -- Redisson 缓存功能封装模块 +├── engine-core -- 基础核心模块 +├ ├── core-autoconfigure -- 核心自动配置模块 +├ ├── core-definition -- 核心定义模块 +├ ├── core-foundation -- 基础通用模块 +├ └── core-identity -- 身份认证通用模块 +├── engine-data -- 数据访问模块 +├ ├── data-core -- 数据访问通用代码模块 +├ ├── data-core-jpa -- 以 JPA 作为数据访问层的通用代码模块 +├ ├── data-core-mongodb -- 以 MongoDB 作为数据访问层的通用代码模块 +├ ├── data-module-hibernate -- Hibernate 扩展模块 +├ └── data-module-tenant -- 基于 JPA 的多租户扩展配置模块 +├── engine-logic -- 系统内置功能业务逻辑模块 +├ ├── logic-module-identity -- 身份认证功能业务逻辑模块 +├ ├── logic-module-message -- 系统消息业务逻辑模块 +├ └── logic-module-upms -- UPMS 业务逻辑模块 +├── engine-message -- 消息模块 +├ ├── message-autoconfigure -- 消息自动配置模块 +├ ├── message-core -- 消息通用代码模块 +├ └── message-module-websocket-servlet -- 基于 Servlet 环境下的 Websocket 功能封装模块 +├── engine-oauth2 -- OAuth2 认证模块 +├ ├── oauth2-authentication-autoconfigure -- OAuth2 授权服务器基础内容自动配置模块 +├ ├── oauth2-authorization-autoconfigure -- OAuth2 资源服务器基础内容自动配置模块 +├ ├── oauth2-core -- OAuth2 共性通用代码模块 +├ ├── oauth2-module-authentication -- Spring Authorization Server 授权服务器核心功能封装模块 +├ ├── oauth2-module-authorization -- Spring Authorization Server 资源服务器核心功能封装模块 +├ ├── oauth2-module-extension -- Spring Authorization Server 功能扩展模块 +├ └── oauth2-module-persistence-jpa -- 以 JPA 作为 SAS 核心数据访问层代码实现模块 +├── engine-rest -- 系统内置功能 REST 接口模块 +├ ├── rest-module-servlet-identity -- 身份认证功能 Servlet 环境 REST 接口模块 +├ ├── rest-module-servlet-message -- 消息功能 Servlet 环境 REST 接口模块 +├ └── rest-module-servlet-upms -- UPMS 功能 Servlet 环境 REST 接口模块 +├── engine-starter -- Starters +├ ├── cache-spring-boot-starter -- 缓存自动配置 Starter +├ ├── captcha-spring-boot-starter -- 验证码自动配置 Starter +├ ├── data-mongodb-spring-boot-starter -- MongoDB 数据访问层自动配置 Starter +├ ├── data-rdbms-spring-boot-starter -- 关系型数据库数据访问层自动配置 Starter +├ ├── facility-alibaba-spring-boot-starter -- 面向 Spring Cloud Alibaba 的微服务基础设施适配 Starter +├ ├── facility-gateway-spring-boot-starter -- Alibaba Sentinel 在 Gateway 环境下基础设施适配 Starter +├ ├── facility-kafka-spring-boot-starter -- 基于 Kafka 的消息事件自动配置 Starter +├ ├── facility-tencent-spring-boot-starter -- 面向 Spring Cloud Tencent 的微服务基础设施适配模块 Starter +├ ├── logging-spring-boot-starter -- 日志收集和聚合自动配置 Starter +├ ├── reactive-container-spring-boot-starter -- Reactive 容器基础配置自动配置 Starter +├ ├── servlet-container-spring-boot-starter -- Servlet 容器基础配置自动配置 Starter +├ ├── servlet-message-spring-boot-starter -- Servlet 环境消息模块自动配置 Starter +├ └── webmvc-spring-boot-starter -- WebMvc 类型应用自动配置 Starter +├── engine-web -- Web 模块 +├ ├── web-core -- Web 通用代码模块 +├ ├── web-module-api -- Rest 接口通用代码模块 +├ ├── web-module-service -- 微服务通用代码模块 +├ └── web-module-servlet -- Servlet 环境 Web 服务专有基础代码模块 +└── readme -- README 相关素材放置目录 +``` + ## [6]、 版本和分支 ### 一、版本号说明 diff --git a/dependencies/pom.xml b/dependencies/pom.xml index a6977f0e..32eded32 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -86,30 +86,30 @@ org.dromara.dante - dante-module-strategy + authentication-spring-boot-starter ${project.version} org.dromara.dante - authentication-spring-boot-starter + authorization-servlet-spring-boot-starter ${project.version} org.dromara.dante - service-spring-boot-starter + facility-spring-boot-starter ${project.version} org.dromara.dante - facility-spring-boot-starter + rpc-client-uaa-spring-boot-starter ${project.version} - org.dromara.dante - dante-module-metadata + rpc-server-upms-spring-boot-starter ${project.version} + org.dromara.dante dante-cloud-bpmn-logic diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysAttributeToSecurityAttributeConverter.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysAttributeToSecurityAttributeConverter.java deleted file mode 100644 index ebcf9910..00000000 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysAttributeToSecurityAttributeConverter.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.module.metadata.converter; - -import cn.herodotus.engine.logic.upms.entity.security.SysAttribute; -import cn.herodotus.engine.logic.upms.entity.security.SysPermission; -import cn.herodotus.engine.oauth2.core.definition.domain.SecurityAttribute; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.core.convert.converter.Converter; -import org.springframework.util.StringUtils; - -import java.util.List; -import java.util.Set; - -/** - *

Description: SysAttribute 转 SecurityAttribute 转换器

- * - * @author : gengwei.zheng - * @date : 2023/9/15 0:29 - */ -public class SysAttributeToSecurityAttributeConverter implements Converter { - @Override - public SecurityAttribute convert(SysAttribute sysAttribute) { - SecurityAttribute securityAttribute = new SecurityAttribute(); - securityAttribute.setAttributeId(sysAttribute.getAttributeId()); - securityAttribute.setAttributeCode(sysAttribute.getAttributeCode()); - securityAttribute.setWebExpression(sysAttribute.getWebExpression()); - securityAttribute.setPermissions(permissionToCommaDelimitedString(sysAttribute.getPermissions())); - securityAttribute.setUrl(sysAttribute.getUrl()); - securityAttribute.setRequestMethod(sysAttribute.getRequestMethod()); - securityAttribute.setServiceId(sysAttribute.getServiceId()); - securityAttribute.setAttributeName(sysAttribute.getDescription()); - return securityAttribute; - - - } - - private String permissionToCommaDelimitedString(Set sysAuthorities) { - if (CollectionUtils.isNotEmpty(sysAuthorities)) { - List codes = sysAuthorities.stream().map(SysPermission::getPermissionCode).toList(); - return StringUtils.collectionToCommaDelimitedString(codes); - } else { - return ""; - } - } -} diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysInterfacesToSysAttributesConverter.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysInterfacesToSysAttributesConverter.java deleted file mode 100644 index ce77f58c..00000000 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/converter/SysInterfacesToSysAttributesConverter.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.module.metadata.converter; - -import cn.herodotus.engine.logic.upms.entity.security.SysAttribute; -import cn.herodotus.engine.logic.upms.entity.security.SysInterface; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.core.convert.converter.Converter; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - *

Description: List 转 List 转换器

- * - * @author : gengwei.zheng - * @date : 2023/8/23 22:59 - */ -public class SysInterfacesToSysAttributesConverter implements Converter, List> { - @Override - public List convert(List sysInterfaces) { - if (CollectionUtils.isNotEmpty(sysInterfaces)) { - return sysInterfaces.stream().map(this::convert).collect(Collectors.toList()); - } - return new ArrayList<>(); - } - - private SysAttribute convert(SysInterface sysInterface) { - SysAttribute sysAttribute = new SysAttribute(); - sysAttribute.setAttributeId(sysInterface.getInterfaceId()); - sysAttribute.setAttributeCode(sysInterface.getInterfaceCode()); - sysAttribute.setRequestMethod(sysInterface.getRequestMethod()); - sysAttribute.setServiceId(sysInterface.getServiceId()); - sysAttribute.setClassName(sysInterface.getClassName()); - sysAttribute.setMethodName(sysInterface.getMethodName()); - sysAttribute.setUrl(sysInterface.getUrl()); - sysAttribute.setStatus(sysInterface.getStatus()); - sysAttribute.setReserved(sysInterface.getReserved()); - sysAttribute.setDescription(sysInterface.getDescription()); - sysAttribute.setReversion(sysInterface.getReversion()); - sysAttribute.setCreateTime(sysInterface.getCreateTime()); - sysAttribute.setUpdateTime(sysInterface.getUpdateTime()); - sysAttribute.setRanking(sysInterface.getRanking()); - return sysAttribute; - } - -} diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/LocalChangeUserStatusListener.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/LocalChangeUserStatusListener.java deleted file mode 100644 index ff6a70a1..00000000 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/LocalChangeUserStatusListener.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.module.metadata.listener; - -import cn.herodotus.engine.data.core.enums.DataItemStatus; -import cn.herodotus.engine.logic.upms.service.security.SysUserService; -import cn.herodotus.engine.message.core.logic.domain.UserStatus; -import cn.herodotus.engine.message.core.logic.event.ChangeUserStatusEvent; -import org.apache.commons.lang3.ObjectUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -/** - *

Description: 本地用户状态变更监听

- * - * @author : gengwei.zheng - * @date : 2022/7/10 17:59 - */ -@Component -public class LocalChangeUserStatusListener implements ApplicationListener { - - private static final Logger log = LoggerFactory.getLogger(LocalChangeUserStatusListener.class); - private final SysUserService sysUserService; - - public LocalChangeUserStatusListener(SysUserService sysUserService) { - this.sysUserService = sysUserService; - } - - @Override - public void onApplicationEvent(ChangeUserStatusEvent event) { - - log.info("[Herodotus] |- Change user status gather LOCAL listener, response event!"); - - UserStatus userStatus = event.getData(); - if (ObjectUtils.isNotEmpty(userStatus)) { - DataItemStatus dataItemStatus = DataItemStatus.valueOf(userStatus.getStatus()); - if (ObjectUtils.isNotEmpty(dataItemStatus)) { - sysUserService.changeStatus(userStatus.getUserId(), dataItemStatus); - } - } - } -} diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/LocalRequestMappingGatherListener.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/LocalRequestMappingGatherListener.java deleted file mode 100644 index a599028d..00000000 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/LocalRequestMappingGatherListener.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.module.metadata.listener; - -import org.dromara.dante.module.metadata.processor.RequestMappingStoreProcessor; -import cn.herodotus.engine.message.core.logic.domain.RequestMapping; -import cn.herodotus.engine.message.core.logic.event.RequestMappingGatherEvent; -import org.apache.commons.collections4.CollectionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - *

Description: 本地RequestMapping收集监听

- *

- * 主要在单体式架构，以及 UUA 服务自身使用 - * - * @author : gengwei.zheng - * @date : 2021/8/8 22:02 - */ -@Component -public class LocalRequestMappingGatherListener implements ApplicationListener { - - private static final Logger log = LoggerFactory.getLogger(LocalRequestMappingGatherListener.class); - - private final RequestMappingStoreProcessor requestMappingStoreProcessor; - - @Autowired - public LocalRequestMappingGatherListener(RequestMappingStoreProcessor requestMappingStoreProcessor) { - this.requestMappingStoreProcessor = requestMappingStoreProcessor; - } - - @Override - public void onApplicationEvent(RequestMappingGatherEvent event) { - - log.info("[Herodotus] |- Request mapping gather LOCAL listener, response event!"); - - List requestMappings = event.getData(); - if (CollectionUtils.isNotEmpty(requestMappings)) { - requestMappingStoreProcessor.postProcess(requestMappings); - } - } -} diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteChangeUserStatusListener.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteChangeUserStatusListener.java deleted file mode 100644 index a9b2f6de..00000000 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteChangeUserStatusListener.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.module.metadata.listener; - -import cn.herodotus.engine.core.definition.utils.Jackson2Utils; -import cn.herodotus.engine.data.core.enums.DataItemStatus; -import cn.herodotus.engine.logic.upms.service.security.SysUserService; -import cn.herodotus.engine.message.core.logic.domain.UserStatus; -import cn.herodotus.engine.oauth2.resource.autoconfigure.bus.RemoteChangeUserStatusEvent; -import org.apache.commons.lang3.ObjectUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -/** - *

Description: 远程用户状态变更监听

- * - * @author : gengwei.zheng - * @date : 2022/7/10 18:31 - */ -@Component -public class RemoteChangeUserStatusListener implements ApplicationListener { - - private static final Logger log = LoggerFactory.getLogger(RemoteChangeUserStatusListener.class); - - private final SysUserService sysUserService; - - @Autowired - public RemoteChangeUserStatusListener(SysUserService sysUserService) { - this.sysUserService = sysUserService; - } - - @Override - public void onApplicationEvent(RemoteChangeUserStatusEvent event) { - - log.info("[Herodotus] |- Request mapping gather REMOTE listener, response service [{}] event!", event.getOriginService()); - - String data = event.getData(); - log.debug("[Herodotus] |- Fetch data [{}]", data); - if (ObjectUtils.isNotEmpty(data)) { - UserStatus userStatus = Jackson2Utils.toObject(data, UserStatus.class); - if (ObjectUtils.isNotEmpty(userStatus)) { - DataItemStatus dataItemStatus = DataItemStatus.valueOf(userStatus.getStatus()); - if (ObjectUtils.isNotEmpty(dataItemStatus)) { - sysUserService.changeStatus(userStatus.getUserId(), dataItemStatus); - } - } - } - } -} diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/SysAttributeChangeListener.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/SysAttributeChangeListener.java deleted file mode 100644 index 2cf3223f..00000000 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/SysAttributeChangeListener.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.module.metadata.listener; - -import cn.herodotus.engine.logic.upms.domain.event.SysAttributeChangeEvent; -import cn.herodotus.engine.logic.upms.entity.security.SysAttribute; -import org.apache.commons.lang3.ObjectUtils; -import org.dromara.dante.module.metadata.processor.SecurityMetadataDistributeProcessor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -/** - *

Description: SysSecurityAttribute变更事件监听

- * - * @author : gengwei.zheng - * @date : 2021/8/4 22:18 - */ -@Component -public class SysAttributeChangeListener implements ApplicationListener { - - private static final Logger log = LoggerFactory.getLogger(SysAttributeChangeListener.class); - - private final SecurityMetadataDistributeProcessor securityMetadataDistributeProcessor; - - public SysAttributeChangeListener(SecurityMetadataDistributeProcessor securityMetadataDistributeProcessor) { - this.securityMetadataDistributeProcessor = securityMetadataDistributeProcessor; - } - - @Override - public void onApplicationEvent(SysAttributeChangeEvent event) { - - log.debug("[Herodotus] |- SysAttribute Change Listener, response event!"); - - SysAttribute sysAttribute = event.getData(); - if (ObjectUtils.isNotEmpty(sysAttribute)) { - log.debug("[Herodotus] |- Got SysAttribute, start to process SysAttribute change."); - securityMetadataDistributeProcessor.distributeChangedSecurityAttribute(sysAttribute); - } - } -} diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/RequestMappingStoreProcessor.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/RequestMappingStoreProcessor.java deleted file mode 100644 index 072af780..00000000 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/RequestMappingStoreProcessor.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.module.metadata.processor; - -import cn.herodotus.engine.message.core.logic.domain.RequestMapping; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - *

Description: RequestMapping存储服务

- * - * @author : gengwei.zheng - * @date : 2021/8/7 14:15 - */ -@Component -public class RequestMappingStoreProcessor { - - private static final Logger log = LoggerFactory.getLogger(RequestMappingStoreProcessor.class); - - private final SecurityMetadataDistributeProcessor securityMetadataDistributeProcessor; - - @Autowired - public RequestMappingStoreProcessor(SecurityMetadataDistributeProcessor securityMetadataDistributeProcessor) { - this.securityMetadataDistributeProcessor = securityMetadataDistributeProcessor; - } - - @Async - public void postProcess(List requestMappings) { - log.debug("[Herodotus] |- [4] Async store request mapping process BEGIN!"); - securityMetadataDistributeProcessor.postRequestMappings(requestMappings); - } -} diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java b/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java deleted file mode 100644 index 0ba00dd3..00000000 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.module.metadata.processor; - -import cn.herodotus.engine.core.foundation.exception.transaction.TransactionalRollbackException; -import cn.herodotus.engine.logic.upms.entity.security.SysAttribute; -import cn.herodotus.engine.logic.upms.entity.security.SysInterface; -import cn.herodotus.engine.logic.upms.service.security.SysAttributeService; -import cn.herodotus.engine.logic.upms.service.security.SysInterfaceService; -import cn.herodotus.engine.message.core.definition.strategy.StrategyEventManager; -import cn.herodotus.engine.message.core.logic.domain.RequestMapping; -import cn.herodotus.engine.oauth2.authorization.processor.SecurityMetadataSourceAnalyzer; -import cn.herodotus.engine.oauth2.core.definition.domain.SecurityAttribute; -import cn.herodotus.engine.oauth2.resource.autoconfigure.bus.RemoteSecurityMetadataSyncEvent; -import com.google.common.collect.ImmutableList; -import org.apache.commons.collections4.CollectionUtils; -import org.dromara.dante.module.metadata.converter.SysAttributeToSecurityAttributeConverter; -import org.dromara.dante.module.metadata.converter.SysInterfacesToSysAttributesConverter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.core.convert.converter.Converter; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - *

Description: SecurityMetadata数据处理器

- * - * @author : gengwei.zheng - * @date : 2021/8/8 14:00 - */ -@Component -public class SecurityMetadataDistributeProcessor implements StrategyEventManager> { - - private static final Logger log = LoggerFactory.getLogger(SecurityMetadataDistributeProcessor.class); - - private final Converter, List> toSysAttributes; - private final Converter toSecurityAttribute; - - private final SysAttributeService sysAttributeService; - private final SysInterfaceService sysInterfaceService; - private final SecurityMetadataSourceAnalyzer securityMetadataSourceAnalyzer; - - public SecurityMetadataDistributeProcessor(SysAttributeService sysAttributeService, SysInterfaceService sysInterfaceService, SecurityMetadataSourceAnalyzer securityMetadataSourceAnalyzer) { - this.sysAttributeService = sysAttributeService; - this.sysInterfaceService = sysInterfaceService; - this.securityMetadataSourceAnalyzer = securityMetadataSourceAnalyzer; - this.toSysAttributes = new SysInterfacesToSysAttributesConverter(); - this.toSecurityAttribute = new SysAttributeToSecurityAttributeConverter(); - } - - @Override - public void postLocalProcess(List data) { - securityMetadataSourceAnalyzer.processSecurityAttribute(data); - } - - @Override - public void postRemoteProcess(String data, String originService, String destinationService) { - publishEvent(new RemoteSecurityMetadataSyncEvent(data, originService, destinationService)); - } - - /** - * 将SysAuthority表中存在，但是SysSecurityAttribute中不存在的数据同步至SysSecurityAttribute，保证两侧数据一致 - */ - @Transactional(rollbackFor = TransactionalRollbackException.class) - public void postRequestMappings(List requestMappings) { - List storedInterfaces = sysInterfaceService.storeRequestMappings(requestMappings); - if (CollectionUtils.isNotEmpty(storedInterfaces)) { - log.debug("[Herodotus] |- [5] Request mapping store success, start to merge security metadata!"); - - List sysInterfaces = sysInterfaceService.findAllocatable(); - - if (CollectionUtils.isNotEmpty(sysInterfaces)) { - List elements = toSysAttributes.convert(sysInterfaces); - List result = sysAttributeService.saveAllAndFlush(elements); - if (CollectionUtils.isNotEmpty(result)) { - log.debug("[Herodotus] |- Merge security attribute SUCCESS and FINISHED!"); - } else { - log.error("[Herodotus] |- Merge Security attribute failed!, Please Check!"); - } - } else { - log.debug("[Herodotus] |- No security attribute requires merge, SKIP!"); - } - - distributeServiceSecurityAttributes(storedInterfaces); - } - } - - private void distributeServiceSecurityAttributes(List storedInterfaces) { - storedInterfaces.stream().findAny().ifPresent(item -> { - String serviceId = item.getServiceId(); - List sysAttributes = sysAttributeService.findAllByServiceId(item.getServiceId()); - if (CollectionUtils.isNotEmpty(sysAttributes)) { - List securityAttributes = sysAttributes.stream().map(toSecurityAttribute::convert).toList(); - log.debug("[Herodotus] |- [6] Synchronization permissions to service [{}]", serviceId); - this.postProcess(serviceId, securityAttributes); - } - }); - } - - public void distributeChangedSecurityAttribute(SysAttribute sysAttribute) { - SecurityAttribute securityAttribute = toSecurityAttribute.convert(sysAttribute); - postProcess(securityAttribute.getServiceId(), ImmutableList.of(securityAttribute)); - } -} diff --git a/modules/dante-monomer-autoconfigure/pom.xml b/modules/dante-monomer-autoconfigure/pom.xml index 416e64b7..91f88599 100644 --- a/modules/dante-monomer-autoconfigure/pom.xml +++ b/modules/dante-monomer-autoconfigure/pom.xml @@ -34,20 +34,18 @@ - org.dromara.dante - authentication-spring-boot-starter + cn.herodotus.engine + rest-module-servlet-upms + org.dromara.dante - dante-module-metadata - - - cn.herodotus.engine - message-spring-boot-starter + authentication-spring-boot-starter + cn.herodotus.engine - supplier-sdk-message + servlet-message-spring-boot-starter @@ -55,6 +53,11 @@ oss-spring-boot-starter + + com.github.ulisesbocchio + jasypt-spring-boot-starter + + \ No newline at end of file diff --git a/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/processor/MonomerCorsFilter.java b/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/processor/MonomerCorsFilter.java index d859f7a9..a376ed22 100644 --- a/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/processor/MonomerCorsFilter.java +++ b/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/processor/MonomerCorsFilter.java @@ -25,8 +25,9 @@ package org.dromara.dante.monomer.autoconfigure.processor; +import cn.herodotus.engine.core.definition.constant.HerodotusHeaders; import cn.herodotus.engine.core.definition.constant.SymbolConstants; -import cn.herodotus.engine.web.core.utils.HeaderUtils; +import cn.herodotus.engine.web.core.servlet.utils.HeaderUtils; import com.google.common.net.HttpHeaders; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; @@ -52,7 +53,7 @@ public class MonomerCorsFilter implements Filter { private static final String[] ACCESS_CONTROL_ALLOW_METHODS = new String[]{HttpMethod.GET.name(), HttpMethod.POST.name(), HttpMethod.PUT.name(), HttpMethod.DELETE.name(), HttpMethod.OPTIONS.name()}; - private static final String[] ACCESS_CONTROL_ALLOW_HEADERS = new String[]{HttpHeaders.X_REQUESTED_WITH, HttpHeaders.AUTHORIZATION, HttpHeaders.CONTENT_TYPE, "X-XSRF-TOKEN", HeaderUtils.X_HERODOTUS_SESSION_ID, HeaderUtils.X_HERODOTUS_TENANT_ID}; + private static final String[] ACCESS_CONTROL_ALLOW_HEADERS = new String[]{HttpHeaders.X_REQUESTED_WITH, HttpHeaders.AUTHORIZATION, HttpHeaders.CONTENT_TYPE, "X-XSRF-TOKEN", HerodotusHeaders.X_HERODOTUS_SESSION_ID, HerodotusHeaders.X_HERODOTUS_TENANT_ID}; @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException { diff --git a/modules/pom.xml b/modules/pom.xml index 60c87203..63e690f2 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -66,8 +66,6 @@ dante-module-common - dante-module-metadata - dante-module-strategy dante-monomer-autoconfigure diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index 88ef4988..076e67f6 100644 --- a/packages/authentication-spring-boot-starter/pom.xml +++ b/packages/authentication-spring-boot-starter/pom.xml @@ -40,12 +40,17 @@ org.dromara.dante - dante-module-strategy + rpc-client-uaa-spring-boot-starter cn.herodotus.engine - oauth2-authorization-server-autoconfigure + oauth2-authentication-autoconfigure + + + + cn.herodotus.engine + webmvc-spring-boot-starter diff --git a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/ArchitectureStrategyAutoConfiguration.java b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/ArchitectureStrategyAutoConfiguration.java deleted file mode 100644 index 0ffc1f05..00000000 --- a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/ArchitectureStrategyAutoConfiguration.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.authentication.autoconfigure; - -import jakarta.annotation.PostConstruct; -import org.dromara.dante.module.strategy.config.DistributedArchitectureConfiguration; -import org.dromara.dante.module.strategy.config.MonocoqueArchitectureConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.context.annotation.Import; - -/** - *

Description: 策略模块配置

- * - * @author : gengwei.zheng - * @date : 2022/2/1 17:58 - */ -@AutoConfiguration -@Import({ - DistributedArchitectureConfiguration.class, - MonocoqueArchitectureConfiguration.class -}) -public class ArchitectureStrategyAutoConfiguration { - - private static final Logger log = LoggerFactory.getLogger(ArchitectureStrategyAutoConfiguration.class); - - @PostConstruct - public void postConstruct() { - log.debug("[Herodotus] |- Module [Strategy Module] Auto Configure."); - } -} diff --git a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthenticationAutoConfiguration.java b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthenticationAutoConfiguration.java deleted file mode 100644 index 2a3614de..00000000 --- a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthenticationAutoConfiguration.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.authentication.autoconfigure; - -import jakarta.annotation.PostConstruct; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.AutoConfiguration; - -/** - *

Description: OAuth Starter 自动注入配置

- * - * @author : gengwei.zheng - * @date : 2022/2/17 13:43 - */ -@AutoConfiguration -public class AuthenticationAutoConfiguration { - - private static final Logger log = LoggerFactory.getLogger(AuthenticationAutoConfiguration.class); - - @PostConstruct - public void postConstruct() { - log.info("[Herodotus] |- Module [Herodotus Authentication Starter] Auto Configure."); - } -} diff --git a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java index 33c9538f..a3753626 100644 --- a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java +++ b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java @@ -25,22 +25,17 @@ package org.dromara.dante.authentication.autoconfigure; +import cn.herodotus.engine.core.autoconfigure.oauth2.OAuth2AuthorizationProperties; +import cn.herodotus.engine.core.foundation.enums.Certificate; import cn.herodotus.engine.core.foundation.utils.ResourceResolverUtils; +import cn.herodotus.engine.core.identity.service.ClientDetailsService; +import cn.herodotus.engine.oauth2.authentication.configurer.OAuth2AuthenticationConfigurerManager; import cn.herodotus.engine.oauth2.authentication.configurer.OAuth2AuthenticationProviderConfigurer; -import cn.herodotus.engine.oauth2.authentication.customizer.OAuth2FormLoginConfigurerCustomizer; -import cn.herodotus.engine.oauth2.authentication.properties.OAuth2AuthenticationProperties; import cn.herodotus.engine.oauth2.authentication.utils.OAuth2ConfigurerUtils; import cn.herodotus.engine.oauth2.authorization.autoconfigure.customizer.OAuth2AuthorizationServerConfigurerCustomizer; -import cn.herodotus.engine.oauth2.authorization.customizer.OAuth2ResourceServerConfigurerCustomer; -import cn.herodotus.engine.oauth2.authorization.customizer.OAuth2SessionManagementConfigurerCustomer; -import cn.herodotus.engine.oauth2.authorization.properties.OAuth2AuthorizationProperties; -import cn.herodotus.engine.oauth2.core.definition.service.ClientDetailsService; -import cn.herodotus.engine.oauth2.core.enums.Certificate; -import cn.herodotus.engine.oauth2.management.response.OAuth2DeviceVerificationResponseHandler; -import cn.herodotus.engine.oauth2.management.response.OidcClientRegistrationResponseHandler; -import cn.herodotus.engine.rest.condition.properties.EndpointProperties; -import cn.herodotus.engine.rest.protect.crypto.processor.HttpCryptoProcessor; -import cn.herodotus.engine.rest.protect.tenant.MultiTenantFilter; +import cn.herodotus.engine.oauth2.authorization.servlet.ServletOAuth2AuthorizationConfigurerManager; +import cn.herodotus.engine.web.service.properties.EndpointProperties; +import cn.herodotus.engine.web.servlet.tenant.MultiTenantFilter; import com.nimbusds.jose.jwk.JWKSet; import com.nimbusds.jose.jwk.RSAKey; import com.nimbusds.jose.jwk.source.JWKSource; @@ -95,13 +90,8 @@ public class AuthorizationServerAutoConfiguration { PasswordEncoder passwordEncoder, UserDetailsService userDetailsService, ClientDetailsService clientDetailsService, - HttpCryptoProcessor httpCryptoProcessor, - OidcClientRegistrationResponseHandler oidcClientRegistrationResponseHandler, - OAuth2AuthenticationProperties oauth2AuthenticationProperties, - OAuth2DeviceVerificationResponseHandler oauth2DeviceVerificationResponseHandler, - OAuth2FormLoginConfigurerCustomizer oauth2FormLoginConfigurerCustomizer, - OAuth2ResourceServerConfigurerCustomer oauth2ResourceServerConfigurerCustomer, - OAuth2SessionManagementConfigurerCustomer oauth2sessionManagementConfigurerCustomer + OAuth2AuthenticationConfigurerManager authenticationConfigurerManager, + ServletOAuth2AuthorizationConfigurerManager authorizationConfigurerManager ) throws Exception { log.debug("[Herodotus] |- Bean [Authorization Server Security Filter Chain] Auto Configure."); @@ -115,14 +105,14 @@ public class AuthorizationServerAutoConfiguration { // 不配置 oauth2ResourceServer 就不会启用BearerTokenAuthenticationFilter // 当前的版本 SAS(1.4.1) 环境下，oauth2ResourceServer 必须在 with(authorizationServerConfigurer 前面配置，否则会导致应用无法启动 // 主要原因是 OAuth2AuthorizationServerConfigurer 默认 jwt 配置与 Opaqua 配置冲突。see：https://stackoverflow.com/questions/79336064/oidcuserinfoauthenticationprovider-doesnt-support-for-opaque-token-bearer-autho - .oauth2ResourceServer(oauth2ResourceServerConfigurerCustomer) - .with(authorizationServerConfigurer, new OAuth2AuthorizationServerConfigurerCustomizer(httpSecurity, sessionRegistry, clientDetailsService, httpCryptoProcessor, oidcClientRegistrationResponseHandler, oauth2DeviceVerificationResponseHandler)) + .oauth2ResourceServer(authorizationConfigurerManager.getOAuth2ResourceServerConfigurerCustomer()) + .with(authorizationServerConfigurer, new OAuth2AuthorizationServerConfigurerCustomizer(httpSecurity, sessionRegistry, clientDetailsService, authenticationConfigurerManager)) // 开启请求认证 .authorizeHttpRequests(authorizeRequests -> authorizeRequests.anyRequest().authenticated()) - .formLogin(oauth2FormLoginConfigurerCustomizer) - .sessionManagement(oauth2sessionManagementConfigurerCustomer) + .formLogin(authenticationConfigurerManager.getOAuth2FormLoginConfigurerCustomizer()) + .sessionManagement(authorizationConfigurerManager.getOAuth2SessionManagementConfigurerCustomer()) .addFilterBefore(new MultiTenantFilter(), AuthorizationFilter.class) - .with(new OAuth2AuthenticationProviderConfigurer(sessionRegistry, passwordEncoder, userDetailsService, oauth2AuthenticationProperties), (configurer) -> { + .with(new OAuth2AuthenticationProviderConfigurer(sessionRegistry, passwordEncoder, userDetailsService, authenticationConfigurerManager.getOAuth2AuthenticationProperties()), (configurer) -> { }); return httpSecurity.build(); diff --git a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java index ea1ee849..a15cecb5 100644 --- a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java +++ b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java @@ -26,20 +26,12 @@ package org.dromara.dante.authentication.autoconfigure; import cn.herodotus.engine.core.foundation.support.captcha.CaptchaRendererFactory; +import cn.herodotus.engine.core.identity.strategy.StrategyUserDetailsService; +import cn.herodotus.engine.oauth2.authentication.configurer.OAuth2AuthenticationConfigurerManager; import cn.herodotus.engine.oauth2.authentication.configurer.OAuth2FormLoginSecureConfigurer; -import cn.herodotus.engine.oauth2.authentication.properties.OAuth2AuthenticationProperties; +import cn.herodotus.engine.oauth2.authentication.customizer.HerodotusUserDetailsService; import cn.herodotus.engine.oauth2.authentication.response.DefaultOAuth2AuthenticationEventPublisher; -import cn.herodotus.engine.oauth2.authorization.customizer.OAuth2AuthorizeHttpRequestsConfigurerCustomer; -import cn.herodotus.engine.oauth2.authorization.customizer.OAuth2ResourceServerConfigurerCustomer; -import cn.herodotus.engine.oauth2.authorization.customizer.OAuth2SessionManagementConfigurerCustomer; -import cn.herodotus.engine.oauth2.core.definition.service.ClientDetailsService; -import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyUserDetailsService; -import cn.herodotus.engine.oauth2.core.response.HerodotusAccessDeniedHandler; -import cn.herodotus.engine.oauth2.core.response.HerodotusAuthenticationEntryPoint; -import cn.herodotus.engine.oauth2.management.processor.HerodotusClientDetailsService; -import cn.herodotus.engine.oauth2.management.processor.HerodotusUserDetailsService; -import cn.herodotus.engine.oauth2.management.service.OAuth2ApplicationService; -import cn.herodotus.engine.rest.protect.crypto.processor.HttpCryptoProcessor; +import cn.herodotus.engine.oauth2.authorization.servlet.ServletOAuth2AuthorizationConfigurerManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -72,12 +64,9 @@ public class DefaultSecurityAutoConfiguration { SecurityFilterChain defaultSecurityFilterChain( HttpSecurity httpSecurity, UserDetailsService userDetailsService, - HttpCryptoProcessor httpCryptoProcessor, - OAuth2AuthenticationProperties authenticationProperties, CaptchaRendererFactory captchaRendererFactory, - OAuth2SessionManagementConfigurerCustomer oauth2SessionManagementConfigurerCustomer, - OAuth2ResourceServerConfigurerCustomer oauth2ResourceServerConfigurerCustomer, - OAuth2AuthorizeHttpRequestsConfigurerCustomer oauth2AuthorizeHttpRequestsConfigurerCustomer + OAuth2AuthenticationConfigurerManager authenticationConfigurerManager, + ServletOAuth2AuthorizationConfigurerManager authorizationConfigurerManager ) throws Exception { log.debug("[Herodotus] |- Bean [Default Security Filter Chain] Auto Configure."); @@ -86,14 +75,12 @@ public class DefaultSecurityAutoConfiguration { // @formatter:off httpSecurity - .authorizeHttpRequests(oauth2AuthorizeHttpRequestsConfigurerCustomer) - .sessionManagement(oauth2SessionManagementConfigurerCustomer) - .exceptionHandling(exceptions -> { - exceptions.authenticationEntryPoint(new HerodotusAuthenticationEntryPoint()); - exceptions.accessDeniedHandler(new HerodotusAccessDeniedHandler()); - }) - .oauth2ResourceServer(oauth2ResourceServerConfigurerCustomer) - .with(new OAuth2FormLoginSecureConfigurer<>(userDetailsService, authenticationProperties, captchaRendererFactory, httpCryptoProcessor), (configurer) -> {}); + .authorizeHttpRequests(authorizationConfigurerManager.getOAuth2AuthorizeHttpRequestsConfigurerCustomer()) + .sessionManagement(authorizationConfigurerManager.getOAuth2SessionManagementConfigurerCustomer()) + .exceptionHandling(authorizationConfigurerManager.getOAuth2ExceptionHandlingConfigurerCustomizer()) + .oauth2ResourceServer(authorizationConfigurerManager.getOAuth2ResourceServerConfigurerCustomer()) + .with(new OAuth2FormLoginSecureConfigurer<>(userDetailsService, authenticationConfigurerManager.getOAuth2AuthenticationProperties(), captchaRendererFactory, authenticationConfigurerManager.getHttpCryptoProcessor()), (configurer) -> { + }); // @formatter:on return httpSecurity.build(); @@ -120,12 +107,4 @@ public class DefaultSecurityAutoConfiguration { log.debug("[Herodotus] |- Bean [Herodotus User Details Service] Auto Configure."); return herodotusUserDetailsService; } - - @Bean - @ConditionalOnMissingBean - public ClientDetailsService clientDetailsService(OAuth2ApplicationService applicationService) { - HerodotusClientDetailsService herodotusClientDetailsService = new HerodotusClientDetailsService(applicationService); - log.debug("[Herodotus] |- Bean [Herodotus Client Details Service] Auto Configure."); - return herodotusClientDetailsService; - } } diff --git a/packages/authentication-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/packages/authentication-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 62c0cf22..51fe2591 100644 --- a/packages/authentication-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/packages/authentication-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,2 @@ -org.dromara.dante.authentication.autoconfigure.AuthenticationAutoConfiguration -org.dromara.dante.authentication.autoconfigure.ArchitectureStrategyAutoConfiguration org.dromara.dante.authentication.autoconfigure.DefaultSecurityAutoConfiguration org.dromara.dante.authentication.autoconfigure.AuthorizationServerAutoConfiguration \ No newline at end of file diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/authorization-servlet-spring-boot-starter/pom.xml similarity index 87% rename from packages/service-spring-boot-starter/pom.xml rename to packages/authorization-servlet-spring-boot-starter/pom.xml index 8dcd23ba..c125ef12 100644 --- a/packages/service-spring-boot-starter/pom.xml +++ b/packages/authorization-servlet-spring-boot-starter/pom.xml @@ -35,18 +35,23 @@ 3.5.5.2 - service-spring-boot-starter + authorization-servlet-spring-boot-starter cn.herodotus.engine - oauth2-resource-server-autoconfigure + oauth2-authorization-autoconfigure org.dromara.dante facility-spring-boot-starter + + + cn.herodotus.engine + webmvc-spring-boot-starter + \ No newline at end of file diff --git a/packages/service-spring-boot-starter/src/main/java/org/dromara/dante/service/autoconfigure/ResourceServerAutoConfiguration.java b/packages/authorization-servlet-spring-boot-starter/src/main/java/org/dromara/dante/authorization/servlet/autoconfigure/AuthorizationServletAutoConfiguration.java similarity index 68% rename from packages/service-spring-boot-starter/src/main/java/org/dromara/dante/service/autoconfigure/ResourceServerAutoConfiguration.java rename to packages/authorization-servlet-spring-boot-starter/src/main/java/org/dromara/dante/authorization/servlet/autoconfigure/AuthorizationServletAutoConfiguration.java index 20087d3d..fb7414e9 100644 --- a/packages/service-spring-boot-starter/src/main/java/org/dromara/dante/service/autoconfigure/ResourceServerAutoConfiguration.java +++ b/packages/authorization-servlet-spring-boot-starter/src/main/java/org/dromara/dante/authorization/servlet/autoconfigure/AuthorizationServletAutoConfiguration.java @@ -23,11 +23,9 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.service.autoconfigure; +package org.dromara.dante.authorization.servlet.autoconfigure; -import cn.herodotus.engine.oauth2.authorization.customizer.OAuth2AuthorizeHttpRequestsConfigurerCustomer; -import cn.herodotus.engine.oauth2.authorization.customizer.OAuth2ResourceServerConfigurerCustomer; -import cn.herodotus.engine.oauth2.authorization.customizer.OAuth2SessionManagementConfigurerCustomer; +import cn.herodotus.engine.oauth2.authorization.servlet.ServletOAuth2AuthorizationConfigurerManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -45,25 +43,24 @@ import org.springframework.security.web.SecurityFilterChain; */ @AutoConfiguration @EnableWebSecurity -public class ResourceServerAutoConfiguration { +public class AuthorizationServletAutoConfiguration { - private static final Logger log = LoggerFactory.getLogger(ResourceServerAutoConfiguration.class); + private static final Logger log = LoggerFactory.getLogger(AuthorizationServletAutoConfiguration.class); @Bean public SecurityFilterChain securityFilterChain( HttpSecurity httpSecurity, - OAuth2SessionManagementConfigurerCustomer oauth2SessionManagementConfigurerCustomer, - OAuth2ResourceServerConfigurerCustomer oauth2ResourceServerConfigurerCustomer, - OAuth2AuthorizeHttpRequestsConfigurerCustomer oauth2AuthorizeHttpRequestsConfigurerCustomer + ServletOAuth2AuthorizationConfigurerManager authorizationConfigurerManager ) throws Exception { log.debug("[Herodotus] |- Bean [Resource Server Security Filter Chain] Auto Configure."); httpSecurity.csrf(AbstractHttpConfigurer::disable).cors(AbstractHttpConfigurer::disable); - httpSecurity.authorizeHttpRequests(oauth2AuthorizeHttpRequestsConfigurerCustomer) - .sessionManagement(oauth2SessionManagementConfigurerCustomer) - .oauth2ResourceServer(oauth2ResourceServerConfigurerCustomer); + httpSecurity.authorizeHttpRequests(authorizationConfigurerManager.getOAuth2AuthorizeHttpRequestsConfigurerCustomer()) + .sessionManagement(authorizationConfigurerManager.getOAuth2SessionManagementConfigurerCustomer()) + .exceptionHandling(authorizationConfigurerManager.getOAuth2ExceptionHandlingConfigurerCustomizer()) + .oauth2ResourceServer(authorizationConfigurerManager.getOAuth2ResourceServerConfigurerCustomer()); return httpSecurity.build(); } diff --git a/packages/authorization-servlet-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/packages/authorization-servlet-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..abf64c48 --- /dev/null +++ b/packages/authorization-servlet-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.dante.authorization.servlet.autoconfigure.AuthorizationServletAutoConfiguration \ No newline at end of file diff --git a/packages/pom.xml b/packages/pom.xml index c0c72489..abf7be17 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -66,8 +66,10 @@ authentication-spring-boot-starter - service-spring-boot-starter + authorization-servlet-spring-boot-starter facility-spring-boot-starter + rpc-client-uaa-spring-boot-starter + rpc-server-upms-spring-boot-starter \ No newline at end of file diff --git a/modules/dante-module-strategy/pom.xml b/packages/rpc-client-uaa-spring-boot-starter/pom.xml similarity index 85% rename from modules/dante-module-strategy/pom.xml rename to packages/rpc-client-uaa-spring-boot-starter/pom.xml index f275fc95..931b3be1 100644 --- a/modules/dante-module-strategy/pom.xml +++ b/packages/rpc-client-uaa-spring-boot-starter/pom.xml @@ -28,28 +28,34 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - modules org.dromara.dante + packages 3.5.5.2 - dante-module-strategy + rpc-client-uaa-spring-boot-starter cn.herodotus.engine - rest-sdk-condition + oauth2-core + + + org.dromara.dante + dante-module-common + + cn.herodotus.engine logic-module-upms - org.dromara.dante - dante-module-common + org.springframework.cloud + spring-cloud-starter-openfeign + true diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/DistributedArchitectureConfiguration.java b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/DistributedArchitectureConfiguration.java similarity index 62% rename from modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/DistributedArchitectureConfiguration.java rename to packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/DistributedArchitectureConfiguration.java index 9986bef3..a0452081 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/DistributedArchitectureConfiguration.java +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/DistributedArchitectureConfiguration.java @@ -23,26 +23,26 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.module.strategy.config; +package org.dromara.dante.rpc.client.uaa.autoconfigure; import cn.herodotus.engine.core.foundation.condition.ConditionalOnArchitecture; import cn.herodotus.engine.core.foundation.enums.Architecture; import cn.herodotus.engine.core.foundation.enums.DataAccessStrategy; +import cn.herodotus.engine.core.identity.strategy.StrategyPermissionDetailsService; +import cn.herodotus.engine.core.identity.strategy.StrategyUserDetailsService; import cn.herodotus.engine.logic.upms.annotation.EnableHerodotusLogicUpms; import cn.herodotus.engine.logic.upms.definition.SocialAuthenticationHandler; import cn.herodotus.engine.logic.upms.service.security.SysPermissionService; import cn.herodotus.engine.logic.upms.service.security.SysUserService; -import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyPermissionDetailsService; -import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyUserDetailsService; import cn.herodotus.engine.web.core.condition.ConditionalOnDataAccessStrategy; import jakarta.annotation.PostConstruct; -import org.dromara.dante.module.strategy.feign.RemoteAuthorityDetailsService; -import org.dromara.dante.module.strategy.feign.RemoteSocialDetailsService; -import org.dromara.dante.module.strategy.feign.RemoteUserDetailsService; -import org.dromara.dante.module.strategy.service.HerodotusLocalPermissionDetailsService; -import org.dromara.dante.module.strategy.service.HerodotusLocalUserDetailsService; -import org.dromara.dante.module.strategy.service.HerodotusRemotePermissionDetailsService; -import org.dromara.dante.module.strategy.service.HerodotusRemoteUserDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.feign.FeignStrategyPermissionDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.feign.FeignStrategyUserDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.feign.api.RemoteAuthorityDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.feign.api.RemoteSocialDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.feign.api.RemoteUserDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.local.LocalStrategyPermissionDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.local.LocalStrategyUserDetailsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -74,38 +74,40 @@ public class DistributedArchitectureConfiguration { @Bean @ConditionalOnMissingBean - public StrategyUserDetailsService herodotusLocalUserDetailsService(SysUserService sysUserService, SocialAuthenticationHandler socialAuthenticationHandler) { + public StrategyUserDetailsService localStrategyUserDetailsService(SysUserService sysUserService, SocialAuthenticationHandler socialAuthenticationHandler) { + LocalStrategyUserDetailsService service = new LocalStrategyUserDetailsService(sysUserService, socialAuthenticationHandler); log.debug("[Herodotus] |- Strategy [Local User Details Service] Auto Configure."); - return new HerodotusLocalUserDetailsService(sysUserService, socialAuthenticationHandler); + return service; } @Bean @ConditionalOnMissingBean - public StrategyPermissionDetailsService herodotusLocalPermissionDetailsService(SysPermissionService sysPermissionService) { - HerodotusLocalPermissionDetailsService herodotusLocalPermissionDetailsService = new HerodotusLocalPermissionDetailsService(sysPermissionService); + public StrategyPermissionDetailsService localStrategyPermissionDetailsService(SysPermissionService sysPermissionService) { + LocalStrategyPermissionDetailsService service = new LocalStrategyPermissionDetailsService(sysPermissionService); log.debug("[Herodotus] |- Strategy [Local Permission Details Service] Auto Configure."); - return herodotusLocalPermissionDetailsService; + return service; } } @Configuration(proxyBeanMethods = false) @ConditionalOnDataAccessStrategy(DataAccessStrategy.REMOTE) - @EnableFeignClients(basePackages = {"org.dromara.dante.module.strategy.feign"}) + @EnableFeignClients(basePackages = {"org.dromara.dante.rpc.client.uaa.autoconfigure.feign.api"}) static class DataAccessStrategyRemoteConfiguration { @Bean @ConditionalOnMissingBean - public StrategyUserDetailsService herodotusRemoteUserDetailsService(RemoteUserDetailsService remoteUserDetailsService, RemoteSocialDetailsService remoteSocialDetailsService) { + public StrategyUserDetailsService feignStrategyUserDetailsService(RemoteUserDetailsService remoteUserDetailsService, RemoteSocialDetailsService remoteSocialDetailsService) { + FeignStrategyUserDetailsService service = new FeignStrategyUserDetailsService(remoteUserDetailsService, remoteSocialDetailsService); log.debug("[Herodotus] |- Strategy [Remote User Details Service] Auto Configure."); - return new HerodotusRemoteUserDetailsService(remoteUserDetailsService, remoteSocialDetailsService); + return service; } @Bean @ConditionalOnMissingBean - public StrategyPermissionDetailsService herodotusRemotePermissionDetailsService(RemoteAuthorityDetailsService remoteAuthorityDetailsService) { - HerodotusRemotePermissionDetailsService herodotusRemotePermissionDetailsService = new HerodotusRemotePermissionDetailsService(remoteAuthorityDetailsService); + public StrategyPermissionDetailsService feignStrategyPermissionDetailsService(RemoteAuthorityDetailsService remoteAuthorityDetailsService) { + FeignStrategyPermissionDetailsService service = new FeignStrategyPermissionDetailsService(remoteAuthorityDetailsService); log.debug("[Herodotus] |- Strategy [Remote Permission Details Service] Auto Configure."); - return herodotusRemotePermissionDetailsService; + return service; } } } diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/MonocoqueArchitectureConfiguration.java b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/MonocoqueArchitectureConfiguration.java similarity index 81% rename from modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/MonocoqueArchitectureConfiguration.java rename to packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/MonocoqueArchitectureConfiguration.java index a7ba29d8..23617812 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/config/MonocoqueArchitectureConfiguration.java +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/MonocoqueArchitectureConfiguration.java @@ -23,19 +23,19 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.module.strategy.config; +package org.dromara.dante.rpc.client.uaa.autoconfigure; import cn.herodotus.engine.core.foundation.condition.ConditionalOnArchitecture; import cn.herodotus.engine.core.foundation.enums.Architecture; +import cn.herodotus.engine.core.identity.strategy.StrategyPermissionDetailsService; +import cn.herodotus.engine.core.identity.strategy.StrategyUserDetailsService; import cn.herodotus.engine.logic.upms.annotation.EnableHerodotusLogicUpms; import cn.herodotus.engine.logic.upms.definition.SocialAuthenticationHandler; import cn.herodotus.engine.logic.upms.service.security.SysPermissionService; import cn.herodotus.engine.logic.upms.service.security.SysUserService; -import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyPermissionDetailsService; -import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyUserDetailsService; import jakarta.annotation.PostConstruct; -import org.dromara.dante.module.strategy.service.HerodotusLocalPermissionDetailsService; -import org.dromara.dante.module.strategy.service.HerodotusLocalUserDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.local.LocalStrategyPermissionDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.local.LocalStrategyUserDetailsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -63,15 +63,16 @@ public class MonocoqueArchitectureConfiguration { @Bean @ConditionalOnMissingBean public StrategyPermissionDetailsService herodotusLocalPermissionDetailsService(SysPermissionService sysPermissionService) { - HerodotusLocalPermissionDetailsService herodotusLocalPermissionDetailsService = new HerodotusLocalPermissionDetailsService(sysPermissionService); + LocalStrategyPermissionDetailsService service = new LocalStrategyPermissionDetailsService(sysPermissionService); log.debug("[Herodotus] |- Strategy [Local Permission Details Service] Auto Configure."); - return herodotusLocalPermissionDetailsService; + return service; } @Bean @ConditionalOnMissingBean public StrategyUserDetailsService herodotusLocalUserDetailsService(SysUserService sysUserService, SocialAuthenticationHandler socialAuthenticationHandler) { + LocalStrategyUserDetailsService service = new LocalStrategyUserDetailsService(sysUserService, socialAuthenticationHandler); log.debug("[Herodotus] |- Strategy [Local User Details Service] Auto Configure."); - return new HerodotusLocalUserDetailsService(sysUserService, socialAuthenticationHandler); + return service; } } diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyPermissionDetailsService.java b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/definition/AbstractStrategyPermissionDetailsService.java similarity index 90% rename from modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyPermissionDetailsService.java rename to packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/definition/AbstractStrategyPermissionDetailsService.java index a1f528ab..337cf274 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyPermissionDetailsService.java +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/definition/AbstractStrategyPermissionDetailsService.java @@ -23,11 +23,11 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.module.strategy.definition; +package org.dromara.dante.rpc.client.uaa.autoconfigure.definition; +import cn.herodotus.engine.core.identity.domain.HerodotusPermission; +import cn.herodotus.engine.core.identity.strategy.StrategyPermissionDetailsService; import cn.herodotus.engine.logic.upms.entity.security.SysPermission; -import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusPermission; -import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyPermissionDetailsService; import java.util.List; import java.util.stream.Collectors; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyUserDetailsService.java b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/definition/AbstractStrategyUserDetailsService.java similarity index 91% rename from modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyUserDetailsService.java rename to packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/definition/AbstractStrategyUserDetailsService.java index 60413ea2..602cfdbd 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/definition/AbstractStrategyUserDetailsService.java +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/definition/AbstractStrategyUserDetailsService.java @@ -23,12 +23,12 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.module.strategy.definition; +package org.dromara.dante.rpc.client.uaa.autoconfigure.definition; +import cn.herodotus.engine.core.identity.domain.HerodotusUser; +import cn.herodotus.engine.core.identity.strategy.StrategyUserDetailsService; import cn.herodotus.engine.logic.upms.converter.SysUserToHerodotusUserConverter; import cn.herodotus.engine.logic.upms.entity.security.SysUser; -import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; -import cn.herodotus.engine.oauth2.core.definition.strategy.StrategyUserDetailsService; import org.apache.commons.lang3.ObjectUtils; import org.springframework.core.convert.converter.Converter; import org.springframework.security.core.AuthenticationException; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemotePermissionDetailsService.java b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/FeignStrategyPermissionDetailsService.java similarity index 79% rename from modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemotePermissionDetailsService.java rename to packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/FeignStrategyPermissionDetailsService.java index 9c3abf15..54b8b17a 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemotePermissionDetailsService.java +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/FeignStrategyPermissionDetailsService.java @@ -23,14 +23,14 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.module.strategy.service; +package org.dromara.dante.rpc.client.uaa.autoconfigure.feign; import cn.herodotus.engine.core.definition.domain.Result; +import cn.herodotus.engine.core.identity.domain.HerodotusPermission; import cn.herodotus.engine.logic.upms.entity.security.SysPermission; -import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusPermission; import org.apache.commons.collections4.CollectionUtils; -import org.dromara.dante.module.strategy.definition.AbstractStrategyPermissionDetailsService; -import org.dromara.dante.module.strategy.feign.RemoteAuthorityDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.definition.AbstractStrategyPermissionDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.feign.api.RemoteAuthorityDetailsService; import java.util.ArrayList; import java.util.List; @@ -41,11 +41,11 @@ import java.util.List; * @author : gengwei.zheng * @date : 2022/4/1 19:01 */ -public class HerodotusRemotePermissionDetailsService extends AbstractStrategyPermissionDetailsService { +public class FeignStrategyPermissionDetailsService extends AbstractStrategyPermissionDetailsService { private final RemoteAuthorityDetailsService remoteAuthorityDetailsService; - public HerodotusRemotePermissionDetailsService(RemoteAuthorityDetailsService remoteAuthorityDetailsService) { + public FeignStrategyPermissionDetailsService(RemoteAuthorityDetailsService remoteAuthorityDetailsService) { this.remoteAuthorityDetailsService = remoteAuthorityDetailsService; } diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/FeignStrategyUserDetailsService.java similarity index 79% rename from modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java rename to packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/FeignStrategyUserDetailsService.java index bf48e9a8..ddb31bcb 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/FeignStrategyUserDetailsService.java @@ -23,15 +23,15 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.module.strategy.service; +package org.dromara.dante.rpc.client.uaa.autoconfigure.feign; import cn.herodotus.engine.core.definition.domain.Result; import cn.herodotus.engine.core.identity.domain.AccessPrincipal; +import cn.herodotus.engine.core.identity.domain.HerodotusUser; import cn.herodotus.engine.logic.upms.entity.security.SysUser; -import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; -import org.dromara.dante.module.strategy.definition.AbstractStrategyUserDetailsService; -import org.dromara.dante.module.strategy.feign.RemoteSocialDetailsService; -import org.dromara.dante.module.strategy.feign.RemoteUserDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.definition.AbstractStrategyUserDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.feign.api.RemoteSocialDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.feign.api.RemoteUserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; /** @@ -40,12 +40,12 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; * @author : gengwei.zheng * @date : 2021/5/23 9:21 */ -public class HerodotusRemoteUserDetailsService extends AbstractStrategyUserDetailsService { +public class FeignStrategyUserDetailsService extends AbstractStrategyUserDetailsService { private final RemoteUserDetailsService remoteUserDetailsService; private final RemoteSocialDetailsService remoteSocialDetailsService; - public HerodotusRemoteUserDetailsService(RemoteUserDetailsService remoteUserDetailsService, RemoteSocialDetailsService remoteSocialDetailsService) { + public FeignStrategyUserDetailsService(RemoteUserDetailsService remoteUserDetailsService, RemoteSocialDetailsService remoteSocialDetailsService) { this.remoteUserDetailsService = remoteUserDetailsService; this.remoteSocialDetailsService = remoteSocialDetailsService; } diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteAuthorityDetailsService.java b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/api/RemoteAuthorityDetailsService.java similarity index 96% rename from modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteAuthorityDetailsService.java rename to packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/api/RemoteAuthorityDetailsService.java index 8cbeb0bd..e91e2a93 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteAuthorityDetailsService.java +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/api/RemoteAuthorityDetailsService.java @@ -23,7 +23,7 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.module.strategy.feign; +package org.dromara.dante.rpc.client.uaa.autoconfigure.feign.api; import cn.herodotus.engine.core.definition.domain.Result; import cn.herodotus.engine.logic.upms.entity.security.SysPermission; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/api/RemoteSocialDetailsService.java similarity index 94% rename from modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java rename to packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/api/RemoteSocialDetailsService.java index bb82dca6..c724c9b7 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteSocialDetailsService.java +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/api/RemoteSocialDetailsService.java @@ -23,12 +23,12 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.module.strategy.feign; +package org.dromara.dante.rpc.client.uaa.autoconfigure.feign.api; import cn.herodotus.engine.core.definition.annotation.Inner; import cn.herodotus.engine.core.definition.domain.Result; import cn.herodotus.engine.core.identity.domain.AccessPrincipal; -import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; +import cn.herodotus.engine.core.identity.domain.HerodotusUser; import org.dromara.dante.module.common.ServiceNameConstants; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/api/RemoteUserDetailsService.java similarity index 96% rename from modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java rename to packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/api/RemoteUserDetailsService.java index e03e3bad..9a104b0c 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/feign/RemoteUserDetailsService.java +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/feign/api/RemoteUserDetailsService.java @@ -23,7 +23,7 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.module.strategy.feign; +package org.dromara.dante.rpc.client.uaa.autoconfigure.feign.api; import cn.herodotus.engine.core.definition.annotation.Inner; import cn.herodotus.engine.core.definition.domain.Result; diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalPermissionDetailsService.java b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/local/LocalStrategyPermissionDetailsService.java similarity index 82% rename from modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalPermissionDetailsService.java rename to packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/local/LocalStrategyPermissionDetailsService.java index 4d056143..60e3f3f1 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalPermissionDetailsService.java +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/local/LocalStrategyPermissionDetailsService.java @@ -23,13 +23,13 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.module.strategy.service; +package org.dromara.dante.rpc.client.uaa.autoconfigure.local; +import cn.herodotus.engine.core.identity.domain.HerodotusPermission; import cn.herodotus.engine.logic.upms.entity.security.SysPermission; import cn.herodotus.engine.logic.upms.service.security.SysPermissionService; -import org.dromara.dante.module.strategy.definition.AbstractStrategyPermissionDetailsService; -import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusPermission; import org.apache.commons.collections4.CollectionUtils; +import org.dromara.dante.rpc.client.uaa.autoconfigure.definition.AbstractStrategyPermissionDetailsService; import java.util.ArrayList; import java.util.List; @@ -40,11 +40,11 @@ import java.util.List; * @author : gengwei.zheng * @date : 2022/4/1 18:56 */ -public class HerodotusLocalPermissionDetailsService extends AbstractStrategyPermissionDetailsService { +public class LocalStrategyPermissionDetailsService extends AbstractStrategyPermissionDetailsService { private final SysPermissionService sysPermissionService; - public HerodotusLocalPermissionDetailsService(SysPermissionService sysPermissionService) { + public LocalStrategyPermissionDetailsService(SysPermissionService sysPermissionService) { this.sysPermissionService = sysPermissionService; } diff --git a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalUserDetailsService.java b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/local/LocalStrategyUserDetailsService.java similarity index 84% rename from modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalUserDetailsService.java rename to packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/local/LocalStrategyUserDetailsService.java index 2c491c59..8ba153e2 100644 --- a/modules/dante-module-strategy/src/main/java/org/dromara/dante/module/strategy/service/HerodotusLocalUserDetailsService.java +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/local/LocalStrategyUserDetailsService.java @@ -23,14 +23,14 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.module.strategy.service; +package org.dromara.dante.rpc.client.uaa.autoconfigure.local; import cn.herodotus.engine.core.identity.domain.AccessPrincipal; +import cn.herodotus.engine.core.identity.domain.HerodotusUser; import cn.herodotus.engine.logic.upms.definition.SocialAuthenticationHandler; import cn.herodotus.engine.logic.upms.entity.security.SysUser; import cn.herodotus.engine.logic.upms.service.security.SysUserService; -import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser; -import org.dromara.dante.module.strategy.definition.AbstractStrategyUserDetailsService; +import org.dromara.dante.rpc.client.uaa.autoconfigure.definition.AbstractStrategyUserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; /** @@ -39,12 +39,12 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; * @author : gengwei.zheng * @date : 2021/5/23 9:20 */ -public class HerodotusLocalUserDetailsService extends AbstractStrategyUserDetailsService { +public class LocalStrategyUserDetailsService extends AbstractStrategyUserDetailsService { private final SysUserService sysUserService; private final SocialAuthenticationHandler socialAuthenticationHandler; - public HerodotusLocalUserDetailsService(SysUserService sysUserService, SocialAuthenticationHandler socialAuthenticationHandler) { + public LocalStrategyUserDetailsService(SysUserService sysUserService, SocialAuthenticationHandler socialAuthenticationHandler) { this.sysUserService = sysUserService; this.socialAuthenticationHandler = socialAuthenticationHandler; } diff --git a/packages/rpc-client-uaa-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/packages/rpc-client-uaa-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..1c2cf70f --- /dev/null +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,27 @@ +# +# Copyright 2020-2030 码匠君 +# +# Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： +# +# 1. 请不要删除和修改根目录下的LICENSE文件。 +# 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 +# 3. 请保留源码和相关描述文件的项目出处，作者声明等。 +# 4. 分发源码时候，请注明软件出处 +# 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 +# 6. 若您的项目无法满足以上几点，可申请商业授权 +# + +org.dromara.dante.rpc.client.uaa.autoconfigure.DistributedArchitectureConfiguration +org.dromara.dante.rpc.client.uaa.autoconfigure.MonocoqueArchitectureConfiguration \ No newline at end of file diff --git a/modules/dante-module-metadata/pom.xml b/packages/rpc-server-upms-spring-boot-starter/pom.xml similarity index 91% rename from modules/dante-module-metadata/pom.xml rename to packages/rpc-server-upms-spring-boot-starter/pom.xml index bb33b80b..0234e2f3 100644 --- a/modules/dante-module-metadata/pom.xml +++ b/packages/rpc-server-upms-spring-boot-starter/pom.xml @@ -28,24 +28,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - modules org.dromara.dante + packages 3.5.5.2 - dante-module-metadata + rpc-server-upms-spring-boot-starter cn.herodotus.engine - rest-module-servlet-upms + oauth2-authorization-autoconfigure cn.herodotus.engine - oauth2-resource-server-autoconfigure + rest-module-servlet-upms diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/config/MetadataModuleConfiguration.java b/packages/rpc-server-upms-spring-boot-starter/src/main/java/org/dromara/dante/rpc/server/upms/autoconfigure/RpcServerUpmsAutoConfiguration.java similarity index 72% rename from modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/config/MetadataModuleConfiguration.java rename to packages/rpc-server-upms-spring-boot-starter/src/main/java/org/dromara/dante/rpc/server/upms/autoconfigure/RpcServerUpmsAutoConfiguration.java index 5bd2f89c..eb5e0619 100644 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/config/MetadataModuleConfiguration.java +++ b/packages/rpc-server-upms-spring-boot-starter/src/main/java/org/dromara/dante/rpc/server/upms/autoconfigure/RpcServerUpmsAutoConfiguration.java @@ -23,35 +23,38 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.module.metadata.config; +package org.dromara.dante.rpc.server.upms.autoconfigure; import cn.herodotus.engine.rest.servlet.upms.annotation.EnableHerodotusRestServletUpms; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; /** - *

Description: UpmsRest配置类

+ *

Description: Rpc Server Upms 自动配置

* * @author : gengwei.zheng - * @date : 2021/1/5 11:58 + * @date : 2024/4/24 23:12 */ -@Configuration(proxyBeanMethods = false) -@ComponentScan(basePackages = { - "org.dromara.dante.module.metadata.processor", - "org.dromara.dante.module.metadata.listener", -}) +@AutoConfiguration @EnableHerodotusRestServletUpms -public class MetadataModuleConfiguration { +public class RpcServerUpmsAutoConfiguration { - private static final Logger log = LoggerFactory.getLogger(MetadataModuleConfiguration.class); + private static final Logger log = LoggerFactory.getLogger(RpcServerUpmsAutoConfiguration.class); @PostConstruct public void postConstruct() { - log.info("[Herodotus] |- SDK [Metadata Module] Auto Configure."); + log.info("[Herodotus] |- Starter [Rpc Server Upms] Auto Configure."); } + @Configuration(proxyBeanMethods = false) + @ComponentScan(basePackages = { + "org.dromara.dante.rpc.server.upms.autoconfigure.feign" + }) + static class FeignConfiguration { -} + } +} \ No newline at end of file diff --git a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteRequestMappingGatherListener.java b/packages/rpc-server-upms-spring-boot-starter/src/main/java/org/dromara/dante/rpc/server/upms/autoconfigure/feign/SocialSignInController.java similarity index 33% rename from modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteRequestMappingGatherListener.java rename to packages/rpc-server-upms-spring-boot-starter/src/main/java/org/dromara/dante/rpc/server/upms/autoconfigure/feign/SocialSignInController.java index 9e9e6be3..37ea3a8b 100644 --- a/modules/dante-module-metadata/src/main/java/org/dromara/dante/module/metadata/listener/RemoteRequestMappingGatherListener.java +++ b/packages/rpc-server-upms-spring-boot-starter/src/main/java/org/dromara/dante/rpc/server/upms/autoconfigure/feign/SocialSignInController.java @@ -1,7 +1,7 @@ /* * Copyright 2020-2030 码匠君 * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); + * Dante Engine licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -13,62 +13,63 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： + * Dante Engine 是 Dante Cloud 系统核心组件库，采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： * * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 + * 2. 请不要删除和修改 Dante Engine 源码头部的版权声明。 * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 * 4. 分发源码时候，请注明软件出处 * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package org.dromara.dante.module.metadata.listener; +package org.dromara.dante.rpc.server.upms.autoconfigure.feign; -import cn.herodotus.engine.core.definition.utils.Jackson2Utils; -import cn.herodotus.engine.message.core.logic.domain.RequestMapping; -import cn.herodotus.engine.oauth2.resource.autoconfigure.bus.RemoteRequestMappingGatherEvent; -import org.apache.commons.collections4.CollectionUtils; +import cn.herodotus.engine.core.definition.domain.Result; +import cn.herodotus.engine.core.identity.domain.AccessPrincipal; +import cn.herodotus.engine.core.identity.domain.HerodotusUser; +import cn.herodotus.engine.logic.upms.definition.AbstractSocialAuthenticationHandler; +import cn.herodotus.engine.logic.upms.definition.SocialAuthenticationHandler; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.ObjectUtils; -import org.dromara.dante.module.metadata.processor.RequestMappingStoreProcessor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -import java.util.List; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** - *

Description: SecurityMetadata远程变更事件监听

+ *

Description: 社交用户登录接口

* * @author : gengwei.zheng - * @date : 2021/8/5 16:16 + * @date : 2022/6/20 18:19 */ -@Component -public class RemoteRequestMappingGatherListener implements ApplicationListener { - - private static final Logger log = LoggerFactory.getLogger(RemoteRequestMappingGatherListener.class); +@RestController +@RequestMapping("/security/social") +@Tag(name = "社交用户登录接口") +public class SocialSignInController { - private final RequestMappingStoreProcessor requestMappingStoreProcessor; + private final SocialAuthenticationHandler socialAuthenticationHandler; @Autowired - public RemoteRequestMappingGatherListener(RequestMappingStoreProcessor requestMappingStoreProcessor) { - this.requestMappingStoreProcessor = requestMappingStoreProcessor; + public SocialSignInController(SocialAuthenticationHandler socialAuthenticationHandler) { + this.socialAuthenticationHandler = socialAuthenticationHandler; } - @Override - public void onApplicationEvent(RemoteRequestMappingGatherEvent event) { - - log.info("[Herodotus] |- Request mapping gather REMOTE listener, response service [{}] event!", event.getOriginService()); - - String requestMapping = event.getData(); - log.debug("[Herodotus] |- Fetch data [{}]", requestMapping); - if (ObjectUtils.isNotEmpty(requestMapping)) { - List requestMappings = Jackson2Utils.toList(requestMapping, RequestMapping.class); - if (CollectionUtils.isNotEmpty(requestMappings)) { - requestMappingStoreProcessor.postProcess(requestMappings); - } + @Operation(summary = "社交登录用户信息查询", description = "根据不同的source查询对应社交用户的信息") + @Parameters({ + @Parameter(name = "source", required = true, description = "系统用户名", in = ParameterIn.PATH), + }) + @RequestMapping("/sign-in/{source}") + public Result findUserDetailsBySocial(@PathVariable("source") String source, AccessPrincipal accessPrincipal) { + HerodotusUser herodotusUser = this.socialAuthenticationHandler.authentication(source, accessPrincipal); + if (ObjectUtils.isNotEmpty(herodotusUser)) { + return Result.success("社交登录成功", herodotusUser); + } else { + return Result.failure("社交登录失败，未能查到用户数据"); } } } diff --git a/packages/rpc-server-upms-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/packages/rpc-server-upms-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..abc94186 --- /dev/null +++ b/packages/rpc-server-upms-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,26 @@ +# +# Copyright 2020-2030 码匠君 +# +# Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： +# +# 1. 请不要删除和修改根目录下的LICENSE文件。 +# 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 +# 3. 请保留源码和相关描述文件的项目出处，作者声明等。 +# 4. 分发源码时候，请注明软件出处 +# 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 +# 6. 若您的项目无法满足以上几点，可申请商业授权 +# + +org.dromara.dante.rpc.server.upms.autoconfigure.RpcServerUpmsAutoConfiguration \ No newline at end of file diff --git a/packages/service-spring-boot-starter/src/main/java/org/dromara/dante/service/autoconfigure/ServiceAutoConfiguration.java b/packages/service-spring-boot-starter/src/main/java/org/dromara/dante/service/autoconfigure/ServiceAutoConfiguration.java deleted file mode 100644 index 845d89e0..00000000 --- a/packages/service-spring-boot-starter/src/main/java/org/dromara/dante/service/autoconfigure/ServiceAutoConfiguration.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.service.autoconfigure; - -import jakarta.annotation.PostConstruct; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.AutoConfiguration; - -/** - *

Description: 服务通用Starter自动配置

- * - * @author : gengwei.zheng - * @date : 2022/2/17 13:44 - */ -@AutoConfiguration -public class ServiceAutoConfiguration { - - private static final Logger log = LoggerFactory.getLogger(ServiceAutoConfiguration.class); - - @PostConstruct - public void postConstruct() { - log.info("[Herodotus] |- Module [Herodotus Service Starter] Auto Configure."); - } -} diff --git a/packages/service-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/packages/service-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 905bff9c..00000000 --- a/packages/service-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -org.dromara.dante.service.autoconfigure.ServiceAutoConfiguration -org.dromara.dante.service.autoconfigure.ResourceServerAutoConfiguration \ No newline at end of file diff --git a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java index b2ff830c..6934a635 100644 --- a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java +++ b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/filter/GlobalCertificationFilter.java @@ -25,10 +25,10 @@ package org.dromara.dante.gateway.filter; -import cn.herodotus.engine.core.definition.constant.BaseConstants; import cn.herodotus.engine.core.definition.constant.ErrorCodes; +import cn.herodotus.engine.core.definition.constant.HerodotusHeaders; +import cn.herodotus.engine.core.definition.constant.SystemConstants; import cn.herodotus.engine.core.definition.domain.Result; -import cn.herodotus.engine.web.core.utils.HeaderUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -85,7 +85,7 @@ public class GlobalCertificationFilter implements GlobalFilter, Ordered { } // 2.外部进入的请求，如果包含 X_HERODOTUS_FROM_IN 请求头，认为是非法请求，直接拦截。X_HERODOTUS_FROM_IN 只能用于内部 Feign 间忽略权限使用 - String fromIn = exchange.getRequest().getHeaders().getFirst(HeaderUtils.X_HERODOTUS_FROM_IN); + String fromIn = exchange.getRequest().getHeaders().getFirst(HerodotusHeaders.X_HERODOTUS_FROM_IN); if (ObjectUtils.isNotEmpty(fromIn)) { log.warn("[Herodotus] |- Illegal request to disable access!"); return WebFluxUtils.writeJsonResponse(exchange.getResponse(), new Result().type(ErrorCodes.ACCESS_DENIED).status(HttpStatus.SC_FORBIDDEN)); @@ -112,6 +112,6 @@ public class GlobalCertificationFilter implements GlobalFilter, Ordered { } private boolean isTokenWellFormed(String token) { - return !StringUtils.isBlank(token) && !StringUtils.containsOnly(token, BaseConstants.BEARER_TOKEN); + return !StringUtils.isBlank(token) && !StringUtils.containsOnly(token, SystemConstants.BEARER_TOKEN); } } diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml index 0fde7aea..72a3eefa 100644 --- a/platform/dante-cloud-message/pom.xml +++ b/platform/dante-cloud-message/pom.xml @@ -39,15 +39,11 @@ org.dromara.dante - service-spring-boot-starter + authorization-servlet-spring-boot-starter cn.herodotus.engine - message-spring-boot-starter - - - cn.herodotus.engine - supplier-sdk-message + servlet-message-spring-boot-starter diff --git a/platform/dante-cloud-message/src/main/java/org/dromara/dante/message/MessageApplication.java b/platform/dante-cloud-message/src/main/java/org/dromara/dante/message/MessageApplication.java index 938020b3..cc7c048b 100644 --- a/platform/dante-cloud-message/src/main/java/org/dromara/dante/message/MessageApplication.java +++ b/platform/dante-cloud-message/src/main/java/org/dromara/dante/message/MessageApplication.java @@ -25,7 +25,7 @@ package org.dromara.dante.message; -import cn.herodotus.engine.supplier.message.annotation.EnableHerodotusSupplierMessage; +import cn.herodotus.engine.rest.servlet.message.annotation.EnableHerodotusRestServletMessage; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -38,7 +38,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; */ @SpringBootApplication @EnableDiscoveryClient -@EnableHerodotusSupplierMessage +@EnableHerodotusRestServletMessage public class MessageApplication { public static void main(String[] args) { diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index 433e235b..ef29a479 100644 --- a/platform/dante-cloud-monitor/pom.xml +++ b/platform/dante-cloud-monitor/pom.xml @@ -35,8 +35,10 @@ dante-cloud-monitor 3.5.5.2 + dante-cloud-monitor dante-cloud-monitor + cn.herodotus.engine diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml index 41821c71..706b7c58 100644 --- a/platform/dante-cloud-upms/pom.xml +++ b/platform/dante-cloud-upms/pom.xml @@ -40,12 +40,14 @@ org.dromara.dante - service-spring-boot-starter + authorization-servlet-spring-boot-starter + org.dromara.dante - dante-module-metadata + rpc-server-upms-spring-boot-starter + diff --git a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/UpmsApplication.java b/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/UpmsApplication.java index 2e94b14d..e0519072 100644 --- a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/UpmsApplication.java +++ b/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/UpmsApplication.java @@ -25,11 +25,9 @@ package org.dromara.dante.upms; -import org.dromara.dante.upms.config.UpmsConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.annotation.Import; /** *

Description: 用户中心服务

@@ -39,7 +37,6 @@ import org.springframework.context.annotation.Import; */ @EnableDiscoveryClient @SpringBootApplication -@Import(UpmsConfiguration.class) public class UpmsApplication { public static void main(String[] args) { diff --git a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/config/UpmsConfiguration.java b/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/config/UpmsConfiguration.java deleted file mode 100644 index e3b3013b..00000000 --- a/platform/dante-cloud-upms/src/main/java/org/dromara/dante/upms/config/UpmsConfiguration.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： - * - * 1. 请不要删除和修改根目录下的LICENSE文件。 - * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 - * 4. 分发源码时候，请注明软件出处 - * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6. 若您的项目无法满足以上几点，可申请商业授权 - */ - -package org.dromara.dante.upms.config; - -import cn.herodotus.engine.logic.upms.config.LogicUpmsConfiguration; -import jakarta.annotation.PostConstruct; -import org.dromara.dante.module.metadata.config.MetadataModuleConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -/** - *

Description: Upms 服务配置

- * - * @author : gengwei.zheng - * @date : 2021/1/19 15:24 - */ -@Configuration(proxyBeanMethods = false) -@Import({ - LogicUpmsConfiguration.class, - MetadataModuleConfiguration.class -}) -public class UpmsConfiguration { - - private static final Logger log = LoggerFactory.getLogger(UpmsConfiguration.class); - - @PostConstruct - public void postConstruct() { - log.info("[Herodotus] |- Service [Upms Ability] Auto Configure."); - } -} diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml index 31d2ece6..e3d3e40c 100644 --- a/services/dante-cloud-bpmn-ability/pom.xml +++ b/services/dante-cloud-bpmn-ability/pom.xml @@ -43,7 +43,7 @@ org.dromara.dante - service-spring-boot-starter + authorization-servlet-spring-boot-starter fastjson diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml index d378bbb5..d23d20a7 100644 --- a/services/dante-cloud-bpmn-logic/pom.xml +++ b/services/dante-cloud-bpmn-logic/pom.xml @@ -40,11 +40,12 @@ cn.herodotus.engine - rest-spring-boot-starter + webmvc-spring-boot-starter + cn.herodotus.engine - message-kafka-spring-boot-starter + facility-kafka-spring-boot-starter diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdGroupRepository.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdGroupRepository.java index d056b46b..45b54242 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdGroupRepository.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdGroupRepository.java @@ -25,7 +25,7 @@ package org.dromara.dante.bpmn.logic.repository; -import cn.herodotus.engine.data.core.repository.BaseRepository; +import cn.herodotus.engine.data.core.jpa.repository.BaseJpaRepository; import org.dromara.dante.bpmn.logic.entity.ActIdGroup; /** @@ -34,5 +34,5 @@ import org.dromara.dante.bpmn.logic.entity.ActIdGroup; * @author : gengwei.zheng * @date : 2021/7/20 13:12 */ -public interface ActIdGroupRepository extends BaseRepository { +public interface ActIdGroupRepository extends BaseJpaRepository { } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdMembershipRepository.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdMembershipRepository.java index a4108965..b74a7e19 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdMembershipRepository.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdMembershipRepository.java @@ -25,7 +25,7 @@ package org.dromara.dante.bpmn.logic.repository; -import cn.herodotus.engine.data.core.repository.BaseRepository; +import cn.herodotus.engine.data.core.jpa.repository.BaseJpaRepository; import org.dromara.dante.bpmn.logic.entity.ActIdMembership; /** @@ -34,7 +34,7 @@ import org.dromara.dante.bpmn.logic.entity.ActIdMembership; * @author : gengwei.zheng * @date : 2021/7/20 13:13 */ -public interface ActIdMembershipRepository extends BaseRepository { +public interface ActIdMembershipRepository extends BaseJpaRepository { /** * 根据UserId和GroupId删除信息 diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdTenantMemberRepository.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdTenantMemberRepository.java index 6ce8c774..42b0098d 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdTenantMemberRepository.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdTenantMemberRepository.java @@ -25,7 +25,7 @@ package org.dromara.dante.bpmn.logic.repository; -import cn.herodotus.engine.data.core.repository.BaseRepository; +import cn.herodotus.engine.data.core.jpa.repository.BaseJpaRepository; import org.dromara.dante.bpmn.logic.entity.ActIdTenantMember; /** @@ -34,5 +34,5 @@ import org.dromara.dante.bpmn.logic.entity.ActIdTenantMember; * @author : gengwei.zheng * @date : 2021/7/20 13:13 */ -public interface ActIdTenantMemberRepository extends BaseRepository { +public interface ActIdTenantMemberRepository extends BaseJpaRepository { } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdTenantRepository.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdTenantRepository.java index 02f07056..09dff91a 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdTenantRepository.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdTenantRepository.java @@ -25,7 +25,7 @@ package org.dromara.dante.bpmn.logic.repository; -import cn.herodotus.engine.data.core.repository.BaseRepository; +import cn.herodotus.engine.data.core.jpa.repository.BaseJpaRepository; import org.dromara.dante.bpmn.logic.entity.ActIdTenant; /** @@ -34,5 +34,5 @@ import org.dromara.dante.bpmn.logic.entity.ActIdTenant; * @author : gengwei.zheng * @date : 2021/7/20 13:12 */ -public interface ActIdTenantRepository extends BaseRepository { +public interface ActIdTenantRepository extends BaseJpaRepository { } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdUserRepository.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdUserRepository.java index ba16ea01..6796321e 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdUserRepository.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/repository/ActIdUserRepository.java @@ -25,7 +25,7 @@ package org.dromara.dante.bpmn.logic.repository; -import cn.herodotus.engine.data.core.repository.BaseRepository; +import cn.herodotus.engine.data.core.jpa.repository.BaseJpaRepository; import org.dromara.dante.bpmn.logic.entity.ActIdUser; /** @@ -34,5 +34,5 @@ import org.dromara.dante.bpmn.logic.entity.ActIdUser; * @author : gengwei.zheng * @date : 2021/7/20 13:12 */ -public interface ActIdUserRepository extends BaseRepository { +public interface ActIdUserRepository extends BaseJpaRepository { } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdGroupService.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdGroupService.java index 2ab6bf4f..f9286a36 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdGroupService.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdGroupService.java @@ -25,8 +25,8 @@ package org.dromara.dante.bpmn.logic.service; -import cn.herodotus.engine.data.core.repository.BaseRepository; -import cn.herodotus.engine.data.core.service.WriteableService; +import cn.herodotus.engine.data.core.jpa.repository.BaseJpaRepository; +import cn.herodotus.engine.data.core.jpa.service.BaseJpaWriteableService; import org.dromara.dante.bpmn.logic.entity.ActIdGroup; import org.dromara.dante.bpmn.logic.repository.ActIdGroupRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +39,7 @@ import org.springframework.stereotype.Service; * @date : 2021/7/20 13:25 */ @Service -public class ActIdGroupService implements WriteableService { +public class ActIdGroupService implements BaseJpaWriteableService { private final ActIdGroupRepository actIdGroupRepository; @@ -49,7 +49,7 @@ public class ActIdGroupService implements WriteableService { } @Override - public BaseRepository getRepository() { + public BaseJpaRepository getRepository() { return this.actIdGroupRepository; } } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdMembershipService.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdMembershipService.java index a18398c7..b48a8cd1 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdMembershipService.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdMembershipService.java @@ -25,8 +25,8 @@ package org.dromara.dante.bpmn.logic.service; -import cn.herodotus.engine.data.core.repository.BaseRepository; -import cn.herodotus.engine.data.core.service.WriteableService; +import cn.herodotus.engine.data.core.jpa.repository.BaseJpaRepository; +import cn.herodotus.engine.data.core.jpa.service.BaseJpaWriteableService; import org.dromara.dante.bpmn.logic.entity.ActIdMembership; import org.dromara.dante.bpmn.logic.repository.ActIdMembershipRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +39,7 @@ import org.springframework.stereotype.Service; * @date : 2021/7/20 14:32 */ @Service -public class ActIdMembershipService implements WriteableService { +public class ActIdMembershipService implements BaseJpaWriteableService { private final ActIdMembershipRepository actIdMembershipRepository; @@ -49,7 +49,7 @@ public class ActIdMembershipService implements WriteableService getRepository() { + public BaseJpaRepository getRepository() { return this.actIdMembershipRepository; } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdTenantMemberService.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdTenantMemberService.java index 7cdec3b9..b9d5d5e5 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdTenantMemberService.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdTenantMemberService.java @@ -25,8 +25,8 @@ package org.dromara.dante.bpmn.logic.service; -import cn.herodotus.engine.data.core.repository.BaseRepository; -import cn.herodotus.engine.data.core.service.WriteableService; +import cn.herodotus.engine.data.core.jpa.repository.BaseJpaRepository; +import cn.herodotus.engine.data.core.jpa.service.BaseJpaWriteableService; import org.dromara.dante.bpmn.logic.entity.ActIdTenantMember; import org.dromara.dante.bpmn.logic.repository.ActIdTenantMemberRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +39,7 @@ import org.springframework.stereotype.Service; * @date : 2021/7/20 14:33 */ @Service -public class ActIdTenantMemberService implements WriteableService { +public class ActIdTenantMemberService implements BaseJpaWriteableService { private final ActIdTenantMemberRepository actIdTenantMemberRepository; @@ -49,7 +49,7 @@ public class ActIdTenantMemberService implements WriteableService getRepository() { + public BaseJpaRepository getRepository() { return this.actIdTenantMemberRepository; } } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdTenantService.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdTenantService.java index 80488bf7..7c3759ef 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdTenantService.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdTenantService.java @@ -25,8 +25,8 @@ package org.dromara.dante.bpmn.logic.service; -import cn.herodotus.engine.data.core.repository.BaseRepository; -import cn.herodotus.engine.data.core.service.WriteableService; +import cn.herodotus.engine.data.core.jpa.repository.BaseJpaRepository; +import cn.herodotus.engine.data.core.jpa.service.BaseJpaWriteableService; import org.dromara.dante.bpmn.logic.entity.ActIdTenant; import org.dromara.dante.bpmn.logic.repository.ActIdTenantRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +39,7 @@ import org.springframework.stereotype.Service; * @date : 2021/7/20 13:30 */ @Service -public class ActIdTenantService implements WriteableService { +public class ActIdTenantService implements BaseJpaWriteableService { private final ActIdTenantRepository actIdTenantRepository; @@ -49,7 +49,7 @@ public class ActIdTenantService implements WriteableService } @Override - public BaseRepository getRepository() { + public BaseJpaRepository getRepository() { return this.actIdTenantRepository; } } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdUserService.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdUserService.java index 3b3e653e..1d7a8663 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdUserService.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/service/ActIdUserService.java @@ -25,8 +25,8 @@ package org.dromara.dante.bpmn.logic.service; -import cn.herodotus.engine.data.core.repository.BaseRepository; -import cn.herodotus.engine.data.core.service.WriteableService; +import cn.herodotus.engine.data.core.jpa.repository.BaseJpaRepository; +import cn.herodotus.engine.data.core.jpa.service.BaseJpaWriteableService; import org.dromara.dante.bpmn.logic.entity.ActIdUser; import org.dromara.dante.bpmn.logic.repository.ActIdUserRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +39,7 @@ import org.springframework.stereotype.Service; * @date : 2021/7/20 13:28 */ @Service -public class ActIdUserService implements WriteableService { +public class ActIdUserService implements BaseJpaWriteableService { private final ActIdUserRepository actIdUserRepository; @@ -49,7 +49,7 @@ public class ActIdUserService implements WriteableService { } @Override - public BaseRepository getRepository() { + public BaseJpaRepository getRepository() { return this.actIdUserRepository; } } diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml index fbc26c0e..0910dd58 100644 --- a/services/dante-cloud-oss-ability/pom.xml +++ b/services/dante-cloud-oss-ability/pom.xml @@ -39,7 +39,7 @@ org.dromara.dante - service-spring-boot-starter + authorization-servlet-spring-boot-starter cn.herodotus.oss -- Gitee From a0f12d1c296386e9e02750747d81a3383f885032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Wed, 10 Sep 2025 12:22:29 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=AF=B9=E9=BD=90=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=85=8D=E7=BD=AE=E6=A0=BC=E5=BC=8F=E5=8F=8A?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nacos_config_export_20250910121145.zip | Bin 0 -> 12986 bytes ...l => dante-cloud-database-opengauss6.yaml} | 2 +- .../yamls/common/dante-cloud-database.yaml | 4 +- .../yamls/common/dante-cloud-platform.yaml | 14 +- .../backup/yamls/common/dante-cloud-rest.yaml | 16 +- .../yamls/common/dante-cloud-social.yaml | 34 ++- .../development/dante-cloud-environment.yaml | 24 +-- .../yamls/docker/dante-cloud-environment.yaml | 24 +-- .../production/dante-cloud-environment.yaml | 24 +-- .../src/main/resources/application.yml | 203 +++++++----------- 10 files changed, 138 insertions(+), 207 deletions(-) create mode 100644 configurations/backup/alibaba/3.5.5.3/nacos_config_export_20250910121145.zip rename configurations/backup/yamls/common/{dante-cloud-database-opengauss5.yaml => dante-cloud-database-opengauss6.yaml} (76%) diff --git a/configurations/backup/alibaba/3.5.5.3/nacos_config_export_20250910121145.zip b/configurations/backup/alibaba/3.5.5.3/nacos_config_export_20250910121145.zip new file mode 100644 index 0000000000000000000000000000000000000000..0e261e64233a8ff2c628294069db89796d777853 GIT binary patch literal 12986 zcmeHN^;?!*)}_08^+F?glC81}W)o>F$=4kdT({@4v`t28h|F(_~6 zn)<5JuwhSJ-8@JJZN&Um1i%&6b6%cehCpy*+V)4Q_FpFLILye9!Es~1sx3>|+4Tyb z$gJ5U%+XN{X}YCp0W9yjm9d-=H<(!(YFsI1?M7VfAzh-O)WUh?fYw^yIC)nfI_K*d zPaCr>bs{+#Klqo9q3l3w$yh9Pu$SR)yH+d{iEz%g5(AEIo#myVVZMd7X4e6iCkP4x zBL7DM46FeFYpb8uZ=h#jYV@6e$QWk1E+&*fXRko$*?gbwbyylELm$}CYjYhu>^|&I zi8Yvm-rFVlv?}Bnau=bb_H=t_@ zRS*TTVKNY|hG~r|gH}#=voVNyPjCw@96$@!IfZMqpr}qgvm#l$f`6hpl|LGh z07&r&*q>;A2K*4eq1jN+K~G=L-iQI!7EogWciw@ z;Z$1)xo=53hrBp|p@VggPqrrQ#T5!3bvfMEoi8swbK=H{Bg_&jAFZ$ipi5$aiSg>) zdOZ_({Z?+smOw7HX7o(Rs^8)CdRfQ5%rfReD2a!ncKd7HTH#A)mBq@P6E}^=!i{ii z!FIYqeAhBCz-ivO{Z{ghvLhkSX5RI^eq}$|t#wOQFp-erL$}1J3Ysy^dQc|~{BwJS zl5cnmA?l*s_v*waLjl*u_czE-WQvMMH(dg$%Ku}`QvWYxa{YtL5m|6%gn*-0Eh0#! z)-vG@$}z7Ao>7NE+`EEU&mQC(9;|bTL7p$~T6vf8yYZcx?L!4x%%&~fr!%uZQ;xPl zG3}Z3gUa{P8|LtHN?|<^@a&6IlbX*)@Cb;9f?(j;Xsm7Rx`|w#epes2;(!DZvNMC5 zPzw+a6wWdotMXhOdr`14V8%mPC2GPGwO3@t<#A=f_?}^s5k@II??Q2fBkk<7)j}P; zTZ7ErC=cH)6huo-OYAn!c++qb9(G1(lnQpX*r=8MEvSSgfj8F4FMSz}~e( zxR~rb&)bL0`-}j>y`%%!_H2FsAq6fuMA zEGoz|UevuC%Q(p9sMzsXs*_Ir__XHn*{jY};EEXjxMmXI6TdqL07mxqdM1BmLeJ2VXETAagWZir?fW^UxZq9Nq$xQ)pa|Ti} zGd$WEDZ%L+27Glm%BGcBp94)gl^G&!QsQ!JT@GqKC3+mLdDL=as}3Rba(0~)@F#LO zkR$oVfJ?XjBRS;2Ck(9(ER5`aIwOp%oXqU3tpG+=4&MWzR7u7@l?kQwR&{4w#NEdy z5`1gcEy?^VXa=x&s~Jw|erz6| z*F3mPz8Wq2CZ=!Bc(hK*n;DeZl}Xm5&XEK=vfsthglrXu>@R>b^-Si`4p_qr3MoO0e(%f6{1n%O04kDS2W{uO zH0|~P7>+q;S_|79yy?OcUtyu)%YFQ~i9hU-PBP87Yz4m>fD6DKe>aI=;k`jAIW0TO zibcv(TJ#klDUY-UyobtF)E~-OQ)r5tk(i zQcov7M`7mjAzuZ2VuKPfRO;L}0-Zh<6JMMfxLjJCoD6+i zJlN$d8CcJM_7ge3vG6~K_aD!yAGj_u$*-aNBq%l`N> zWp~-lYBR@YHM6`ed0V{|kCtRka7sM1O}tbh=Aat|yh%*+dUjm8c0G6ts|miGHIe`c z^CyZvExg$`d5@4m(JHR&u*p z+`?O}d2qioHa@~@u0_ej#N7`cP=sww3Er0!wIaK#neV!Yb;g;W8D$1u@^PDWybH!0 zBYo}}!8#IcCS~4uU!+(EVFc|Ukq>ssshuUhVb!feU3*Yr7a%4EeRLyzFDUiZa^dyT5yhNP;|oVBCX28R5fu>0EyrV@vdq(Q zxqKK)Kpta4?`qEKJniuUn|RYX=<1#?gYjco9q%>CBF9Az!Ste+-yxbByf|{TD5zKd1`L%Ul981gVd_$B?%L)iMLcij%&61A6E%-s{%ZRixOPM)fs9nRft zB=*#&5^t+wS3AVRCWSHE#0Yh7z;^S&qd#hy=<`I8MC3wvKY~7Gvh+|kZxUe8IsGx{ zp342-lwlTn#uj?tb6D%^4y#3Rl-5f+7&g@^#eED!U+oknBq1b$GwC?G)OY=q4b8A= zoj&`@Re6#z@N|x)O-uyym22IxQ~tVd>Q0%z#7@(E99LINkf3=D#qxF$r?Qg<+f0JYzT@IC5RvXQ3z0gJ{Kr+Y9k=|#cA5#GD?bw0aL6jov7 z==*MmN&smpEvg^OTV_bZkr)FlLvCNath8P@<)}(SQuTL-CWosso2C)^>Z}N#CN#~% z(0t;W5F)pCNHWQi_4}r&mFTD1grXgXEwcux&>SqchatCmwIm@#`>UjjlQ;s=YW(y; zJvib9@?wK(pSjlL2^K*qQtrbAvw5N-rjq)!)4-%^ba-Iha!|((q;t~}L~09!!FMBg z3K>H488q!Qg%d(V3Q=gC&!JgAVAVK5m6ld4e%X62pgDc7-J`RMG>biyfN1up?)V>den;#s@1gbeaa$a?T)dJnHmomV-R{f{nuykVFeHS>0|*KX65OF(qex#Xyz5cOu`k&&&Cyoy7T^SfDP8jbRM{N=8@ zT?U!o$c?cv4-35s!>Vidx6n&c;LepiiE<@L=thpgFwGaXw*g#e`wgW;>$P{*tv9 z*}UvQb$13K!>;KF?KmSPs!m%Vzv9hfjMSuGcrxq3^PXpytR6QAk&&y@c zzUv#O)~toFV-^!JosYtaP2yqkMy|{Udzl-)Cqi>p)+=p|vg*tO1(zX%oC)L4$-5qHyNKcl=5M%P>I}=E$i%Yyi|Jr7^h{0Lw37$958@HCv&1jb-eWL`l9Qlo;S!rl|iGv9z4}wv^qzqC3`T6r+JLR#2emdbrhB_{5IzKnGDEV@G}YzR$~N#uoEXv$4?yse+* z>-Y$?4=2;9qUH@6;)1*zD@i2C)@qb(Ho72?4%1fHB~a2PNr|FMnwI$Hp~DMA8hV@E z%@)=CFYI#JU8KNoz#%$!BeLw;TzehLDBh5C;CR3c*o@gZ2F^a);-a+T=oLoMcKP~B zL13#;Svjbk6^Ws+?v{BM4QfE2`pnnH!bNmmIik6iEmg8MQol|kU0LpYBzeJJyhxf~ z`AF#D$S9uRkr?sP^3l)dd<8<%>vS&>s>Q9qV8WEmm`RSqo6I==Bg%*Vbq}FK8;Pn4 z_+v>}+|ghw+@m;1M(2ck8d&f#`}IFS+b{$m6( zIw^)tJAD8_SjHe%8k|)KF$yMZYS{So;)k3`6{?B3ydXzzM80rTOz)sMv@=8_{pY`#_jlLn3hIDu`EFR` z%g~yHa?I@D9%1&)7A!hI-`g8I*)))_OTG@caGWECfCkTE=j2Lm7vtSsLfCTUW%s|R zPo?Ra780uTU%aD!+B4SBZ#Cd1yli-5U+^2930KBP+!#LDAnh93rb0o^(83t<3Wf$ zwuYs1F`_u|eLJ*ysR0OBs<(yE4Rs}7as>l{Yvnam1<~!NwZ>6r(J@S57WB5GgCHq6 zH;mPt>72UsjaVOaZ6+P4MVka124vQjy&y!FIwW2Tt5l?o%*;sRiM@;SNA$~+g0Rk( zOf6o(a?E(GqOhf<<%D|}rZt0sc*5gN0^i59snO0BGRbFRq>kYl$FAOMudPa;UdK?) z6Sdwi%efggV#2rP<-JQ?X4_CPj~Ks%mFBb)EESmzX~H*B0|G!x6KC5NU4O;Uvc5yv zhg@~|<^DkSjT;qHG9R4`TJ8MV>jC%VJ}TSpt%1$S-4iTyLMKx*W@i(^O%3&Ww`+dv~q9VtA7Qy&l?+U{7hRE+D#!4=8IG{85)B`u&B#-rB%S?;rA({E%!n z6GF===7X=5HbDClbA1#!FG>phy^sX$$+aP9DONyt$K>#QMog>X0CRor4X=;9MKQzv zfiRC)p2kNeLC;oUkcF-mg|qQNA=TO-{?Y6E#D&5-PY2H8%7iPxnbFHkX086 zO3OCgMf3-q&)9c}wR7yD;PE{&rG<~$eW((7uNze~6O4?VoJh87T@!ghI;}2v=;!d- zi@78AUxT|)@ZKW9-c#SqLvp2cZGdHk8lMf&lIwZnPAskjB`dPERxbpcfnIs#5RUc* zFtvQI~Ae!Jy-Jy!4qG(DSXCieY?QVC|<^a&7_|}({d=q-6-CDF-!Vd9P zNO)93p)#dbhBqFwuDDP|0nu^Dl|Q~^{@{?YyqaNRM7Vq=V42otQhc%WOUu1RPRE-F zv|g07;i>^Ab36vffm6P*_^D41!i$M{gN+i-w5Aq{xw1IeM=^dJZyw8(DyT;0lwMVS zwQL^|B*6Fg5Cf54zUhi5uvNFUZ8i0P-zw)^f8_fD{Y1T90?Q%|koMd^#w)>ppx#mM zuluWK^s+e^GfLnQyk~IZu~W~TRh4y|m3U-=VY)OeS(|$znG@v6H{P@(Ch7ENUzU%r zLFH{NyocUF@u(w(VZ(H&=$OjbqUR z5AcE_MMfz(V8&~%d{e4`L;R8Bwd9v=Cay1D-!Jf1SA-@1y;zt=WDz`eZAGMz!dGBE;H&AoT zrwS#0%)BS%2wCv3eDigb_$dUabm4@Gfgf1(kGqcq_{48C3>!;52V-kHz+Y0V3Q)#i zLTKHlbHI_;^&!yhTXI{><}GcnASa)w!&3i7QEbI=wfa)sX^%>%0;*MgZNuFoue%1P zq@u8tS9>g&kmMSW3<99a1x>mG zE>7^wqB>X9MEYQtLDoR}5+g8%Wj$^d8CPf>gThLi-%P@LlRwU{cUQw;&+AFg=tvAPaQ9eC4`5-(RmvAW31=jf@-iGe0+8KmW=Ga zHQstSU%W(J6kR|*EO`c3q}hhmq1fDQum@cf(>~vTeu@0z(A#U(a!_D230q(SLSBtJ zl~Uxm`k)afbPVp6@BG~)TB_=dtk0K7^wsW$^RI%*H~KEtX&hxSar&A!D&O&9O6qsfRHetInj$W}QYi^fUN#Pf(@1>D-fq$!2iwFN!fpBdT@38*~E%EKx zsUvDmT}!&*_UWG(#E6z|9H z84QOIo!1tay?Fn4ad^sLzX@MpKk2V7LVBEx-6jb_;H3a$_@_yBrJ|K94hX|kvj`m6 zSXsqJ_WE4s1Y=e}k zB*W1+zpLmF8Afgxg$M%h-l95)6W+nsd>y;i6HMH(|A0d;-iJ^20fxgpqG?hs!1ab< z3{@zF#8dZwqRex zfkwJ>bcn*?Mf8h{^OwAAaGSc;>;dN02>Ll+tKkhYmeLfS-uBmvT-}XSJp_B(_I?v4b_IHJ4M0sZ812A8`|D*2u zA9B_|+uz@FR{Coh>qV|7m4Bx~74GmQmalc$MiywxO4%323TnTcUJj)&UCEr*hIHi9R&FsA7uq-F6sVF7S9B7RTJ3Dt8;|@rTBfRt(?o$A zw>7#^UxtOhPIPx=;3Z13)X(G-G}pS2#dESy*GRrG-5ad66P^*QA=8cEnCec(!=rmv z2A^s9&Cy<@ETy0pGFQztma@>FN#k9XW~Mp(0gKTrQ7w)3+JbQF2X9kH09Q9HrZ_=6 z3L~n>sFLf&mWcp!!9u?(7kRPo$MZw$7T4H@J~+9JCh3pW!O%>*+8zetd6`{v>^w%< zET9AchIh23MoJkWhpA;gx8bPJvoW`L!y9Y^SVKJ?aV-|1A$)Xuu_40xK0_BY?l5v9 zmUL~oyZ4*P4LJ~6&1T>9{4#qF$T`C@StC%uvUuD-_hlPcnB`Pzb6zM(03=Syq1Pt7aJ5ORVyT zlj1HL>)T0?1Jh`{4LnN*EvUoiHp3=o1kb?zMbj;6F`E|x+%wyw)ltu?yHF~o(*_Vq z#4d-Kp{Y^8Uy>7e=s#nShX^oPgN3X3=8}*)BRl38>MX!tY$(iqx2S94fl*_fTtj4| zT4}6_Z~Ry%;26zGN5G+xolF2h0G&)O6xBU+6fV4&lacai@LrJDR6+?OmWh6NNJvAO z&X?WYQ13peifehkaT&J_4itEyW6u5?`?GgE7Z}+B}Z{bj&O>7 z4E(z~)bt3y@|_`jx+eLO*?3+xXvv1p>`&PV2ee5B6luW(TNLgAmV6F8?HWi`V5t!z!!FD{srRoV^~qi`Dg% z(XB_1))6btdhhZbOGlYGuGiI;LMEK4Jt!@4+JXq1YE71iq+#GeDc zQC>29Na~ma3&to>LtQU$*! zAd2;vt4E2FnX#4SXVKHa?l1t}Vk%9cgUIV{(3lp*Q9|B)h4=ALw7m~-fa-M}#Zl>B zG^kny1O3+c(#bJbiJg)07}&sN&wWRJoBmnn{CzgDLTkY3i<1f)e)@t>+X$)A*9gFS z56I=hmCfF6oXKZ7*am13h8RUoLAe!3e-Z?nwRkLiwQ@}@t3}OA5W=>;R1-DAn|PUm z-gf_6R*ETW&uWLQxCm%Zk+}lTnikYZCgfaa!jWZ;GS$fP)U(gv*QLpCAScUkOHcRK zqKYDIyyi*{CNhF_2S{$S#KiEhO&g?|*n;HZBw^FP=&Du1ZS8jNr zW?t+#BVu1@>Un8vYpl;OJksPHo;rmi=t3~&*7F#Q*s4g`|4 zEY!x3#_RL%VbcvPDBvnwTJb9v)2ftCYrARS_WFKmPl_7JDg64;874Ziiq0`G z`uKF%{i3>vIhu0!(-KYK!zajZ3~sn0?`cs8KIh?fu|grvLgkvrj4rL3+^WR#@5j=Q ztXnuWd$_k52xWovh6)v>s6`CEUZjYW!qEJc3>D zZdv1gExmMSI5{Q8ptkg7n|t7Vf+~7yVPeQ){ueoY{rmlLX0{B9#I2e$%vOadpY7AB zI2^KQ@?%a|;wPySV|tPeCRC+@79j9cod(bcm$n@K6L<9y0Bf!W(@2M_gbOl(}#>-fNlLBjD?w#CZ@u+Tm|&nRV1(>N?tL z@>wM6VCkA#$w0;0Gh%MGo_BLKiZbgCKTaX;qE7jLPV2`=UuI~EsKC#Dzm%~L;-=g= zAlCfp@i00ij@-hVQW7%vsMGU>%V!i!gwbZc`V@WAgU_HcQe*}1IV_jJ#wC3=V9*U} z^lfm8lc_p)38)i&Lho@VOFGAcR<1Xfh_Tj0|x`*;Va(aB1_B76w^3Z{7@<2ba z2?~Y*^0&G7N7w7qaq#o_o$~rGtM9K+KRP>qh5`lt^WWTI{x;423iYF}@hJuTJxqZq z<2O+Mtc-s$hW?8Bqn+=`PV@Ju1;*KbMg7Ym`77v;ez_;LFe?5Bx7x3OKN?7WCesbrJpLb@O22~s*nj>x zgpPoP%x}KX-%gZYp?+-3{R{<(@?YB5e}W?Yn>gT%8~qPZ|Lp4h3iqSZ{?y+1d)Q+A z{=@!Tv*TCDA9d&_iT;Oy^IP725bS@&`cYV=_yGt6gdO+yulK8t{VU>+QstAJ@%N~} z`#s`6<=J16epLK^-fR{4zg_3Q^1?4d=dZv&YB3~#zaMZ`4SeI@1l~{b;jd^vUh;ol zupRMl(f+08{EGBr9sl!tnE)g4H}Cb&1%H Date: Wed, 10 Sep 2025 14:50:04 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=97=A5=E5=BF=97=E6=A0=BC=E5=BC=8F=E5=8F=8A=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ot.autoconfigure.AutoConfiguration.imports | 4 +--- .../AuthorizationServerAutoConfiguration.java | 8 ++++++- .../DefaultSecurityAutoConfiguration.java | 23 +++++++------------ ...AuthorizationServletAutoConfiguration.java | 2 +- .../FacilityAutoConfiguration.java | 2 +- .../DistributedArchitectureConfiguration.java | 10 ++++---- .../MonocoqueArchitectureConfiguration.java | 6 ++--- .../RpcServerUpmsAutoConfiguration.java | 2 +- .../gateway/config/GatewayConfiguration.java | 2 +- .../src/main/resources/application.yml | 8 +++---- 10 files changed, 32 insertions(+), 35 deletions(-) diff --git a/modules/dante-monomer-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/modules/dante-monomer-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 7188387a..bd15d6fd 100644 --- a/modules/dante-monomer-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/modules/dante-monomer-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -23,6 +23,4 @@ # 6. 若您的项目无法满足以上几点，可申请商业授权 # -org.dromara.dante.monomer.autoconfigure.MonomerAutoConfiguration -org.dromara.dante.module.metadata.config.MetadataModuleConfiguration -cn.herodotus.engine.supplier.message.configuration.SupplierMessageConfiguration \ No newline at end of file +org.dromara.dante.monomer.autoconfigure.MonomerAutoConfiguration \ No newline at end of file diff --git a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java index a3753626..b6a6ee5e 100644 --- a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java +++ b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java @@ -40,6 +40,7 @@ import com.nimbusds.jose.jwk.JWKSet; import com.nimbusds.jose.jwk.RSAKey; import com.nimbusds.jose.jwk.source.JWKSource; import com.nimbusds.jose.proc.SecurityContext; +import jakarta.annotation.PostConstruct; import org.apache.commons.lang3.ArrayUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,6 +84,11 @@ public class AuthorizationServerAutoConfiguration { private static final Logger log = LoggerFactory.getLogger(AuthorizationServerAutoConfiguration.class); + @PostConstruct + public void postConstruct() { + log.info("[Herodotus] |- Auto [Authorization Server] Configure."); + } + @Bean @Order(Ordered.HIGHEST_PRECEDENCE) public SecurityFilterChain authorizationServerSecurityFilterChain( @@ -94,7 +100,7 @@ public class AuthorizationServerAutoConfiguration { ServletOAuth2AuthorizationConfigurerManager authorizationConfigurerManager ) throws Exception { - log.debug("[Herodotus] |- Bean [Authorization Server Security Filter Chain] Auto Configure."); + log.debug("[Herodotus] |- Bean [Authorization Server Security Filter Chain] Configure."); SessionRegistry sessionRegistry = OAuth2ConfigurerUtils.getOptionalBean(httpSecurity, SessionRegistry.class); diff --git a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java index a15cecb5..e13c4068 100644 --- a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java +++ b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java @@ -30,16 +30,13 @@ import cn.herodotus.engine.core.identity.strategy.StrategyUserDetailsService; import cn.herodotus.engine.oauth2.authentication.configurer.OAuth2AuthenticationConfigurerManager; import cn.herodotus.engine.oauth2.authentication.configurer.OAuth2FormLoginSecureConfigurer; import cn.herodotus.engine.oauth2.authentication.customizer.HerodotusUserDetailsService; -import cn.herodotus.engine.oauth2.authentication.response.DefaultOAuth2AuthenticationEventPublisher; import cn.herodotus.engine.oauth2.authorization.servlet.ServletOAuth2AuthorizationConfigurerManager; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; -import org.springframework.security.authentication.AuthenticationEventPublisher; -import org.springframework.security.authentication.event.AuthenticationFailureBadCredentialsEvent; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; @@ -60,6 +57,11 @@ public class DefaultSecurityAutoConfiguration { private static final Logger log = LoggerFactory.getLogger(DefaultSecurityAutoConfiguration.class); + @PostConstruct + public void postConstruct() { + log.info("[Herodotus] |- Auto [Default Security] Configure."); + } + @Bean SecurityFilterChain defaultSecurityFilterChain( HttpSecurity httpSecurity, @@ -69,7 +71,7 @@ public class DefaultSecurityAutoConfiguration { ServletOAuth2AuthorizationConfigurerManager authorizationConfigurerManager ) throws Exception { - log.debug("[Herodotus] |- Bean [Default Security Filter Chain] Auto Configure."); + log.debug("[Herodotus] |- Bean [Default Security Filter Chain] Configure."); // 禁用CSRF 开启跨域 httpSecurity.csrf(AbstractHttpConfigurer::disable).cors(AbstractHttpConfigurer::disable); @@ -91,20 +93,11 @@ public class DefaultSecurityAutoConfiguration { return PasswordEncoderFactories.createDelegatingPasswordEncoder(); } - @Bean - public AuthenticationEventPublisher authenticationEventPublisher(ApplicationContext applicationContext) { - DefaultOAuth2AuthenticationEventPublisher publisher = new DefaultOAuth2AuthenticationEventPublisher(applicationContext); - // 设置默认的错误 Event 类型。在遇到默认字典中没有的错误时，默认抛出。 - publisher.setDefaultAuthenticationFailureEvent(AuthenticationFailureBadCredentialsEvent.class); - log.debug("[Herodotus] |- Bean [Authentication Event Publisher] Auto Configure."); - return publisher; - } - @Bean @ConditionalOnMissingBean public UserDetailsService userDetailsService(StrategyUserDetailsService strategyUserDetailsService) { HerodotusUserDetailsService herodotusUserDetailsService = new HerodotusUserDetailsService(strategyUserDetailsService); - log.debug("[Herodotus] |- Bean [Herodotus User Details Service] Auto Configure."); + log.debug("[Herodotus] |- Bean [Herodotus User Details Service] Configure."); return herodotusUserDetailsService; } } diff --git a/packages/authorization-servlet-spring-boot-starter/src/main/java/org/dromara/dante/authorization/servlet/autoconfigure/AuthorizationServletAutoConfiguration.java b/packages/authorization-servlet-spring-boot-starter/src/main/java/org/dromara/dante/authorization/servlet/autoconfigure/AuthorizationServletAutoConfiguration.java index fb7414e9..919d81f0 100644 --- a/packages/authorization-servlet-spring-boot-starter/src/main/java/org/dromara/dante/authorization/servlet/autoconfigure/AuthorizationServletAutoConfiguration.java +++ b/packages/authorization-servlet-spring-boot-starter/src/main/java/org/dromara/dante/authorization/servlet/autoconfigure/AuthorizationServletAutoConfiguration.java @@ -53,7 +53,7 @@ public class AuthorizationServletAutoConfiguration { ServletOAuth2AuthorizationConfigurerManager authorizationConfigurerManager ) throws Exception { - log.debug("[Herodotus] |- Bean [Resource Server Security Filter Chain] Auto Configure."); + log.debug("[Herodotus] |- Bean [Resource Server Security Filter Chain] Configure."); httpSecurity.csrf(AbstractHttpConfigurer::disable).cors(AbstractHttpConfigurer::disable); diff --git a/packages/facility-spring-boot-starter/src/main/java/org/dromara/dante/facility/autoconfigure/FacilityAutoConfiguration.java b/packages/facility-spring-boot-starter/src/main/java/org/dromara/dante/facility/autoconfigure/FacilityAutoConfiguration.java index 8a7d945c..d0ed2276 100644 --- a/packages/facility-spring-boot-starter/src/main/java/org/dromara/dante/facility/autoconfigure/FacilityAutoConfiguration.java +++ b/packages/facility-spring-boot-starter/src/main/java/org/dromara/dante/facility/autoconfigure/FacilityAutoConfiguration.java @@ -43,6 +43,6 @@ public class FacilityAutoConfiguration { @PostConstruct public void postConstruct() { - log.info("[Herodotus] |- Module [Herodotus Facility Starter] Auto Configure."); + log.info("[Herodotus] |- Starter [Herodotus Facility] Configure."); } } diff --git a/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/DistributedArchitectureConfiguration.java b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/DistributedArchitectureConfiguration.java index a0452081..41159e01 100644 --- a/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/DistributedArchitectureConfiguration.java +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/DistributedArchitectureConfiguration.java @@ -64,7 +64,7 @@ public class DistributedArchitectureConfiguration { @PostConstruct public void postConstruct() { - log.debug("[Herodotus] |- Module [Distributed Architecture] Auto Configure."); + log.debug("[Herodotus] |- Auto [Distributed Architecture] Configure."); } @Configuration(proxyBeanMethods = false) @@ -76,7 +76,7 @@ public class DistributedArchitectureConfiguration { @ConditionalOnMissingBean public StrategyUserDetailsService localStrategyUserDetailsService(SysUserService sysUserService, SocialAuthenticationHandler socialAuthenticationHandler) { LocalStrategyUserDetailsService service = new LocalStrategyUserDetailsService(sysUserService, socialAuthenticationHandler); - log.debug("[Herodotus] |- Strategy [Local User Details Service] Auto Configure."); + log.debug("[Herodotus] |- Strategy [Local User Details Service] Configure."); return service; } @@ -84,7 +84,7 @@ public class DistributedArchitectureConfiguration { @ConditionalOnMissingBean public StrategyPermissionDetailsService localStrategyPermissionDetailsService(SysPermissionService sysPermissionService) { LocalStrategyPermissionDetailsService service = new LocalStrategyPermissionDetailsService(sysPermissionService); - log.debug("[Herodotus] |- Strategy [Local Permission Details Service] Auto Configure."); + log.debug("[Herodotus] |- Strategy [Local Permission Details Service] Configure."); return service; } } @@ -98,7 +98,7 @@ public class DistributedArchitectureConfiguration { @ConditionalOnMissingBean public StrategyUserDetailsService feignStrategyUserDetailsService(RemoteUserDetailsService remoteUserDetailsService, RemoteSocialDetailsService remoteSocialDetailsService) { FeignStrategyUserDetailsService service = new FeignStrategyUserDetailsService(remoteUserDetailsService, remoteSocialDetailsService); - log.debug("[Herodotus] |- Strategy [Remote User Details Service] Auto Configure."); + log.debug("[Herodotus] |- Strategy [Remote User Details Service] Configure."); return service; } @@ -106,7 +106,7 @@ public class DistributedArchitectureConfiguration { @ConditionalOnMissingBean public StrategyPermissionDetailsService feignStrategyPermissionDetailsService(RemoteAuthorityDetailsService remoteAuthorityDetailsService) { FeignStrategyPermissionDetailsService service = new FeignStrategyPermissionDetailsService(remoteAuthorityDetailsService); - log.debug("[Herodotus] |- Strategy [Remote Permission Details Service] Auto Configure."); + log.debug("[Herodotus] |- Strategy [Remote Permission Details Service] Configure."); return service; } } diff --git a/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/MonocoqueArchitectureConfiguration.java b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/MonocoqueArchitectureConfiguration.java index 23617812..00f5ecba 100644 --- a/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/MonocoqueArchitectureConfiguration.java +++ b/packages/rpc-client-uaa-spring-boot-starter/src/main/java/org/dromara/dante/rpc/client/uaa/autoconfigure/MonocoqueArchitectureConfiguration.java @@ -57,14 +57,14 @@ public class MonocoqueArchitectureConfiguration { @PostConstruct public void postConstruct() { - log.debug("[Herodotus] |- SDK [Module Monocoque Architecture] Auto Configure."); + log.debug("[Herodotus] |- Auto [Module Monocoque Architecture] Configure."); } @Bean @ConditionalOnMissingBean public StrategyPermissionDetailsService herodotusLocalPermissionDetailsService(SysPermissionService sysPermissionService) { LocalStrategyPermissionDetailsService service = new LocalStrategyPermissionDetailsService(sysPermissionService); - log.debug("[Herodotus] |- Strategy [Local Permission Details Service] Auto Configure."); + log.debug("[Herodotus] |- Strategy [Local Permission Details Service] Configure."); return service; } @@ -72,7 +72,7 @@ public class MonocoqueArchitectureConfiguration { @ConditionalOnMissingBean public StrategyUserDetailsService herodotusLocalUserDetailsService(SysUserService sysUserService, SocialAuthenticationHandler socialAuthenticationHandler) { LocalStrategyUserDetailsService service = new LocalStrategyUserDetailsService(sysUserService, socialAuthenticationHandler); - log.debug("[Herodotus] |- Strategy [Local User Details Service] Auto Configure."); + log.debug("[Herodotus] |- Strategy [Local User Details Service] Configure."); return service; } } diff --git a/packages/rpc-server-upms-spring-boot-starter/src/main/java/org/dromara/dante/rpc/server/upms/autoconfigure/RpcServerUpmsAutoConfiguration.java b/packages/rpc-server-upms-spring-boot-starter/src/main/java/org/dromara/dante/rpc/server/upms/autoconfigure/RpcServerUpmsAutoConfiguration.java index eb5e0619..1e5ec6fe 100644 --- a/packages/rpc-server-upms-spring-boot-starter/src/main/java/org/dromara/dante/rpc/server/upms/autoconfigure/RpcServerUpmsAutoConfiguration.java +++ b/packages/rpc-server-upms-spring-boot-starter/src/main/java/org/dromara/dante/rpc/server/upms/autoconfigure/RpcServerUpmsAutoConfiguration.java @@ -47,7 +47,7 @@ public class RpcServerUpmsAutoConfiguration { @PostConstruct public void postConstruct() { - log.info("[Herodotus] |- Starter [Rpc Server Upms] Auto Configure."); + log.info("[Herodotus] |- Starter [Rpc Server Upms] Configure."); } @Configuration(proxyBeanMethods = false) diff --git a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java index fe40ec68..b2540ed3 100644 --- a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java +++ b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java @@ -98,7 +98,7 @@ public class GatewayConfiguration { RefreshRoutesListener refreshRoutesListener = new RefreshRoutesListener(); refreshRoutesListener.setRouteLocator(routeLocator); refreshRoutesListener.setSwaggerUiConfigProperties(swaggerUiConfigProperties); - log.trace("[Herodotus] |- Bean [Refresh Routes Listener] in AliyunScanConfiguration Auto Configure."); + log.trace("[Herodotus] |- Bean [Refresh Routes Listener] in AliyunScanConfiguration Configure."); return refreshRoutesListener; } } diff --git a/services/dante-monomer-application/src/main/resources/application.yml b/services/dante-monomer-application/src/main/resources/application.yml index a7f574a2..9349b70d 100644 --- a/services/dante-monomer-application/src/main/resources/application.yml +++ b/services/dante-monomer-application/src/main/resources/application.yml @@ -164,11 +164,11 @@ spring: springdoc: api-docs: - enabled: ${herodotus.swagger.enabled} + enabled: ${herodotus.platform.swagger.enabled} resolve-schema-properties: true swagger-ui: disable-swagger-default-url: true - enabled: ${herodotus.swagger.enabled} + enabled: ${herodotus.platform.swagger.enabled} operations-sorter: method show-common-extensions: true show-extensions: true @@ -388,10 +388,10 @@ spring: springdoc: api-docs: - enabled: ${herodotus.swagger.enabled} + enabled: ${herodotus.platform.swagger.enabled} resolve-schema-properties: true swagger-ui: - enabled: ${herodotus.swagger.enabled} + enabled: ${herodotus.platform.swagger.enabled} disable-swagger-default-url: true operations-sorter: method show-common-extensions: true -- Gitee From c8fbb8a887689ebf33b275a4bdf1944d5980f0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Wed, 10 Sep 2025 15:10:27 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E6=8C=89=E7=85=A7=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BD=E5=90=8D=E4=B8=8D=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nfiguration.java => AuthorizationAutoConfiguration.java} | 6 +++--- ...ngframework.boot.autoconfigure.AutoConfiguration.imports | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/{AuthorizationServerAutoConfiguration.java => AuthorizationAutoConfiguration.java} (97%) diff --git a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationAutoConfiguration.java similarity index 97% rename from packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java rename to packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationAutoConfiguration.java index b6a6ee5e..f34cd0bd 100644 --- a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java +++ b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationAutoConfiguration.java @@ -29,10 +29,10 @@ import cn.herodotus.engine.core.autoconfigure.oauth2.OAuth2AuthorizationProperti import cn.herodotus.engine.core.foundation.enums.Certificate; import cn.herodotus.engine.core.foundation.utils.ResourceResolverUtils; import cn.herodotus.engine.core.identity.service.ClientDetailsService; +import cn.herodotus.engine.oauth2.authentication.autoconfigure.customizer.OAuth2AuthorizationServerConfigurerCustomizer; import cn.herodotus.engine.oauth2.authentication.configurer.OAuth2AuthenticationConfigurerManager; import cn.herodotus.engine.oauth2.authentication.configurer.OAuth2AuthenticationProviderConfigurer; import cn.herodotus.engine.oauth2.authentication.utils.OAuth2ConfigurerUtils; -import cn.herodotus.engine.oauth2.authorization.autoconfigure.customizer.OAuth2AuthorizationServerConfigurerCustomizer; import cn.herodotus.engine.oauth2.authorization.servlet.ServletOAuth2AuthorizationConfigurerManager; import cn.herodotus.engine.web.service.properties.EndpointProperties; import cn.herodotus.engine.web.servlet.tenant.MultiTenantFilter; @@ -80,9 +80,9 @@ import java.util.UUID; * @date : 2022/2/12 20:57 */ @AutoConfiguration -public class AuthorizationServerAutoConfiguration { +public class AuthorizationAutoConfiguration { - private static final Logger log = LoggerFactory.getLogger(AuthorizationServerAutoConfiguration.class); + private static final Logger log = LoggerFactory.getLogger(AuthorizationAutoConfiguration.class); @PostConstruct public void postConstruct() { diff --git a/packages/authentication-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/packages/authentication-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 51fe2591..eab8e9fd 100644 --- a/packages/authentication-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/packages/authentication-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ org.dromara.dante.authentication.autoconfigure.DefaultSecurityAutoConfiguration -org.dromara.dante.authentication.autoconfigure.AuthorizationServerAutoConfiguration \ No newline at end of file +org.dromara.dante.authentication.autoconfigure.AuthorizationAutoConfiguration \ No newline at end of file -- Gitee From e51ed5bf37e0e27009e6fb94206010469ff7f943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Wed, 10 Sep 2025 15:55:54 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E5=8D=95=E4=BD=93=E7=89=88=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E4=BC=98=E5=8C=96=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dante/monomer/autoconfigure/MonomerAutoConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/MonomerAutoConfiguration.java b/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/MonomerAutoConfiguration.java index ac1de88c..da3d4afa 100644 --- a/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/MonomerAutoConfiguration.java +++ b/modules/dante-monomer-autoconfigure/src/main/java/org/dromara/dante/monomer/autoconfigure/MonomerAutoConfiguration.java @@ -25,6 +25,7 @@ package org.dromara.dante.monomer.autoconfigure; +import cn.herodotus.engine.rest.servlet.upms.annotation.EnableHerodotusRestServletUpms; import jakarta.annotation.PostConstruct; import org.dromara.dante.monomer.autoconfigure.processor.MonomerBusBridge; import org.dromara.dante.monomer.autoconfigure.processor.MonomerCorsFilter; @@ -41,6 +42,7 @@ import org.springframework.context.annotation.Bean; * @date : 2024/10/3 17:38 */ @AutoConfiguration +@EnableHerodotusRestServletUpms public class MonomerAutoConfiguration { private static final Logger log = LoggerFactory.getLogger(MonomerAutoConfiguration.class); -- Gitee From 70ddad5467e2bbdfd055b5a84716a3ddb80b2e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Wed, 10 Sep 2025 16:02:26 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=8D=95=E4=BD=93=E7=89=88=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E4=BC=98=E5=8C=96=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/dante-monomer-application/src/main/resources/application.yml b/services/dante-monomer-application/src/main/resources/application.yml index 9349b70d..cefa2093 100644 --- a/services/dante-monomer-application/src/main/resources/application.yml +++ b/services/dante-monomer-application/src/main/resources/application.yml @@ -258,7 +258,7 @@ logging: level: root: INFO org.springframework: info - org.springframework.security: info + org.springframework.security: debug org.springframework.web: info cn.herodotus: debug com.alicp.jetcache: info -- Gitee From 4f37cc46c7978fdd3713e594007bc4ce8d190740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Wed, 10 Sep 2025 18:18:21 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/dante-cloud-message/src/main/resources/application.yml | 1 + platform/dante-cloud-uaa/src/main/resources/application.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/platform/dante-cloud-message/src/main/resources/application.yml b/platform/dante-cloud-message/src/main/resources/application.yml index 2badadba..774084a9 100644 --- a/platform/dante-cloud-message/src/main/resources/application.yml +++ b/platform/dante-cloud-message/src/main/resources/application.yml @@ -59,6 +59,7 @@ logging: com.alibaba.nacos.common.remote.client: error com.ulisesbocchio: error # 开发、调试需要的日志 + cn.herodotus: debug org.springframework.security: info org.springframework.web: debug com.alicp.jetcache: debug diff --git a/platform/dante-cloud-uaa/src/main/resources/application.yml b/platform/dante-cloud-uaa/src/main/resources/application.yml index c33b0be6..8d5a9b82 100644 --- a/platform/dante-cloud-uaa/src/main/resources/application.yml +++ b/platform/dante-cloud-uaa/src/main/resources/application.yml @@ -65,6 +65,7 @@ logging: com.alibaba.nacos.common.remote.client: error com.ulisesbocchio: error # 开发、调试需要的日志 + cn.herodotus: debug org.springframework.security: info org.springframework.web: info com.alicp.jetcache: trace -- Gitee From 34c36bd5cb0f4bbe7174caa650e0d2ce648995f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Wed, 10 Sep 2025 20:29:50 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20feat:=20v3.5.5.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 主要更新 - [重磅] 对齐开源版和企业版内核代码结构及使用方式 - 其它更新 - [升级] ip 位置数据库更新至 2025-09-10 - 依赖更新 - [升级] protobuf-maven-plugin 版本升级至 3.9.0 - [升级] alipay-sdk-java 版本升级至 4.40.440.ALL - [升级] hypersistence-utils-hibernate-63 版本升级至 3.11.0 - [升级] software.amazon.awssdk 版本升级至 2.33.5 - [升级] software.amazon.awssdk.crt 版本升级至 0.38.11 - [升级] springdoc 版本升级至 2.8.13 - [升级] wxjava 版本升级至 4.7.7-20250904.091948 - [升级] webauthn4j 版本升级至 0.29.6.RELEASE、 - [升级] sweetalert2 版本升级至 11.23.0 - [升级] vue webjars 版本升级至 3.5.21 --- README.md | 6 +++--- configurations/docker/docker-compose/linux/herodotus/.env | 2 +- configurations/docker/docker-compose/windows/herodotus/.env | 2 +- dependencies/pom.xml | 2 +- modules/dante-module-common/pom.xml | 2 +- modules/dante-monomer-autoconfigure/pom.xml | 2 +- modules/pom.xml | 2 +- packages/authentication-spring-boot-starter/pom.xml | 2 +- packages/authorization-servlet-spring-boot-starter/pom.xml | 2 +- packages/facility-spring-boot-starter/pom.xml | 2 +- packages/pom.xml | 2 +- packages/rpc-client-uaa-spring-boot-starter/pom.xml | 2 +- packages/rpc-server-upms-spring-boot-starter/pom.xml | 2 +- platform/dante-cloud-gateway/pom.xml | 2 +- platform/dante-cloud-message/pom.xml | 2 +- platform/dante-cloud-monitor/pom.xml | 4 ++-- platform/dante-cloud-uaa/pom.xml | 2 +- platform/dante-cloud-upms/pom.xml | 4 ++-- platform/pom.xml | 2 +- pom.xml | 2 +- services/dante-cloud-bpmn-ability/pom.xml | 4 ++-- services/dante-cloud-bpmn-logic/pom.xml | 2 +- services/dante-cloud-oss-ability/pom.xml | 2 +- services/dante-monomer-application/pom.xml | 2 +- services/pom.xml | 2 +- 25 files changed, 30 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index c455960a..b1e44bf2 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ Nacos 3.0.3

- Version 3.5.5.2 - Dante Engine 3.5.5.2 - Dante OSS 3.5.5.2 + Version 3.5.5.3 + Dante Engine 3.5.5.3 + Dante OSS 3.5.5.3 Java 17 License Apache 2.0 码匠君 diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env index 3c6a46ab..db249153 100644 --- a/configurations/docker/docker-compose/linux/herodotus/.env +++ b/configurations/docker/docker-compose/linux/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.5.5.2 +VERSION=3.5.5.3 SPRING_PROFILES_ACTIVE=alibaba PROFILE=development DATABASE=postgresql diff --git a/configurations/docker/docker-compose/windows/herodotus/.env b/configurations/docker/docker-compose/windows/herodotus/.env index 75d96de8..80e51cbf 100644 --- a/configurations/docker/docker-compose/windows/herodotus/.env +++ b/configurations/docker/docker-compose/windows/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.5.5.2 +VERSION=3.5.5.3 SPRING_PROFILES_ACTIVE=alibaba PROFILE=development DATABASE=postgresql diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 32eded32..26658a11 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -28,7 +28,7 @@ cn.herodotus.engine dependencies - 3.5.5.2 + 3.5.5.3 diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml index 25d2e0b3..11aaa963 100644 --- a/modules/dante-module-common/pom.xml +++ b/modules/dante-module-common/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.5.5.2 + 3.5.5.3 dante-module-common diff --git a/modules/dante-monomer-autoconfigure/pom.xml b/modules/dante-monomer-autoconfigure/pom.xml index 91f88599..04091b66 100644 --- a/modules/dante-monomer-autoconfigure/pom.xml +++ b/modules/dante-monomer-autoconfigure/pom.xml @@ -27,7 +27,7 @@ org.dromara.dante modules - 3.5.5.2 + 3.5.5.3 dante-monomer-autoconfigure diff --git a/modules/pom.xml b/modules/pom.xml index 63e690f2..aee11d5c 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.5.2 + 3.5.5.3 modules diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index 076e67f6..a7a666d7 100644 --- a/packages/authentication-spring-boot-starter/pom.xml +++ b/packages/authentication-spring-boot-starter/pom.xml @@ -32,7 +32,7 @@ packages org.dromara.dante - 3.5.5.2 + 3.5.5.3 authentication-spring-boot-starter diff --git a/packages/authorization-servlet-spring-boot-starter/pom.xml b/packages/authorization-servlet-spring-boot-starter/pom.xml index c125ef12..388c4850 100644 --- a/packages/authorization-servlet-spring-boot-starter/pom.xml +++ b/packages/authorization-servlet-spring-boot-starter/pom.xml @@ -32,7 +32,7 @@ packages org.dromara.dante - 3.5.5.2 + 3.5.5.3 authorization-servlet-spring-boot-starter diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml index 2d698f2d..6124d4a5 100644 --- a/packages/facility-spring-boot-starter/pom.xml +++ b/packages/facility-spring-boot-starter/pom.xml @@ -30,7 +30,7 @@ packages org.dromara.dante - 3.5.5.2 + 3.5.5.3 4.0.0 diff --git a/packages/pom.xml b/packages/pom.xml index abf7be17..7c1150e9 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.5.2 + 3.5.5.3 packages diff --git a/packages/rpc-client-uaa-spring-boot-starter/pom.xml b/packages/rpc-client-uaa-spring-boot-starter/pom.xml index 931b3be1..70888f64 100644 --- a/packages/rpc-client-uaa-spring-boot-starter/pom.xml +++ b/packages/rpc-client-uaa-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante packages - 3.5.5.2 + 3.5.5.3 rpc-client-uaa-spring-boot-starter diff --git a/packages/rpc-server-upms-spring-boot-starter/pom.xml b/packages/rpc-server-upms-spring-boot-starter/pom.xml index 0234e2f3..08432677 100644 --- a/packages/rpc-server-upms-spring-boot-starter/pom.xml +++ b/packages/rpc-server-upms-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante packages - 3.5.5.2 + 3.5.5.3 rpc-server-upms-spring-boot-starter diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml index 20915269..daaed74d 100644 --- a/platform/dante-cloud-gateway/pom.xml +++ b/platform/dante-cloud-gateway/pom.xml @@ -32,7 +32,7 @@ platform org.dromara.dante - 3.5.5.2 + 3.5.5.3 dante-cloud-gateway diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml index 72a3eefa..24006574 100644 --- a/platform/dante-cloud-message/pom.xml +++ b/platform/dante-cloud-message/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante platform - 3.5.5.2 + 3.5.5.3 dante-cloud-message diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index ef29a479..78091ecb 100644 --- a/platform/dante-cloud-monitor/pom.xml +++ b/platform/dante-cloud-monitor/pom.xml @@ -30,11 +30,11 @@ platform org.dromara.dante - 3.5.5.2 + 3.5.5.3 dante-cloud-monitor - 3.5.5.2 + 3.5.5.3 dante-cloud-monitor dante-cloud-monitor diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml index 7ac97299..fd87964d 100644 --- a/platform/dante-cloud-uaa/pom.xml +++ b/platform/dante-cloud-uaa/pom.xml @@ -32,7 +32,7 @@ platform org.dromara.dante - 3.5.5.2 + 3.5.5.3 dante-cloud-uaa diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml index 706b7c58..f897f6b0 100644 --- a/platform/dante-cloud-upms/pom.xml +++ b/platform/dante-cloud-upms/pom.xml @@ -30,12 +30,12 @@ platform org.dromara.dante - 3.5.5.2 + 3.5.5.3 4.0.0 dante-cloud-upms - 3.5.5.2 + 3.5.5.3 diff --git a/platform/pom.xml b/platform/pom.xml index 8a106d9a..904b7a43 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.5.2 + 3.5.5.3 platform diff --git a/pom.xml b/pom.xml index 54f43150..805d4dd9 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.dromara.dante dependencies - 3.5.5.2 + 3.5.5.3 dependencies/pom.xml diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml index e3d3e40c..e21c8651 100644 --- a/services/dante-cloud-bpmn-ability/pom.xml +++ b/services/dante-cloud-bpmn-ability/pom.xml @@ -31,11 +31,11 @@ services org.dromara.dante - 3.5.5.2 + 3.5.5.3 dante-cloud-bpmn-ability - 3.5.5.2 + 3.5.5.3 dante-cloud-bpmn-ability 基于Camunda工作流的服务 diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml index d23d20a7..66407310 100644 --- a/services/dante-cloud-bpmn-logic/pom.xml +++ b/services/dante-cloud-bpmn-logic/pom.xml @@ -32,7 +32,7 @@ services org.dromara.dante - 3.5.5.2 + 3.5.5.3 dante-cloud-bpmn-logic diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml index 0910dd58..6ce447d9 100644 --- a/services/dante-cloud-oss-ability/pom.xml +++ b/services/dante-cloud-oss-ability/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante services - 3.5.5.2 + 3.5.5.3 dante-cloud-oss-ability diff --git a/services/dante-monomer-application/pom.xml b/services/dante-monomer-application/pom.xml index 368c1e8f..26496073 100644 --- a/services/dante-monomer-application/pom.xml +++ b/services/dante-monomer-application/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante services - 3.5.5.2 + 3.5.5.3 dante-monomer-application diff --git a/services/pom.xml b/services/pom.xml index 07f81790..3e50cd90 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.5.2 + 3.5.5.3 services -- Gitee