diff --git a/yudao-admin-server/src/test-integration/java/cn/iocoder/yudao/adminserver/framework/redis/core/stream/RedisStreamTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/yudao/adminserver/framework/redis/core/stream/RedisStreamTest.java index 727b25750..90e25aeeb 100644 --- a/yudao-admin-server/src/test-integration/java/cn/iocoder/yudao/adminserver/framework/redis/core/stream/RedisStreamTest.java +++ b/yudao-admin-server/src/test-integration/java/cn/iocoder/yudao/adminserver/framework/redis/core/stream/RedisStreamTest.java @@ -5,7 +5,7 @@ import cn.iocoder.yudao.adminserver.BaseRedisIntegrationTest; import cn.iocoder.yudao.adminserver.modules.system.mq.consumer.mail.SysMailSendConsumer; import cn.iocoder.yudao.adminserver.modules.system.mq.consumer.sms.SysSmsSendConsumer; import cn.iocoder.yudao.adminserver.modules.system.mq.message.mail.SysMailSendMessage; -import cn.iocoder.yudao.adminserver.modules.system.mq.message.sms.SysSmsSendMessage; +import cn.iocoder.yudao.coreservice.modules.system.mq.message.sms.SysSmsSendMessage; import cn.iocoder.yudao.framework.mq.core.util.RedisMessageUtils; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/yudao-admin-server/src/test-integration/java/cn/iocoder/yudao/adminserver/modules/system/service/sms/SysSmsServiceIntegrationTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/yudao/adminserver/modules/system/service/sms/SysSmsServiceIntegrationTest.java index 7bbaab67a..dc4301952 100644 --- a/yudao-admin-server/src/test-integration/java/cn/iocoder/yudao/adminserver/modules/system/service/sms/SysSmsServiceIntegrationTest.java +++ b/yudao-admin-server/src/test-integration/java/cn/iocoder/yudao/adminserver/modules/system/service/sms/SysSmsServiceIntegrationTest.java @@ -7,9 +7,9 @@ import cn.iocoder.yudao.adminserver.modules.system.mq.consumer.sms.SysSmsSendCon import cn.iocoder.yudao.adminserver.modules.system.mq.producer.sms.SysSmsProducer; import cn.iocoder.yudao.adminserver.modules.system.service.sms.impl.SysSmsChannelServiceImpl; import cn.iocoder.yudao.adminserver.modules.system.service.sms.impl.SysSmsLogServiceImpl; -import cn.iocoder.yudao.adminserver.modules.system.service.sms.impl.SysSmsServiceImpl; import cn.iocoder.yudao.adminserver.modules.system.service.sms.impl.SysSmsTemplateServiceImpl; import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; +import cn.iocoder.yudao.coreservice.modules.system.service.sms.impl.SysSmsCoreServiceImpl; import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; import cn.iocoder.yudao.framework.sms.config.YudaoSmsAutoConfiguration; import org.junit.jupiter.api.Test; @@ -20,13 +20,14 @@ import javax.annotation.Resource; import java.util.Map; import java.util.concurrent.TimeUnit; +// TODO @芋艿：需要迁移 @Import({YudaoSmsAutoConfiguration.class, - SysSmsChannelServiceImpl.class, SysSmsServiceImpl.class, SysSmsTemplateServiceImpl.class, SysSmsLogServiceImpl.class, + SysSmsChannelServiceImpl.class, SysSmsCoreServiceImpl.class, SysSmsTemplateServiceImpl.class, SysSmsLogServiceImpl.class, SysSmsProducer.class, SysSmsSendConsumer.class}) public class SysSmsServiceIntegrationTest extends BaseDbAndRedisIntegrationTest { @Resource - private SysSmsServiceImpl smsService; + private SysSmsCoreServiceImpl smsService; @Resource private SysSmsChannelServiceImpl smsChannelService; diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index e3c970481..125d3bdaf 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -34,9 +34,9 @@ 2.2.0 1.7.0 - 8.5.0 + 8.7.0 2.3.1 - 0.30.0 + 0.31.0 7.2.6.RELEASE 0.1.16 @@ -49,7 +49,7 @@ 1.0.5 30.1.1-jre - 4.5.18 + 4.5.25 2.1.0 1.2.7 @@ -257,12 +257,32 @@ org.apache.skywalking apm-toolkit-opentracing ${skywalking.version} + + + + + + + + + + + + + io.opentracing + opentracing-api + ${opentracing.version} io.opentracing opentracing-util ${opentracing.version} + + io.opentracing + opentracing-noop + ${opentracing.version} + de.codecentric diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml b/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml index 0fa5ac5d5..8088520e1 100644 --- a/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml @@ -41,6 +41,10 @@ + + io.opentracing + opentracing-util + org.apache.skywalking apm-toolkit-trace @@ -53,10 +57,6 @@ org.apache.skywalking apm-toolkit-opentracing - - io.opentracing - opentracing-util - de.codecentric diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java index 6979d8e18..ac76b9ed7 100644 --- a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java +++ b/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java @@ -1,13 +1,9 @@ package cn.iocoder.yudao.framework.tracer.config; +import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; import cn.iocoder.yudao.framework.tracer.core.aop.BizTraceAspect; import cn.iocoder.yudao.framework.tracer.core.filter.TraceFilter; -import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; -import io.opentracing.Tracer; -import io.opentracing.util.GlobalTracer; -import org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.servlet.FilterRegistrationBean; @@ -25,24 +21,25 @@ import org.springframework.context.annotation.Configuration; @ConditionalOnProperty(prefix = "yudao.tracer", value = "enable", matchIfMissing = true) public class YudaoTracerAutoConfiguration { - @Bean - public TracerProperties bizTracerProperties() { - return new TracerProperties(); - } - - @Bean - public BizTraceAspect bizTracingAop() { - return new BizTraceAspect(tracer()); - } - - @Bean - public Tracer tracer() { - // 创建 SkywalkingTracer 对象 - SkywalkingTracer tracer = new SkywalkingTracer(); - // 设置为 GlobalTracer 的追踪器 - GlobalTracer.register(tracer); - return tracer; - } + // TODO @芋艿：重要。目前 opentracing 版本存在冲突，要么保证 skywalking，要么保证阿里云短信 sdk +// @Bean +// public TracerProperties bizTracerProperties() { +// return new TracerProperties(); +// } +// +// @Bean +// public BizTraceAspect bizTracingAop() { +// return new BizTraceAspect(tracer()); +// } +// +// @Bean +// public Tracer tracer() { +// // 创建 SkywalkingTracer 对象 +// SkywalkingTracer tracer = new SkywalkingTracer(); +// // 设置为 GlobalTracer 的追踪器 +// GlobalTracer.register(tracer); +// return tracer; +// } /** * 创建 TraceFilter 过滤器，响应 header 设置 traceId diff --git a/更新日志.md b/更新日志.md index 2f1a9815a..206599b25 100644 --- a/更新日志.md +++ b/更新日志.md @@ -20,6 +20,7 @@ * 新增用户前台的手机登录、验证码登录 * 修复管理后台的用户头像上传 404 的问题，原因是请求路径不对 * 修复用户导入失败的问题，原因是 Lombok 链式与 cglib 读取属性有冲突 +* 修复阿里云短信发送失败的问题，原因是 Opentracing 依赖的版本太低，调整成 0.31.0 ## [v1.0.0] 2021.05.03