From e849f4ec0d937b74c05a40e2adc5b3dd025d736b Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Wed, 8 May 2024 15:30:10 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"feat(all):=20=E4=BF=AE=E6=94=B9mq?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E6=A0=B9=E6=8D=AE=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E5=88=87=E6=8D=A2=E7=9A=84=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ad317385 --- .../base/config/CustomMessageConverter.java | 68 ------------------- .../factorydata/base/config/RabbitConfig.java | 17 ----- .../src/main/resources/application-dev.yml | 8 +-- .../src/main/resources/application-dev.yml | 8 +-- .../olo/aspect/AnnotationAspect.java | 33 --------- .../olo/config/CustomMessageConverter.java | 57 ---------------- .../factorydata/olo/config/RabbitConfig.java | 18 ----- 7 files changed, 8 insertions(+), 201 deletions(-) delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/config/CustomMessageConverter.java delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/config/RabbitConfig.java delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/aspect/AnnotationAspect.java delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/CustomMessageConverter.java delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/RabbitConfig.java diff --git a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/config/CustomMessageConverter.java b/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/config/CustomMessageConverter.java deleted file mode 100644 index c2997a335..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/config/CustomMessageConverter.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.logpm.factorydata.base.config; - -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; -import org.springblade.common.model.MockHttpServletRequest; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.utils.ThreadLocalUtil; -import org.springblade.core.tool.utils.WebUtil; -import org.springframework.amqp.core.Message; -import org.springframework.amqp.core.MessageProperties; -import org.springframework.amqp.support.converter.MessageConversionException; -import org.springframework.amqp.support.converter.MessageConverter; -import org.springframework.http.HttpHeaders; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; -import java.util.Map; - -/** - * @author zhaoqiaobo - * @create 2024-05-08 - */ -public class CustomMessageConverter implements MessageConverter { - private String name; - - @Override - public Message toMessage(Object o, MessageProperties messageProperties) throws MessageConversionException { - HttpHeaders headers = (HttpHeaders) ThreadLocalUtil.get("bladeContext"); - if (headers != null && !headers.isEmpty()) { - headers.forEach((key, values) -> { - values.forEach((value) -> { - messageProperties.setHeader(key, new String[]{value}); - }); - }); - } - BladeUser user = AuthUtil.getUser(); - BladeUser bladeUser = new BladeUser(); - bladeUser.setTenantId(user.getTenantId()); - bladeUser.setUserId(user.getUserId()); - bladeUser.setAccount(user.getAccount()); - bladeUser.setRoleId(user.getRoleId()); - messageProperties.setHeader("bladeUser", JSONUtil.toJsonStr(bladeUser)); - return new Message(o.toString().getBytes(), messageProperties); - } - - @Override - public Object fromMessage(Message message) throws MessageConversionException { - MessageProperties messageProperties = message.getMessageProperties(); - Map headers = messageProperties.getHeaders(); - ThreadLocalUtil.put("bladeContext", headers); - Object bladeUser = headers.get("bladeUser"); - MockHttpServletRequest request = new MockHttpServletRequest(); - BladeUser bladeUser1 = JSONUtil.toBean(bladeUser.toString(), BladeUser.class); - request.setAttribute("_BLADE_USER_REQUEST_ATTR_", bladeUser1); - RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request)); - return new String(message.getBody()); - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/config/RabbitConfig.java b/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/config/RabbitConfig.java deleted file mode 100644 index 31b0350c5..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/config/RabbitConfig.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.logpm.factorydata.base.config; - -import org.springframework.amqp.rabbit.connection.ConnectionFactory; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class RabbitConfig { - - @Bean - public RabbitTemplate rabbitTemplate(ConnectionFactory factory) { - RabbitTemplate template = new RabbitTemplate(factory); - template.setMessageConverter(new CustomMessageConverter()); - return template; - } -} diff --git a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-dev.yml b/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-dev.yml index 799bda9d3..617a0c5de 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-dev.yml +++ b/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-dev.yml @@ -59,13 +59,13 @@ spring: url: ${blade.datasource.factorydata-base.master.url} username: ${blade.datasource.factorydata-base.master.username} password: ${blade.datasource.factorydata-base.master.password} - 627683: + slave: druid: #独立校验配置 validation-query: select 1 #oracle校验 #validation-query: select 1 from dual - url: ${blade.datasource.factorydata-base.627683.url} - username: ${blade.datasource.factorydata-base.627683.username} - password: ${blade.datasource.factorydata-base.627683.password} + url: ${blade.datasource.factorydata-base.slave.url} + username: ${blade.datasource.factorydata-base.slave.username} + password: ${blade.datasource.factorydata-base.slave.password} diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-dev.yml b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-dev.yml index c9c70ac9b..6b1351188 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-dev.yml +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/resources/application-dev.yml @@ -59,13 +59,13 @@ spring: url: ${blade.datasource.factorydata-jinpai.master.url} username: ${blade.datasource.factorydata-jinpai.master.username} password: ${blade.datasource.factorydata-jinpai.master.password} - 627683: + slave: druid: #独立校验配置 validation-query: select 1 #oracle校验 #validation-query: select 1 from dual - url: ${blade.datasource.factorydata-jinpai.627683.url} - username: ${blade.datasource.factorydata-jinpai.627683.username} - password: ${blade.datasource.factorydata-jinpai.627683.password} + url: ${blade.datasource.factorydata-jinpai.slave.url} + username: ${blade.datasource.factorydata-jinpai.slave.username} + password: ${blade.datasource.factorydata-jinpai.slave.password} diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/aspect/AnnotationAspect.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/aspect/AnnotationAspect.java deleted file mode 100644 index b8ad44dc6..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/aspect/AnnotationAspect.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.logpm.factorydata.olo.aspect; - -import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.springblade.core.secure.utils.AuthUtil; -import org.springframework.stereotype.Component; - -@Aspect -@Component -public class AnnotationAspect { - - /** - * 该方法为一个切面，用于对标记了@RabbitListener注解的方法进行增强，主要增加了日志记录和数据源上下文处理的功能。 - * - * @param joinPoint 切面的连接点，表示当前被拦截的方法。 - * @return 返回被拦截方法的执行结果。 - * @throws Throwable 如果执行过程中发生异常，则抛出。 - */ - @Around("@annotation(org.springframework.amqp.rabbit.annotation.RabbitListener)") - public Object logAroundAsyncMethods(ProceedingJoinPoint joinPoint) throws Throwable { - // 在方法执行前，获取当前租户ID并设置到数据源上下文中 - String tenantId = AuthUtil.getTenantId(); - DynamicDataSourceContextHolder.push(tenantId); - // 执行原方法 - Object result = joinPoint.proceed(); - // 在方法执行后，从数据源上下文中移除租户ID - DynamicDataSourceContextHolder.poll(); - return result; - } - -} diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/CustomMessageConverter.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/CustomMessageConverter.java deleted file mode 100644 index a8af5c74d..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/CustomMessageConverter.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.logpm.factorydata.olo.config; - -import cn.hutool.json.JSONUtil; -import org.springblade.common.model.MockHttpServletRequest; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.utils.ThreadLocalUtil; -import org.springframework.amqp.core.Message; -import org.springframework.amqp.core.MessageProperties; -import org.springframework.amqp.support.converter.MessageConversionException; -import org.springframework.amqp.support.converter.MessageConverter; -import org.springframework.http.HttpHeaders; -import org.springframework.stereotype.Component; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import java.util.Map; - -/** - * @author zhaoqiaobo - * @create 2024-05-08 - */ -@Component -public class CustomMessageConverter implements MessageConverter { - @Override - public Message toMessage(Object o, MessageProperties messageProperties) throws MessageConversionException { - HttpHeaders headers = (HttpHeaders) ThreadLocalUtil.get("bladeContext"); - if (headers != null && !headers.isEmpty()) { - headers.forEach((key, values) -> { - values.forEach((value) -> { - messageProperties.setHeader(key, new String[]{value}); - }); - }); - } - BladeUser user = AuthUtil.getUser(); - BladeUser bladeUser = new BladeUser(); - bladeUser.setTenantId(user.getTenantId()); - bladeUser.setUserId(user.getUserId()); - bladeUser.setAccount(user.getAccount()); - bladeUser.setRoleId(user.getRoleId()); - messageProperties.setHeader("bladeUser", JSONUtil.toJsonStr(bladeUser)); - return new Message(o.toString().getBytes(), messageProperties); - } - - @Override - public Object fromMessage(Message message) throws MessageConversionException { - MessageProperties messageProperties = message.getMessageProperties(); - Map headers = messageProperties.getHeaders(); - ThreadLocalUtil.put("bladeContext", headers); - Object bladeUser = headers.get("bladeUser"); - MockHttpServletRequest request = new MockHttpServletRequest(); - BladeUser bladeUser1 = JSONUtil.toBean(bladeUser.toString(), BladeUser.class); - request.setAttribute("_BLADE_USER_REQUEST_ATTR_", bladeUser1); - RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request)); - return new String(message.getBody()); - } -} diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/RabbitConfig.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/RabbitConfig.java deleted file mode 100644 index 46ef3cfc9..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/RabbitConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.logpm.factorydata.olo.config; - -import com.logpm.factorydata.olo.config.CustomMessageConverter; -import org.springframework.amqp.rabbit.connection.ConnectionFactory; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class RabbitConfig { - - @Bean - public RabbitTemplate rabbitTemplate(ConnectionFactory factory, CustomMessageConverter customMessageConverter) { - RabbitTemplate template = new RabbitTemplate(factory); - template.setMessageConverter(customMessageConverter); - return template; - } -}