From d9f0c3522aeddfd1f6b9c343a6967737afe2b558 Mon Sep 17 00:00:00 2001 From: smallchill Date: Thu, 19 Mar 2020 20:29:39 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20oss=E3=80=81sms=20builder=E5=BC=95?= =?UTF-8?q?=E5=85=A5service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/resource/builder/oss/OssBuilder.java | 10 +++++----- .../springblade/resource/builder/sms/SmsBuilder.java | 10 +++++----- .../resource/config/BladeOssConfiguration.java | 6 +++--- .../resource/config/BladeSmsConfiguration.java | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java index 7f98aa74..4b476f4e 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java @@ -32,7 +32,7 @@ import org.springblade.core.tool.utils.StringPool; import org.springblade.core.tool.utils.StringUtil; import org.springblade.core.tool.utils.WebUtil; import org.springblade.resource.entity.Oss; -import org.springblade.resource.mapper.OssMapper; +import org.springblade.resource.service.IOssService; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -50,11 +50,11 @@ public class OssBuilder { public static final String OSS_PARAM_KEY = "code"; private final OssProperties ossProperties; - private final OssMapper ossMapper; + private final IOssService ossService; - public OssBuilder(OssProperties ossProperties, OssMapper ossMapper) { + public OssBuilder(OssProperties ossProperties, IOssService ossService) { this.ossProperties = ossProperties; - this.ossMapper = ossMapper; + this.ossService = ossService; } /** @@ -134,7 +134,7 @@ public class OssBuilder { lqw.eq(Oss::getStatus, OssStatusEnum.ENABLE.getNum()); } Oss oss = CacheUtil.get(RESOURCE_CACHE, OSS_CODE, key, () -> { - Oss o = ossMapper.selectOne(lqw); + Oss o = ossService.getOne(lqw); // 若为空则调用默认配置 if ((Func.isEmpty(o))) { Oss defaultOss = new Oss(); diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java index 5a3bec30..d1904378 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java @@ -31,7 +31,7 @@ import org.springblade.core.tool.utils.StringPool; import org.springblade.core.tool.utils.StringUtil; import org.springblade.core.tool.utils.WebUtil; import org.springblade.resource.entity.Sms; -import org.springblade.resource.mapper.SmsMapper; +import org.springblade.resource.service.ISmsService; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -49,13 +49,13 @@ public class SmsBuilder { public static final String SMS_PARAM_KEY = "code"; private final SmsProperties smsProperties; - private final SmsMapper smsMapper; + private final ISmsService smsService; private final BladeRedis bladeRedis; - public SmsBuilder(SmsProperties smsProperties, SmsMapper smsMapper, BladeRedis bladeRedis) { + public SmsBuilder(SmsProperties smsProperties, ISmsService smsService, BladeRedis bladeRedis) { this.smsProperties = smsProperties; - this.smsMapper = smsMapper; + this.smsService = smsService; this.bladeRedis = bladeRedis; } @@ -131,7 +131,7 @@ public class SmsBuilder { lqw.eq(Sms::getStatus, SmsStatusEnum.ENABLE.getNum()); } Sms sms = CacheUtil.get(RESOURCE_CACHE, SMS_CODE, key, () -> { - Sms s = smsMapper.selectOne(lqw); + Sms s = smsService.getOne(lqw); // 若为空则调用默认配置 if ((Func.isEmpty(s))) { Sms defaultSms = new Sms(); diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java index 4068eeae..127918dd 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java @@ -19,7 +19,7 @@ package org.springblade.resource.config; import lombok.AllArgsConstructor; import org.springblade.core.oss.props.OssProperties; import org.springblade.resource.builder.oss.OssBuilder; -import org.springblade.resource.mapper.OssMapper; +import org.springblade.resource.service.IOssService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -34,11 +34,11 @@ public class BladeOssConfiguration { private OssProperties ossProperties; - private OssMapper ossMapper; + private IOssService ossService; @Bean public OssBuilder ossBuilder() { - return new OssBuilder(ossProperties, ossMapper); + return new OssBuilder(ossProperties, ossService); } } diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeSmsConfiguration.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeSmsConfiguration.java index 5630538b..bacb2dd4 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeSmsConfiguration.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeSmsConfiguration.java @@ -20,7 +20,7 @@ import lombok.AllArgsConstructor; import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.sms.props.SmsProperties; import org.springblade.resource.builder.sms.SmsBuilder; -import org.springblade.resource.mapper.SmsMapper; +import org.springblade.resource.service.ISmsService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -35,13 +35,13 @@ public class BladeSmsConfiguration { private SmsProperties smsProperties; - private SmsMapper smsMapper; + private ISmsService smsService; private BladeRedis bladeRedis; @Bean public SmsBuilder smsBuilder() { - return new SmsBuilder(smsProperties, smsMapper, bladeRedis); + return new SmsBuilder(smsProperties, smsService, bladeRedis); } }