wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/REQ-3488

Browse Source 
# Conflicts:
#	orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/event/config/RocketMQEventConfig.java
This commit is contained in:
liuyang 2025-01-13 10:15:19 +08:00
commit 00024a0b5e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/Config.java
View File

@ -4,6 +4,7 @@ import cn.axzo.foundation.web.support.AppRuntime;
import cn.axzo.foundation.web.support.config.DefaultWebMvcConfig;
import cn.axzo.foundation.web.support.exception.AbstractExceptionHandler;
import cn.axzo.foundation.web.support.log.RequestLogAspect;
import cn.axzo.foundation.web.support.log.RequestLogV2Aspect;
import cn.axzo.orgmanax.infra.event.config.RocketMQEventConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
@ -49,8 +50,8 @@ public class Config {
}
@Bean
public RequestLogAspect requestLogAspect() {
return RequestLogAspect.builder().build();
public RequestLogV2Aspect requestLogV2Aspect() {
return RequestLogV2Aspect.builder().build();
}
@Bean

11
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/event/config/RocketMQEventConfig.java
View File

@ -20,13 +20,10 @@ import org.springframework.stereotype.Component;
public class RocketMQEventConfig {
public static final String DEFAULT_MODULE = "orgmanax-server";
@Value("topic_${spring.application.name}_${spring.profiles.active}")
@Value("topic_organizational_${spring.profiles.active}")
private String currentTopic;
@Value("topic_organizational_${spring.profiles.active}")
private String organizationalTopic;
@Value("topic_${spring.application.name}_retry_${spring.profiles.active}")
@Value("topic_organizational_retry_${spring.profiles.active}")
private String currentRetryTopic;
/**
@ -37,7 +34,7 @@ public class RocketMQEventConfig {
@Component
// XXX: consumerGroup 必须全局唯一. RocketMQ要求同一个Consumer Group的消费者必须要拥有相同的注册信息，即必须要听一样的topic(并且tag也一样)。
// 这里通个添加 topic信息来保证唯一.
@RocketMQMessageListener(topic = "topic_${spring.application.name}_${spring.profiles.active}",
@RocketMQMessageListener(topic = "topic_organizational_${spring.profiles.active}",
consumerGroup = "GID_${spring.application.name}_${spring.application.name}_${spring.profiles.active}",
consumeMode = ConsumeMode.ORDERLY, enableMsgTrace = false)
public static class Listener extends DefaultRocketMQListener {
@ -50,7 +47,7 @@ public class RocketMQEventConfig {
@Component
// XXX: consumerGroup 必须全局唯一. RocketMQ要求同一个Consumer Group的消费者必须要拥有相同的注册信息，即必须要听一样的topic(并且tag也一样)。
// 这里通个添加 topic信息来保证唯一.
@RocketMQMessageListener(topic = "topic_${spring.application.name}_retry_${spring.profiles.active}",
@RocketMQMessageListener(topic = "topic_organizational_retry_${spring.profiles.active}",
consumerGroup = "GID_${spring.application.name}_retry_${spring.application.name}_${spring.profiles.active}",
consumeMode = ConsumeMode.ORDERLY, enableMsgTrace = false)
public static class RetryListener extends DefaultRocketMQListener {