!162 v3.1.5.2

Merge pull request !162 from 码匠君/develop
dromara · Oct 29, 2023 · 329dbb2 · 329dbb2
2 parents 4ed4924 + 4536123
commit 329dbb2
Show file tree

Hide file tree

Showing 38 changed files with 52 additions and 342 deletions.
diff --git a/README.md b/README.md
@@ -13,9 +13,9 @@
     <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://img.shields.io/badge/Nacos-2.2.4-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.2.4"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.1.5.1-red.svg?logo=spring" alt="Version 3.1.5.1"></a>
-    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.1.5.1-red.svg?logo=spring" alt="Dante Engine 3.1.5.1"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.1.5.1-red.svg?logo=spring" alt="Dante OSS 3.1.5.1"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.1.5.2-red.svg?logo=spring" alt="Version 3.1.5.2"></a>
+    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.1.5.2-red.svg?logo=spring" alt="Dante Engine 3.1.5.2"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.1.5.2-red.svg?logo=spring" alt="Dante OSS 3.1.5.2"></a>
     <a href="https://bell-sw.com/pages/downloads/#downloads" target="_blank"><img src="https://img.shields.io/badge/JDK-17%2B-green.svg?logo=openjdk" alt="Java 17"></a>
     <a href="./LICENSE"><img src="https://img.shields.io/badge/License-Apache--2.0-blue.svg?logo=apache" alt="License Apache 2.0"></a>
     <a href="https://www.herodotus.cn"><img src="https://visitor-badge.laobi.icu/badge?page_id=dante-cloud&title=Total%20Visits" alt="Total Visits"></a>
@@ -213,7 +213,6 @@ dante-cloud
 ├── module -- 依赖组件半成品拼装工程
 ├    ├── dante-module-common -- Module 相关模块公共辅助代码模块
 ├    ├── dante-module-metadata -- 权限元数据同步模块
-├    ├── dante-module-security -- Security 相关配置代码模块
 ├    ├── dante-module-social -- 社交登录模块
 ├    └── dante-module-strategy -- UAA 核心数据访问策略模块
 ├── packages -- 基础核心Starter

diff --git a/configurations/backup/alibaba/3.1.5.2/nacos_config_export_20231002222404.zip b/configurations/backup/alibaba/3.1.5.2/nacos_config_export_20231002222404.zip
diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=3.1.5.1
+VERSION=3.1.5.2
 GATEWAY_SERVICE_NAME=dante-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=dante-cloud-uaa

diff --git a/configurations/docker/docker-compose/windows/herodotus/.env b/configurations/docker/docker-compose/windows/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=3.1.5.1
+VERSION=3.1.5.2
 GATEWAY_SERVICE_NAME=dante-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=dante-cloud-uaa

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.1.5.1</version>
+        <version>3.1.5.2</version>
         <relativePath/>
     </parent>
 
@@ -76,11 +76,6 @@
                 <artifactId>dante-module-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>cn.herodotus.dante</groupId>
-                <artifactId>dante-module-security</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>cn.herodotus.dante</groupId>
                 <artifactId>dante-module-strategy</artifactId>

diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.5.1</version>
+        <version>3.1.5.2</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>

diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.5.1</version>
+        <version>3.1.5.2</version>
     </parent>
 
     <artifactId>dante-module-metadata</artifactId>
@@ -49,8 +49,8 @@
         </dependency>
 
         <dependency>
-            <groupId>cn.herodotus.dante</groupId>
-            <artifactId>dante-module-security</artifactId>
+            <groupId>cn.herodotus.engine</groupId>
+            <artifactId>oauth2-resource-server-autoconfigure</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/.../main/java/cn/herodotus/dante/module/metadata/listener/LocalChangeUserStatusListener.java b/.../main/java/cn/herodotus/dante/module/metadata/listener/LocalChangeUserStatusListener.java
@@ -26,8 +26,8 @@
 package cn.herodotus.dante.module.metadata.listener;
 
 import cn.herodotus.engine.data.core.enums.DataItemStatus;
-import cn.herodotus.engine.message.core.domain.UserStatus;
-import cn.herodotus.engine.message.core.event.LocalChangeUserStatusEvent;
+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;
@@ -42,7 +42,7 @@
  * @date : 2022/7/10 17:59
  */
 @Component
