Skip to content

Commit 633caad

Browse files
herodotus-ecosystemgitee-org
herodotus-ecosystem
authored and
gitee-org
committed
!181 v3.2.1.3
Merge pull request !181 from 码匠君/develop
2 parents 4fb9736 + e25c0d8 commit 633caad

File tree

47 files changed

+50
-50
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+50
-50
lines changed

‎README.md

+3-3

‎configurations/backup/alibaba/3.2.1.0/nacos_config_export_20231103170632.zip

-13.6 KB
Binary file not shown.

‎configurations/backup/alibaba/3.2.1.0/nacos_config_export_20240103163908.zip

11.9 KB
Binary file not shown.

‎configurations/backup/alibaba/3.2.1.1/nacos_config_export_20231103170632.zip

-13.6 KB
Binary file not shown.

‎configurations/backup/alibaba/3.2.1.1/nacos_config_export_20240103163908.zip

11.9 KB
Binary file not shown.

‎configurations/backup/alibaba/3.2.1.2/nacos_config_export_20231103170632.zip

-13.6 KB
Binary file not shown.

‎configurations/backup/alibaba/3.2.1.2/nacos_config_export_20240103163908.zip

11.9 KB
Binary file not shown.

‎configurations/backup/alibaba/3.2.1.3/nacos_config_export_20240103163908.zip

11.9 KB
Binary file not shown.

‎configurations/docker/docker-compose/linux/herodotus/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=3.2.1.2
1+
VERSION=3.2.1.3
22
GATEWAY_SERVICE_NAME=dante-cloud-gateway
33
GATEWAY_SERVICE_PORT=8847
44
UAA_SERVICE_NAME=dante-cloud-uaa

‎configurations/docker/docker-compose/linux/herodotus/env.oss.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.8'
22
services:
33
minio:
4-
image: quay.io/minio/minio:RELEASE.2023-12-23T07-19-11Z
4+
image: quay.io/minio/minio:RELEASE.2024-01-01T16-36-33Z
55
container_name: minio
66
hostname: minio
77
ports:

‎configurations/docker/docker-compose/windows/herodotus/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=3.2.1.2
1+
VERSION=3.2.1.3
22
GATEWAY_SERVICE_NAME=dante-cloud-gateway
33
GATEWAY_SERVICE_PORT=8847
44
UAA_SERVICE_NAME=dante-cloud-uaa

‎configurations/docker/docker-compose/windows/herodotus/env.oss.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.8'
22
services:
33
minio:
4-
image: quay.io/minio/minio:RELEASE.2023-12-23T07-19-11Z
4+
image: quay.io/minio/minio:RELEASE.2024-01-01T16-36-33Z
55
container_name: minio
66
hostname: minio
77
ports:

‎dependencies/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<groupId>cn.herodotus.engine</groupId>
3434
<artifactId>dependencies</artifactId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
<relativePath/>
3737
</parent>
3838

‎modules/dante-module-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>modules</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
</parent>
3737

3838
<artifactId>dante-module-common</artifactId>

‎modules/dante-module-metadata/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>modules</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
</parent>
3737

3838
<artifactId>dante-module-metadata</artifactId>

‎modules/dante-module-social/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>modules</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
</parent>
3737

3838
<artifactId>dante-module-social</artifactId>

‎modules/dante-module-strategy/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>modules</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
</parent>
3737

3838
<artifactId>dante-module-strategy</artifactId>

‎modules/dante-module-strategy/src/main/java/cn/herodotus/dante/module/strategy/feign/RemoteAuthorityDetailsService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
package cn.herodotus.dante.module.strategy.feign;
2727

2828
import cn.herodotus.dante.module.common.ServiceNameConstants;
29-
import cn.herodotus.engine.assistant.core.domain.Result;
29+
import cn.herodotus.engine.assistant.definition.domain.Result;
3030
import cn.herodotus.engine.supplier.upms.logic.entity.security.SysPermission;
3131
import org.springframework.cloud.openfeign.FeignClient;
3232
import org.springframework.web.bind.annotation.GetMapping;

‎modules/dante-module-strategy/src/main/java/cn/herodotus/dante/module/strategy/feign/RemoteSocialDetailsService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import cn.herodotus.dante.module.common.ServiceNameConstants;
2929
import cn.herodotus.engine.assistant.core.domain.AccessPrincipal;
30-
import cn.herodotus.engine.assistant.core.domain.Result;
30+
import cn.herodotus.engine.assistant.definition.domain.Result;
3131
import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser;
3232
import cn.herodotus.engine.rest.core.annotation.Inner;
3333
import org.springframework.cloud.openfeign.FeignClient;

‎modules/dante-module-strategy/src/main/java/cn/herodotus/dante/module/strategy/feign/RemoteUserDetailsService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
package cn.herodotus.dante.module.strategy.feign;
2727

2828
import cn.herodotus.dante.module.common.ServiceNameConstants;
29-
import cn.herodotus.engine.assistant.core.domain.Result;
29+
import cn.herodotus.engine.assistant.definition.domain.Result;
3030
import cn.herodotus.engine.rest.core.annotation.Inner;
3131
import cn.herodotus.engine.supplier.upms.logic.entity.security.SysUser;
3232
import org.springframework.cloud.openfeign.FeignClient;

