diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 11f579a436d39dad3301b5fdbd93cffa9ef3b03c..040346132671ca340047d47a11758e47ede7a3b9 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -15,12 +15,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out the repo - uses: actions/checkout@v7.0.0 + uses: actions/checkout@v7.0.1 with: ref: ${{ github.event.inputs.release_tag }} - name: Set up Apache Maven Central - uses: actions/setup-java@v5.4.0 + uses: actions/setup-java@v5.6.0 with: distribution: 'liberica' java-version: '25' diff --git a/README.md b/README.md index 8f8c8ef513917febbf46c418b4f8fcee0e66d518..06eb259de98bbfc7cdb55031646994d673649b9d 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ ---

- Spring Boot 4.1.0 - Spring Cloud 2025.1.2 + Spring Boot 4.1.1 + Spring Cloud 2025.1.3 Spring Cloud Alibaba 2025.1.0.0 Spring Cloud Tencent 2.1.2.0-2025.0.2 Nacos 3.2.3 @@ -15,11 +15,11 @@ 码匠君 License Apache 2.0 Java 25 - Version 4.1.0.4 - Dante Cloud 4.1.0.4 - ThingsBrain 4.1.0.4 - Dante Cloud UI 4.1.0.4 - Dante Cloud UI(New) 4.1.0.4 + Version 4.1.1.0 + Dante Cloud 4.1.1.0 + ThingsBrain 4.1.1.0 + Dante Cloud UI 4.1.1.0 + Dante Cloud UI(New) 4.1.1.0 Github star Github fork Gitee star @@ -155,8 +155,8 @@ dante-engine | 分支名称 | 对应 Spring 生态版本 | 对应 JDK 版本 | 用途 | 现状 | |:----------------------:|-----------------------------------------|-----------|----------------|-------------------------------------------------------------| -| master | Spring Boot 4.1 和 Spring Cloud 2025.1.2 | JDK 25 | 主要发布分支 | 推荐使用代码分支 | -| develop | Spring Boot 4.1 和 Spring Cloud 2025.1.2 | JDK 25 | Development 分支 | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支 | +| master | Spring Boot 4.1 和 Spring Cloud 2025.1.3 | JDK 25 | 主要发布分支 | 推荐使用代码分支 | +| develop | Spring Boot 4.1 和 Spring Cloud 2025.1.3 | JDK 25 | Development 分支 | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支 | | 4.0.X | Spring Boot 4.0 和 Spring Cloud 2025.1.1 | JDK 25 | 历史版本，停止维护 | 基于 Spring Boot 4.0 时代开发的代码分支，稳定可用，停止维护 | | 3.5.X | Spring Boot 3.5 和 Spring Cloud 2025.0.X | JDK 17 | 历史版本，停止维护 | 基于 Spring Boot 3.5 时代开发的代码分支，稳定可用，停止维护 | | 3.4.X | Spring Boot 3.4 和 Spring Cloud 2024.0.X | JDK 17 | 历史版本，停止维护 | 基于 Spring Boot 3.4 时代开发的代码分支，稳定可用，停止维护 | diff --git a/dante-assistant/dante-assistant-access/pom.xml b/dante-assistant/dante-assistant-access/pom.xml index 23e5d0ade157549ea9a4cf3eda8bb6f8ef212a30..490d8c776fe25fea36067751e79acf5e8ce78e8e 100644 --- a/dante-assistant/dante-assistant-access/pom.xml +++ b/dante-assistant/dante-assistant-access/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-assistant - 4.1.0.4 + 4.1.1.0 dante-assistant-access diff --git a/dante-assistant/dante-assistant-captcha/pom.xml b/dante-assistant/dante-assistant-captcha/pom.xml index ccd3dfd99e486962771acd503a343de719678eb9..7dfb0c83264989cd9ee4527b51a6371b2a35d6fe 100644 --- a/dante-assistant/dante-assistant-captcha/pom.xml +++ b/dante-assistant/dante-assistant-captcha/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-assistant - 4.1.0.4 + 4.1.1.0 dante-assistant-captcha diff --git a/dante-assistant/dante-assistant-oss/pom.xml b/dante-assistant/dante-assistant-oss/pom.xml index 34de6cb7aaf9c785d602cf577a61c7439707487c..14cdd4d3a4f79ad2440028c0335b0fc9a0e1b55b 100644 --- a/dante-assistant/dante-assistant-oss/pom.xml +++ b/dante-assistant/dante-assistant-oss/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-assistant - 4.1.0.4 + 4.1.1.0 dante-assistant-oss diff --git a/dante-assistant/pom.xml b/dante-assistant/pom.xml index 3146db740da245c8f9e24e99590b5f1ac00e5b00..50d927a16b16f2d801a6207bedc06bea3703bf3b 100644 --- a/dante-assistant/pom.xml +++ b/dante-assistant/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-engine - 4.1.0.4 + 4.1.1.0 dante-assistant diff --git a/dante-data/dante-data-commons/pom.xml b/dante-data/dante-data-commons/pom.xml index 503d391f9318f7bea4dc4474c6a3dc96ccdd3ae9..f1ea19b6d665244c05c1313480dd1947e659e47d 100644 --- a/dante-data/dante-data-commons/pom.xml +++ b/dante-data/dante-data-commons/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-data - 4.1.0.4 + 4.1.1.0 dante-data-commons diff --git a/dante-data/dante-data-commons/src/main/java/cn/herodotus/dante/data/commons/entity/AbstractEntity.java b/dante-data/dante-data-commons/src/main/java/cn/herodotus/dante/data/commons/entity/AbstractEntity.java index 517ac02e9602b21f2a5dad96976fa1d3c6833afe..58823098fb2ed78b98b642dd0db8d996b2cba252 100644 --- a/dante-data/dante-data-commons/src/main/java/cn/herodotus/dante/data/commons/entity/AbstractEntity.java +++ b/dante-data/dante-data-commons/src/main/java/cn/herodotus/dante/data/commons/entity/AbstractEntity.java @@ -31,6 +31,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.google.common.base.MoreObjects; import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDateTime; import java.util.Date; /** @@ -48,25 +49,25 @@ public abstract class AbstractEntity implements BaseEntity { @Schema(name = "数据创建时间", title = "数据库审计通用字段", description = "该字段仅用于数据显示，具体的数据设置由各自 Spring Data Module 负责设置") @JsonFormat(pattern = SystemConstants.PATTERN__DATE_TIME) - private Date createTime = new Date(); + private LocalDateTime createTime = LocalDateTime.now(); @Schema(name = "数据更新时间", title = "数据库审计通用字段", description = "该字段仅用于数据显示，具体的数据设置由各自 Spring Data Module 负责设置") @JsonFormat(pattern = SystemConstants.PATTERN__DATE_TIME) - private Date updateTime = new Date(); + private LocalDateTime updateTime = LocalDateTime.now(); - public Date getCreateTime() { + public LocalDateTime getCreateTime() { return createTime; } - public void setCreateTime(Date createTime) { + public void setCreateTime(LocalDateTime createTime) { this.createTime = createTime; } - public Date getUpdateTime() { + public LocalDateTime getUpdateTime() { return updateTime; } - public void setUpdateTime(Date updateTime) { + public void setUpdateTime(LocalDateTime updateTime) { this.updateTime = updateTime; } diff --git a/dante-data/dante-data-jpa/pom.xml b/dante-data/dante-data-jpa/pom.xml index 1111c064092d00de09e58614cc32403f50fd3803..ec321bbcc303ea52e51dda69ff5b7544fd87798c 100644 --- a/dante-data/dante-data-jpa/pom.xml +++ b/dante-data/dante-data-jpa/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-data - 4.1.0.4 + 4.1.1.0 dante-data-jpa diff --git a/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/entity/AbstractEntity.java b/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/entity/AbstractEntity.java index ed9494ad10876c7aad94865cbb269f6e64533000..1e929e66979ec8692c9d4bc99dfea85b89f104d5 100644 --- a/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/entity/AbstractEntity.java +++ b/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/entity/AbstractEntity.java @@ -36,7 +36,7 @@ import jakarta.persistence.MappedSuperclass; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; -import java.util.Date; +import java.time.LocalDateTime; /** *

Description: 通用的基础实体定义

@@ -53,27 +53,27 @@ public abstract class AbstractEntity implements BaseEntity { @Column(name = "create_time", updatable = false) @CreatedDate @JsonFormat(pattern = SystemConstants.PATTERN__DATE_TIME) - private Date createTime = new Date(); + private LocalDateTime createTime = LocalDateTime.now(); @Schema(name = "数据更新时间", title = "数据库审计通用字段", description = "由 JPA 自动填充无需手动设置") @Column(name = "update_time") @LastModifiedDate @JsonFormat(pattern = SystemConstants.PATTERN__DATE_TIME) - private Date updateTime = new Date(); + private LocalDateTime updateTime = LocalDateTime.now(); - public Date getCreateTime() { + public LocalDateTime getCreateTime() { return createTime; } - public void setCreateTime(Date createTime) { + public void setCreateTime(LocalDateTime createTime) { this.createTime = createTime; } - public Date getUpdateTime() { + public LocalDateTime getUpdateTime() { return updateTime; } - public void setUpdateTime(Date updateTime) { + public void setUpdateTime(LocalDateTime updateTime) { this.updateTime = updateTime; } diff --git a/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/repository/BaseJpaRepository.java b/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/repository/BaseJpaRepository.java index 85ebeafc2b171fe2b395e68821d7ad38ea42d2ab..2bbe3a8d87d6df412a4f2b4ba1e3edbc17ea934b 100644 --- a/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/repository/BaseJpaRepository.java +++ b/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/repository/BaseJpaRepository.java @@ -36,7 +36,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.QueryHints; import org.springframework.data.repository.NoRepositoryBean; -import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; import java.util.List; @@ -51,55 +50,51 @@ import java.util.Optional; @NoRepositoryBean public interface BaseJpaRepository extends JpaRepository, JpaSpecificationExecutor { - @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) @Override + @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) List findAll(); - @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) @Override + @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) List findAll(Sort sort); - @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) @Override + @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) Page findAll(Pageable pageable); - @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) @Override + @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) List findAll(Specification specification); - @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) @Override + @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) List findAll(Specification specification, Sort sort); - @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) @Override + @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) Page findAll(Specification specification, Pageable pageable); - @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) @Override + @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) Optional findById(ID id); - @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) @Override + @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) Optional findOne(Specification specification); - @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) @Override + @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) List findAllById(Iterable ids); - @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) @Override + @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) long count(Specification specification); - @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) @Override + @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) long count(); - @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) @Override + @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) E getReferenceById(ID id); - - @Transactional - @Override - void deleteById(ID id); } diff --git a/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/service/AbstractJpaService.java b/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/service/AbstractJpaService.java index eaf4467732b60292e16e41b90d4d09be194b410c..c4a0b17bf20f2a1d3d17ac5f2126e0fb53cdab4e 100644 --- a/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/service/AbstractJpaService.java +++ b/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/service/AbstractJpaService.java @@ -27,6 +27,13 @@ package cn.herodotus.dante.data.jpa.service; import cn.herodotus.dante.core.constant.SymbolConstants; import cn.herodotus.dante.core.domain.BaseEntity; +import cn.herodotus.dante.data.jpa.entity.AbstractEntity; +import com.google.common.reflect.TypeToken; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.data.jpa.domain.Specification; import java.io.Serializable; @@ -41,4 +48,25 @@ public abstract class AbstractJpaService findByCondition(Specification specification, int pageNumber, int pageSize) { + + Pageable pageable = PageRequest.of(pageNumber, pageSize); + + TypeToken typeToken = new TypeToken<>(getClass()) { + }; + if (typeToken.isSubtypeOf(AbstractEntity.class)) { + pageable = PageRequest.of(pageNumber, pageSize, Sort.by(Sort.Direction.DESC, "updateTime")); + } + + return findByPage(specification, pageable); + } } diff --git a/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/service/BaseJpaReadableService.java b/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/service/BaseJpaReadableService.java index 9be4b8d6b55ac357693f94fb31632afd291f6437..d087f1629599d5f6be1b937f036f25ada538b930 100644 --- a/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/service/BaseJpaReadableService.java +++ b/dante-data/dante-data-jpa/src/main/java/cn/herodotus/dante/data/jpa/service/BaseJpaReadableService.java @@ -187,19 +187,21 @@ public interface BaseJpaReadableService findByPage(Specification specification, int pageNumber, int pageSize) { - return getRepository().findAll(specification, PageRequest.of(pageNumber, pageSize)); + return findByPage(specification, PageRequest.of(pageNumber, pageSize)); } /** * 查询分页数据 * - * @param pageNumber 当前页码, 起始页码 0 - * @param pageSize 每页显示的数据条数 - * @param direction {@link Sort.Direction} + * @param specification {@link Specification} + * @param pageNumber 当前页码, 起始页码 0 + * @param pageSize 每页显示的数据条数 + * @param direction 排序方向 {@link Sort.Direction} + * @param properties 需要排序的字段 * @return 分页数据 */ - default Page findByPage(int pageNumber, int pageSize, Sort.Direction direction) { - return findByPage(PageRequest.of(pageNumber, pageSize, direction)); + default Page findByPage(Specification specification, int pageNumber, int pageSize, Sort.Direction direction, String... properties) { + return findByPage(specification, PageRequest.of(pageNumber, pageSize, direction, properties)); } /** diff --git a/dante-data/dante-data-rest/pom.xml b/dante-data/dante-data-rest/pom.xml index 43cc17c7b2e21da2b3ca4f499aaa4b3aaf11c5f9..c691bf3a591f18d132f111eab8697b31ecac8734 100644 --- a/dante-data/dante-data-rest/pom.xml +++ b/dante-data/dante-data-rest/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-data - 4.1.0.4 + 4.1.1.0 dante-data-rest diff --git a/dante-data/pom.xml b/dante-data/pom.xml index ef6733480b3c2d0b48e59307a56127a209ac4ce8..3e55a47f569086b9cce3ab27d7ed05de63dbf831 100644 --- a/dante-data/pom.xml +++ b/dante-data/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-engine - 4.1.0.4 + 4.1.1.0 dante-data diff --git a/dante-dependencies/pom.xml b/dante-dependencies/pom.xml index 76c7dbd77c6916358a64d2abec6842eb9eccb59b..568a815e6233fcbbdf983ed5580195a8366d358f 100644 --- a/dante-dependencies/pom.xml +++ b/dante-dependencies/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.ecosystem herodotus-ecosystem-dependencies - 4.1.0.4 + 4.1.1.0 diff --git a/dante-framework/dante-autoconfigure/pom.xml b/dante-framework/dante-autoconfigure/pom.xml index 32cda5aa846756a0f477c9df1f776496512a631a..619cdbdd9a11664ae7084a3745ec57878a320368 100644 --- a/dante-framework/dante-autoconfigure/pom.xml +++ b/dante-framework/dante-autoconfigure/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-framework - 4.1.0.4 + 4.1.1.0 dante-autoconfigure diff --git a/dante-framework/dante-cache/pom.xml b/dante-framework/dante-cache/pom.xml index 1b14e6e3eb2ab5dcea60a835db55d6ba672a265d..6703223671551dfa60e6acad6ac0cc71586cd84e 100644 --- a/dante-framework/dante-cache/pom.xml +++ b/dante-framework/dante-cache/pom.xml @@ -6,7 +6,7 @@ cn.herodotus.dante dante-framework - 4.1.0.4 + 4.1.1.0 dante-cache diff --git a/dante-framework/dante-core/pom.xml b/dante-framework/dante-core/pom.xml index 10db889456546835e807fa07d23c550a2317c2af..a9b5547a6f885ae19222070195afbd27be697bc1 100644 --- a/dante-framework/dante-core/pom.xml +++ b/dante-framework/dante-core/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-framework - 4.1.0.4 + 4.1.1.0 dante-core diff --git a/dante-framework/dante-core/src/main/java/cn/herodotus/dante/core/constant/SystemConstants.java b/dante-framework/dante-core/src/main/java/cn/herodotus/dante/core/constant/SystemConstants.java index 4a66776372c062ebf3431abcfe91663acab7a73d..876fd72033ed691b8a95b50d0d1cf1f7493c4d23 100644 --- a/dante-framework/dante-core/src/main/java/cn/herodotus/dante/core/constant/SystemConstants.java +++ b/dante-framework/dante-core/src/main/java/cn/herodotus/dante/core/constant/SystemConstants.java @@ -40,6 +40,10 @@ public interface SystemConstants { * 默认租户ID */ String TENANT_ID = "public"; + /** + * 默认的 API 版本 + */ + String API_VERSION = "v1"; /** * 默认树形结构根节点 */ @@ -58,16 +62,31 @@ public interface SystemConstants { */ String DATA_TYPE__STRING = "STRING"; String DATA_TYPE__NUMBER = "NUMBER"; + /** + * gRPC 服务发现协议 + */ + String GRPC__DISCOVERY_SCHEMA = "discovery"; + String GRPC__DISCOVERY_PROTOCOL = GRPC__DISCOVERY_SCHEMA + ":///"; + /** + * 常用状态值 + */ + String STATUS__SUCCESS = "success"; + String STATUS__FAILURE = "failure"; + String STATUS__ERROR = "error"; /* ---------- 系统信息 ---------- */ + String DN_CN = "*.herodotus.cn"; + String DN_C = "CN"; + String DN_ST = "YUNNAN"; + String DN_L = "KUNMING"; + String DN_O = "Herodotus"; String DN_OU = "Herodotus Cloud"; String WEBSITE = "https://www.herodotus.cn"; - String COPYRIGHT_DETAILS = "Apache-2.0 Licensed | Copyright © 2020-2030 码 匠 君"; + String COPYRIGHT_DETAILS = "AGPL-3.0 Licensed | Copyright © 2020-2030 码 匠 君"; String SYSTEM_NAME = DN_OU; String OPEN_API_SECURITY_SCHEME_BEARER_NAME = "HERODOTUS_AUTH"; - /* ---------- OAuth2 相关常量 ---------- */ String BEARER_TYPE = "Bearer"; @@ -89,19 +108,23 @@ public interface SystemConstants { String OIDC_CLIENT_REGISTRATION_ENDPOINT = "/connect/register"; String OIDC_LOGOUT_ENDPOINT = "/connect/logout"; String OIDC_USER_INFO_ENDPOINT = "/userinfo"; + String WEBAUTHN_AUTHENTICATE_OPTIONS_ENDPOINT = "/webauthn/authenticate/options"; + String WEBAUTHN_REGISTER_OPTIONS_ENDPOINT = "/webauthn/register/options"; + String WEBAUTHN_REGISTER_ENDPOINT = "/webauthn/register"; /** * OAuth2 Custom Endpoint */ String OAUTH2_AUTHORIZATION_CONSENT_URI = "/oauth2/consent"; String OAUTH2_DEVICE_ACTIVATION_URI = "/oauth2/device_activation"; - String OAUTH2_DEVICE_VERIFICATION_SUCCESS_URI = "/device_activated"; + String OAUTH2_DEVICE_VERIFICATION_SUCCESS_URI = "/device_activation_success"; String OAUTH2_DEVICE_VERIFICATION_FAILURE_URI = "/device_activation_failure"; /** - * Oauth2 模式类型 + * OAuth2 模式类型 */ String USERNAME = "username"; String PASSWORD = "password"; String SOCIAL_CREDENTIALS = "social_credentials"; + String WEBAUTHN_CREDENTIALS = "webauthn_credentials"; /** * OAuth2 Token Custom Attribute */ @@ -115,7 +138,7 @@ public interface SystemConstants { String LICENSE = "license"; String COPYRIGHT = "copyright"; /** - * 从 OidcScope 中拷贝的默认 Scope 方便以后使用 + * 从 OidcScope 中拷贝的 OAuth2 默认 Scope 方便以后使用 */ String SCOPE_OPENID = "openid"; String SCOPE_EMAIL = "email"; @@ -142,6 +165,7 @@ public interface SystemConstants { */ String MATCHER__STATIC = "/static/**"; String MATCHER__WEBJARS = "/webjars/**"; + String MATCHER__BPMN = "/engine-rest/**"; /** * 默认用户 Session 属性 */ @@ -149,7 +173,13 @@ public interface SystemConstants { /** * 签名算法属性 */ + String KEY__PRODUCT_KEY = "productKey"; + String KEY__DEVICE_NAME = "deviceName"; + String KEY__CLIENT_ID = "clientId"; + String KEY__SECURE_MODE = "securemode"; + String KEY__SIGNATURE_METHOD = "signMethod"; String KEY__TIMESTAMP = "timestamp"; + String KEY__AUTH_TYPE = "authType"; String KEY__RANDOM = "random"; /* ---------- OSS 相关常量 ---------- */ @@ -183,6 +213,6 @@ public interface SystemConstants { *

* 定义测试用途的通用目录，外部资源的统一使用和管控。 */ - String TESTING__WINDOWS_DEFAULT_FOLDER = "D:/workspaces/Testing"; + String TESTING__WINDOWS_DEFAULT_FOLDER = "D:/workspaces/testing"; } diff --git a/dante-framework/dante-core/src/main/java/cn/herodotus/dante/core/domain/Result.java b/dante-framework/dante-core/src/main/java/cn/herodotus/dante/core/domain/Result.java index ddf93b615b990c9c726ee2b244cff210368cb0c6..b6f74e8e8582f31d66656eb78bc2412d4342f377 100644 --- a/dante-framework/dante-core/src/main/java/cn/herodotus/dante/core/domain/Result.java +++ b/dante-framework/dante-core/src/main/java/cn/herodotus/dante/core/domain/Result.java @@ -269,14 +269,14 @@ public class Result extends Response { public Map toModel() { Map result = createModel(); result.put("data", getData()); - result.put("error", error); + result.put(SystemConstants.STATUS__ERROR, error); return result; } public Map toErrorModel() { Map result = createModel(); result.put("exception", getData()); - result.put("error", ObjectUtils.isNotEmpty(getError()) ? getError().getDetail() : StringUtils.EMPTY); + result.put(SystemConstants.STATUS__ERROR, ObjectUtils.isNotEmpty(getError()) ? getError().getDetail() : StringUtils.EMPTY); // result.put("trace", ObjectUtils.isNotEmpty(getError()) ? getError().getStackTrace() : null); return result; } diff --git a/dante-framework/dante-hibernate/pom.xml b/dante-framework/dante-hibernate/pom.xml index 38415feae8f0c10a891d3ba8f132092f5c8fd8af..df6a581b371b2359c6947dd40ef1b78c2442e4f0 100644 --- a/dante-framework/dante-hibernate/pom.xml +++ b/dante-framework/dante-hibernate/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-framework - 4.1.0.4 + 4.1.1.0 dante-hibernate @@ -46,7 +46,7 @@ - p6spy + cn.unikue.forkextension.p6spy p6spy diff --git a/dante-framework/dante-hibernate/src/main/java/cn/herodotus/dante/hibernate/p6spy/P6SpyMessageFormatting.java b/dante-framework/dante-hibernate/src/main/java/cn/herodotus/dante/hibernate/p6spy/P6SpyMessageFormatting.java index 7a962ca8419b6fd69f0d0293800170c2e9426d7c..87e5737ccd2b106b9dc81ec3f42a4a764b0c605d 100644 --- a/dante-framework/dante-hibernate/src/main/java/cn/herodotus/dante/hibernate/p6spy/P6SpyMessageFormatting.java +++ b/dante-framework/dante-hibernate/src/main/java/cn/herodotus/dante/hibernate/p6spy/P6SpyMessageFormatting.java @@ -45,13 +45,6 @@ public class P6SpyMessageFormatting implements MessageFormattingStrategy { @Override public String formatMessage(int connectionId, String now, long elapsed, String category, String prepared, String sql, String url) { - /** - * - * StringBuilder 是为了避免字符串拼接过程中产生很多不必要的字符串对象。 - * 经过编译器优化，多个字符串相‘+’，优化后，与StringBuilder等价 - * - * 关注idea的“'StringBuilder builder' can be replaced with 'String'”提示 - */ String builder = this.format.format(new Date()) + " | took " + elapsed + "ms | " + @@ -63,6 +56,6 @@ public class P6SpyMessageFormatting implements MessageFormattingStrategy { "\n------------------------| " + sql + ";"; - return StringUtils.isNotEmpty(sql.trim()) ? String.valueOf(builder) : ""; + return StringUtils.isNotEmpty(sql.trim()) ? builder : ""; } } diff --git a/dante-framework/dante-security/pom.xml b/dante-framework/dante-security/pom.xml index aa2f8634ecf784cf94864ed99a7396af270174e8..d77d504aad1e785dfd23363ea806e173dbb32421 100644 --- a/dante-framework/dante-security/pom.xml +++ b/dante-framework/dante-security/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-framework - 4.1.0.4 + 4.1.1.0 dante-security diff --git a/dante-framework/dante-spring/pom.xml b/dante-framework/dante-spring/pom.xml index 108e99aa4c19b535ac8de8618ae55d52048dad01..ee1aa7676ab2e4c9eca08f0c0f58920d3e700d7e 100644 --- a/dante-framework/dante-spring/pom.xml +++ b/dante-framework/dante-spring/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-framework - 4.1.0.4 + 4.1.1.0 dante-spring diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/event/AbstractApplicationEvent.java b/dante-framework/dante-spring/src/main/java/cn/herodotus/dante/spring/event/AbstractApplicationEvent.java similarity index 96% rename from dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/event/AbstractApplicationEvent.java rename to dante-framework/dante-spring/src/main/java/cn/herodotus/dante/spring/event/AbstractApplicationEvent.java index 789c32dd517241b43ac466a5e234e44ea83d9288..3d27eda4428dd04bbfbd4c72f5c4977c744d256a 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/event/AbstractApplicationEvent.java +++ b/dante-framework/dante-spring/src/main/java/cn/herodotus/dante/spring/event/AbstractApplicationEvent.java @@ -23,7 +23,7 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package cn.herodotus.dante.message.commons.definition.event; +package cn.herodotus.dante.spring.event; import org.springframework.context.ApplicationEvent; diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/event/ApplicationStrategyEventManager.java b/dante-framework/dante-spring/src/main/java/cn/herodotus/dante/spring/event/ApplicationStrategyEventManager.java similarity index 96% rename from dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/event/ApplicationStrategyEventManager.java rename to dante-framework/dante-spring/src/main/java/cn/herodotus/dante/spring/event/ApplicationStrategyEventManager.java index 37d953ae9d9e6aad6566ff3d7bde9229859e6523..3dd4f88862838eabd98e5dc48f429a9a521c85e3 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/event/ApplicationStrategyEventManager.java +++ b/dante-framework/dante-spring/src/main/java/cn/herodotus/dante/spring/event/ApplicationStrategyEventManager.java @@ -23,7 +23,7 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package cn.herodotus.dante.message.commons.definition.event; +package cn.herodotus.dante.spring.event; /** *

Description: 应用策略事件

diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/event/StrategyEventManager.java b/dante-framework/dante-spring/src/main/java/cn/herodotus/dante/spring/event/StrategyEventManager.java similarity index 98% rename from dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/event/StrategyEventManager.java rename to dante-framework/dante-spring/src/main/java/cn/herodotus/dante/spring/event/StrategyEventManager.java index 078d6a8a1fdbfbb788a0280907420e20e1a22857..9c01246cca6b53525dffad360b7b44e1bdc56287 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/event/StrategyEventManager.java +++ b/dante-framework/dante-spring/src/main/java/cn/herodotus/dante/spring/event/StrategyEventManager.java @@ -23,7 +23,7 @@ * 6. 若您的项目无法满足以上几点，可申请商业授权 */ -package cn.herodotus.dante.message.commons.definition.event; +package cn.herodotus.dante.spring.event; import cn.herodotus.dante.core.jackson.JacksonUtils; import cn.herodotus.dante.spring.context.ServiceContextHolder; diff --git a/dante-framework/dante-web/pom.xml b/dante-framework/dante-web/pom.xml index 5bc10a1aa9e10418967631bb8531d1413bfd1964..633502920b601d7a7a232bc14b89d74d24c0b2f0 100644 --- a/dante-framework/dante-web/pom.xml +++ b/dante-framework/dante-web/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-framework - 4.1.0.4 + 4.1.1.0 dante-web diff --git a/dante-framework/pom.xml b/dante-framework/pom.xml index 2ecc84b31c2e78ff234b22b717514101c47f2daf..f1cfff2b87c72ba6cdf4b239531358581c9829df 100644 --- a/dante-framework/pom.xml +++ b/dante-framework/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-engine - 4.1.0.4 + 4.1.1.0 dante-framework diff --git a/dante-logic/dante-logic-identity/pom.xml b/dante-logic/dante-logic-identity/pom.xml index 8b312fac54365561b8001edeaf8c5136c47d8b75..9a2b7ca53a89267b840a7e478a06fb48178403ed 100644 --- a/dante-logic/dante-logic-identity/pom.xml +++ b/dante-logic/dante-logic-identity/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-logic - 4.1.0.4 + 4.1.1.0 dante-logic-identity diff --git a/dante-logic/dante-logic-message/pom.xml b/dante-logic/dante-logic-message/pom.xml index 7e901380294974ef2c00ac88ad7976ea96f4eb02..4e67f0bbef914c3d9b6e0f281c4623aec0e811c9 100644 --- a/dante-logic/dante-logic-message/pom.xml +++ b/dante-logic/dante-logic-message/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-logic - 4.1.0.4 + 4.1.1.0 dante-logic-message diff --git a/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/entity/PullStamp.java b/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/entity/PullStamp.java index 27c02a38d6d7f41ae40e82d59a3cd08f1a9765fa..a6ab40bd7a5f13ec71b8fd6356c0424ad86ab03f 100644 --- a/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/entity/PullStamp.java +++ b/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/entity/PullStamp.java @@ -35,7 +35,7 @@ import jakarta.persistence.*; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.UuidGenerator; -import java.util.Date; +import java.time.LocalDateTime; /** *

Description: 信息拉取标记

@@ -69,7 +69,7 @@ public class PullStamp implements BaseEntity { @Schema(name = "上次拉取时间") @Column(name = "latest_pull_time", updatable = false) @JsonFormat(pattern = SystemConstants.PATTERN__DATE_TIME) - private Date latestPullTime = new Date(); + private LocalDateTime latestPullTime = LocalDateTime.now(); public String getStampId() { return stampId; @@ -95,11 +95,11 @@ public class PullStamp implements BaseEntity { this.source = source; } - public Date getLatestPullTime() { + public LocalDateTime getLatestPullTime() { return latestPullTime; } - public void setLatestPullTime(Date latestPullTime) { + public void setLatestPullTime(LocalDateTime latestPullTime) { this.latestPullTime = latestPullTime; } diff --git a/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/repository/AnnouncementRepository.java b/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/repository/AnnouncementRepository.java index 00ea4d7291c2f361a6b4baaa3029685f5a5f427e..10304a7c8c1957cb9a91ebbdfec35f8636770371 100644 --- a/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/repository/AnnouncementRepository.java +++ b/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/repository/AnnouncementRepository.java @@ -31,7 +31,7 @@ import jakarta.persistence.QueryHint; import org.hibernate.jpa.AvailableHints; import org.springframework.data.jpa.repository.QueryHints; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; /** @@ -43,5 +43,5 @@ import java.util.List; public interface AnnouncementRepository extends BaseJpaRepository { @QueryHints(@QueryHint(name = AvailableHints.HINT_CACHEABLE, value = "true")) - List findAllByCreateTimeAfter(Date stamp); + List findAllByCreateTimeAfter(LocalDateTime stamp); } diff --git a/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/service/AnnouncementService.java b/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/service/AnnouncementService.java index 899aac96509a9f8657b6c0e1ac248e0545dd476b..9d5376baf03ce610fb6879d5d2f9108bc78ce0e7 100644 --- a/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/service/AnnouncementService.java +++ b/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/service/AnnouncementService.java @@ -31,7 +31,7 @@ import cn.herodotus.dante.logic.message.entity.Announcement; import cn.herodotus.dante.logic.message.repository.AnnouncementRepository; import org.springframework.stereotype.Service; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; /** @@ -54,7 +54,7 @@ public class AnnouncementService extends AbstractJpaService pullAnnouncements(Date stamp) { + public List pullAnnouncements(LocalDateTime stamp) { return announcementRepository.findAllByCreateTimeAfter(stamp); } } diff --git a/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/service/PullStampService.java b/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/service/PullStampService.java index b246096647102318cd37d0d63101b87af3a87d2e..25d6803b1d1cb5021002b913def5a6d2a73a07cf 100644 --- a/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/service/PullStampService.java +++ b/dante-logic/dante-logic-message/src/main/java/cn/herodotus/dante/logic/message/service/PullStampService.java @@ -32,7 +32,7 @@ import cn.herodotus.dante.logic.message.repository.PullStampRepository; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; -import java.util.Date; +import java.time.LocalDateTime; /** *

Description: MessagePullStampService

@@ -65,7 +65,7 @@ public class PullStampService extends AbstractJpaService { stamp = new PullStamp(); stamp.setUserId(userId); } - stamp.setLatestPullTime(new Date()); + stamp.setLatestPullTime(LocalDateTime.now()); return this.save(stamp); } diff --git a/dante-logic/dante-logic-upms/pom.xml b/dante-logic/dante-logic-upms/pom.xml index 1625fb58b165a5d8f1c9bbd8c6e300b1909f0a95..86af6e07f3fa6c4e0c3b843117890b05243c262b 100644 --- a/dante-logic/dante-logic-upms/pom.xml +++ b/dante-logic/dante-logic-upms/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-logic - 4.1.0.4 + 4.1.1.0 dante-logic-upms diff --git a/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/domain/event/SysAttributeChangeEvent.java b/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/domain/event/SysAttributeChangeEvent.java index f32d7c949261bd9301db50b93c5f160bb825da51..d0c8d8c10a23b91e8074704b66679b56fc7aae3e 100644 --- a/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/domain/event/SysAttributeChangeEvent.java +++ b/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/domain/event/SysAttributeChangeEvent.java @@ -26,7 +26,7 @@ package cn.herodotus.dante.logic.upms.domain.event; import cn.herodotus.dante.logic.upms.entity.security.SysAttribute; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import java.time.Clock; diff --git a/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/entity/hr/SysEmployee.java b/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/entity/hr/SysEmployee.java index e9e115daa9be63107bfacfab55ae14afe7651fcd..54ca9406343848a067ed6600cea703c4a4b09cb4 100644 --- a/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/entity/hr/SysEmployee.java +++ b/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/entity/hr/SysEmployee.java @@ -33,6 +33,7 @@ import cn.herodotus.dante.logic.upms.entity.security.SysUser; import cn.herodotus.dante.logic.upms.enums.Gender; import cn.herodotus.dante.logic.upms.enums.Identity; import cn.herodotus.dante.security.enums.AccountCategory; +import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; import com.google.common.base.MoreObjects; @@ -147,8 +148,9 @@ public class SysEmployee extends AbstractSysEntity implements SocialUserDetails private Set departments = new HashSet<>(); @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = LogicUpmsConstants.REGION_SYS_USER) - @JsonDeserialize(using = SysUserEmptyToNull.class) @OneToOne(mappedBy = "employee", cascade = CascadeType.ALL) + @JsonDeserialize(using = SysUserEmptyToNull.class) + @JsonBackReference private SysUser user; public SysUser getUser() { diff --git a/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/entity/security/SysUser.java b/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/entity/security/SysUser.java index 9562f600a68325e591071e318ec0d52b33c00bd1..3373a0fb851eeb28d23e7030f5a54eb56fa1d380 100644 --- a/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/entity/security/SysUser.java +++ b/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/entity/security/SysUser.java @@ -38,6 +38,7 @@ import cn.herodotus.dante.logic.upms.constant.LogicUpmsConstants; import cn.herodotus.dante.logic.upms.domain.deserializer.SysEmployeeEmptyToNull; import cn.herodotus.dante.logic.upms.entity.hr.SysEmployee; import com.fasterxml.jackson.annotation.JsonIdentityInfo; +import com.fasterxml.jackson.annotation.JsonManagedReference; import com.fasterxml.jackson.annotation.ObjectIdGenerators; import com.google.common.base.MoreObjects; import io.swagger.v3.oas.annotations.media.Schema; @@ -136,7 +137,6 @@ public class SysUser extends AbstractSysEntity { *

* 因为 @ManyToMany 使用的是集合，空对象不会被转成对象Set进去。 */ - @JsonDeserialize(using = SysEmployeeEmptyToNull.class) @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = LogicUpmsConstants.REGION_SYS_EMPLOYEE) @Schema(name = "人员") @OneToOne(fetch = FetchType.LAZY) @@ -145,6 +145,8 @@ public class SysUser extends AbstractSysEntity { inverseJoinColumns = {@JoinColumn(name = "employee_id")}, uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "employee_id"})}, indexes = {@Index(name = "sys_user_employee_sid_idx", columnList = "user_id"), @Index(name = "sys_user_employee_eid_idx", columnList = "employee_id")}) + @JsonManagedReference + @JsonDeserialize(using = SysEmployeeEmptyToNull.class) private SysEmployee employee; public String getPhoneNumber() { diff --git a/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/service/security/SysAttributeService.java b/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/service/security/SysAttributeService.java index 2e7203eaf515e9dc2e6f8e3d10a657a122647d71..2a4a55117ee88fe53e1238f845b73daf02042d97 100644 --- a/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/service/security/SysAttributeService.java +++ b/dante-logic/dante-logic-upms/src/main/java/cn/herodotus/dante/logic/upms/service/security/SysAttributeService.java @@ -32,7 +32,11 @@ import cn.herodotus.dante.logic.upms.entity.security.SysPermission; import cn.herodotus.dante.logic.upms.repository.security.SysAttributeRepository; import org.springframework.stereotype.Service; -import java.util.*; +import java.time.LocalDateTime; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; /** *

Description: SysAttributeService

@@ -69,7 +73,7 @@ public class SysAttributeService extends AbstractJpaService cn.herodotus.dante dante-engine - 4.1.0.4 + 4.1.1.0 dante-logic diff --git a/dante-message/dante-message-autoconfigure/pom.xml b/dante-message/dante-message-autoconfigure/pom.xml index 448b3174bd934bad4fd8222356211365574cfac6..042f3f192b92ff9b44b3a67881644bf1999fcab8 100644 --- a/dante-message/dante-message-autoconfigure/pom.xml +++ b/dante-message/dante-message-autoconfigure/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-message - 4.1.0.4 + 4.1.1.0 dante-message-autoconfigure diff --git a/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/emqx/WebhookMapToEventTransformer.java b/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/emqx/WebhookMapToEventTransformer.java index 5467d41e92afd03c81548a9d56c7fa51924c390f..061e73b0a40ee68cd01aacad61af476ae488677f 100644 --- a/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/emqx/WebhookMapToEventTransformer.java +++ b/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/emqx/WebhookMapToEventTransformer.java @@ -51,7 +51,6 @@ class WebhookMapToEventTransformer extends AbstractPayloadTransformer - * 该配置主要用于系统的统一消息发送。因为不同的类型的消息，发送逻辑不同，所以目前只处理 {@link MqttMessageSendingEvent} 两种事件。 + * 该配置主要用于系统的统一消息发送。因为不同的类型的消息，发送逻辑不同，所以目前只处理 {@link MailMessageSendingEvent} 和 {@link MqttMessageSendingEvent} 两种事件。 * * @return {@link ApplicationEventListeningMessageProducer} */ diff --git a/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/message/MessageAutoConfiguration.java b/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/message/MessageAutoConfiguration.java index 11650009725303afeb2cb319673b4d29be6ad394..d9acdeaabd2ff32cb9d20ccc921a647b3d45613c 100644 --- a/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/message/MessageAutoConfiguration.java +++ b/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/message/MessageAutoConfiguration.java @@ -45,7 +45,7 @@ public class MessageAutoConfiguration { @PostConstruct public void postConstruct() { - log.info("[Herodotus] |- Auto [Message] Configure."); + log.info("[Herodotus] |- Auto [Unified Message] Configure."); } @Bean diff --git a/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/mqtt/IntegrationMqttAutoConfiguration.java b/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/mqtt/IntegrationMqttAutoConfiguration.java index 5f5e0e63132a2569cfdd924e9a16c583f4d84997..23dd4c6b4888ddfc1c0de89bcd52687c8d0bb06c 100644 --- a/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/mqtt/IntegrationMqttAutoConfiguration.java +++ b/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/mqtt/IntegrationMqttAutoConfiguration.java @@ -151,15 +151,15 @@ public class IntegrationMqttAutoConfiguration { @Qualifier(Channels.MQTT__DEFAULT_INBOUND_TO_EVENT_CHANNEL) MessageChannel mqttDefaultInboundToEventChannel) { // 接收 mqtt 指定 topic 中的消息 - Mqttv5PahoMessageDrivenChannelAdapter messageProducer = new Mqttv5PahoMessageDrivenChannelAdapter(clientManager, ListUtils.toStringArray(mqttProperties.getDefaultSubscribes())); - messageProducer.setManualAcks(false); - messageProducer.setOutputChannel(mqttDefaultInboundChannel); - messageProducer.setErrorChannelName(IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME); + Mqttv5PahoMessageDrivenChannelAdapter adapter = new Mqttv5PahoMessageDrivenChannelAdapter(clientManager, ListUtils.toStringArray(mqttProperties.getDefaultSubscribes())); + adapter.setManualAcks(false); + adapter.setOutputChannel(mqttDefaultInboundChannel); + adapter.setErrorChannelName(IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME); log.trace("[Herodotus] |- Bean [Mqtt v5 Paho Message Driven Channel Adapter] Configure."); // 将 mqtt 指定 topic 中的消息，转换成 Event，通过 ApplicationEventPublishingMessageHandler 发送出去。 // 这种实现主要用于解决 mqtt 消息接收的解耦 - return IntegrationFlow.from(messageProducer) + return IntegrationFlow.from(adapter) .transform(new DefaultMessageToEventTransformer()) .channel(mqttDefaultInboundToEventChannel) .handle(applicationEventPublishingMessageHandler) diff --git a/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/mqtt/MqttProperties.java b/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/mqtt/MqttProperties.java index 01fa8c207f566582e6d3bfff5e2b5b0a55c61dd0..f04d4d6c9c36ae938be7698adfa24757fa13e1a0 100644 --- a/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/mqtt/MqttProperties.java +++ b/dante-message/dante-message-autoconfigure/src/main/java/cn/herodotus/dante/message/autoconfigure/mqtt/MqttProperties.java @@ -116,7 +116,7 @@ public class MqttProperties { *

* 当客户端确定不再需要该会话时，应以会话过期间隔设为0的方式断开连接。 */ - private Duration sessionExpiryInterval = Duration.ofSeconds(600); + private Duration sessionExpiryInterval = Duration.ofDays(1); /** * 默认的主题。如果消息中不存在 mqtt_topic 头，则使用该值作为默认主题。 */ diff --git a/dante-message/dante-message-commons/pom.xml b/dante-message/dante-message-commons/pom.xml index 6d36d2b95cce765b2c22ba88474627aad5582cbd..2288c86d448d56c44c57cfd755de6d0a9a926b4d 100644 --- a/dante-message/dante-message-commons/pom.xml +++ b/dante-message/dante-message-commons/pom.xml @@ -32,7 +32,7 @@ dante-message cn.herodotus.dante - 4.1.0.4 + 4.1.1.0 dante-message-commons diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/constant/MessageConstants.java b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/constant/MessageConstants.java index 9e2f708961ece13d2551aae62e4121bf3266c81a..dd166846e14e38e6b1b8639e4443b07d7ca209d2 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/constant/MessageConstants.java +++ b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/constant/MessageConstants.java @@ -67,6 +67,8 @@ public interface MessageConstants extends BaseConstants { String WEBSOCKET_DESTINATION_BROADCAST_NOTICE = STOMP_CHANNEL_BROADCAST + "/notice"; String WEBSOCKET_DESTINATION_BROADCAST_ONLINE = STOMP_CHANNEL_BROADCAST + "/online"; String WEBSOCKET_DESTINATION_PERSONAL_MESSAGE = STOMP_CHANNEL_PERSONAL + "/message"; + String WEBSOCKET_DESTINATION_PERSONAL_NOTIFY = STOMP_CHANNEL_PERSONAL + "/notify"; + String CACHE_NAME_EMAIL_VERIFICATION_CODE = CACHE_TOKEN_BASE_PREFIX + "email_verification:"; } diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/strategy/EnumDictionaryCollectEventManager.java b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/strategy/EnumDictionaryCollectEventManager.java index 01cdc497337b213de8a2a99bd12c82fc8814d85d..e7fb540fb56c7ad65c3b5e0406c8ed65dc16b4e6 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/strategy/EnumDictionaryCollectEventManager.java +++ b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/strategy/EnumDictionaryCollectEventManager.java @@ -26,7 +26,7 @@ package cn.herodotus.dante.message.commons.definition.strategy; import cn.herodotus.dante.core.domain.Dictionary; -import cn.herodotus.dante.message.commons.definition.event.ApplicationStrategyEventManager; +import cn.herodotus.dante.spring.event.ApplicationStrategyEventManager; import java.util.List; diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/strategy/MessageSendingEventManager.java b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/strategy/MessageSendingEventManager.java index af2d629966320d464ddbe27b79939812090fe71f..eb87ecdcb755f581e6e26ebbfa512aaea400b0c2 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/strategy/MessageSendingEventManager.java +++ b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/strategy/MessageSendingEventManager.java @@ -27,7 +27,7 @@ package cn.herodotus.dante.message.commons.definition.strategy; import cn.herodotus.dante.message.commons.definition.Message; import cn.herodotus.dante.message.commons.definition.enums.MessageCategory; -import cn.herodotus.dante.message.commons.definition.event.ApplicationStrategyEventManager; +import cn.herodotus.dante.spring.event.ApplicationStrategyEventManager; import cn.herodotus.dante.message.commons.domain.BroadcastMessage; import cn.herodotus.dante.message.commons.domain.MqttMessage; import cn.herodotus.dante.message.commons.domain.UserMessage; diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/strategy/RestMappingCollectEventManager.java b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/strategy/RestMappingCollectEventManager.java index dea7790456d97eb877584544ffc94e9e88704994..734a120f70af87f4f88c947110731ebcc84f6b9b 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/strategy/RestMappingCollectEventManager.java +++ b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/definition/strategy/RestMappingCollectEventManager.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.message.commons.definition.strategy; -import cn.herodotus.dante.message.commons.definition.event.ApplicationStrategyEventManager; +import cn.herodotus.dante.spring.event.ApplicationStrategyEventManager; import cn.herodotus.dante.security.domain.attribute.RestMapping; import cn.herodotus.dante.spring.context.ServiceContextHolder; import org.apache.commons.collections4.MapUtils; diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/DialogueMessageReceivingEvent.java b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/DialogueMessageReceivingEvent.java index 0fc8b3e3d149c826bf2e99bfe01f752ef6e09c73..800b561c242b19481ced3aef10fa66346ba90eb7 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/DialogueMessageReceivingEvent.java +++ b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/DialogueMessageReceivingEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.message.commons.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import cn.herodotus.dante.message.commons.domain.DialogueMessage; import java.time.Clock; diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/EnumDictionaryCollectEvent.java b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/EnumDictionaryCollectEvent.java index c2c06d198b5263e06a94ccb4b5b0f2e1f5d0b934..cdcce953f7a1bf644f930ef65a659179c9fde11e 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/EnumDictionaryCollectEvent.java +++ b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/EnumDictionaryCollectEvent.java @@ -26,7 +26,7 @@ package cn.herodotus.dante.message.commons.event; import cn.herodotus.dante.core.domain.Dictionary; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import java.util.List; diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/MqttMessageReceivingEvent.java b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/MqttMessageReceivingEvent.java index 24f2848d6ccc3dd64a8b8f72a9cb4762eaf37740..1147b1f904feb9fa3c480ce4d9f1f6c25a437bbc 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/MqttMessageReceivingEvent.java +++ b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/MqttMessageReceivingEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.message.commons.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import org.springframework.messaging.Message; /** diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/MqttMessageSendingEvent.java b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/MqttMessageSendingEvent.java index 62a506b4855836519bbc2bb0ccd8870d1e1b9677..721330e2eee5f2d74e3578b819bc6ce5217accbb 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/MqttMessageSendingEvent.java +++ b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/MqttMessageSendingEvent.java @@ -25,10 +25,9 @@ package cn.herodotus.dante.message.commons.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import cn.herodotus.dante.message.commons.domain.MqttMessage; import cn.hutool.v7.core.util.ByteUtil; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import java.nio.charset.StandardCharsets; diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/RestMappingCollectEvent.java b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/RestMappingCollectEvent.java index 4bacfe44e7efc8e5f75ea6b3e144bef860a8443d..0fe48ee423c20b8b644142602d11145be337e4ca 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/RestMappingCollectEvent.java +++ b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/RestMappingCollectEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.message.commons.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import cn.herodotus.dante.security.domain.attribute.RestMapping; import java.time.Clock; diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/StreamMessageSendingEvent.java b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/StreamMessageSendingEvent.java index 92c2efb496c0527b9e526e293ce75db425552c67..bec8a70c24d5b16071f3a4d8412dadfb9f63dd96 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/StreamMessageSendingEvent.java +++ b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/StreamMessageSendingEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.message.commons.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import cn.herodotus.dante.message.commons.domain.StreamMessage; import java.time.Clock; diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/WebSocketBroadcastMessageSendingEvent.java b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/WebSocketBroadcastMessageSendingEvent.java index f4e0bf75802acfa4e8e05c03e259c7297003d81f..bfaf4a2164f28bb824a43116bb0c28054641a420 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/WebSocketBroadcastMessageSendingEvent.java +++ b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/WebSocketBroadcastMessageSendingEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.message.commons.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import cn.herodotus.dante.message.commons.domain.BroadcastMessage; /** diff --git a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/WebSocketUserMessageSendingEvent.java b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/WebSocketUserMessageSendingEvent.java index 53b0e5cf483806cad32436be794224de7b4f0f07..4fbae6e877ad8e00f940e13b9e92e1b4f74da617 100644 --- a/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/WebSocketUserMessageSendingEvent.java +++ b/dante-message/dante-message-commons/src/main/java/cn/herodotus/dante/message/commons/event/WebSocketUserMessageSendingEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.message.commons.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import cn.herodotus.dante.message.commons.domain.UserMessage; /** diff --git a/dante-message/dante-message-emqx/pom.xml b/dante-message/dante-message-emqx/pom.xml index 84fb4b638725b4b5297650f351d5032aabf2636a..4b6915a0b8ddb63f5f8bf8e71104acc356b0b10a 100644 --- a/dante-message/dante-message-emqx/pom.xml +++ b/dante-message/dante-message-emqx/pom.xml @@ -6,7 +6,7 @@ cn.herodotus.dante dante-message - 4.1.0.4 + 4.1.1.0 dante-message-emqx diff --git a/dante-message/dante-message-emqx/src/main/java/cn/herodotus/dante/message/emqx/definition/event/AbstractSystemTopicApplicationEvent.java b/dante-message/dante-message-emqx/src/main/java/cn/herodotus/dante/message/emqx/definition/event/AbstractSystemTopicApplicationEvent.java index 49f610365c82250f789892dfa1cbea41b2855d96..2b50078a22c4ee4f41fa2291ab8924ad99533c11 100644 --- a/dante-message/dante-message-emqx/src/main/java/cn/herodotus/dante/message/emqx/definition/event/AbstractSystemTopicApplicationEvent.java +++ b/dante-message/dante-message-emqx/src/main/java/cn/herodotus/dante/message/emqx/definition/event/AbstractSystemTopicApplicationEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.message.emqx.definition.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import cn.herodotus.dante.message.emqx.definition.domain.AbstractSystemTopic; import java.time.Clock; diff --git a/dante-message/dante-message-emqx/src/main/java/cn/herodotus/dante/message/emqx/definition/event/AbstractWebhookApplicationEvent.java b/dante-message/dante-message-emqx/src/main/java/cn/herodotus/dante/message/emqx/definition/event/AbstractWebhookApplicationEvent.java index 249ba6c04746e251a961e19837821e990a874a69..65cdd488bcbf440a5b59507609404f92a53e9509 100644 --- a/dante-message/dante-message-emqx/src/main/java/cn/herodotus/dante/message/emqx/definition/event/AbstractWebhookApplicationEvent.java +++ b/dante-message/dante-message-emqx/src/main/java/cn/herodotus/dante/message/emqx/definition/event/AbstractWebhookApplicationEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.message.emqx.definition.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import cn.herodotus.dante.message.emqx.definition.domain.AbstractWebhook; import java.time.Clock; diff --git a/dante-message/dante-message-servlet-websocket/pom.xml b/dante-message/dante-message-servlet-websocket/pom.xml index 9731d0e8f1659d7945e3d0116279f90fa79e8d86..c70882d4e7bf70c92e3a0d3ca4bf909011d07c98 100644 --- a/dante-message/dante-message-servlet-websocket/pom.xml +++ b/dante-message/dante-message-servlet-websocket/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-message - 4.1.0.4 + 4.1.1.0 dante-message-servlet-websocket diff --git a/dante-message/pom.xml b/dante-message/pom.xml index 267f954d1821a0aca6a587f8ef423ca5839965a2..5f1f7013c676ac509f03332e8de0977e346e18d4 100644 --- a/dante-message/pom.xml +++ b/dante-message/pom.xml @@ -32,7 +32,7 @@ dante-engine cn.herodotus.dante - 4.1.0.4 + 4.1.1.0 dante-message diff --git a/dante-oauth2/dante-authentication-autoconfigure/pom.xml b/dante-oauth2/dante-authentication-autoconfigure/pom.xml index f6a2f813521994aeb92bfe73d0cb02ebeceabc60..c634b1be860520b35157157d21ef360da8eba1c5 100644 --- a/dante-oauth2/dante-authentication-autoconfigure/pom.xml +++ b/dante-oauth2/dante-authentication-autoconfigure/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-oauth2 - 4.1.0.4 + 4.1.1.0 dante-authentication-autoconfigure diff --git a/dante-oauth2/dante-authorization-autoconfigure/pom.xml b/dante-oauth2/dante-authorization-autoconfigure/pom.xml index 59d42686ad694b70960da58678c25d9b8e99d9e8..da8430a2755cab4b8984c0d5dd085ee9ad3823de 100644 --- a/dante-oauth2/dante-authorization-autoconfigure/pom.xml +++ b/dante-oauth2/dante-authorization-autoconfigure/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-oauth2 - 4.1.0.4 + 4.1.1.0 dante-authorization-autoconfigure diff --git a/dante-oauth2/dante-authorization-autoconfigure/src/main/java/cn/herodotus/dante/oauth2/authorization/autoconfigure/ResourceServiceMessageAutoConfiguration.java b/dante-oauth2/dante-authorization-autoconfigure/src/main/java/cn/herodotus/dante/oauth2/authorization/autoconfigure/ResourceServiceMessageAutoConfiguration.java index d93a9e830dc1ae6b9157eb0570998c50da80b1a4..55e1f31d2794e3e9256bfbf878bdbd2aab79c080 100644 --- a/dante-oauth2/dante-authorization-autoconfigure/src/main/java/cn/herodotus/dante/oauth2/authorization/autoconfigure/ResourceServiceMessageAutoConfiguration.java +++ b/dante-oauth2/dante-authorization-autoconfigure/src/main/java/cn/herodotus/dante/oauth2/authorization/autoconfigure/ResourceServiceMessageAutoConfiguration.java @@ -26,10 +26,12 @@ package cn.herodotus.dante.oauth2.authorization.autoconfigure; import cn.herodotus.dante.message.commons.definition.strategy.EnumDictionaryCollectEventManager; +import cn.herodotus.dante.message.commons.definition.strategy.MessageSendingEventManager; import cn.herodotus.dante.message.commons.definition.strategy.RestMappingCollectEventManager; import cn.herodotus.dante.oauth2.authorization.attribute.SecurityAttributeAnalyzer; import cn.herodotus.dante.oauth2.authorization.autoconfigure.listener.RemoteAttributeDistributionListener; import cn.herodotus.dante.oauth2.authorization.autoconfigure.strategy.DefaultEnumDictionaryCollectEventManager; +import cn.herodotus.dante.oauth2.authorization.autoconfigure.strategy.DefaultMessageSendingEventManager; import cn.herodotus.dante.oauth2.authorization.autoconfigure.strategy.DefaultRestMappingCollectEventManager; import cn.herodotus.dante.spring.condition.ConditionalOnArchitecture; import cn.herodotus.dante.spring.enums.Architecture; @@ -79,6 +81,14 @@ public class ResourceServiceMessageAutoConfiguration { return manager; } + @Bean + public MessageSendingEventManager messageSendingEventManager() { + DefaultMessageSendingEventManager manager = new DefaultMessageSendingEventManager(); + log.trace("[Herodotus] |- Bean [Unified Message Sending Event Manager] Configure."); + return manager; + } + + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(StreamBusBridge.class) @ConditionalOnArchitecture(Architecture.DISTRIBUTED) diff --git a/dante-oauth2/dante-authorization-autoconfigure/src/main/java/cn/herodotus/dante/oauth2/authorization/autoconfigure/processor/SecurityAttributeDistributionProcessor.java b/dante-oauth2/dante-authorization-autoconfigure/src/main/java/cn/herodotus/dante/oauth2/authorization/autoconfigure/processor/SecurityAttributeDistributionProcessor.java index 7f1672c008f68d5777ef7b13de4e78902a3d8a2a..e43d28c1e32af7146baf702eb889e7830e681241 100644 --- a/dante-oauth2/dante-authorization-autoconfigure/src/main/java/cn/herodotus/dante/oauth2/authorization/autoconfigure/processor/SecurityAttributeDistributionProcessor.java +++ b/dante-oauth2/dante-authorization-autoconfigure/src/main/java/cn/herodotus/dante/oauth2/authorization/autoconfigure/processor/SecurityAttributeDistributionProcessor.java @@ -31,7 +31,7 @@ import cn.herodotus.dante.logic.upms.entity.security.SysAttribute; import cn.herodotus.dante.logic.upms.entity.security.SysInterface; import cn.herodotus.dante.logic.upms.service.security.SysAttributeService; import cn.herodotus.dante.logic.upms.service.security.SysInterfaceService; -import cn.herodotus.dante.message.commons.definition.event.StrategyEventManager; +import cn.herodotus.dante.spring.event.StrategyEventManager; import cn.herodotus.dante.message.commons.event.ApplicationReadinessEvent; import cn.herodotus.dante.oauth2.authorization.attribute.SecurityAttributeAnalyzer; import cn.herodotus.dante.oauth2.authorization.autoconfigure.bus.RemoteAttributeDistributionEvent; diff --git a/dante-oauth2/dante-oauth2-authentication/pom.xml b/dante-oauth2/dante-oauth2-authentication/pom.xml index 651719a67103d2ff1a7c6421b8dc96f38aaa6e34..9d41c47b8cd60d059189c38a5b1972a8edb3788b 100644 --- a/dante-oauth2/dante-oauth2-authentication/pom.xml +++ b/dante-oauth2/dante-oauth2-authentication/pom.xml @@ -33,7 +33,7 @@ dante-oauth2 cn.herodotus.dante - 4.1.0.4 + 4.1.1.0 dante-oauth2-authentication diff --git a/dante-oauth2/dante-oauth2-authorization/pom.xml b/dante-oauth2/dante-oauth2-authorization/pom.xml index 05556b3e55bfef5144cf410c5efe4c8066ce0741..41fdaf91696826b33a4132c61ab753fa3b50db6f 100644 --- a/dante-oauth2/dante-oauth2-authorization/pom.xml +++ b/dante-oauth2/dante-oauth2-authorization/pom.xml @@ -32,7 +32,7 @@ dante-oauth2 cn.herodotus.dante - 4.1.0.4 + 4.1.1.0 dante-oauth2-authorization diff --git a/dante-oauth2/dante-oauth2-commons/pom.xml b/dante-oauth2/dante-oauth2-commons/pom.xml index 791a49ebd749e9abee0110c8bfef5d14b0562cb6..e79aaaaaa439cea22cc46d5d7653667016d5c13f 100644 --- a/dante-oauth2/dante-oauth2-commons/pom.xml +++ b/dante-oauth2/dante-oauth2-commons/pom.xml @@ -32,7 +32,7 @@ dante-oauth2 cn.herodotus.dante - 4.1.0.4 + 4.1.1.0 dante-oauth2-commons diff --git a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/AccountStatusChangeEvent.java b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/AccountStatusChangeEvent.java index 142f2843d1b988a580c4002d46bb8de2a2d610eb..0b186ab4de12e0fc1f170b978797169bc5448f2c 100644 --- a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/AccountStatusChangeEvent.java +++ b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/AccountStatusChangeEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.oauth2.commons.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import cn.herodotus.dante.message.commons.domain.AccountStatus; import java.time.Clock; diff --git a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/DisableAuthenticationEvent.java b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/DisableAuthenticationEvent.java index 69ad49429b5520dd503c4717d01c37264c185c89..33f810527f30b595b88de419500f8b75cd468dd2 100644 --- a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/DisableAuthenticationEvent.java +++ b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/DisableAuthenticationEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.oauth2.commons.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; /** *

Description: 关闭认证事件

diff --git a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/EnableAuthenticationEvent.java b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/EnableAuthenticationEvent.java index 639691c883a4ad8b4de3bfbba263f52a5644ccef..c6e02ea991b79732fae941268b461ad4a6937e40 100644 --- a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/EnableAuthenticationEvent.java +++ b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/EnableAuthenticationEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.oauth2.commons.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import cn.herodotus.dante.security.domain.RegisteredClientTransmitter; /** diff --git a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/MessageSendingEvent.java b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/MessageSendingEvent.java index 739a59614524fffef1e9335b3e1f281bbdcfb848..4600afa4e0f8d4c5282ce066eb70cdcf59603ad8 100644 --- a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/MessageSendingEvent.java +++ b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/MessageSendingEvent.java @@ -26,7 +26,7 @@ package cn.herodotus.dante.oauth2.commons.event; import cn.herodotus.dante.message.commons.definition.Message; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; /** *

Description: 本地发送统一消息事件

diff --git a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/OAuth2ClientRegistrationSuccessEvent.java b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/OAuth2ClientRegistrationSuccessEvent.java index e7d52fc05566d9aa4ba8ebabd5103c26b8c48e79..108c2317a11449e89701e6a5bc8b557cf8438e3f 100644 --- a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/OAuth2ClientRegistrationSuccessEvent.java +++ b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/OAuth2ClientRegistrationSuccessEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.oauth2.commons.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import cn.herodotus.dante.security.domain.RegisteredClientTransmitter; /** diff --git a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/OAuth2DeviceVerificationSuccessEvent.java b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/OAuth2DeviceVerificationSuccessEvent.java index 11ab66eb909ace9d469d27247c463189595c1beb..87250f13d1c2e20498fcf8844fa94662da099ac8 100644 --- a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/OAuth2DeviceVerificationSuccessEvent.java +++ b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/event/OAuth2DeviceVerificationSuccessEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.oauth2.commons.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import cn.herodotus.dante.security.domain.DeviceVerificationTransmitter; /** diff --git a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/AccountStatusChangedEventManager.java b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/AccountStatusChangedEventManager.java index 25bebc79fa63e175c7718bf6c2faea76b9f5b3db..5f4b3161c1aa87e86b202215d1fb6195c0368737 100644 --- a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/AccountStatusChangedEventManager.java +++ b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/AccountStatusChangedEventManager.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.oauth2.commons.strategy; -import cn.herodotus.dante.message.commons.definition.event.ApplicationStrategyEventManager; +import cn.herodotus.dante.spring.event.ApplicationStrategyEventManager; import cn.herodotus.dante.message.commons.domain.AccountStatus; /** diff --git a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/DisableAuthenticationEventManager.java b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/DisableAuthenticationEventManager.java index c2c2c8ab716fea673c5c05e62facc3d293f3dac7..14813c30a0a9294dabb1b21d39c67374bce70598 100644 --- a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/DisableAuthenticationEventManager.java +++ b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/DisableAuthenticationEventManager.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.oauth2.commons.strategy; -import cn.herodotus.dante.message.commons.definition.event.ApplicationStrategyEventManager; +import cn.herodotus.dante.spring.event.ApplicationStrategyEventManager; /** *

Description: 开启认证事件管理器

diff --git a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/EnableAuthenticationEventManager.java b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/EnableAuthenticationEventManager.java index c0c8ca4c095636decfba239de2032ee5fac07bbe..0a06447fc42803f7aeb2d4dadb0885d3bec51b7d 100644 --- a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/EnableAuthenticationEventManager.java +++ b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/EnableAuthenticationEventManager.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.oauth2.commons.strategy; -import cn.herodotus.dante.message.commons.definition.event.ApplicationStrategyEventManager; +import cn.herodotus.dante.spring.event.ApplicationStrategyEventManager; import cn.herodotus.dante.security.domain.RegisteredClientTransmitter; /** diff --git a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/OAuth2ClientRegistrationSuccessEventManager.java b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/OAuth2ClientRegistrationSuccessEventManager.java index 49126b25bb3f8ae6c9798c2d49cfe0f349bf850b..e2ee2d820e213ab08cb0f2c7a400294de648d74d 100644 --- a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/OAuth2ClientRegistrationSuccessEventManager.java +++ b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/OAuth2ClientRegistrationSuccessEventManager.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.oauth2.commons.strategy; -import cn.herodotus.dante.message.commons.definition.event.ApplicationStrategyEventManager; +import cn.herodotus.dante.spring.event.ApplicationStrategyEventManager; import cn.herodotus.dante.security.domain.RegisteredClientTransmitter; /** diff --git a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/OAuth2DeviceVerificationSuccessEventManager.java b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/OAuth2DeviceVerificationSuccessEventManager.java index 415336aaf887542bf0a535b876a7d0766133ab1c..1e4bfe0c1ff3c8823836c0479cb28a31dad06931 100644 --- a/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/OAuth2DeviceVerificationSuccessEventManager.java +++ b/dante-oauth2/dante-oauth2-commons/src/main/java/cn/herodotus/dante/oauth2/commons/strategy/OAuth2DeviceVerificationSuccessEventManager.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.oauth2.commons.strategy; -import cn.herodotus.dante.message.commons.definition.event.ApplicationStrategyEventManager; +import cn.herodotus.dante.spring.event.ApplicationStrategyEventManager; import cn.herodotus.dante.security.domain.DeviceVerificationTransmitter; /** diff --git a/dante-oauth2/dante-oauth2-extension/pom.xml b/dante-oauth2/dante-oauth2-extension/pom.xml index f8cee5bdb22f1e257dbff31a023e3ea424beabb0..0cf939a783347274e7d6d9640feb48b3b7131099 100644 --- a/dante-oauth2/dante-oauth2-extension/pom.xml +++ b/dante-oauth2/dante-oauth2-extension/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-oauth2 - 4.1.0.4 + 4.1.1.0 dante-oauth2-extension diff --git a/dante-oauth2/pom.xml b/dante-oauth2/pom.xml index c458a44e2e455d2dea85e45c6563df521e390fcb..5a74a0174544cebf6b6d37eb4b2449cc07597e84 100644 --- a/dante-oauth2/pom.xml +++ b/dante-oauth2/pom.xml @@ -32,7 +32,7 @@ dante-engine cn.herodotus.dante - 4.1.0.4 + 4.1.1.0 dante-oauth2 diff --git a/dante-persistence/dante-persistence-autoconfigure/pom.xml b/dante-persistence/dante-persistence-autoconfigure/pom.xml index 1d94e3efd375676e0044b89d9490102831a0e9b4..0d5983a2aba46ad62c3148cfabf9f76fee008ba0 100644 --- a/dante-persistence/dante-persistence-autoconfigure/pom.xml +++ b/dante-persistence/dante-persistence-autoconfigure/pom.xml @@ -6,7 +6,7 @@ cn.herodotus.dante dante-persistence - 4.1.0.4 + 4.1.1.0 dante-persistence-autoconfigure diff --git a/dante-persistence/dante-persistence-commons/pom.xml b/dante-persistence/dante-persistence-commons/pom.xml index fd818b5138ddbe95471a9b2f5bf03f3eca3f63d3..8cfdc8d7f081a68183fbefbc3374b3d607f4e60b 100644 --- a/dante-persistence/dante-persistence-commons/pom.xml +++ b/dante-persistence/dante-persistence-commons/pom.xml @@ -6,7 +6,7 @@ cn.herodotus.dante dante-persistence - 4.1.0.4 + 4.1.1.0 dante-persistence-commons diff --git a/dante-persistence/dante-persistence-commons/src/main/java/cn/herodotus/dante/persistence/commons/definition/AbstractAuditRecord.java b/dante-persistence/dante-persistence-commons/src/main/java/cn/herodotus/dante/persistence/commons/definition/AbstractAuditRecord.java index ea7f83727542d90c23ec6f26d48a44307fca4541..1c38f570108ed9f56049e3c3e0d2a553d191b030 100644 --- a/dante-persistence/dante-persistence-commons/src/main/java/cn/herodotus/dante/persistence/commons/definition/AbstractAuditRecord.java +++ b/dante-persistence/dante-persistence-commons/src/main/java/cn/herodotus/dante/persistence/commons/definition/AbstractAuditRecord.java @@ -31,7 +31,7 @@ import cn.hutool.v7.http.useragent.UserAgentUtil; import com.google.common.base.MoreObjects; import org.apache.commons.lang3.ObjectUtils; -import java.util.Date; +import java.time.LocalDateTime; /** *

Description: 审计记录抽象定义

@@ -65,9 +65,9 @@ public abstract class AbstractAuditRecord implements BaseModel { private String browserEngineVersion; - private Date createTime = new Date(); + private LocalDateTime createTime = LocalDateTime.now(); - private Date updateTime = new Date(); + private LocalDateTime updateTime = LocalDateTime.now(); protected AbstractAuditRecord() { } @@ -172,19 +172,19 @@ public abstract class AbstractAuditRecord implements BaseModel { this.browserEngineVersion = browserEngineVersion; } - public Date getCreateTime() { + public LocalDateTime getCreateTime() { return createTime; } - public void setCreateTime(Date createTime) { + public void setCreateTime(LocalDateTime createTime) { this.createTime = createTime; } - public Date getUpdateTime() { + public LocalDateTime getUpdateTime() { return updateTime; } - public void setUpdateTime(Date updateTime) { + public void setUpdateTime(LocalDateTime updateTime) { this.updateTime = updateTime; } diff --git a/dante-persistence/dante-persistence-commons/src/main/java/cn/herodotus/dante/persistence/commons/domain/IpProtection.java b/dante-persistence/dante-persistence-commons/src/main/java/cn/herodotus/dante/persistence/commons/domain/IpProtection.java index 20f57a75c879388bc296a7de5c0ddd8a73068c9f..70a85b49bbf7b267741927a7f2aa3eb9b2863b39 100644 --- a/dante-persistence/dante-persistence-commons/src/main/java/cn/herodotus/dante/persistence/commons/domain/IpProtection.java +++ b/dante-persistence/dante-persistence-commons/src/main/java/cn/herodotus/dante/persistence/commons/domain/IpProtection.java @@ -28,6 +28,7 @@ package cn.herodotus.dante.persistence.commons.domain; import cn.herodotus.dante.core.domain.BaseModel; import com.google.common.base.MoreObjects; +import java.time.LocalDateTime; import java.util.Date; /** @@ -57,7 +58,7 @@ public class IpProtection implements BaseModel { /** * 上次登录时间 */ - private Date lastSignInTime; + private LocalDateTime lastSignInTime; /** * 本次登录IP地址 */ @@ -69,7 +70,7 @@ public class IpProtection implements BaseModel { /** * 本次登录时间 */ - private Date currentSignInTime; + private LocalDateTime currentSignInTime; /** * 是否为常规登录地址 */ @@ -99,11 +100,11 @@ public class IpProtection implements BaseModel { this.currentLocation = currentLocation; } - public Date getCurrentSignInTime() { + public LocalDateTime getCurrentSignInTime() { return currentSignInTime; } - public void setCurrentSignInTime(Date currentSignInTime) { + public void setCurrentSignInTime(LocalDateTime currentSignInTime) { this.currentSignInTime = currentSignInTime; } @@ -123,11 +124,11 @@ public class IpProtection implements BaseModel { this.lastLocation = lastLocation; } - public Date getLastSignInTime() { + public LocalDateTime getLastSignInTime() { return lastSignInTime; } - public void setLastSignInTime(Date lastSignInTime) { + public void setLastSignInTime(LocalDateTime lastSignInTime) { this.lastSignInTime = lastSignInTime; } diff --git a/dante-persistence/dante-persistence-commons/src/main/java/cn/herodotus/dante/persistence/commons/event/SignOutComplianceEvent.java b/dante-persistence/dante-persistence-commons/src/main/java/cn/herodotus/dante/persistence/commons/event/SignOutComplianceEvent.java index 537edb7b3b4d53addbe67db4f0c57fdcaf43ee05..82c8873f9506e3f8f0181cf38d68bede2f679aba 100644 --- a/dante-persistence/dante-persistence-commons/src/main/java/cn/herodotus/dante/persistence/commons/event/SignOutComplianceEvent.java +++ b/dante-persistence/dante-persistence-commons/src/main/java/cn/herodotus/dante/persistence/commons/event/SignOutComplianceEvent.java @@ -25,7 +25,7 @@ package cn.herodotus.dante.persistence.commons.event; -import cn.herodotus.dante.message.commons.definition.event.AbstractApplicationEvent; +import cn.herodotus.dante.spring.event.AbstractApplicationEvent; import jakarta.servlet.http.HttpServletRequest; import org.springframework.security.oauth2.server.authorization.OAuth2Authorization; diff --git a/dante-persistence/dante-persistence-sas-jpa/pom.xml b/dante-persistence/dante-persistence-sas-jpa/pom.xml index 60084470805c2f7565f16c9552fbfad79fb20630..1363991df1a8fb7bb30276d4d8baf5aee6bca658 100644 --- a/dante-persistence/dante-persistence-sas-jpa/pom.xml +++ b/dante-persistence/dante-persistence-sas-jpa/pom.xml @@ -6,7 +6,7 @@ cn.herodotus.dante dante-persistence - 4.1.0.4 + 4.1.1.0 dante-persistence-sas-jpa diff --git a/dante-persistence/pom.xml b/dante-persistence/pom.xml index f86b329cf0600e19238118f6cf66e9c38e32a533..3db9ffc2031f1dc9a76b002d0e7228f8c36e41b7 100644 --- a/dante-persistence/pom.xml +++ b/dante-persistence/pom.xml @@ -7,7 +7,7 @@ cn.herodotus.dante dante-engine - 4.1.0.4 + 4.1.1.0 dante-persistence diff --git a/dante-rest/dante-rest-identity/pom.xml b/dante-rest/dante-rest-identity/pom.xml index f81cfae4f433f4a78d84f36c3115977d66082d0e..7172d398b0096c35fda709db594883262d8d3909 100644 --- a/dante-rest/dante-rest-identity/pom.xml +++ b/dante-rest/dante-rest-identity/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-rest - 4.1.0.4 + 4.1.1.0 dante-rest-identity diff --git a/dante-rest/dante-rest-identity/src/main/java/cn/herodotus/dante/rest/identity/controller/OpenDeviceController.java b/dante-rest/dante-rest-identity/src/main/java/cn/herodotus/dante/rest/identity/controller/OpenDeviceController.java index 479fed178948945cadcb972ee3f02a1c8cdd0511..0855d4c8d0062ce264eb907e46088d0e29450415 100644 --- a/dante-rest/dante-rest-identity/src/main/java/cn/herodotus/dante/rest/identity/controller/OpenDeviceController.java +++ b/dante-rest/dante-rest-identity/src/main/java/cn/herodotus/dante/rest/identity/controller/OpenDeviceController.java @@ -61,7 +61,7 @@ public class OpenDeviceController { return "activation-denied"; } - @GetMapping(value = "/", params = "success") + @GetMapping(value = "/", params = SystemConstants.STATUS__SUCCESS) public String success() { return "activation-allowed"; } diff --git a/dante-rest/dante-rest-message/pom.xml b/dante-rest/dante-rest-message/pom.xml index 6dcf9ca9aa42683afe4b7536ba339c1c99986b4a..241ba13bd7485686e5649110cef75989063352de 100644 --- a/dante-rest/dante-rest-message/pom.xml +++ b/dante-rest/dante-rest-message/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-rest - 4.1.0.4 + 4.1.1.0 dante-rest-message diff --git a/dante-rest/dante-rest-oss/pom.xml b/dante-rest/dante-rest-oss/pom.xml index 8f08ca03471102eb5d93432b47ead5b675d02deb..1b95cad879586446e235751045806d023df2860f 100644 --- a/dante-rest/dante-rest-oss/pom.xml +++ b/dante-rest/dante-rest-oss/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-rest - 4.1.0.4 + 4.1.1.0 dante-rest-oss diff --git a/dante-rest/dante-rest-upms/pom.xml b/dante-rest/dante-rest-upms/pom.xml index 4d57b288b0317e2639b97aa296f3dbbd8424573b..eb81898bdfb60b06132ca908986447517fd31509 100644 --- a/dante-rest/dante-rest-upms/pom.xml +++ b/dante-rest/dante-rest-upms/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-rest - 4.1.0.4 + 4.1.1.0 dante-rest-upms diff --git a/dante-rest/pom.xml b/dante-rest/pom.xml index 7048465d0dfef29d7f4b744eda105193ed1507dc..cf1f49c5c3a0c0949ef16febc5cd0277b05614fa 100644 --- a/dante-rest/pom.xml +++ b/dante-rest/pom.xml @@ -32,7 +32,7 @@ dante-engine cn.herodotus.dante - 4.1.0.4 + 4.1.1.0 dante-rest diff --git a/dante-starter/cache-spring-boot-starter/pom.xml b/dante-starter/cache-spring-boot-starter/pom.xml index 9478a98d9607d13640b2c0cb95d9ede8bcc04eda..21b28a271a86556ac97abe275e632bf8f3e9a446 100644 --- a/dante-starter/cache-spring-boot-starter/pom.xml +++ b/dante-starter/cache-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-starter - 4.1.0.4 + 4.1.1.0 cache-spring-boot-starter diff --git a/dante-starter/data-rdbms-spring-boot-starter/pom.xml b/dante-starter/data-rdbms-spring-boot-starter/pom.xml index 55073dd40cb6d058b02e626ac7481f9fd810ea7c..7fcc4692a4923d9d240f32c2238a01489cf91555 100644 --- a/dante-starter/data-rdbms-spring-boot-starter/pom.xml +++ b/dante-starter/data-rdbms-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-starter - 4.1.0.4 + 4.1.1.0 data-rdbms-spring-boot-starter diff --git a/dante-starter/logging-spring-boot-starter/pom.xml b/dante-starter/logging-spring-boot-starter/pom.xml index f56a2fd7758e7b8fbdea3cadb9a96ce3546358d2..e3bd4daa4ed6a21a45884aeba0e570b3110f8d32 100644 --- a/dante-starter/logging-spring-boot-starter/pom.xml +++ b/dante-starter/logging-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-starter - 4.1.0.4 + 4.1.1.0 logging-spring-boot-starter diff --git a/dante-starter/oss-spring-boot-starter/pom.xml b/dante-starter/oss-spring-boot-starter/pom.xml index 3b670337b234305f8bb68b45988879e840f977b9..fcdb8a8de8eca1862f3f7e28af5d8ade70e8d5da 100644 --- a/dante-starter/oss-spring-boot-starter/pom.xml +++ b/dante-starter/oss-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-starter - 4.1.0.4 + 4.1.1.0 oss-spring-boot-starter diff --git a/dante-starter/pom.xml b/dante-starter/pom.xml index dffd2f52a2f3552425b2bf1159c14e06eee6371e..83756e0619ba1fbdab5791ed6f2b7dae1576752f 100644 --- a/dante-starter/pom.xml +++ b/dante-starter/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-engine - 4.1.0.4 + 4.1.1.0 dante-starter diff --git a/dante-starter/reactive-container-spring-boot-starter/pom.xml b/dante-starter/reactive-container-spring-boot-starter/pom.xml index b57a1c28fd588e2ecdbc686772017b0ff7a9846f..7cd498df85e1badc90a01b3c9a1649400aa171f4 100644 --- a/dante-starter/reactive-container-spring-boot-starter/pom.xml +++ b/dante-starter/reactive-container-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-starter - 4.1.0.4 + 4.1.1.0 reactive-container-spring-boot-starter diff --git a/dante-starter/servlet-container-spring-boot-starter/pom.xml b/dante-starter/servlet-container-spring-boot-starter/pom.xml index 98f727e66e9357a839243ecdbd72b14b5a0c62c5..63061d220845d8d0642705e1ca0dca51a5473984 100644 --- a/dante-starter/servlet-container-spring-boot-starter/pom.xml +++ b/dante-starter/servlet-container-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-starter - 4.1.0.4 + 4.1.1.0 servlet-container-spring-boot-starter diff --git a/dante-starter/servlet-message-spring-boot-starter/pom.xml b/dante-starter/servlet-message-spring-boot-starter/pom.xml index bb0d4f702a6671d57a13c747106720479bcbdd80..cd30e384c5caf91a931fd7c9c38641f5b5a132d2 100644 --- a/dante-starter/servlet-message-spring-boot-starter/pom.xml +++ b/dante-starter/servlet-message-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-starter - 4.1.0.4 + 4.1.1.0 servlet-message-spring-boot-starter diff --git a/dante-starter/tenant-spring-boot-starter/pom.xml b/dante-starter/tenant-spring-boot-starter/pom.xml index 8e9799b1fd3cb3a60f3c5ea57e3801ab7afd91ff..fae15f981fe154854d08388b5548d29bb9f2fb81 100644 --- a/dante-starter/tenant-spring-boot-starter/pom.xml +++ b/dante-starter/tenant-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-starter - 4.1.0.4 + 4.1.1.0 tenant-spring-boot-starter diff --git a/dante-starter/web-spring-boot-starter/pom.xml b/dante-starter/web-spring-boot-starter/pom.xml index 295ce34a53690ae08046ee99f05a8391571d5e43..feed943cfcee368dc1f6caa3d4b07af976b09aec 100644 --- a/dante-starter/web-spring-boot-starter/pom.xml +++ b/dante-starter/web-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-starter - 4.1.0.4 + 4.1.1.0 web-spring-boot-starter diff --git a/dante-starter/webmvc-spring-boot-starter/pom.xml b/dante-starter/webmvc-spring-boot-starter/pom.xml index f32e244a0a9a3fa40d75fb992994255ad1a06f77..695d29ff2036093356e69c2e35d1810992a155ab 100644 --- a/dante-starter/webmvc-spring-boot-starter/pom.xml +++ b/dante-starter/webmvc-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ cn.herodotus.dante dante-starter - 4.1.0.4 + 4.1.1.0 webmvc-spring-boot-starter diff --git a/pom.xml b/pom.xml index 3f4660a1c322bb4d3388e9e2a3f9bb2b2d5d2349..72f77eb290c2d9f3579bbc3895ea33876d6585e2 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ cn.herodotus.ecosystem herodotus-ecosystem-parent - 4.1.0.4 + 4.1.1.0