diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml new file mode 100644 index 000000000..0f5db966c --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml @@ -0,0 +1,56 @@ + + + + yudao-framework + cn.iocoder.cloud + ${revision} + + 4.0.0 + yudao-spring-boot-starter-biz-error-code + jar + + ${project.artifactId} + + 错误码 ErrorCode 的自动配置功能，提供如下功能： + 1. 远程读取：项目启动时，从 system-server 服务，读取数据库中的 ErrorCode 错误码，实现错误码的提水可配置； + 2. 自动更新：管理员在管理后台修数据库中的 ErrorCode 错误码时，项目自动从 system-server 服务加载最新的 ErrorCode 错误码； + 3. 自动写入：项目启动时，将项目本地的错误码写到 system-server 服务中，方便管理员在管理后台编辑； + + https://github.com/YunaiV/ruoyi-vue-pro + + + + cn.iocoder.cloud + yudao-common + + + + + org.springframework.boot + spring-boot-starter + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-rpc + true + + + + + cn.iocoder.cloud + yudao-module-system-api + ${revision} + + + + jakarta.validation + jakarta.validation-api + provided + + + + diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/config/ErrorCodeProperties.java b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/config/ErrorCodeProperties.java rename to yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java index 686f03e2c..cc2e1c5c8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/config/ErrorCodeProperties.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.framework.errorcode.config; +package cn.iocoder.yudao.framework.errorcode.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/config/ErrorCodeConfiguration.java b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeAutoConfiguration.java similarity index 55% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/config/ErrorCodeConfiguration.java rename to yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeAutoConfiguration.java index 4c72ccec7..423573419 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/config/ErrorCodeConfiguration.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeAutoConfiguration.java @@ -1,37 +1,37 @@ -package cn.iocoder.yudao.module.system.framework.errorcode.config; +package cn.iocoder.yudao.framework.errorcode.config; -import cn.iocoder.yudao.module.system.framework.errorcode.core.generator.ErrorCodeAutoGenerator; -import cn.iocoder.yudao.module.system.framework.errorcode.core.loader.ErrorCodeLoader; -import cn.iocoder.yudao.module.system.framework.errorcode.core.service.ErrorCodeFrameworkService; -import cn.iocoder.yudao.module.system.framework.errorcode.core.loader.ErrorCodeLoaderImpl; -import cn.iocoder.yudao.module.system.framework.errorcode.core.generator.ErrorCodeAutoGeneratorImpl; +import cn.iocoder.yudao.framework.errorcode.core.generator.ErrorCodeAutoGenerator; +import cn.iocoder.yudao.framework.errorcode.core.generator.ErrorCodeAutoGeneratorImpl; +import cn.iocoder.yudao.framework.errorcode.core.loader.ErrorCodeLoader; +import cn.iocoder.yudao.framework.errorcode.core.loader.ErrorCodeLoaderImpl; +import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; -// TODO 芋艿：貌似放的位置有问题 /** * 错误码配置类 + * + * @author 芋道源码 */ @Configuration @EnableConfigurationProperties(ErrorCodeProperties.class) @EnableScheduling // 开启调度任务的功能，因为 ErrorCodeRemoteLoader 通过定时刷新错误码 -public class ErrorCodeConfiguration { +public class YudaoErrorCodeAutoConfiguration { @Bean public ErrorCodeAutoGenerator errorCodeAutoGenerator(@Value("${spring.application.name}") String applicationName, ErrorCodeProperties errorCodeProperties, - ErrorCodeFrameworkService errorCodeFrameworkService) { - return new ErrorCodeAutoGeneratorImpl(applicationName, errorCodeProperties.getConstantsClassList(), - errorCodeFrameworkService); + ErrorCodeApi errorCodeApi) { + return new ErrorCodeAutoGeneratorImpl(applicationName, errorCodeProperties.getConstantsClassList(), errorCodeApi); } @Bean public ErrorCodeLoader errorCodeLoader(@Value("${spring.application.name}") String applicationName, - ErrorCodeFrameworkService errorCodeFrameworkService) { - return new ErrorCodeLoaderImpl(applicationName, errorCodeFrameworkService); + ErrorCodeApi errorCodeApi) { + return new ErrorCodeLoaderImpl(applicationName, errorCodeApi); } } diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeRpcAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeRpcAutoConfiguration.java new file mode 100644 index 000000000..9e4728a25 --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeRpcAutoConfiguration.java @@ -0,0 +1,15 @@ +package cn.iocoder.yudao.framework.errorcode.config; + +import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Configuration; + +/** + * 错误码用到 Feign 的配置项 + * + * @author 芋道源码 + */ +@Configuration(proxyBeanMethods = false) +@EnableFeignClients(clients = ErrorCodeApi.class) // 主要是引入相关的 API 服务 +public class YudaoErrorCodeRpcAutoConfiguration { +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java similarity index 71% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java rename to yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java index 6fb2abc02..b13cacaa2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.framework.errorcode.core.generator; +package cn.iocoder.yudao.framework.errorcode.core.generator; /** * 错误码的自动生成器 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java rename to yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java index db75aaa7c..3ec761f80 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.framework.errorcode.core.generator; +package cn.iocoder.yudao.framework.errorcode.core.generator; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ReflectUtil; import cn.iocoder.yudao.framework.common.exception.ErrorCode; -import cn.iocoder.yudao.module.system.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; -import cn.iocoder.yudao.module.system.framework.errorcode.core.service.ErrorCodeFrameworkService; +import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi; +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.context.event.ApplicationReadyEvent; @@ -36,9 +36,9 @@ public class ErrorCodeAutoGeneratorImpl implements ErrorCodeAutoGenerator { */ private final List constantsClassList; /** - * 错误码 Service + * 错误码 Api */ - private final ErrorCodeFrameworkService errorCodeService; + private final ErrorCodeApi errorCodeApi; @Override @EventListener(ApplicationReadyEvent.class) @@ -49,7 +49,7 @@ public class ErrorCodeAutoGeneratorImpl implements ErrorCodeAutoGenerator { log.info("[execute][解析到错误码数量为 ({}) 个]", autoGenerateDTOs.size()); // 第二步，写入到 system 服务 - errorCodeService.autoGenerateErrorCodes(autoGenerateDTOs); + errorCodeApi.autoGenerateErrorCodes(autoGenerateDTOs).checkError(); log.info("[execute][写入到 system 组件完成]"); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/loader/ErrorCodeLoader.java b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoader.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/loader/ErrorCodeLoader.java rename to yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoader.java index 6712c33e9..26fb060d2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/loader/ErrorCodeLoader.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoader.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.framework.errorcode.core.loader; +package cn.iocoder.yudao.framework.errorcode.core.loader; import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java similarity index 81% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java rename to yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java index 1641f520f..da8a60152 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.framework.errorcode.core.loader; +package cn.iocoder.yudao.framework.errorcode.core.loader; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.module.system.framework.errorcode.core.dto.ErrorCodeRespDTO; -import cn.iocoder.yudao.module.system.framework.errorcode.core.service.ErrorCodeFrameworkService; import cn.iocoder.yudao.framework.common.util.date.DateUtils; +import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi; +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.context.event.ApplicationReadyEvent; @@ -34,9 +34,9 @@ public class ErrorCodeLoaderImpl implements ErrorCodeLoader { */ private final String applicationName; /** - * 错误码 Service + * 错误码 Api */ - private final ErrorCodeFrameworkService errorCodeService; + private final ErrorCodeApi errorCodeApi; /** * 缓存错误码的最大更新时间，用于后续的增量轮询，判断是否有更新 @@ -55,7 +55,7 @@ public class ErrorCodeLoaderImpl implements ErrorCodeLoader { private void loadErrorCodes0() { // 加载错误码 - List errorCodeRespDTOs = errorCodeService.getErrorCodeList(applicationName, maxUpdateTime); + List errorCodeRespDTOs = errorCodeApi.getErrorCodeList(applicationName, maxUpdateTime).getCheckedData(); if (CollUtil.isEmpty(errorCodeRespDTOs)) { return; } diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/package-info.java b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/package-info.java new file mode 100644 index 000000000..ddba4f78a --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/package-info.java @@ -0,0 +1,10 @@ +/** + * 错误码 ErrorCode 的自动配置功能，提供如下功能： + * + * 1. 远程读取：项目启动时，从 system-service 服务，读取数据库中的 ErrorCode 错误码，实现错误码的提水可配置； + * 2. 自动更新：管理员在管理后台修数据库中的 ErrorCode 错误码时，项目自动从 system-service 服务加载最新的 ErrorCode 错误码； + * 3. 自动写入：项目启动时，将项目本地的错误码写到 system-server 服务中，方便管理员在管理后台编辑； + * + * @author 芋道源码 + */ +package cn.iocoder.yudao.framework.errorcode; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/resources/META-INF/spring.factories b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/resources/META-INF/spring.factories new file mode 100644 index 000000000..3ad458353 --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + cn.iocoder.yudao.framework.errorcode.config.YudaoErrorCodeRpcAutoConfiguration,\ + cn.iocoder.yudao.framework.errorcode.config.YudaoErrorCodeAutoConfiguration diff --git a/yudao-module-infra/yudao-module-infra-biz/pom.xml b/yudao-module-infra/yudao-module-infra-biz/pom.xml index 40d0fef26..2b8c66b25 100644 --- a/yudao-module-infra/yudao-module-infra-biz/pom.xml +++ b/yudao-module-infra/yudao-module-infra-biz/pom.xml @@ -46,6 +46,10 @@ cn.iocoder.cloud yudao-spring-boot-starter-biz-tenant + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-error-code + diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java index e12da0078..901c7cbd0 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java @@ -22,7 +22,7 @@ import java.util.List; @Api(tags = "RPC 服务 - 错误码") public interface ErrorCodeApi { - String PREFIX = ApiConstants.PREFIX + "/oauth2/token"; + String PREFIX = ApiConstants.PREFIX + "/error-code"; @PostMapping(PREFIX + "/auto-generate") @ApiOperation("自动创建错误码") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/application.yaml b/yudao-module-system/yudao-module-system-biz/src/main/resources/application.yaml index 8c4c25faa..5598ef1a5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/application.yaml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/application.yaml @@ -78,6 +78,7 @@ yudao: - /admin-api/system/captcha/get-image # 获取图片验证码，和租户无关 - /admin-api/system/sms/callback/* # 短信回调接口，无法带上租户编号 - /rpc-api/system/tenant/valid # 防止递归。避免调用 /rpc-api/system/tenant/valid 接口时，又去触发 /rpc-api/system/tenant/valid 去校验 + - /rpc-api/system/error-code/* # 错误码的自动创建与下载的接口，无法带上租户编号 ignore-tables: - system_tenant - system_tenant_package diff --git a/归档/common/mall-spring-boot-starter-system-error-code/src/main/resources/META-INF/spring.factories b/归档/common/mall-spring-boot-starter-system-error-code/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 760e604d3..000000000 --- a/归档/common/mall-spring-boot-starter-system-error-code/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - cn.iocoder.mall.system.errorcode.config.ErrorCodeAutoConfiguration diff --git a/归档/moved/system/system-biz/pom.xml b/归档/moved/system/system-biz/pom.xml deleted file mode 100644 index 6f2ee0145..000000000 --- a/归档/moved/system/system-biz/pom.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - system - cn.iocoder.mall - 1.0-SNAPSHOT - - 4.0.0 - - system-biz - - - - - cn.iocoder.mall - system-biz-api - 1.0-SNAPSHOT - - - - - org.springframework.boot - spring-boot-starter - - - - - mysql - mysql-connector-java - - - - org.springframework - spring-tx - - - org.springframework - spring-jdbc - - - com.alibaba - druid-spring-boot-starter - - - - cn.iocoder.mall - mall-spring-boot-starter-mybatis - 1.0-SNAPSHOT - - - - - com.yunpian.sdk - yunpian-java-sdk - - - com.aliyun - aliyun-java-sdk-core - - - - - com.qiniu - qiniu-java-sdk - - - - - org.mapstruct - mapstruct - - - org.mapstruct - mapstruct-jdk8 - - - org.projectlombok - lombok - - - - com.alibaba - fastjson - - - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework - spring-webmvc - compile - - - javax.servlet - servlet-api - compile - - - - - diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/ListSmsSignBO.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/ListSmsSignBO.java deleted file mode 100644 index bc3a3db8d..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/ListSmsSignBO.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.iocoder.mall.system.biz.bo.smsSign; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * sms page - * - * @author Sin - * @time 2019/5/19 4:23 PM - */ -@Data -@Accessors(chain = true) -public class ListSmsSignBO { - - /** - * 编号 - */ - private Integer id; - /** - * 短信平台 - */ - private Integer platform; - /** - * 签名名称 - */ - private String sign; - /** - * 审核状态 - *