‎modules/dante-module-strategy/src/main/java/cn/herodotus/dante/module/strategy/service/HerodotusRemotePermissionDetailsService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import cn.herodotus.dante.module.strategy.definition.AbstractStrategyPermissionDetailsService;
2929
import cn.herodotus.dante.module.strategy.feign.RemoteAuthorityDetailsService;
30-
import cn.herodotus.engine.assistant.core.domain.Result;
30+
import cn.herodotus.engine.assistant.definition.domain.Result;
3131
import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusPermission;
3232
import cn.herodotus.engine.supplier.upms.logic.entity.security.SysPermission;
3333
import org.apache.commons.collections4.CollectionUtils;

‎modules/dante-module-strategy/src/main/java/cn/herodotus/dante/module/strategy/service/HerodotusRemoteUserDetailsService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import cn.herodotus.dante.module.strategy.feign.RemoteSocialDetailsService;
3030
import cn.herodotus.dante.module.strategy.feign.RemoteUserDetailsService;
3131
import cn.herodotus.engine.assistant.core.domain.AccessPrincipal;
32-
import cn.herodotus.engine.assistant.core.domain.Result;
32+
import cn.herodotus.engine.assistant.definition.domain.Result;
3333
import cn.herodotus.engine.oauth2.core.definition.domain.HerodotusUser;
3434
import cn.herodotus.engine.supplier.upms.logic.entity.security.SysUser;
3535
import org.springframework.security.core.userdetails.UsernameNotFoundException;

‎modules/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>dante-cloud</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
</parent>
3737

3838
<artifactId>modules</artifactId>

‎packages/authentication-spring-boot-starter/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>packages</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
</parent>
3737

3838
<artifactId>authentication-spring-boot-starter</artifactId>

‎packages/authentication-spring-boot-starter/src/main/java/cn/herodotus/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
package cn.herodotus.dante.authentication.autoconfigure;
2727

28-
import cn.herodotus.engine.assistant.core.constants.DefaultConstants;
2928
import cn.herodotus.engine.assistant.core.utils.ResourceUtils;
29+
import cn.herodotus.engine.assistant.definition.constants.DefaultConstants;
3030
import cn.herodotus.engine.oauth2.authentication.configurer.OAuth2AuthenticationProviderConfigurer;
3131
import cn.herodotus.engine.oauth2.authentication.consumer.OAuth2AuthorizationCodeAuthenticationProviderConsumer;
3232
import cn.herodotus.engine.oauth2.authentication.consumer.OAuth2ClientCredentialsAuthenticationProviderConsumer;

‎packages/facility-spring-boot-starter/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<parent>
3131
<artifactId>packages</artifactId>
3232
<groupId>cn.herodotus.dante</groupId>
33-
<version>3.2.1.2</version>
33+
<version>3.2.1.3</version>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>
3636

‎packages/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>dante-cloud</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
</parent>
3737

3838
<artifactId>packages</artifactId>

‎packages/service-spring-boot-starter/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>packages</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
</parent>
3737

3838
<artifactId>service-spring-boot-starter</artifactId>

‎platform/dante-cloud-gateway/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>platform</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
</parent>
3737

3838
<artifactId>dante-cloud-gateway</artifactId>

‎platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/filter/GlobalCertificationFilter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
import cn.herodotus.dante.gateway.properties.GatewaySecurityProperties;
2929
import cn.herodotus.dante.gateway.utils.WebFluxUtils;
30-
import cn.herodotus.engine.assistant.core.constants.BaseConstants;
31-
import cn.herodotus.engine.assistant.core.constants.ErrorCodes;
32-
import cn.herodotus.engine.assistant.core.domain.Result;
3330
import cn.herodotus.engine.assistant.core.utils.http.HeaderUtils;
31+
import cn.herodotus.engine.assistant.definition.constants.BaseConstants;
32+
import cn.herodotus.engine.assistant.definition.constants.ErrorCodes;
33+
import cn.herodotus.engine.assistant.definition.domain.Result;
3434
import jakarta.annotation.Resource;
3535
import org.apache.commons.lang3.ObjectUtils;
3636
import org.apache.commons.lang3.StringUtils;

‎platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/filter/GlobalSqlInjectionFilter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
package cn.herodotus.dante.gateway.filter;
2727

2828
import cn.herodotus.dante.gateway.utils.WebFluxUtils;
29-
import cn.herodotus.engine.assistant.core.constants.ErrorCodes;
30-
import cn.herodotus.engine.assistant.core.domain.Result;
3129
import cn.herodotus.engine.assistant.core.utils.protect.SqlInjectionUtils;
30+
import cn.herodotus.engine.assistant.definition.constants.ErrorCodes;
31+
import cn.herodotus.engine.assistant.definition.domain.Result;
3232
import io.netty.buffer.ByteBufAllocator;
3333
import org.apache.commons.lang3.StringUtils;
3434
import org.apache.hc.core5.http.HttpStatus;