-public class LocalChangeUserStatusListener implements ApplicationListener<LocalChangeUserStatusEvent> {
+public class LocalChangeUserStatusListener implements ApplicationListener<ChangeUserStatusEvent> {
 
     private static final Logger log = LoggerFactory.getLogger(LocalChangeUserStatusListener.class);
     private final SysUserService sysUserService;
@@ -52,7 +52,7 @@ public LocalChangeUserStatusListener(SysUserService sysUserService) {
     }
 
     @Override
-    public void onApplicationEvent(LocalChangeUserStatusEvent event) {
+    public void onApplicationEvent(ChangeUserStatusEvent event) {
 
         log.info("[Herodotus] |- Change user status gather LOCAL listener, response event!");
 

diff --git a/...n/java/cn/herodotus/dante/module/metadata/listener/LocalRequestMappingGatherListener.java b/...n/java/cn/herodotus/dante/module/metadata/listener/LocalRequestMappingGatherListener.java
@@ -26,8 +26,8 @@
 package cn.herodotus.dante.module.metadata.listener;
 
 import cn.herodotus.dante.module.metadata.processor.RequestMappingStoreProcessor;
-import cn.herodotus.engine.message.core.domain.RequestMapping;
-import cn.herodotus.engine.message.core.event.LocalRequestMappingGatherEvent;
+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;
@@ -46,7 +46,7 @@
  * @date : 2021/8/8 22:02
  */
 @Component
-public class LocalRequestMappingGatherListener implements ApplicationListener<LocalRequestMappingGatherEvent> {
+public class LocalRequestMappingGatherListener implements ApplicationListener<RequestMappingGatherEvent> {
 
     private static final Logger log = LoggerFactory.getLogger(LocalRequestMappingGatherListener.class);
 
@@ -58,7 +58,7 @@ public LocalRequestMappingGatherListener(RequestMappingStoreProcessor requestMap
     }
 
     @Override
-    public void onApplicationEvent(LocalRequestMappingGatherEvent event) {
+    public void onApplicationEvent(RequestMappingGatherEvent event) {
 
         log.info("[Herodotus] |- Request mapping gather LOCAL listener, response event!");
 

diff --git a/...main/java/cn/herodotus/dante/module/metadata/listener/RemoteChangeUserStatusListener.java b/...main/java/cn/herodotus/dante/module/metadata/listener/RemoteChangeUserStatusListener.java
@@ -27,8 +27,8 @@
 
 import cn.herodotus.engine.assistant.core.json.jackson2.utils.Jackson2Utils;
 import cn.herodotus.engine.data.core.enums.DataItemStatus;
-import cn.herodotus.engine.message.core.domain.UserStatus;
-import cn.herodotus.engine.message.security.autoconfigure.event.RemoteChangeUserStatusEvent;
+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;

diff --git a/.../java/cn/herodotus/dante/module/metadata/listener/RemoteRequestMappingGatherListener.java b/.../java/cn/herodotus/dante/module/metadata/listener/RemoteRequestMappingGatherListener.java
@@ -27,8 +27,8 @@
 
 import cn.herodotus.dante.module.metadata.processor.RequestMappingStoreProcessor;
 import cn.herodotus.engine.assistant.core.json.jackson2.utils.Jackson2Utils;
-import cn.herodotus.engine.message.core.domain.RequestMapping;
-import cn.herodotus.engine.message.security.autoconfigure.event.RemoteRequestMappingGatherEvent;
+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.slf4j.Logger;

diff --git a/.../main/java/cn/herodotus/dante/module/metadata/processor/RequestMappingStoreProcessor.java b/.../main/java/cn/herodotus/dante/module/metadata/processor/RequestMappingStoreProcessor.java
@@ -25,7 +25,7 @@
 
 package cn.herodotus.dante.module.metadata.processor;
 
-import cn.herodotus.engine.message.core.domain.RequestMapping;
+import cn.herodotus.engine.message.core.logic.domain.RequestMapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...ava/cn/herodotus/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java b/...ava/cn/herodotus/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java
@@ -27,13 +27,12 @@
 
 import cn.herodotus.dante.module.metadata.converter.SysAttributeToSecurityAttributeConverter;
 import cn.herodotus.dante.module.metadata.converter.SysInterfacesToSysAttributesConverter;
-import cn.herodotus.engine.assistant.core.context.ServiceContextHolder;
 import cn.herodotus.engine.assistant.core.exception.transaction.TransactionalRollbackException;
-import cn.herodotus.engine.message.core.definition.StrategyEventManager;
-import cn.herodotus.engine.message.core.domain.RequestMapping;
-import cn.herodotus.engine.message.security.autoconfigure.event.RemoteSecurityMetadataSyncEvent;
+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;
@@ -81,7 +80,7 @@ public void postLocalProcess(List<SecurityAttribute> data) {
 
     @Override
     public void postRemoteProcess(String data, String originService, String destinationService) {
-        ServiceContextHolder.getInstance().publishEvent(new RemoteSecurityMetadataSyncEvent(data, originService, destinationService));
+        publishEvent(new RemoteSecurityMetadataSyncEvent(data, originService, destinationService));
     }
 
     /**

diff --git a/modules/dante-module-security/pom.xml b/modules/dante-module-security/pom.xml
diff --git a/...in/java/cn/herodotus/dante/module/security/configuration/SecurityModuleConfiguration.java b/...in/java/cn/herodotus/dante/module/security/configuration/SecurityModuleConfiguration.java
diff --git a/...cn/herodotus/dante/module/security/processor/HerodotusRequestMappingScanEventManager.java b/...cn/herodotus/dante/module/security/processor/HerodotusRequestMappingScanEventManager.java