- * - 1、审核中 - * - 2、审核成功 - * - 3、审核失败 - */ - private Integer applyStatus; - /** - * 审核信息 - */ - private String applyMessage; - /** - * 更新时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date updateTime; - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/SmsSignBO.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/SmsSignBO.java deleted file mode 100644 index e14e3f38e..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/SmsSignBO.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.iocoder.mall.system.biz.bo.smsSign; - -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 短信签名 - * - * @author Sin - * @time 2019/5/16 6:30 PM - */ -@Data -@Accessors(chain = true) -public class SmsSignBO { - - /** - * 编号 - */ - private Integer id; - /** - * 签名id 这个是第三方的 - */ - private Integer signId; - /** - * 签名名称 - */ - private String sign; - /** - * 审核状态 - * - * - 1、审核中 - * - 2、审核成功 - * - 3、审核失败 - */ - private Integer applyStatus; - /** - * 审核信息 - */ - private String applyMessage; -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/ListSmsTemplateBO.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/ListSmsTemplateBO.java deleted file mode 100644 index 0cbf83d58..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/ListSmsTemplateBO.java +++ /dev/null @@ -1,103 +0,0 @@ -package cn.iocoder.mall.system.biz.bo.smsTemplate; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * sms page - * - * @author Sin - * @time 2019/5/19 4:23 PM - */ -@Data -@Accessors(chain = true) -public class ListSmsTemplateBO { - - /** - * 编号 - */ - private Integer id; - /** - * 模板编号 (第三方的) - */ - private Integer smsSignId; - /** - * 短信签名 id - */ - private String platform; - /** - * 短信模板 Code - */ - private String templateCode; - /** - * 短信模板 - */ - private String template; - /** - * 短信类型 - */ - private Integer smsType; - /** - * 审核状态 - *

- * 1、审核中 - * 2、审核成功 - * 3、审核失败 - */ - private Integer applyStatus; - /** - * 审核信息 - */ - private String applyMessage; - /** - * 更新时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date updateTime; - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - - /// - /// 关联字段 - - /** - * 签名信息 - */ - private Sign sign; - - - @Data - @Accessors(chain = true) - public static class Sign { - /** - * 编号 - */ - private Integer id; - /** - * 签名id 这个是第三方的 - */ - private String platformId; - /** - * 签名名称 - */ - private String sign; - /** - * 审核状态 - *

- * - 1、审核中 - * - 2、审核成功 - * - 3、审核失败 - */ - private Integer applyStatus; - /** - * 审核信息 - */ - private String applyMessage; - } -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/SmsTemplateBO.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/SmsTemplateBO.java deleted file mode 100644 index d19aab797..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/SmsTemplateBO.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.iocoder.mall.system.biz.bo.smsTemplate; - -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 短信 template - * - * @author Sin - * @time 2019/5/16 7:41 PM - */ -@Data -@Accessors(chain = true) -public class SmsTemplateBO { - - /** - * 编号 - */ - private Integer id; - /** - * 模板编号 (第三方的) - */ - private Integer smsSignId; - /** - * 短信签名 id - */ - private String platformId; - /** - * 短信模板 - */ - private String template; - /** - * 审核状态 - * - * 1、审核中 - * 2、审核成功 - * 3、审核失败 - */ - private Integer applyStatus; - /** - * 审核信息 - */ - private String applyMessage; -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/config/QiniuConfiguration.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/config/QiniuConfiguration.java deleted file mode 100644 index 7e5519d00..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/config/QiniuConfiguration.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.iocoder.mall.system.biz.config; - -import com.qiniu.util.Auth; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class QiniuConfiguration { - - @Value("${qiniu.access-key}") - private String accessKey; - @Value("${qiniu.secret-key}") - private String secretKey; - - @Bean - public Auth auth() { - return Auth.create(accessKey, secretKey); - } - -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsSignConvert.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsSignConvert.java deleted file mode 100644 index 8bf1df19b..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsSignConvert.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.iocoder.mall.system.biz.convert; - -import cn.iocoder.mall.system.biz.bo.smsSign.ListSmsSignBO; -import cn.iocoder.mall.system.biz.bo.smsSign.SmsSignBO; -import cn.iocoder.mall.system.biz.dataobject.sms.SmsSignDO; -import org.mapstruct.Mapper; -import org.mapstruct.Mappings; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 短信 签名 - * - * @author Sin - * @time 2019/5/16 6:31 PM - */ -@Mapper -public interface SmsSignConvert { - - SmsSignConvert INSTANCE = Mappers.getMapper(SmsSignConvert.class); - - @Mappings({}) - SmsSignBO convert(SmsSignDO bean); - - @Mappings({}) - List convert(List beans); - -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsTemplateConvert.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsTemplateConvert.java deleted file mode 100644 index 586fcc389..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsTemplateConvert.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.iocoder.mall.system.biz.convert; - -import cn.iocoder.mall.system.biz.bo.smsTemplate.ListSmsTemplateBO; -import cn.iocoder.mall.system.biz.bo.smsTemplate.SmsTemplateBO; -import cn.iocoder.mall.system.biz.dataobject.sms.SmsSignDO; -import cn.iocoder.mall.system.biz.dataobject.sms.SmsTemplateDO; -import org.mapstruct.Mapper; -import org.mapstruct.Mappings; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 短信 template - * - * @author Sin - * @time 2019/5/16 7:43 PM - */ -@Mapper -public interface SmsTemplateConvert { - - SmsTemplateConvert INSTANCE = Mappers.getMapper(SmsTemplateConvert.class); - - @Mappings({}) - SmsTemplateBO convert(SmsTemplateDO smsTemplateDO); - - @Mappings({}) - List convert(List smsTemplateDOList); - - @Mappings({}) - List convertTemplateSign(List smsSignDOList); -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSendMapper.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSendMapper.java deleted file mode 100644 index 88475fab0..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSendMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.iocoder.mall.system.biz.dao.sms; - -import cn.iocoder.mall.system.biz.dataobject.sms.SmsSendLogDO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springframework.stereotype.Repository; - -/** - * 短信 - * - * @author Sin - * @time 2019/5/16 6:18 PM - */ -@Repository -public interface SmsSendMapper extends BaseMapper { -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSignMapper.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSignMapper.java deleted file mode 100644 index 6aa05f8dd..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSignMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.iocoder.mall.system.biz.dao.sms; - -import cn.iocoder.mall.system.biz.dataobject.sms.SmsSignDO; -import cn.iocoder.mall.system.biz.dto.smsSign.ListSmsSignDTO; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.stereotype.Repository; -import org.springframework.util.StringUtils; - -/** - * 短信 - * - * @author Sin - * @time 2019/5/16 6:18 PM - */ -@Repository -public interface SmsSignMapper extends BaseMapper { - - default IPage listSmsSign(ListSmsSignDTO queryDTO) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (queryDTO.getApplyStatus() != null) { - queryWrapper.eq(SmsSignDO::getApplyStatus, queryDTO.getApplyStatus()); - } - if (!StringUtils.isEmpty(queryDTO.getSign())) { - queryWrapper.like(SmsSignDO::getSign, queryDTO.getSign()); - } - if (!StringUtils.isEmpty(queryDTO.getId())) { - queryWrapper.eq(SmsSignDO::getId, queryDTO.getId()); - } - - Page page = new Page() - .setSize(queryDTO.getPageSize()) - .setCurrent(queryDTO.getPageNo()) - .setDesc("create_time"); - return selectPage(page, queryWrapper); - } -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsTemplateMapper.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsTemplateMapper.java deleted file mode 100644 index effa88f88..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsTemplateMapper.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.iocoder.mall.system.biz.dao.sms; - -import cn.iocoder.mall.system.biz.dataobject.sms.SmsTemplateDO; -import cn.iocoder.mall.system.biz.dto.smsTemplate.ListSmsTemplateDTO; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.stereotype.Repository; -import org.springframework.util.StringUtils; - -/** - * 短信 template - * - * @author Sin - * @time 2019/5/16 6:18 PM - */ -@Repository -public interface SmsTemplateMapper extends BaseMapper { - - default IPage listSmsTemplate(ListSmsTemplateDTO listSmsTemplateDTO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - if (listSmsTemplateDTO.getApplyStatus() != null) { - queryWrapper.eq("apply_status", listSmsTemplateDTO.getApplyStatus()); - } - if (listSmsTemplateDTO.getSmsSignId() != null) { - queryWrapper.eq("sms_sign_id", listSmsTemplateDTO.getSmsSignId()); - } - if (!StringUtils.isEmpty(listSmsTemplateDTO.getTemplate())) { - queryWrapper.like("template", listSmsTemplateDTO.getTemplate()); - } - if (!StringUtils.isEmpty(listSmsTemplateDTO.getId())) { - queryWrapper.eq("id", listSmsTemplateDTO.getId()); - } - - Page page = new Page() - .setSize(listSmsTemplateDTO.getPageSize()) - .setCurrent(listSmsTemplateDTO.getPageNo()) - .setDesc("create_time"); - return selectPage(page, queryWrapper); - } -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSendLogDO.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSendLogDO.java deleted file mode 100644 index 2d9c7c33d..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSendLogDO.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.iocoder.mall.system.biz.dataobject.sms; - -import cn.iocoder.mall.mybatis.core.dataobject.BaseDO; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 短信 client log - * - * @author Sin - * @time 2019/5/25 12:36 PM - */ -@Data -@Accessors(chain = true) -public class SmsSendLogDO extends BaseDO { - - /** - * 编号 - */ - private Integer id; - /** - * 短信模板 - */ - private Integer templateId; - /** - * 短信 - */ - private String template; - /** - * 参数 - */ - private String params; - /** - * 发送信息 - */ - private String message; -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSignDO.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSignDO.java deleted file mode 100644 index de5310868..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSignDO.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.iocoder.mall.system.biz.dataobject.sms; - -import cn.iocoder.mall.mybatis.core.dataobject.DeletableDO; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 短信签名 - * - * 签名是短信发送前缀 如：【阿里云】、【小红书】 - * - * @author Sin - * @time 2019/5/16 12:28 PM - */ -@Data -@Accessors(chain = true) -@TableName("sms_sign") -public class SmsSignDO extends DeletableDO { - - /** - * 编号 - */ - private Integer id; - /** - * 签名名称 - */ - private String sign; - /** - * 平台 - * - * 1、云片 - * 2、阿里云 - */ - private Integer platform; - /** - * 审核状态 - * - * - 1、审核中 - * - 2、审核成功 - * - 10、审核失败 - */ - private Integer applyStatus; - /** - * 审核信息 - */ - private String applyMessage; -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsTemplateDO.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsTemplateDO.java deleted file mode 100644 index d0dfaeae8..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsTemplateDO.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.iocoder.mall.system.biz.dataobject.sms; - -import cn.iocoder.mall.mybatis.core.dataobject.DeletableDO; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 短信 模板 - * - * @author Sin - * @time 2019/5/16 12:31 PM - */ -@Data -@Accessors(chain = true) -@TableName("sms_template") -public class SmsTemplateDO extends DeletableDO { - - /** - * 编号 - */ - private Integer id; - /** - * 模板编号 (第三方的) - */ - private Integer smsSignId; - /** - * 模板 code（第三方平台 code） - */ - private String templateCode; - /** - * 短信签名 id - */ - private Integer platform; - /** - * 短信模板 - */ - private String template; - /** - * 短信类型 - * - * - 验证码类 - * - 通知类 - * - 营销类 - */ - private Integer smsType; - /** - * 审核状态 - * - * 1、审核中 - * 2、审核成功 - * 10、审核失败 - */ - private Integer applyStatus; - /** - * 审核信息 - */ - private String applyMessage; -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/AddSignDTO.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/AddSignDTO.java deleted file mode 100644 index 01fc7bfcb..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/AddSignDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.iocoder.mall.system.biz.dto.smsSign; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 添加 sign - * - * author: sin - * time: 2020/4/20 11:10 上午 - */ -@Data -@Accessors(chain = true) -public class AddSignDTO implements Serializable { - - private String sign; - - private Integer platform; -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/ListSmsSignDTO.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/ListSmsSignDTO.java deleted file mode 100644 index 0ed8bb8bb..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/ListSmsSignDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.iocoder.mall.system.biz.dto.smsSign; - -import cn.iocoder.common.framework.vo.PageParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * page 短信模板 query - * - * @author Sin - * @time 2019/5/19 4:32 PM - */ -@Data -@Accessors(chain = true) -@ApiModel("短信服务查询") -public class ListSmsSignDTO extends PageParam { - - @ApiModelProperty("编号") - private Integer id; - - @ApiModelProperty("签名") - private String sign; - - @ApiModelProperty("申请状态") - private Integer applyStatus; - -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/UpdateSignDTO.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/UpdateSignDTO.java deleted file mode 100644 index 8e45514f4..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/UpdateSignDTO.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.iocoder.mall.system.biz.dto.smsSign; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 更新签名 - *

- * author: sin - * time: 2020/4/20 11:05 上午 - */ -@Data -@Accessors(chain = true) -public class UpdateSignDTO implements Serializable { - - private Integer id; - - private String sign; - - private Integer platform; - -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsTemplate/ListSmsTemplateDTO.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsTemplate/ListSmsTemplateDTO.java deleted file mode 100644 index 86eaecb50..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsTemplate/ListSmsTemplateDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.iocoder.mall.system.biz.dto.smsTemplate; - -import cn.iocoder.common.framework.vo.PageParam; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotNull; - -/** - * page 短信模板 query - * - * @author Sin - * @time 2019/5/19 4:32 PM - */ -@Data -@Accessors(chain = true) -public class ListSmsTemplateDTO extends PageParam { - - @NotNull - private String id; - - @NotNull - private Integer smsSignId; - - @NotNull - private String template; - - @NotNull - private String applyStatus; -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsApplyStatusEnum.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsApplyStatusEnum.java deleted file mode 100644 index 80ce41876..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsApplyStatusEnum.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.iocoder.mall.system.biz.enums.sms; - -/** - * 短信审核状态 - * - * @author Sin - * @time 2019/5/16 12:48 PM - */ -public enum SmsApplyStatusEnum { - - CHECKING(1, "审核中"), - SUCCESS(2, "审核成功"), - FAIL(10, "审核失败"), - ; - - private final Integer value; - private final String name; - - SmsApplyStatusEnum(int code, String message) { - this.value = code; - this.name = message; - } - - public int getValue() { - return value; - } - - public String getName() { - return name; - } -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsPlatformEnum.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsPlatformEnum.java deleted file mode 100644 index ce125e1ba..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsPlatformEnum.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.iocoder.mall.system.biz.enums.sms; - -import cn.iocoder.common.framework.core.IntArrayValuable; - -import java.util.Arrays; - -/** - * 短信审核状态 - * - * @author Sin - * @time 2019/5/16 12:48 PM - */ -public enum SmsPlatformEnum implements IntArrayValuable { - - YunPian(1, "云片"), - AliYun(2, "阿里云"), - ; - - public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(SmsPlatformEnum::getValue).toArray(); - - private final Integer value; - private final String name; - - SmsPlatformEnum(Integer code, String message) { - this.value = code; - this.name = message; - } - - public Integer getValue() { - return value; - } - - public String getName() { - return name; - } - - @Override - public int[] array() { - return ARRAYS; - } -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsTypeEnum.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsTypeEnum.java deleted file mode 100644 index 29fafc9e8..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsTypeEnum.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.iocoder.mall.system.biz.enums.sms; - -import cn.iocoder.common.framework.core.IntArrayValuable; - -import java.util.Arrays; - -/** - * 短信审核状态 - * - * @author Sin - * @time 2019/5/16 12:48 PM - */ -public enum SmsTypeEnum implements IntArrayValuable { - - VERIFICATION_CODE(1, "验证码"), - NOTICE(2, "通知"), - MARKETING(3, "营销"), - ; - - public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(SmsTypeEnum::getValue).toArray(); - - private final Integer value; - private final String name; - - SmsTypeEnum(Integer code, String message) { - this.value = code; - this.name = message; - } - - public Integer getValue() { - return value; - } - - public String getName() { - return name; - } - - @Override - public int[] array() { - return ARRAYS; - } -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/annotation/OperationLogging.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/annotation/OperationLogging.java deleted file mode 100644 index db597757f..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/annotation/OperationLogging.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.iocoder.mall.system.biz.log.operation.annotation; - -import java.lang.annotation.*; - -/** - * @author Hccake - * @version 1.0 - * @date 2019/10/15 18:09 - */ -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface OperationLogging { - - /** - * 日志信息 - * @return - */ - String value(); -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/aspect/OperationLogAspect.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/aspect/OperationLogAspect.java deleted file mode 100644 index ff79f7d11..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/aspect/OperationLogAspect.java +++ /dev/null @@ -1,118 +0,0 @@ -package cn.iocoder.mall.system.biz.log.operation.aspect; - -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.URLUtil; -import cn.hutool.json.JSONUtil; -import cn.iocoder.common.framework.util.HttpUtil; -import cn.iocoder.common.framework.util.MallUtils; -import cn.iocoder.mall.system.biz.log.operation.annotation.OperationLogging; -import cn.iocoder.mall.system.biz.log.operation.enums.LogStatus; -import cn.iocoder.mall.system.biz.log.operation.event.OperationLogEvent; -import cn.iocoder.mall.system.biz.log.operation.model.dto.OperationLogDTO; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.Signature; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.core.annotation.Order; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - -/** - * @author Hccake - * @version 1.0 - * @date 2019/10/15 18:16 - */ -@Slf4j -@Aspect -@Order(0) -@RequiredArgsConstructor -public class OperationLogAspect { - private final ApplicationEventPublisher publisher; - - @Around("@annotation(operationLogging)") - public Object around(ProceedingJoinPoint joinPoint, OperationLogging operationLogging) throws Throwable { - Signature signature = joinPoint.getSignature(); - String strClassName = joinPoint.getTarget().getClass().getName(); - String strMethodName = signature.getName(); - log.debug("[类名]:{},[方法]:{}", strClassName, strMethodName); - - // 获取日志 - OperationLogDTO operationLogDTO = prodOperationLog(); - operationLogDTO.setMsg(operationLogging.value()); - // 记录参数 - MethodSignature methodSignature = (MethodSignature) signature; - operationLogDTO.setParams(getParams(joinPoint, methodSignature)); - // 开始时间 - long startTime = System.currentTimeMillis(); - Object result; - try { - result = joinPoint.proceed(); - } catch (Throwable throwable) { - operationLogDTO.setStatus(LogStatus.FAIL.getValue()); - throw throwable; - } - // 结束时间 - operationLogDTO.setResponseTime((int) (System.currentTimeMillis() - startTime)); - // 发布事件 - publisher.publishEvent(new OperationLogEvent(operationLogDTO)); - - return result; - } - - - /** - * 获取方法参数 - * @param joinPoint joinPoint - * @param methodSignature 方法签名 - * @return 方法参数的Json字符串形式 - */ - private String getParams(ProceedingJoinPoint joinPoint, MethodSignature methodSignature) { - String[] parameterNames = methodSignature.getParameterNames(); - Object[] args = joinPoint.getArgs(); - if(ArrayUtil.isEmpty(parameterNames)){ - return null; - } - Map paramsMap = new HashMap<>(); - for (int i = 0; i < parameterNames.length; i++) { - paramsMap.put(parameterNames[i], args[i]); - } - return JSONUtil.toJsonStr(paramsMap); - } - - - /** - * 根据请求生成操作日志 - * @return 操作日志DTO - */ - private OperationLogDTO prodOperationLog() { - HttpServletRequest request = ((ServletRequestAttributes) Objects - .requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); - - return new OperationLogDTO() - .setTraceId(MallUtils.getTraceId()) - .setUri(URLUtil.getPath(request.getRequestURI())) - .setUserAgent(HttpUtil.getUserAgent(request)) - .setIp(HttpUtil.getIp(request)) - .setMethod(request.getMethod()) - // TODO 获取管理员用户名 或者 用户ID - // .setOperator(Objects.requireNonNull(LogUtils.getUsername())) - .setStatus(LogStatus.SUCCESS.getValue()); - } - - - - - - - - -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/enums/LogStatus.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/enums/LogStatus.java deleted file mode 100644 index c6a6ae5d9..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/enums/LogStatus.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.mall.system.biz.log.operation.enums; - -/** - * @author Hccake - * @version 1.0 - * @date 2020/5/15 14:47 - */ -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 操作状态 - */ -@Getter -@AllArgsConstructor -public enum LogStatus { - /** - * 成功 - */ - SUCCESS(1), - /** - * 失败 - */ - FAIL(0); - - private final int value; -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogEvent.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogEvent.java deleted file mode 100644 index 40051f3a6..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogEvent.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.iocoder.mall.system.biz.log.operation.event; - -import cn.iocoder.mall.system.biz.log.operation.model.dto.OperationLogDTO; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @author - * 系统日志事件 - */ -@Getter -@AllArgsConstructor -public class OperationLogEvent { - private final OperationLogDTO operationLogDTO; -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogListener.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogListener.java deleted file mode 100644 index 2a41ef616..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogListener.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.iocoder.mall.system.biz.log.operation.event; - -import cn.iocoder.mall.system.biz.log.operation.service.OperationLogSaveService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.event.EventListener; -import org.springframework.core.annotation.Order; -import org.springframework.scheduling.annotation.Async; - -/** - * @author - * 异步监听日志事件 - */ -@Slf4j -public class OperationLogListener { - - @Autowired - private OperationLogSaveService operationLogSaveService; - - @Async - @Order - @EventListener(OperationLogEvent.class) - public void saveSysLog(OperationLogEvent event) { - operationLogSaveService.saveLog(event.getOperationLogDTO()); - } -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/dto/OperationLogDTO.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/dto/OperationLogDTO.java deleted file mode 100644 index dd675d12c..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/dto/OperationLogDTO.java +++ /dev/null @@ -1,87 +0,0 @@ -package cn.iocoder.mall.system.biz.log.operation.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.time.LocalDateTime; - -/** - * 操作日志 - * - * @author hccake - * @date 2020-05-15 15:12:53 - */ -@Data -@Accessors(chain = true) -@ApiModel(value = "操作日志") -public class OperationLogDTO{ - private static final long serialVersionUID = 1L; - - /** - * 链路追踪编号 - */ - @ApiModelProperty(value = "链路追踪编号") - private String traceId; - /** - * 账号编号 - */ - @ApiModelProperty(value = "账号编号") - private Integer accountId; - /** - * 应用名 - */ - @ApiModelProperty(value = "应用名") - private String applicationName; - /** - * 访问地址 - */ - @ApiModelProperty(value = "访问地址") - private String uri; - /** - * 参数 - */ - @ApiModelProperty(value = "参数") - private String params; - /** - * http 方法 - */ - @ApiModelProperty(value = "http 方法") - private String method; - /** - * userAgent - */ - @ApiModelProperty(value = "userAgent") - private String userAgent; - /** - * ip - */ - @ApiModelProperty(value = "ip") - private String ip; - /** - * 请求时间 - */ - @ApiModelProperty(value = "请求时间") - private LocalDateTime startTime; - /** - * 响应时长 -- 毫秒级 - */ - @ApiModelProperty(value = "响应时长 -- 毫秒级") - private Integer responseTime; - /** - * 日志消息 - */ - @ApiModelProperty(value = "日志消息") - private String msg; - /** - * 操作状态 - */ - @ApiModelProperty(value = "操作状态") - private Integer status; - /** - * 创建者 - */ - @ApiModelProperty(value = "创建者") - private String operator; -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/po/OperationLogPO.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/po/OperationLogPO.java deleted file mode 100644 index a6e348630..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/po/OperationLogPO.java +++ /dev/null @@ -1,89 +0,0 @@ -package cn.iocoder.mall.system.biz.log.operation.model.po; - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.time.LocalDateTime; - -/** - * 操作日志 - * - * @author hccake - * @date 2020-05-15 15:12:53 - */ -@Data -@TableName("operation_log") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "操作日志") -public class OperationLogPO extends Model { - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @TableId - private Integer id; - /** - * 链路追踪编号 - */ - private String traceId; - /** - * 账号编号 - */ - private Integer accountId; - /** - * 应用名 - */ - private String applicationName; - /** - * 访问地址 - */ - private String uri; - /** - * 参数 - */ - private String params; - /** - * http 方法 - */ - private String method; - /** - * userAgent - */ - private String userAgent; - /** - * ip - */ - private String ip; - /** - * 请求时间 - */ - private LocalDateTime startTime; - /** - * 响应时长 -- 毫秒级 - */ - private Integer responseTime; - /** - * 日志消息 - */ - private String msg; - /** - * 操作状态 - */ - private Integer status; - /** - * 创建者 - */ - private String operator; - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - private LocalDateTime createTime; -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/service/OperationLogSaveService.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/service/OperationLogSaveService.java deleted file mode 100644 index 159d85691..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/service/OperationLogSaveService.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.iocoder.mall.system.biz.log.operation.service; - - -import cn.iocoder.mall.system.biz.log.operation.model.dto.OperationLogDTO; - -/** - * 操作日志业务类 - * @author Hccake - * @version 1.0 - * @date 2019/10/15 19:57 - */ -public interface OperationLogSaveService { - - /** - * 保存操作日志 - * @param operationLogDTO - * @return true/false - */ - boolean saveLog(OperationLogDTO operationLogDTO); -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/AliYunSmsClient.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/AliYunSmsClient.java deleted file mode 100644 index 81a932cbc..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/AliYunSmsClient.java +++ /dev/null @@ -1,155 +0,0 @@ -package cn.iocoder.mall.system.biz.service.sms; - -import com.alibaba.fastjson.JSON; -import com.aliyuncs.CommonRequest; -import com.aliyuncs.CommonResponse; -import com.aliyuncs.DefaultAcsClient; -import com.aliyuncs.IAcsClient; -import com.aliyuncs.exceptions.ClientException; -import com.aliyuncs.http.MethodType; -import com.aliyuncs.profile.DefaultProfile; -import lombok.Data; -import lombok.experimental.Accessors; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import java.util.Collections; -import java.util.List; -import java.util.Map; - -/** - * 短信 AliYun client - * - * @author Sin - * @time 2019/5/25 12:28 PM - */ -@Component // TODO DOME FROM 芋艿 to 小范：建议类名改成 AliYunSmsClient -public class AliYunSmsClient implements SmsClient { - - private static final Logger LOGGER = LoggerFactory.getLogger(AliYunSmsClient.class); - - private static final String DOMAIN = "dysmsapi.aliyuncs.com"; - private static final String SUCCESS_CODE = "OK"; - private static final String SUCCESS_MESSAGE = "OK"; - /** - * 阿里云短信 - 批量推送最大数 500，支持 1000 - */ - private static final int MAX_BATCH_SIZE = 500; - - @Value("${sms.aliYun.accessKeyId?:'default_value'}") - private String accessKeyId; - @Value("${sms.aliYun.accessSecret?:'default_value'}") - private String accessSecret; - - @Data - @Accessors(chain = true) - public static class Result { - /** - * 发送回执ID，可根据该ID在接口QuerySendDetails中查询具体的发送状态。 - */ - private String BizId; - /** - * 请求状态码。 - * - * - OK 蔡成功 - */ - private String Code; - /** - * 状态码的描述。 - */ - private String Message; - /** - * 请求ID。 - */ - private String RequestId; - } - - @Override - public SendResult singleSend(String mobile, String sign, String templateCode, - String template, Map templateParams) { - // params - CommonRequest request = new CommonRequest(); - request.setMethod(MethodType.POST); - request.setDomain(DOMAIN); - request.setVersion("2017-05-25"); - request.setAction("SendSms"); - request.putQueryParameter("PhoneNumbers", mobile); - request.putQueryParameter("SignName", sign); - request.putQueryParameter("TemplateCode", templateCode); - request.putQueryParameter("TemplateParam", JSON.toJSONString(templateParams)); - // 发送请求 - return doSend(request); - } - - @Override - public SendResult batchSend(List mobileList, String sign, String templateCode, - String template, Map templateParams) { - // 最大发送数为 1000，我们设置为 500 个, 分段发送 - int maxSendSize = MAX_BATCH_SIZE; - int maxSendSizeCount = mobileList.size() % maxSendSize == 0 - ? mobileList.size() / maxSendSize - : mobileList.size() / maxSendSize + 1; - // 处理批量 - SendResult sendResult = null; - for (int i = 0; i < maxSendSizeCount; i++) { - // 分批发送 - List batchSendMobile = mobileList - .subList(i * maxSendSize, (i + 1) * maxSendSize); - // params - CommonRequest request = new CommonRequest(); - request.setMethod(MethodType.POST); - request.setDomain(DOMAIN); - request.setVersion("2017-05-25"); - request.setAction("SendBatchSms"); - request.putQueryParameter("PhoneNumberJson", JSON.toJSONString(batchSendMobile)); - request.putQueryParameter("SignNameJson", JSON.toJSONString(Collections.singletonList(sign))); - request.putQueryParameter("TemplateCode", templateCode); - request.putQueryParameter("TemplateParamJson", JSON.toJSONString(Collections.singletonList(templateParams))); - // 发送请求 - sendResult = doSend(request); - } - return sendResult; - } - - private SendResult doSend(CommonRequest request) { - // 获取 client - IAcsClient client = getClient(); - try { - CommonResponse response = client.getCommonResponse(request); - Result result = JSON.parseObject(response.getData(), Result.class); - if (!SUCCESS_CODE.equals(result.getCode())) { - LOGGER.info("发送验证码失败 params {} res {}", JSON.toJSON(request), JSON.toJSON(result)); - // 错误发送失败 - return new SendResult() - .setIsSuccess(false) - .setCode(SendResult.ERROR_CODE) - .setMessage(result.getMessage()); - } else { - LOGGER.info("发送验证码失败 params {} res", JSON.toJSON(request), JSON.toJSON(result)); - // 发送成功 - return new SendResult() - .setIsSuccess(true) - .setCode(SendResult.SUCCESS_CODE) - .setMessage(result.getMessage()); - } - } catch (ClientException e) { - LOGGER.error("发送验证码异常 {}", ExceptionUtils.getMessage(e)); - return new SendResult() - .setIsSuccess(false) - .setCode(SendResult.ERROR_CODE) - .setMessage(ExceptionUtils.getMessage(e)); - } - } - - /** - * 获取 client - * - * @return - */ - private IAcsClient getClient() { - return new DefaultAcsClient(DefaultProfile.getProfile("default", accessKeyId, accessSecret)); - } -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsClient.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsClient.java deleted file mode 100644 index bb1eecaab..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsClient.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.iocoder.mall.system.biz.service.sms; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; -import java.util.Map; - -/** - * 短信平台 - * - * @author Sin - * @time 2019/5/16 6:33 PM - */ -public interface SmsClient { - - /** - * 短信发送 - 单个 - * - * @param mobile 手机号 - * @param sign 签名 - * @param templateCode 短信模板code - * @param template 短信模板 - * @param templateParams 短信模板 params - * @return 发送后信息 - */ - SendResult singleSend(String mobile, String sign, String templateCode, - String template, Map templateParams); - - /** - * 短信发送 - 批量 - * - * @param mobileList 手机号 - * @param sign 签名 - * @param templateCode 短信模板 code - * @param template 短信模板 - * @param templateParams 短信模板params - * @return 发送后信息 - */ - SendResult batchSend(List mobileList, String sign, String templateCode, - String template, Map templateParams); - - @Data - @Accessors(chain = true) - class SendResult { - - public static final int SUCCESS_CODE = 0; - public static final int ERROR_CODE = 1; - public static final String SUCCESS_MESSAGE = "SUCCESS"; - - /** - * 错误码 - */ - private Integer code; - /** - * 错误信息 - */ - private String message; - /** - * 是否成功 - */ - private Boolean isSuccess; - } -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsService.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsService.java deleted file mode 100644 index 69c3f698e..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsService.java +++ /dev/null @@ -1,117 +0,0 @@ -package cn.iocoder.mall.system.biz.service.sms; - -import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.system.biz.bo.smsSign.ListSmsSignBO; -import cn.iocoder.mall.system.biz.bo.smsTemplate.ListSmsTemplateBO; -import cn.iocoder.mall.system.biz.bo.smsSign.SmsSignBO; -import cn.iocoder.mall.system.biz.bo.smsTemplate.SmsTemplateBO; -import cn.iocoder.mall.system.biz.dto.smsSign.AddSignDTO; -import cn.iocoder.mall.system.biz.dto.smsSign.ListSmsSignDTO; -import cn.iocoder.mall.system.biz.dto.smsTemplate.ListSmsTemplateDTO; -import cn.iocoder.mall.system.biz.dto.smsSign.UpdateSignDTO; - -import java.util.List; -import java.util.Map; - -/** - * 短信服务 - * - * @author Sin - * @time 2019/5/16 9:54 AM - */ -public interface SmsService { - - /** - * 短信模板 - 分页 - * - * @param listSmsSignDTO - * @return - */ - PageResult listSmsSign(ListSmsSignDTO listSmsSignDTO); - - /** - * 短信模板 - 分页 - * - * @param listSmsTemplateDTO - * @return - */ - PageResult listSmsTemplate(ListSmsTemplateDTO listSmsTemplateDTO); - - /** - * 签名 - 创建 - * - * @param addSignDTO - */ - void addSign(AddSignDTO addSignDTO); - - /** - * 签名 - 获取 - * - * @param id - */ - SmsSignBO getSign(Integer id); - - /** - * 签名 - 更新 - * - * @param updateSignDTO - */ - void updateSign(UpdateSignDTO updateSignDTO); - - /** - * 签名 - 更新 - * - * @param id - */ - void deleteSign(Integer id); - - /** - * 模板 - 创建 - * - * @param smsSignId 选用的哪个签名 - * @param templateCode 模板code - * @param template 模板内容 - * @param platform 平台 - */ - void addTemplate(Integer smsSignId, String templateCode, - String template, Integer platform, Integer smsType); - - /** - * 模板 - 获取 - * - * @param id - */ - SmsTemplateBO getTemplate(Integer id, Integer platform); - - /** - * 模板 - 更新 - * - * @param id 模板id - * @param smsSignId 短期签名 - * @param template 模板内容 - * @param platform 短信平台 - */ - void updateTemplate(Integer id, Integer smsSignId, String templateCode, - String template, Integer platform, Integer smsType); - - /** - * 模板 - 删除 - * - * @param id - */ - void deleteTemplate(Integer id); - - /** - * 短信发送 - 单个 - * - * @return - */ - void singleSend(String mobile, Integer smsTemplateId, Map params); - - /** - * 短信发送 - 批量 - * - * @return - */ - void batchSend(List mobileList, Integer smsTemplateId, Map params); -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsServiceImpl.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsServiceImpl.java deleted file mode 100644 index 56cddb602..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsServiceImpl.java +++ /dev/null @@ -1,364 +0,0 @@ -package cn.iocoder.mall.system.biz.service.sms; - -import cn.iocoder.common.framework.exception.ServiceException; -import cn.iocoder.common.framework.util.ServiceExceptionUtil; -import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.mybatis.core.enums.DeletedStatusEnum; -import cn.iocoder.mall.system.biz.bo.smsSign.ListSmsSignBO; -import cn.iocoder.mall.system.biz.bo.smsSign.SmsSignBO; -import cn.iocoder.mall.system.biz.bo.smsTemplate.ListSmsTemplateBO; -import cn.iocoder.mall.system.biz.bo.smsTemplate.SmsTemplateBO; -import cn.iocoder.mall.system.biz.convert.SmsSignConvert; -import cn.iocoder.mall.system.biz.convert.SmsTemplateConvert; -import cn.iocoder.mall.system.biz.dao.sms.SmsSendMapper; -import cn.iocoder.mall.system.biz.dao.sms.SmsSignMapper; -import cn.iocoder.mall.system.biz.dao.sms.SmsTemplateMapper; -import cn.iocoder.mall.system.biz.dataobject.sms.SmsSendLogDO; -import cn.iocoder.mall.system.biz.dataobject.sms.SmsSignDO; -import cn.iocoder.mall.system.biz.dataobject.sms.SmsTemplateDO; -import cn.iocoder.mall.system.biz.dto.smsSign.AddSignDTO; -import cn.iocoder.mall.system.biz.dto.smsSign.ListSmsSignDTO; -import cn.iocoder.mall.system.biz.dto.smsSign.UpdateSignDTO; -import cn.iocoder.mall.system.biz.dto.smsTemplate.ListSmsTemplateDTO; -import cn.iocoder.mall.system.biz.enums.SystemErrorCodeEnum; -import cn.iocoder.mall.system.biz.enums.sms.SmsApplyStatusEnum; -import cn.iocoder.mall.system.biz.enums.sms.SmsPlatformEnum; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * 短信 - * - * @author Sin - * @time 2019/5/16 10:30 AM - */ -@Service -public class SmsServiceImpl implements SmsService { - - @Autowired - private SmsSignMapper smsSignMapper; - @Autowired - private SmsTemplateMapper smsTemplateMapper; - @Autowired - private SmsSendMapper smsSendMapper; - - @Autowired - @Qualifier("yunPianSmsClient") - private SmsClient smsYunPianClient; - @Autowired - @Qualifier("aliYunSmsClient") - private SmsClient smsAliYunClient; - - @Override - public PageResult listSmsSign(ListSmsSignDTO queryDTO) { - // TODO DOME FROM 芋艿 to 小范：mybatis-plus 的 QueryWrapper 不要到 Service 层，可以抽 Dao 方法里哈。其它的类似可以瞅瞅噢 - IPage signPage = smsSignMapper.listSmsSign(queryDTO); - List signList = SmsSignConvert.INSTANCE.convert(signPage.getRecords()); - return new PageResult().setList(signList).setTotal(signPage.getTotal()); - } - - @Override - public PageResult listSmsTemplate(ListSmsTemplateDTO listSmsTemplateDTO) { - // 获取 template - IPage signPage = smsTemplateMapper.listSmsTemplate(listSmsTemplateDTO); - if (CollectionUtils.isEmpty(signPage.getRecords())) { - // TODO DOME FROM 芋艿 to 小范，Collections.EMPTY_LIST =》Collections.emptyList();另外，可以考虑直接 Convert 哈 - return new PageResult().setList(Collections.emptyList()).setTotal(signPage.getTotal()); - } - // 转换bo - List templateList = SmsTemplateConvert.INSTANCE.convert(signPage.getRecords()); - // 获取 sign - Set smsSignIds = templateList.stream().map( - ListSmsTemplateBO::getSmsSignId).collect(Collectors.toSet()); - - List smsSignDOList = smsSignMapper.selectList( - new QueryWrapper().in("id", smsSignIds)); - - List signList = SmsTemplateConvert.INSTANCE.convertTemplateSign(smsSignDOList); - // sign 转换为 map - Map smsSignDOMap = signList - .stream().collect(Collectors.toMap(ListSmsTemplateBO.Sign::getId, o -> o)); - // 设置 sign - templateList.forEach(template -> { - if (smsSignDOMap.containsKey(template.getSmsSignId())) { - template.setSign(smsSignDOMap.get(template.getSmsSignId())); - } - }); - return new PageResult().setList(templateList).setTotal(signPage.getTotal()); - } - - @Override - @Transactional - public void addSign(AddSignDTO addSignDTO) { - // 避免重复 - SmsSignDO smsSignDO = smsSignMapper.selectOne( - new QueryWrapper() - .eq("platform", addSignDTO.getPlatform()) - .eq("sign", addSignDTO.getSign()) - ); - // 处理 null 情况 - if (smsSignDO != null) { - // TODO DOME FROM 芋艿 to 小范：可以使用 ServiceExceptionUtil.exception(SystemErrorCodeEnum.SMS_SIGN_IS_EXISTENT); - throw ServiceExceptionUtil.exception(SystemErrorCodeEnum.SMS_SIGN_IS_EXISTENT); - } - // 保存数据库 - smsSignMapper.insert( - (SmsSignDO) new SmsSignDO() - .setSign(addSignDTO.getSign()) - .setPlatform(addSignDTO.getPlatform()) - .setApplyStatus(SmsApplyStatusEnum.SUCCESS.getValue()) - .setDeleted(DeletedStatusEnum.DELETED_NO.getValue()) - .setUpdateTime(new Date()) - .setCreateTime(new Date()) - ); - } - - @Override - public SmsSignBO getSign(Integer signId) { - // 查询数据库 - SmsSignDO smsSignDO = smsSignMapper.selectOne( - new QueryWrapper() - .eq("id", signId) - .eq("deleted", DeletedStatusEnum.DELETED_NO.getValue())); - // 处理 null - if (smsSignDO == null) { - throw new ServiceException(SystemErrorCodeEnum.SMS_SIGN_NOT_EXISTENT.getCode(), - SystemErrorCodeEnum.SMS_SIGN_NOT_EXISTENT.getMessage()); - } - // 转换vo返回 - return SmsSignConvert.INSTANCE.convert(smsSignDO); - } - - @Override - @Transactional - public void updateSign(UpdateSignDTO updateSignDTO) { - // 避免重复 - SmsSignDO smsSignDO = smsSignMapper.selectOne( - new QueryWrapper() - .eq("sign", updateSignDTO.getSign()) - .eq("platform", updateSignDTO.getPlatform())); - // 处理 null - if (smsSignDO != null) { - throw new ServiceException(SystemErrorCodeEnum.SMS_SIGN_IS_EXISTENT.getCode(), - SystemErrorCodeEnum.SMS_SIGN_IS_EXISTENT.getMessage()); - } - // 更新 - smsSignMapper.update( - (SmsSignDO) new SmsSignDO() - .setSign(updateSignDTO.getSign()) - .setPlatform(updateSignDTO.getPlatform()) - .setUpdateTime(new Date()), - new QueryWrapper().eq("id", updateSignDTO.getId()) - ); - } - - @Override - public void deleteSign(Integer id) { - // 根据id查询 - SmsSignDO smsSignDO = smsSignMapper.selectById(id); - // 处理 null - if (smsSignDO == null) { - throw new ServiceException(SystemErrorCodeEnum.SMS_SIGN_NOT_EXISTENT.getCode(), - SystemErrorCodeEnum.SMS_SIGN_NOT_EXISTENT.getMessage()); - } - // 更新 deleted 为 YES - smsSignMapper.delete(new UpdateWrapper() - .set("deleted", DeletedStatusEnum.DELETED_YES.getName()) - .eq("id", id) - ); - } - - @Override - @Transactional - public void addTemplate(Integer smsSignId, String templateCode, - String template, Integer platform, Integer smsType) { - // 根据id查询 - SmsSignDO smsSignDO = smsSignMapper.selectById(smsSignId); - // 处理 null - if (smsSignDO == null) { - throw new ServiceException(SystemErrorCodeEnum.SMS_SIGN_NOT_EXISTENT.getCode(), - SystemErrorCodeEnum.SMS_SIGN_NOT_EXISTENT.getMessage()); - } - // 保存数据库 - smsTemplateMapper.insert( - (SmsTemplateDO) new SmsTemplateDO() - .setId(null) - .setSmsSignId(smsSignId) - .setTemplateCode(templateCode) - .setTemplate(template) - .setPlatform(platform) - .setSmsType(smsType) - .setApplyStatus(SmsApplyStatusEnum.SUCCESS.getValue()) - .setApplyMessage("") - .setDeleted(DeletedStatusEnum.DELETED_NO.getValue()) - .setCreateTime(new Date()) - ); - } - - @Override - public SmsTemplateBO getTemplate(Integer id, Integer platform) { - // 获取数据 - SmsTemplateDO smsTemplateDO = smsTemplateMapper.selectOne( - new QueryWrapper() - .eq("platform", platform) - .eq("id", id)); - // 处理 null - if (smsTemplateDO == null) { - throw new ServiceException(SystemErrorCodeEnum.SMS_TEMPLATE_NOT_EXISTENT.getCode(), - SystemErrorCodeEnum.SMS_TEMPLATE_NOT_EXISTENT.getMessage()); - } - // 转换bo返回 - return SmsTemplateConvert.INSTANCE.convert(smsTemplateDO); - } - - @Override - @Transactional - public void updateTemplate(Integer id, Integer smsSignId, String templateCode, - String template, Integer platform, Integer smsType) { - // 获取 template - SmsTemplateDO smsTemplateDO = smsTemplateMapper.selectById(id); - if (smsTemplateDO == null) { - throw new ServiceException(SystemErrorCodeEnum.SMS_TEMPLATE_NOT_EXISTENT.getCode(), - SystemErrorCodeEnum.SMS_TEMPLATE_NOT_EXISTENT.getMessage()); - } - // 获取 sign - SmsSignDO smsSignDO = smsSignMapper.selectOne( - new QueryWrapper().eq("id", smsTemplateDO.getSmsSignId())); - if (smsSignDO == null) { - throw new ServiceException(SystemErrorCodeEnum.SMS_SIGN_NOT_EXISTENT.getCode(), - SystemErrorCodeEnum.SMS_SIGN_NOT_EXISTENT.getMessage()); - } - // 更新数据库 - smsTemplateMapper.update( - (SmsTemplateDO) new SmsTemplateDO() - .setSmsSignId(smsSignId) - .setTemplateCode(templateCode) - .setTemplate(template) - .setPlatform(platform) - .setSmsType(smsType) - .setUpdateTime(new Date()), - new QueryWrapper().eq("id", id) - ); - } - - @Override - @Transactional - public void deleteTemplate(Integer id) { - SmsTemplateDO smsTemplateDO = smsTemplateMapper.selectOne( - new QueryWrapper().eq("id", id)); - // 处理不存在情况 - if (smsTemplateDO == null - || smsTemplateDO.getDeleted().equals(DeletedStatusEnum.DELETED_YES.getValue())) { - throw new ServiceException(SystemErrorCodeEnum.SMS_TEMPLATE_NOT_EXISTENT.getCode(), - SystemErrorCodeEnum.SMS_TEMPLATE_NOT_EXISTENT.getMessage()); - } - // 删除 数据库模板 - SmsTemplateDO updateTemplate =new SmsTemplateDO(); - updateTemplate.setDeleted(DeletedStatusEnum.DELETED_YES.getValue()); - smsTemplateMapper.delete( - new UpdateWrapper() - .set("deleted", DeletedStatusEnum.DELETED_YES) - .eq("id", id)); - } - - @Override - public void singleSend(String mobile, Integer smsTemplateId, Map params) { - // 获取 template - SmsTemplateDO smsTemplateDO = smsTemplateMapper.selectById(smsTemplateId); - if (smsTemplateDO == null - || smsTemplateDO.getDeleted().equals(DeletedStatusEnum.DELETED_YES.getValue())) { - throw new ServiceException(SystemErrorCodeEnum.SMS_TEMPLATE_NOT_EXISTENT.getCode(), - SystemErrorCodeEnum.SMS_TEMPLATE_NOT_EXISTENT.getMessage()); - } - // 获取 sign - SmsSignDO smsSignDO = smsSignMapper.selectById(smsTemplateDO.getSmsSignId()); - if (smsSignDO == null) { - throw new ServiceException(SystemErrorCodeEnum.SMS_SIGN_NOT_EXISTENT.getCode(), - SystemErrorCodeEnum.SMS_SIGN_NOT_EXISTENT.getMessage()); - } - // 获取 client - SmsClient smsClient = getSmsClient(smsTemplateDO.getPlatform()); - // 发送短信 - SmsClient.SendResult sendResult = smsClient.singleSend(mobile, smsSignDO.getSign(), - smsTemplateDO.getTemplateCode(), smsTemplateDO.getTemplate(), params); - // 添加日志 - smsSendMapper.insert( - (SmsSendLogDO) new SmsSendLogDO() - .setTemplateId(smsTemplateDO.getId()) - .setTemplate(smsTemplateDO.getTemplate()) - .setMessage(sendResult.getMessage()) - .setCreateTime(new Date()) - ); - } - - @Override - public void batchSend(List mobileList, Integer smsTemplateId, Map params) { - // 获取 template - SmsTemplateDO smsTemplateDO = smsTemplateMapper.selectById(smsTemplateId); - if (smsTemplateDO == null - || smsTemplateDO.getDeleted().equals(DeletedStatusEnum.DELETED_YES.getValue())) { - throw new ServiceException(SystemErrorCodeEnum.SMS_TEMPLATE_NOT_EXISTENT.getCode(), - SystemErrorCodeEnum.SMS_TEMPLATE_NOT_EXISTENT.getMessage()); - } - // 获取 sign - SmsSignDO smsSignDO = smsSignMapper.selectById(smsTemplateDO.getSmsSignId()); - if (smsSignDO == null) { - // 添加日志 - smsSendMapper.insert( - (SmsSendLogDO) new SmsSendLogDO() - .setTemplateId(smsTemplateDO.getId()) - .setTemplate(smsTemplateDO.getTemplate()) - .setMessage("发送成功!") - .setCreateTime(new Date()) - ); - - throw new ServiceException(SystemErrorCodeEnum.SMS_SIGN_NOT_EXISTENT.getCode(), - SystemErrorCodeEnum.SMS_SIGN_NOT_EXISTENT.getMessage()); - } - // 获取 client - SmsClient smsClient = getSmsClient(smsTemplateDO.getPlatform()); - // 发送短信 - SmsClient.SendResult sendResult = smsClient.batchSend(mobileList, smsSignDO.getSign(), - smsTemplateDO.getTemplateCode(), smsTemplateDO.getTemplate(), params); - // 添加日志 - smsSendMapper.insert( - (SmsSendLogDO) new SmsSendLogDO() - .setTemplateId(smsTemplateDO.getId()) - .setTemplate(smsTemplateDO.getTemplate()) - .setMessage(sendResult.getMessage()) - .setCreateTime(new Date()) - ); - } - - /** - * 获取 sms 对于的 client - * - * @param platform - * @return - */ - private SmsClient getSmsClient(Integer platform) { - SmsClient smsClient = null; - // 阿里云和云片 - if (SmsPlatformEnum.YunPian.getValue().equals(platform)) { - smsClient = smsYunPianClient; - } else if (SmsPlatformEnum.AliYun.getValue().equals(platform)) { - smsClient = smsAliYunClient; - } - // 没有支持的平台 - if (smsClient == null) { - throw new ServiceException( - SystemErrorCodeEnum.SMS_NOT_SEND_CLIENT.getCode(), - SystemErrorCodeEnum.SMS_NOT_SEND_CLIENT.getMessage()); - } - return smsClient; - } -} diff --git a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/YunPianSmsClient.java b/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/YunPianSmsClient.java deleted file mode 100644 index 749264bb2..000000000 --- a/归档/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/YunPianSmsClient.java +++ /dev/null @@ -1,232 +0,0 @@ -package cn.iocoder.mall.system.biz.service.sms; - -import cn.iocoder.common.framework.exception.ServiceException; -import cn.iocoder.mall.system.biz.enums.SystemErrorCodeEnum; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import org.apache.http.HttpEntity; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * 云片 短信平台 - * - * @author Sin - * @time 2019/5/16 6:34 PM - */ -@Component -public class YunPianSmsClient implements SmsClient { - - protected static final Logger LOGGER = LoggerFactory.getLogger(YunPianSmsClient.class); - - private static final int SUCCESS_CODE = 0; - private static final String SUCCESS_MESSAGE = "SUCCESS"; - - /** - * 云片短信 - 批量推送最大数 500，支持 1000 - */ - private static final int MAX_BATCH_SIZE = 500; - /** - * 模板 - 参数拼接 - */ - private static final String PARAM_TEMPLATE = "#%s#"; - /** - * 模板 - 签名拼接 - */ - private static final String SIGN_TEMPLATE = "【%s】%s"; - - /** - * 签名 - 添加 - */ - private static final String URL_SIGN_ADD = "https://sms.yunpian.com/v2/sign/add.json"; - /** - * 签名 - 获取 - */ - private static final String URL_SIGN_GET = "https://sms.yunpian.com/v2/sign/get.json"; - /** - * 签名 - 更新 - */ - private static final String URL_SIGN_UPDATE = "https://sms.yunpian.com/v2/sign/update.json"; - /** - * 模板 - 添加 - */ - private static final String URL_TEMPLATE_ADD = "https://sms.yunpian.com/v2/tpl/add.json"; - /** - * 模板 - 获取 - */ - private static final String URL_TEMPLATE_GET = "https://sms.yunpian.com/v2/tpl/get.json"; - /** - * 模板 - 更新 - */ - private static final String URL_TEMPLATE_UPDATE = "https://sms.yunpian.com/v2/tpl/update.json"; - /** - * 模板 - 删除 - */ - private static final String URL_TEMPLATE_DELETE = "https://sms.yunpian.com/v2/tpl/del.json"; - /** - * 短信发送 - 单个 - */ - private static final String URL_SEND_SINGLE = "https://sms.yunpian.com/v2/sms/single_send.json"; - /** - * 短信发送 - 批量 - */ - private static final String URL_SEND_BATCH = "https://sms.yunpian.com/v2/sms/batch_send.json"; - - //编码格式。发送编码格式统一用UTF-8 - private static String ENCODING = "UTF-8"; - - @Value("${sms.yunPian.apiKey?:'default_value'}") - private String apiKey; - - @Override - public SendResult singleSend(String mobile, String sign, String templateCode, String template, Map templateParams) { - // build 模板 - template = buildTemplate(sign, template, templateParams); - // 请求参数 - Map params = new LinkedHashMap<>(); - params.put("apikey", apiKey); - params.put("mobile", mobile); - params.put("text", template); - // TODO: 2019/5/19 sin 运营商发送报告 回调 - // params.put("callback_url", template); - String result = post(URL_SEND_SINGLE, params); - JSONObject jsonObject = JSON.parseObject(result); - if (jsonObject.containsKey("code") - && !(jsonObject.getInteger("code") == SUCCESS_CODE)) { - throw new ServiceException(SystemErrorCodeEnum.SMS_PLATFORM_FAIL.getCode(), - jsonObject.getString("detail")); - } - // 转换 result - return new SendResult() - .setIsSuccess(SUCCESS_CODE == jsonObject.getInteger("code")) - .setCode(jsonObject.getInteger("code")) - .setMessage(jsonObject.getString("detail")); - } - - @Override - public SendResult batchSend(List mobileList, String sign, - String templateCode, String template, - Map templateParams) { - // build 模板 - template = buildTemplate(sign, template, templateParams); - // 最大发送数为 1000，我们设置为 500 个, 分段发送 - int maxSendSize = MAX_BATCH_SIZE; - int maxSendSizeCount = mobileList.size() % maxSendSize == 0 - ? mobileList.size() / maxSendSize - : mobileList.size() / maxSendSize + 1; - int j = 0; - int j2 = mobileList.size(); - - for (int i = 0; i < maxSendSizeCount; i++) { - StringBuffer sendMobileStr = new StringBuffer(); - for (int k = j; k < j2; k++) { - sendMobileStr.append(","); - sendMobileStr.append(mobileList.get(k)); - } - String dividedMobile = sendMobileStr.toString().substring(1); - // 发送手机号 - Map params = new LinkedHashMap<>(); - params.put("apikey", apiKey); - params.put("mobile", dividedMobile); - params.put("text", template); - // TODO: 2019/5/19 sin 运营商发送报告 回调 - // params.put("callback_url", template); - String result = post(URL_SEND_BATCH, params); - JSONObject jsonObject = JSON.parseObject(result); - if (jsonObject.containsKey("code") - && !(jsonObject.getInteger("code") == SUCCESS_CODE)) { - throw new ServiceException(SystemErrorCodeEnum.SMS_PLATFORM_FAIL.getCode(), - jsonObject.getString("detail")); - } - // 用于递增 maxSendSize - j = j2; - j2 = j + maxSendSize; - } - return new SendResult() - .setIsSuccess(true) - .setCode(SUCCESS_CODE) - .setMessage(SUCCESS_MESSAGE); - } - - /** - * 构建模板 - * - * @param sign - * @param template - * @param templateParams - * @return - */ - private static String buildTemplate(String sign, String template, - Map templateParams) { - // 不处理 empty 数据 - if (CollectionUtils.isEmpty(templateParams)) { - return template; - } - // 处理template参数 - for (Map.Entry entry : templateParams.entrySet()) { - String paramsKey = entry.getKey(); - String value = entry.getValue(); - String paramPlace = String.format(PARAM_TEMPLATE, paramsKey); - template = template.replaceAll(paramPlace, value); - } - template = String.format(SIGN_TEMPLATE, sign, template); - return template; - } - - /** - * 基于HttpClient 4.3的通用POST方法 - * - * @param url 提交的URL - * @param paramsMap 提交<参数，值>Map - * @return 提交响应 - */ - - public static String post(String url, Map paramsMap) { - CloseableHttpClient client = HttpClients.createDefault(); - String responseText = ""; - CloseableHttpResponse response = null; - try { - HttpPost method = new HttpPost(url); - if (paramsMap != null) { - List paramList = new ArrayList<>(); - for (Map.Entry param : paramsMap.entrySet()) { - NameValuePair pair = new BasicNameValuePair(param.getKey(), - param.getValue()); - paramList.add(pair); - } - method.setEntity(new UrlEncodedFormEntity(paramList, ENCODING)); - } - response = client.execute(method); - HttpEntity entity = response.getEntity(); - if (entity != null) { - responseText = EntityUtils.toString(entity, ENCODING); - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - try { - response.close(); - } catch (Exception e) { - e.printStackTrace(); - } - } - LOGGER.debug("云片短信平台 res: {}", responseText); - return responseText; - } -} diff --git a/归档/moved/system/system-rest/pom.xml b/归档/moved/system/system-rest/pom.xml deleted file mode 100644 index 9e232f904..000000000 --- a/归档/moved/system/system-rest/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - system - cn.iocoder.mall - 1.0-SNAPSHOT - - 4.0.0 - - system-rest - 提供 system 服务的 Rest 接口的实现，提供对外调用 - - - - - cn.iocoder.mall - system-biz - 1.0-SNAPSHOT - - - - - cn.iocoder.mall - mall-spring-boot-starter-web - 1.0-SNAPSHOT - - - cn.iocoder.mall - mall-spring-boot-starter-security - 1.0-SNAPSHOT - - - cn.iocoder.mall - mall-spring-boot-starter-swagger - 1.0-SNAPSHOT - - - - diff --git a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/file/AdminsFileController.java b/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/file/AdminsFileController.java deleted file mode 100644 index 63709079c..000000000 --- a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/file/AdminsFileController.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.iocoder.mall.system.rest.controller.file; - -import cn.iocoder.common.framework.vo.CommonResult; -import com.qiniu.util.Auth; -import io.swagger.annotations.Api; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 文件模块(Admins API) - * - * author: sin - * time: 2020/4/20 9:41 上午 - */ -@RestController -@RequestMapping("admins/file") -@Api(tags = "文件模块") -public class AdminsFileController { - - private Logger logger = LoggerFactory.getLogger(getClass()); - - @Autowired - private Auth auth; - @Value("${qiniu.bucket}") - private String bucket; - - @GetMapping("/get-qiniu-token") - public CommonResult getQiniuToken() { - String token = auth.uploadToken(bucket); - logger.info("[qiniu_token][token({}) get]", token); - return CommonResult.success(token); - } -} diff --git a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsSignController.java b/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsSignController.java deleted file mode 100644 index fc435ba13..000000000 --- a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsSignController.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.iocoder.mall.system.rest.controller.sms; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.system.biz.bo.smsSign.ListSmsSignBO; -import cn.iocoder.mall.system.biz.dto.smsSign.ListSmsSignDTO; -import cn.iocoder.mall.system.biz.service.sms.SmsService; -import cn.iocoder.mall.system.rest.convert.sms.AdminsSmsConvert; -import cn.iocoder.mall.system.rest.request.sms.AddSignRequest; -import cn.iocoder.mall.system.rest.request.sms.UpdateSignRequest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -/** - * 短信服务 - * - * @author Sin - * @time 2019/5/26 12:26 PM - */ -@RestController -@RequestMapping("admins/sms/sign") -@Api("短信服务(签名)") -public class AdminsSmsSignController { - - @Autowired - private SmsService smsService; - - @GetMapping("page") - @ApiOperation("签名-page") - public CommonResult> pageSign(@Validated ListSmsSignDTO listSmsSignDTO) { - return CommonResult.success(smsService.listSmsSign(listSmsSignDTO)); - } - - @PostMapping("add") - @ApiOperation("签名-添加") - public CommonResult addSign(@RequestBody AddSignRequest addSignRequest) { - smsService.addSign(AdminsSmsConvert.INSTANCE.convert(addSignRequest)); - return CommonResult.success(null); - } - - @PutMapping("update") - @ApiOperation("签名-更新") - public CommonResult updateSign(@RequestBody UpdateSignRequest updateSignRequest) { - smsService.updateSign(AdminsSmsConvert.INSTANCE.convert(updateSignRequest)); - return CommonResult.success(null); - } - - @DeleteMapping("deleted") - @ApiOperation("签名-删除") - public CommonResult deletedSign(@RequestParam("id") Integer id) { - smsService.deleteSign(id); - return CommonResult.success(null); - } -} diff --git a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsTemplateController.java b/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsTemplateController.java deleted file mode 100644 index 373246676..000000000 --- a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsTemplateController.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.iocoder.mall.system.rest.controller.sms; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.common.framework.vo.PageResult; -import cn.iocoder.mall.system.biz.bo.smsTemplate.ListSmsTemplateBO; -import cn.iocoder.mall.system.biz.service.sms.SmsService; -import cn.iocoder.mall.system.rest.convert.sms.AdminsSmsConvert; -import cn.iocoder.mall.system.rest.request.sms.AddSmsTemplateRequest; -import cn.iocoder.mall.system.rest.request.sms.ListSmsTemplateRequest; -import cn.iocoder.mall.system.rest.request.sms.UpdateSmsTemplateRequest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * 短信服务 - * - * @author Sin - * @time 2019/5/26 12:26 PM - */ -@RestController -@RequestMapping("admins/sms/template") -@Api("短信服务(短信模板)") -public class AdminsSmsTemplateController { - - @Autowired - private SmsService smsService; - - @PostMapping("page") - @ApiOperation("短信模板-page") - public CommonResult> pageSign(@RequestBody ListSmsTemplateRequest request) { - return CommonResult.success(smsService.listSmsTemplate(AdminsSmsConvert.INSTANCE.convert(request))); - } - - @PostMapping("add") - @ApiOperation("短信模板-添加") - public CommonResult addSign(@RequestBody AddSmsTemplateRequest smsTemplateAddPO) { - smsService.addTemplate( - smsTemplateAddPO.getSmsSignId(), - smsTemplateAddPO.getTemplateCode(), - smsTemplateAddPO.getTemplate(), - smsTemplateAddPO.getPlatform(), - smsTemplateAddPO.getSmsType()); - return CommonResult.success(null); - } - - @PutMapping("update") - @ApiOperation("短信模板-更新") - public CommonResult updateSign(@RequestBody UpdateSmsTemplateRequest smsTemplateUpdatePO) { - smsService.updateTemplate( - smsTemplateUpdatePO.getId(), - smsTemplateUpdatePO.getSmsSignId(), - smsTemplateUpdatePO.getTemplateCode(), - smsTemplateUpdatePO.getTemplate(), - smsTemplateUpdatePO.getPlatform(), - smsTemplateUpdatePO.getSmsType()); - return CommonResult.success(null); - } - - @DeleteMapping("deleted") - @ApiOperation("短信模板-删除") - public CommonResult deletedSign(@RequestParam("id") Integer id) { - smsService.deleteTemplate(id); - return CommonResult.success(null); - } -} diff --git a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/sms/AdminsSmsConvert.java b/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/sms/AdminsSmsConvert.java deleted file mode 100644 index b6dc4cac9..000000000 --- a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/sms/AdminsSmsConvert.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.iocoder.mall.system.rest.convert.sms; - -import cn.iocoder.mall.system.biz.dto.smsSign.AddSignDTO; -import cn.iocoder.mall.system.biz.dto.smsSign.UpdateSignDTO; -import cn.iocoder.mall.system.biz.dto.smsTemplate.ListSmsTemplateDTO; -import cn.iocoder.mall.system.rest.request.sms.AddSignRequest; -import cn.iocoder.mall.system.rest.request.sms.UpdateSignRequest; -import cn.iocoder.mall.system.rest.request.sms.ListSmsTemplateRequest; -import org.mapstruct.Mapper; -import org.mapstruct.Mappings; -import org.mapstruct.factory.Mappers; - -/** - * sms admins convert - * - * author: sin - * time: 2020/4/20 11:07 上午 - */ -@Mapper -public interface AdminsSmsConvert { - - AdminsSmsConvert INSTANCE = Mappers.getMapper(AdminsSmsConvert.class); - - @Mappings({}) - AddSignDTO convert(AddSignRequest bean); - - @Mappings({}) - UpdateSignDTO convert(UpdateSignRequest bean); - - @Mappings({}) - ListSmsTemplateDTO convert(ListSmsTemplateRequest bean); -} diff --git a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/admin/AdminsUserUpdateRequest.java b/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/admin/AdminsUserUpdateRequest.java deleted file mode 100644 index da63719e2..000000000 --- a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/admin/AdminsUserUpdateRequest.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.iocoder.mall.system.rest.request.admin; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotNull; - -/** - * @Author: jiangweifan - * @Date: 2020/5/12 - * @Description: 管理员 - 用户信息 - 更新用户信息 - */ -@ApiModel("更新用户信息Request") -@Data -@Accessors(chain = true) -public class AdminsUserUpdateRequest { - - @ApiModelProperty(name = "id", value = "用户编号", required = true, example = "1") - @NotNull(message = "用户编号不能为空") - private Integer id; - - @ApiModelProperty(name = "nickname", value = "昵称", required = true, example = "小王") - private String nickname; - - @ApiModelProperty(name = "avatar", value = "头像", required = true, example = "http://www.iocoder.cn/xxx.jpg") - private String avatar; -} diff --git a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSignRequest.java b/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSignRequest.java deleted file mode 100644 index 55be319db..000000000 --- a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSignRequest.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.iocoder.mall.system.rest.request.sms; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 添加 sign - * - * author: sin - * time: 2020/4/20 11:10 上午 - */ -@Data -@Accessors(chain = true) -public class AddSignRequest implements Serializable { - - private String sign; - - private Integer platform; -} diff --git a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSmsTemplateRequest.java b/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSmsTemplateRequest.java deleted file mode 100644 index 6357f9aa3..000000000 --- a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSmsTemplateRequest.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.iocoder.mall.system.rest.request.sms; - -import cn.iocoder.common.framework.validator.InEnum; -import cn.iocoder.mall.system.biz.enums.sms.SmsPlatformEnum; -import cn.iocoder.mall.system.biz.enums.sms.SmsTypeEnum; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serializable; - -/** - * 短信模板 add - * - * @author Sin - * @time 2019/5/26 12:37 PM - */ -@ApiModel("短信模板-添加") -@Data -@Accessors(chain = true) -public class AddSmsTemplateRequest implements Serializable { - - @ApiModelProperty("短信签名id") - @NotNull(message = "短信短信签名id不能为空!") - private Integer smsSignId; - - @ApiModelProperty("短信模板code") - @NotNull - @Size(min = 3, max = 50, message = "短信code在 3-50 之间") - private String templateCode; - - @ApiModelProperty("短信模板") - @NotNull - @Size(min = 3, max = 255, message = "短信在 3-255 之间") - private String template; - - @ApiModelProperty("短信模板-平台") - @NotNull - @InEnum(value = SmsPlatformEnum.class) - private Integer platform; - - @ApiModelProperty("短信模板-平台") - @NotNull - @InEnum(value = SmsTypeEnum.class) - private Integer smsType; -} diff --git a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/ListSmsTemplateRequest.java b/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/ListSmsTemplateRequest.java deleted file mode 100644 index 7c26646d1..000000000 --- a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/ListSmsTemplateRequest.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.iocoder.mall.system.rest.request.sms; - -import cn.iocoder.common.framework.vo.PageParam; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotNull; - -/** - * page 短信模板 query - * - * @author Sin - * @time 2019/5/19 4:32 PM - */ -@Data -@Accessors(chain = true) -public class ListSmsTemplateRequest extends PageParam { - - @NotNull - private String id; - - @NotNull - private Integer smsSignId; - - @NotNull - private String template; - - @NotNull - private String applyStatus; -} diff --git a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSignRequest.java b/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSignRequest.java deleted file mode 100644 index cbde8ea4a..000000000 --- a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSignRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.iocoder.mall.system.rest.request.sms; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 更新签名 - *

- * author: sin - * time: 2020/4/20 11:02 上午 - */ -@Data -@Accessors(chain = true) -public class UpdateSignRequest implements Serializable { - - private Integer id; - - private String sign; - - private Integer platform; -} diff --git a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSmsTemplateRequest.java b/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSmsTemplateRequest.java deleted file mode 100644 index 1a45de2e3..000000000 --- a/归档/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSmsTemplateRequest.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.iocoder.mall.system.rest.request.sms; - -import cn.iocoder.common.framework.validator.InEnum; -import cn.iocoder.mall.system.biz.enums.sms.SmsPlatformEnum; -import cn.iocoder.mall.system.biz.enums.sms.SmsTypeEnum; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serializable; - -/** - * 短信模板 add - * - * @author Sin - * @time 2019/5/26 12:37 PM - */ -@ApiModel("短信模板-添加") -@Data -@Accessors(chain = true) -public class UpdateSmsTemplateRequest implements Serializable { - - @ApiModelProperty("短信模板id") - @NotNull(message = "短信模板不能为空!") - private Integer id; - - @ApiModelProperty("短信签名id") - @NotNull(message = "短信短信签名id不能为空!") - private Integer smsSignId; - - @ApiModelProperty("短信模板code") - @NotNull - @Size(min = 3, max = 50, message = "短信code在 3-50 之间") - private String templateCode; - - @ApiModelProperty("短信模板") - @NotNull - @Size(min = 3, max = 255, message = "短信在 3-255 之间") - private String template; - - @ApiModelProperty("短信模板-平台") - @NotNull - @InEnum(value = SmsPlatformEnum.class) - private Integer platform; - - @ApiModelProperty("短信模板-平台") - @NotNull - @InEnum(value = SmsTypeEnum.class) - private Integer smsType; -} diff --git a/归档/moved/system/system-rest/src/main/resources/rest.yaml b/归档/moved/system/system-rest/src/main/resources/rest.yaml deleted file mode 100644 index a41390b41..000000000 --- a/归档/moved/system/system-rest/src/main/resources/rest.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# 服务器的配置项 -server: - port: 18083 - servlet: - context-path: /system-api/ - -# Swagger 配置项 -swagger: - title: 管理员子系统 - description: 管理员子系统 - version: 1.0.0 - base-package: cn.iocoder.mall.system.rest.controller diff --git a/归档/moved/system/system-service-api/pom.xml b/归档/moved/system/system-service-api/pom.xml deleted file mode 100644 index 3b77e0d06..000000000 --- a/归档/moved/system/system-service-api/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - system - cn.iocoder.mall - 1.0-SNAPSHOT - - 4.0.0 - jar - - system-service-api - - - - cn.iocoder.mall - common-framework - 1.0-SNAPSHOT - - - - - io.swagger - swagger-annotations - - - - - org.mapstruct - mapstruct - - - org.mapstruct - mapstruct-jdk8 - - - - org.projectlombok - lombok - - - - diff --git a/归档/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/DataDictService.java b/归档/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/DataDictService.java deleted file mode 100644 index ab7d60d61..000000000 --- a/归档/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/DataDictService.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.iocoder.mall.system.api; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.system.api.bo.datadict.DataDictBO; -import cn.iocoder.mall.system.api.dto.datadict.DataDictAddDTO; -import cn.iocoder.mall.system.api.dto.datadict.DataDictUpdateDTO; - -import java.util.Collection; -import java.util.List; - -public interface DataDictService { - - List selectDataDictList(); - - DataDictBO addDataDict(Integer adminId, DataDictAddDTO dataDictAddDTO); - - Boolean updateDataDict(Integer adminId, DataDictUpdateDTO dataDictUpdateDTO); - - Boolean deleteDataDict(Integer adminId, Integer dataDictId); - - /** - * 获取字典值 - 单个 - * - * 注意: dictValue:Object 为了方便调用，会自动转换为 dictValue:String - * - * @param dictKey - * @param dictValue - * @return - */ - CommonResult getDataDict(String dictKey, Object dictValue); - - CommonResult> getDataDict(String dictKey); - - /** - * 获取字典值 - 多个 - * - * 注意：dictValueList:? 为了方便调用，会自动转换为 Set:String - * - * @param dictKey - * @param dictValueList - * @return - */ - CommonResult> getDataDictList(String dictKey, Collection dictValueList); -} diff --git a/归档/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/SmsService.java b/归档/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/SmsService.java deleted file mode 100644 index fe15355c7..000000000 --- a/归档/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/SmsService.java +++ /dev/null @@ -1,116 +0,0 @@ -package cn.iocoder.mall.system.api; - -import cn.iocoder.mall.system.api.bo.sms.SmsSignBO; -import cn.iocoder.mall.system.api.bo.sms.PageSmsSignBO; -import cn.iocoder.mall.system.api.bo.sms.SmsTemplateBO; -import cn.iocoder.mall.system.api.bo.sms.PageSmsTemplateBO; -import cn.iocoder.mall.system.api.dto.sms.PageQuerySmsSignDTO; -import cn.iocoder.mall.system.api.dto.sms.PageQuerySmsTemplateDTO; - -import java.util.List; -import java.util.Map; - -/** - * 短信服务 - * - * @author Sin - * @time 2019/5/16 9:54 AM - */ -public interface SmsService { - - /** - * 短信模板 - 分页 - * - * @param queryDTO - * @return - */ - PageSmsSignBO pageSmsSign(PageQuerySmsSignDTO queryDTO); - - /** - * 短信模板 - 分页 - * - * @param queryDTO - * @return - */ - PageSmsTemplateBO pageSmsTemplate(PageQuerySmsTemplateDTO queryDTO); - - /** - * 签名 - 创建 - * - * @param sign - */ - void addSign(String sign, Integer platform); - - /** - * 签名 - 获取 - * - * @param id - */ - SmsSignBO getSign(Integer id); - - /** - * 签名 - 更新 - * - * @param id - * @param newSign - * @param platform - */ - void updateSign(Integer id, String newSign, Integer platform); - - /** - * 签名 - 更新 - * - * @param id - */ - void deleteSign(Integer id); - - /** - * 模板 - 创建 - * - * @param smsSignId 选用的哪个签名 - * @param templateCode 模板code - * @param template 模板内容 - * @param platform 平台 - */ - void addTemplate(Integer smsSignId, String templateCode, - String template, Integer platform, Integer smsType); - - /** - * 模板 - 获取 - * - * @param id - */ - SmsTemplateBO getTemplate(Integer id, Integer platform); - - /** - * 模板 - 更新 - * - * @param id 模板id - * @param smsSignId 短期签名 - * @param template 模板内容 - * @param platform 短信平台 - */ - void updateTemplate(Integer id, Integer smsSignId, String templateCode, - String template, Integer platform, Integer smsType); - - /** - * 模板 - 删除 - * - * @param id - */ - void deleteTemplate(Integer id); - - /** - * 短信发送 - 单个 - * - * @return - */ - void singleSend(String mobile, Integer smsTemplateId, Map params); - - /** - * 短信发送 - 批量 - * - * @return - */ - void batchSend(List mobileList, Integer smsTemplateId, Map params); -} diff --git a/归档/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsSignBO.java b/归档/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsSignBO.java deleted file mode 100644 index a4482d2b0..000000000 --- a/归档/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsSignBO.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.iocoder.mall.system.api.bo.sms; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; -import java.util.List; - -/** - * sms page - * - * @author Sin - * @time 2019/5/19 4:23 PM - */ -@Data -@Accessors(chain = true) -public class PageSmsSignBO { - - private Integer count; - - private Long current; - - private Long size; - - private Long total; - - private List data; - - @Data - @Accessors(chain = true) - public static class Sign { - /** - * 编号 - */ - private Integer id; - /** - * 短信平台 - */ - private Integer platform; - /** - * 签名名称 - */ - private String sign; - /** - * 审核状态 - *

- * - 1、审核中 - * - 2、审核成功 - * - 3、审核失败 - */ - private Integer applyStatus; - /** - * 审核信息 - */ - private String applyMessage; - /** - * 更新时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date updateTime; - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - } -} diff --git a/归档/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsTemplateBO.java b/归档/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsTemplateBO.java deleted file mode 100644 index ece12fc9c..000000000 --- a/归档/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsTemplateBO.java +++ /dev/null @@ -1,117 +0,0 @@ -package cn.iocoder.mall.system.api.bo.sms; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; -import java.util.List; - -/** - * sms page - * - * @author Sin - * @time 2019/5/19 4:23 PM - */ -@Data -@Accessors(chain = true) -public class PageSmsTemplateBO { - - private Long total; - - private Long current; - - private Long size; - - private List