‎platform/dante-cloud-gateway/src/main/java/cn/herodotus/dante/gateway/utils/WebFluxUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
package cn.herodotus.dante.gateway.utils;
2727

28-
import cn.herodotus.engine.assistant.core.domain.Result;
2928
import cn.herodotus.engine.assistant.core.json.jackson2.utils.Jackson2Utils;
29+
import cn.herodotus.engine.assistant.definition.domain.Result;
3030
import org.springframework.core.io.buffer.DataBuffer;
3131
import org.springframework.core.io.buffer.DataBufferUtils;
3232
import org.springframework.http.HttpHeaders;

‎platform/dante-cloud-message/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<parent>
3232
<groupId>cn.herodotus.dante</groupId>
3333
<artifactId>platform</artifactId>
34-
<version>3.2.1.2</version>
34+
<version>3.2.1.3</version>
3535
</parent>
3636

3737
<artifactId>dante-cloud-message</artifactId>

‎platform/dante-cloud-monitor/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
<parent>
3131
<artifactId>platform</artifactId>
3232
<groupId>cn.herodotus.dante</groupId>
33-
<version>3.2.1.2</version>
33+
<version>3.2.1.3</version>
3434
</parent>
3535

3636
<artifactId>dante-cloud-monitor</artifactId>
37-
<version>3.2.1.2</version>
37+
<version>3.2.1.3</version>
3838
<name>dante-cloud-monitor</name>
3939
<description>dante-cloud-monitor</description>
4040
<dependencies>

‎platform/dante-cloud-uaa/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>platform</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
</parent>
3737

3838
<artifactId>dante-cloud-uaa</artifactId>

‎platform/dante-cloud-upms/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
<parent>
3131
<artifactId>platform</artifactId>
3232
<groupId>cn.herodotus.dante</groupId>
33-
<version>3.2.1.2</version>
33+
<version>3.2.1.3</version>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>
3636

3737
<artifactId>dante-cloud-upms</artifactId>
38-
<version>3.2.1.2</version>
38+
<version>3.2.1.3</version>
3939

4040
<dependencies>
4141
<dependency>

‎platform/dante-cloud-upms/src/main/java/cn/herodotus/dante/upms/controller/AuthorizationController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
package cn.herodotus.dante.upms.controller;
2727

2828
import cn.herodotus.dante.upms.service.AuthorizationService;
29-
import cn.herodotus.engine.assistant.core.domain.Result;
29+
import cn.herodotus.engine.assistant.definition.domain.Result;
3030
import jakarta.validation.constraints.NotNull;
3131
import org.apache.commons.collections4.MapUtils;
3232
import org.springframework.beans.factory.annotation.Autowired;

‎platform/dante-cloud-upms/src/main/java/cn/herodotus/dante/upms/service/AuthorizationService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
package cn.herodotus.dante.upms.service;
2727

28-
import cn.herodotus.engine.assistant.core.definition.RestApiTemplate;
28+
import cn.herodotus.engine.assistant.core.support.RestApiTemplate;
2929
import cn.zhxu.data.TypeRef;
3030
import cn.zhxu.okhttps.OkHttps;
3131
import org.dromara.hutool.core.codec.binary.Base64;

‎platform/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>dante-cloud</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
</parent>
3737

3838
<artifactId>platform</artifactId>

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<groupId>cn.herodotus.dante</groupId>
3434
<artifactId>dependencies</artifactId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
<relativePath>dependencies/pom.xml</relativePath>
3737
</parent>
3838

‎services/dante-cloud-bpmn-ability/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
<parent>
3232
<artifactId>services</artifactId>
3333
<groupId>cn.herodotus.dante</groupId>
34-
<version>3.2.1.2</version>
34+
<version>3.2.1.3</version>
3535
</parent>
3636

3737
<artifactId>dante-cloud-bpmn-ability</artifactId>
38-
<version>3.2.1.2</version>
38+
<version>3.2.1.3</version>
3939

4040
<name>dante-cloud-bpmn-ability</name>
4141
<description>基于Camunda工作流的服务</description>

‎services/dante-cloud-bpmn-logic/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>services</artifactId>
3434
<groupId>cn.herodotus.dante</groupId>
35-
<version>3.2.1.2</version>
35+
<version>3.2.1.3</version>
3636
</parent>
3737

3838
<artifactId>dante-cloud-bpmn-logic</artifactId>

‎services/dante-cloud-bpmn-logic/src/main/java/cn/herodotus/dante/bpmn/logic/domain/base/BaseEntity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
package cn.herodotus.dante.bpmn.logic.domain.base;
2727

28-
import cn.herodotus.engine.assistant.core.definition.domain.Entity;
28+
import cn.herodotus.engine.assistant.definition.domain.Entity;
2929
import jakarta.persistence.MappedSuperclass;
3030

3131
/**

‎services/dante-cloud-oss-ability/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<parent>
3232
<groupId>cn.herodotus.dante</groupId>
3333
<artifactId>services</artifactId>
34-
<version>3.2.1.2</version>
34+
<version>3.2.1.3</version>
3535
</parent>
3636

3737
<artifactId>dante-cloud-oss-ability</artifactId>

0 commit comments

Comments
 (0)