From fce3423ad7c385e1c1faf0d4b583e77bd7f57b99 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sat, 11 May 2024 20:44:12 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20SMS=20=E7=BB=93=E5=90=88=E5=B7=A5?= =?UTF-8?q?=E5=8E=82+=E7=AD=96=E7=95=A5=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 6 -- .../application/config/SmsInitConfig.java | 20 +---- .../application/config/SmsReadConfig.java | 65 ++------------- .../controller/SchisandraSmsController.java | 8 +- .../factory/SmsTypeHandlerFactory.java | 40 +++++++++ .../handler/AlibabaSmsHandler.java | 51 ++++++++++++ .../handler/SchisandraSmsTypeHandler.java | 21 +++++ .../pom.xml | 21 +++-- .../auth/common/enums/SmsSupplierType.java | 82 +++++++++++++++++++ .../SchisandraSmsConfigDomainService.java | 2 + .../SchisandraSmsConfigDomainServiceImpl.java | 8 ++ .../basic/dao/SchisandraSmsConfigDao.java | 2 + .../service/SchisandraSmsConfigService.java | 2 + .../impl/SchisandraSmsConfigServiceImpl.java | 5 ++ .../mapper/SchisandraSmsConfigDao.xml | 6 ++ 15 files changed, 247 insertions(+), 92 deletions(-) create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/factory/SmsTypeHandlerFactory.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/handler/AlibabaSmsHandler.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/handler/SchisandraSmsTypeHandler.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/SmsSupplierType.java diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/pom.xml index c300f41..860327c 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/pom.xml @@ -66,11 +66,5 @@ schisandra-cloud-storage-auth-api 1.0-SNAPSHOT - - com.xkcoding - justauth-spring-boot-starter - 1.1.0 - compile - diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsInitConfig.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsInitConfig.java index 3df73ac..ec71925 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsInitConfig.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsInitConfig.java @@ -1,31 +1,17 @@ package com.schisandra.auth.application.config; -import com.schisandra.auth.application.convert.SchisandraSmsConfigDTOConvert; -import com.schisandra.auth.application.dto.SchisandraSmsConfigDTO; -import com.schisandra.auth.domain.bo.SchisandraSmsConfigBO; -import com.schisandra.auth.domain.service.SchisandraSmsConfigDomainService; -import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; import org.dromara.sms4j.core.factory.SmsFactory; import org.springframework.context.annotation.Configuration; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.context.event.EventListener; import javax.annotation.Resource; -import java.util.List; @Configuration public class SmsInitConfig { @Resource SmsReadConfig smsReadConfig; - @Resource - SchisandraSmsConfigDomainService schisandraSmsConfigDomainService; @EventListener - public void init(ContextRefreshedEvent event){ - List SchisandraSmsConfigBOs= schisandraSmsConfigDomainService.queryAll(); - List schisandraSmsConfigDTOS = SchisandraSmsConfigDTOConvert.INSTANCE.convertBOToDTOList(SchisandraSmsConfigBOs); - for (SchisandraSmsConfigDTO schisandraSmsConfig : schisandraSmsConfigDTOS){ - if (schisandraSmsConfig!=null){ - // 创建SmsBlend 短信实例 - SmsFactory.createSmsBlend(smsReadConfig); - }; - }} + public void init(ContextRefreshedEvent event) { + SmsFactory.createSmsBlend(smsReadConfig, "alibaba"); + } } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsReadConfig.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsReadConfig.java index ac40ceb..3103fd9 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsReadConfig.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsReadConfig.java @@ -1,19 +1,11 @@ package com.schisandra.auth.application.config; -import com.schisandra.auth.application.convert.SchisandraSmsConfigDTOConvert; -import com.schisandra.auth.application.dto.SchisandraSmsConfigDTO; -import com.schisandra.auth.domain.bo.SchisandraSmsConfigBO; -import com.schisandra.auth.domain.service.SchisandraSmsConfigDomainService; -import com.schisandra.auth.infra.basic.dao.SchisandraSmsConfigDao; -import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; -import org.dromara.sms4j.aliyun.config.AlibabaConfig; -import org.dromara.sms4j.huawei.config.HuaweiConfig; +import com.schisandra.auth.application.factory.SmsTypeHandlerFactory; +import com.schisandra.auth.application.handler.SchisandraSmsTypeHandler; import org.dromara.sms4j.provider.config.BaseConfig; -import org.dromara.sms4j.tencent.config.TencentConfig; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; /** @@ -27,62 +19,21 @@ import java.util.List; */ @Component public class SmsReadConfig implements org.dromara.sms4j.core.datainterface.SmsReadConfig { + + @Resource - SchisandraSmsConfigDomainService schisandraSmsConfigDomainService; + private SmsTypeHandlerFactory smsTypeHandlerFactory; @Override public BaseConfig getSupplierConfig(String configId) { - return null; + SchisandraSmsTypeHandler handler = smsTypeHandlerFactory.getHandler(configId); + return handler.addConfig(configId); } @Override public List getSupplierConfigList() { - List configs = new ArrayList<>(); - List SchisandraSmsConfigBOs= schisandraSmsConfigDomainService.queryAll(); - List schisandraSmsConfigDTOS = SchisandraSmsConfigDTOConvert.INSTANCE.convertBOToDTOList(SchisandraSmsConfigBOs); - for (SchisandraSmsConfigDTO schisandraSmsConfig : schisandraSmsConfigDTOS){ - if ("alibaba".equals(schisandraSmsConfig.getConfigId())) { - AlibabaConfig alibabaConfig = new AlibabaConfig(); - alibabaConfig.setConfigId(schisandraSmsConfig.getConfigId()); - alibabaConfig.setRequestUrl(schisandraSmsConfig.getRequestUrl()); - alibabaConfig.setAccessKeyId(schisandraSmsConfig.getAccessKeyId()); - alibabaConfig.setAccessKeySecret(schisandraSmsConfig.getAccessKeySecret()); - alibabaConfig.setSignature(schisandraSmsConfig.getSignature()); - alibabaConfig.setTemplateId(schisandraSmsConfig.getTemplateId()); - alibabaConfig.setTemplateName(schisandraSmsConfig.getTemplateName()); - alibabaConfig.setSdkAppId(schisandraSmsConfig.getSdkAppId()); - configs.add(alibabaConfig); - } - if ("tencent".equals(schisandraSmsConfig.getConfigId())) { - TencentConfig tencentConfig=new TencentConfig(); - tencentConfig.setConfigId(schisandraSmsConfig.getConfigId()); - tencentConfig.setAccessKeyId(schisandraSmsConfig.getAccessKeyId()); - tencentConfig.setAccessKeySecret(schisandraSmsConfig.getAccessKeySecret()); - tencentConfig.setSdkAppId(schisandraSmsConfig.getSdkAppId()); - tencentConfig.setService(schisandraSmsConfig.getSdkAppId()); - tencentConfig.setRequestUrl(schisandraSmsConfig.getRequestUrl()); - tencentConfig.setTerritory(schisandraSmsConfig.getRegion()); - tencentConfig.setAction(schisandraSmsConfig.getAction()); - tencentConfig.setSignature(schisandraSmsConfig.getSignature()); - tencentConfig.setTemplateId(schisandraSmsConfig.getTemplateId()); - tencentConfig.setVersion(schisandraSmsConfig.getVersion()); - tencentConfig.setConnTimeout(schisandraSmsConfig.getConnTimeout()); - tencentConfig.setSdkAppId(schisandraSmsConfig.getSdkAppId()); - configs.add(tencentConfig); - } - if ("huawei".equals(schisandraSmsConfig.getConfigId())) { - HuaweiConfig huaweiConfig = new HuaweiConfig(); - huaweiConfig.setConfigId(schisandraSmsConfig.getConfigId()); - huaweiConfig.setSdkAppId(schisandraSmsConfig.getSdkAppId()); - huaweiConfig.setAccessKeySecret(schisandraSmsConfig.getAccessKeySecret()); - huaweiConfig.setAccessKeyId(schisandraSmsConfig.getAccessKeyId()); - huaweiConfig.setUrl(schisandraSmsConfig.getUrl()); - huaweiConfig.setSignature(schisandraSmsConfig.getSignature()); - huaweiConfig.setTemplateId(schisandraSmsConfig.getTemplateId()); - configs.add(huaweiConfig); - }} - return configs; + return null; } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java index db7f73a..ea6d06e 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java @@ -1,10 +1,14 @@ package com.schisandra.auth.application.controller; +import com.schisandra.auth.application.config.SmsReadConfig; +import com.schisandra.auth.application.factory.SmsTypeHandlerFactory; +import com.schisandra.auth.application.handler.SchisandraSmsTypeHandler; import com.schisandra.auth.common.entity.Result; import com.schisandra.auth.common.redis.RedisUtil; import com.schisandra.auth.common.utils.SmsCodeUtils; import lombok.extern.slf4j.Slf4j; +import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.core.factory.SmsFactory; import org.springframework.web.bind.annotation.GetMapping; @@ -21,6 +25,8 @@ import static java.util.concurrent.TimeUnit.SECONDS; public class SchisandraSmsController { @Resource private RedisUtil redisUtil; + @Resource + private SmsReadConfig smsReadConfig; private final String authPhonePrefix="auth.phone"; /** @@ -35,7 +41,7 @@ public class SchisandraSmsController { String prefix = redisUtil.buildKey(authPhonePrefix, phone); String code = SmsCodeUtils.generateValidateCode(4).toString(); if (!redisUtil.exist(prefix)){ - SmsResponse smsResponse=SmsFactory.getBySupplier("alibaba").sendMessage(phone,code); + SmsResponse smsResponse=SmsFactory.getSmsBlend("alibaba").sendMessage(phone,code); if (smsResponse.isSuccess()){ redisUtil.setNx(prefix, code, 60L,SECONDS); return Result.ok(); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/factory/SmsTypeHandlerFactory.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/factory/SmsTypeHandlerFactory.java new file mode 100644 index 0000000..608d4d9 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/factory/SmsTypeHandlerFactory.java @@ -0,0 +1,40 @@ +package com.schisandra.auth.application.factory; + +import com.schisandra.auth.application.handler.SchisandraSmsTypeHandler; +import com.schisandra.auth.common.enums.SmsSupplierType; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Classname SmsTypeHandlerFactory + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.application.factory + * @Author: landaiqing + * @CreateTime: 2024-05-11 18:36 + * @Description: TODO + * @Version: 1.0 + */ +@Component +public class SmsTypeHandlerFactory implements InitializingBean { + @Resource + private List smsTypeHandlerList; + + private HashMap handlerMap =new HashMap<>(); + + public SchisandraSmsTypeHandler getHandler(String configId){ + SmsSupplierType smsSupplierType = SmsSupplierType.getByKey(configId); + return handlerMap.get(smsSupplierType); + } + + @Override + public void afterPropertiesSet() throws Exception { + for(SchisandraSmsTypeHandler smsTypeHandler : smsTypeHandlerList){ + handlerMap.put(smsTypeHandler.getHandlerType(),smsTypeHandler); + } + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/handler/AlibabaSmsHandler.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/handler/AlibabaSmsHandler.java new file mode 100644 index 0000000..c2d503a --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/handler/AlibabaSmsHandler.java @@ -0,0 +1,51 @@ +package com.schisandra.auth.application.handler; + +import com.schisandra.auth.application.convert.SchisandraSmsConfigDTOConvert; +import com.schisandra.auth.application.dto.SchisandraSmsConfigDTO; +import com.schisandra.auth.common.enums.SmsSupplierType; +import com.schisandra.auth.domain.bo.SchisandraSmsConfigBO; +import com.schisandra.auth.domain.service.SchisandraSmsConfigDomainService; +import org.apache.commons.lang3.ObjectUtils; +import org.dromara.sms4j.aliyun.config.AlibabaConfig; +import org.dromara.sms4j.provider.config.BaseConfig; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * @Classname AlibabaSmsHandler + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.application.handler + * @Author: landaiqing + * @CreateTime: 2024-05-11 18:20 + * @Description: TODO + * @Version: 1.0 + */ +@Component +public class AlibabaSmsHandler implements SchisandraSmsTypeHandler{ + @Resource + SchisandraSmsConfigDomainService schisandraSmsConfigDomainService; + @Override + public SmsSupplierType getHandlerType() { + return SmsSupplierType.ALIBABA; + } + + @Override + public BaseConfig addConfig(String configId) { + SchisandraSmsConfigBO schisandraSmsConfigBO = schisandraSmsConfigDomainService.queryByConfigId(configId); + SchisandraSmsConfigDTO schisandraSmsConfigDTO = SchisandraSmsConfigDTOConvert.INSTANCE.convertBOToDTO(schisandraSmsConfigBO); + if (ObjectUtils.isEmpty(schisandraSmsConfigDTO)){ + return null; + } + AlibabaConfig alibabaConfig=new AlibabaConfig(); + alibabaConfig.setConfigId(schisandraSmsConfigDTO.getConfigId()); + alibabaConfig.setRequestUrl(schisandraSmsConfigDTO.getRequestUrl()); + alibabaConfig.setAccessKeyId(schisandraSmsConfigDTO.getAccessKeyId()); + alibabaConfig.setAccessKeySecret(schisandraSmsConfigDTO.getAccessKeySecret()); + alibabaConfig.setSignature(schisandraSmsConfigDTO.getSignature()); + alibabaConfig.setTemplateId(schisandraSmsConfigDTO.getTemplateId()); + alibabaConfig.setTemplateName(schisandraSmsConfigDTO.getTemplateName()); + alibabaConfig.setSdkAppId(schisandraSmsConfigDTO.getSdkAppId()); + return alibabaConfig; + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/handler/SchisandraSmsTypeHandler.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/handler/SchisandraSmsTypeHandler.java new file mode 100644 index 0000000..b31a25b --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/handler/SchisandraSmsTypeHandler.java @@ -0,0 +1,21 @@ +package com.schisandra.auth.application.handler; + +import com.schisandra.auth.common.enums.SmsSupplierType; +import org.dromara.sms4j.provider.config.BaseConfig; +import org.springframework.stereotype.Component; + +/** + * @Classname SchisandraSmsTypeHandler + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.application.handler + * @Author: landaiqing + * @CreateTime: 2024-05-11 18:04 + * @Description: TODO + * @Version: 1.0 + */ +@Component +public interface SchisandraSmsTypeHandler { + SmsSupplierType getHandlerType(); + + BaseConfig addConfig(String configId); +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/pom.xml index c8a657a..bc8b0de 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/pom.xml @@ -110,14 +110,6 @@ - - - cn.hutool - hutool-all - 5.3.8 - - - org.apache.directory.studio org.apache.commons.codec @@ -125,9 +117,16 @@ - cn.hutool - hutool-extra - 5.8.27 + com.xkcoding + justauth-spring-boot-starter + 1.1.0 + compile + + + hutool-http + cn.hutool + + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/SmsSupplierType.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/SmsSupplierType.java new file mode 100644 index 0000000..aef910d --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/SmsSupplierType.java @@ -0,0 +1,82 @@ +package com.schisandra.auth.common.enums; + +import lombok.Getter; + +@Getter +public enum SmsSupplierType { + /** + * 阿里云 + */ + ALIBABA("alibaba"), + /** + * 华为云 + */ + HUAWEI("huawei"), + /** + * 云片 + */ + YUNPIAN("yunpian"), + /** + * 腾讯云 + */ + TENCENT("tenxun"), + /** + * 合一短信 + */ + UNI_SMS("uni"), + /** + * 京东云 + */ + JD_CLOUD("jd"), + /** + * 容联云 + */ + CLOOPEN("cloopen"), + /** + * 亿美软通 + */ + EMAY("emay"), + /** + * 天翼云 + */ + CTYUN("ctyun"), + /** + * 网易云 + */ + WANGYIYUN("wangyiyun"), + /** + * 七牛云 + */ + QINIU("qiniu"), + /** + * 助通 + */ + ZHUTONG("zhutong"), + + /** + * 联麓 + */ + LIANLU("lianlu"), + + /** + * 鼎众 + */ + DINGZHONG("dingzhong"), + ; + public String key; + + SmsSupplierType(String key) { + this.key = key; + + } + + public static SmsSupplierType getByKey(String key) { + for (SmsSupplierType resultKeyEnum : SmsSupplierType.values()) { + if (resultKeyEnum.key.equals(key)) { + return resultKeyEnum; + } + } + return null; + } +} + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSmsConfigDomainService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSmsConfigDomainService.java index 68b55bf..0193380 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSmsConfigDomainService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSmsConfigDomainService.java @@ -18,5 +18,7 @@ public interface SchisandraSmsConfigDomainService { List queryAll(); + SchisandraSmsConfigBO queryByConfigId(String configId); + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java index 1a5056d..03e17c3 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java @@ -23,4 +23,12 @@ public class SchisandraSmsConfigDomainServiceImpl implements SchisandraSmsConfig } + @Override + public SchisandraSmsConfigBO queryByConfigId(String configId) { + SchisandraSmsConfig schisandraSmsConfig= schisandraSmsConfigService.queryByConfigId(configId); + + SchisandraSmsConfigBO schisandraSmsConfigBO = SchisandraSmsConfigBOConvert.INSTANCE.convertEntityToBO(schisandraSmsConfig); + return schisandraSmsConfigBO; + } + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraSmsConfigDao.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraSmsConfigDao.java index 695410a..22b0f46 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraSmsConfigDao.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraSmsConfigDao.java @@ -81,5 +81,7 @@ public interface SchisandraSmsConfigDao { int deleteById(Integer id); List queryAll(); + + SchisandraSmsConfig queryByConfigId(String configId); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSmsConfigService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSmsConfigService.java index df68b9f..41f650c 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSmsConfigService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSmsConfigService.java @@ -56,4 +56,6 @@ public interface SchisandraSmsConfigService { boolean deleteById(Integer id); List queryAll(); + + SchisandraSmsConfig queryByConfigId(String configId); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java index 79d038e..798bcd4 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java @@ -85,4 +85,9 @@ public class SchisandraSmsConfigServiceImpl implements SchisandraSmsConfigServic public List queryAll() { return schisandraSmsConfigDao.queryAll(); } + + @Override + public SchisandraSmsConfig queryByConfigId(String configId) { + return schisandraSmsConfigDao.queryByConfigId(configId); + } } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraSmsConfigDao.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraSmsConfigDao.xml index 68cceff..16e2d4d 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraSmsConfigDao.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraSmsConfigDao.xml @@ -335,6 +335,12 @@ from schisandra_sms_config where is_deleted = 0 +