Kaynağa Gözat

短信基础配置基本完成

Huanyi 1 ay önce
ebeveyn
işleme
f0821fcfa5
31 değiştirilmiş dosya ile 949 ekleme ve 11 silme
  1. 14 0
      ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteSmsConfigService.java
  2. 28 0
      ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteSmsConfig.java
  3. 6 3
      ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java
  4. 10 0
      ruoyi-common/ruoyi-common-sms/pom.xml
  5. 66 0
      ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/DataSourceSmsReadConfig.java
  6. 12 0
      ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java
  7. 22 0
      ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/model/SmsModel.java
  8. 56 0
      ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/utils/SmsUtils.java
  9. 1 0
      ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  10. 5 0
      ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java
  11. 5 0
      ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/AreaStationTranslationImpl.java
  12. 5 0
      ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/TenantCatergoriesNameTranslationImpl.java
  13. 5 0
      ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/TenantNameTranslationImpl.java
  14. 1 1
      ruoyi-modules/ruoyi-gen/src/main/resources/application.yml
  15. 106 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysSmsConfigController.java
  16. 7 2
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysSmsController.java
  17. 66 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysSmsConfig.java
  18. 71 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysSmsConfigBo.java
  19. 80 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysSmsConfigVo.java
  20. 76 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteSmsConfigServiceImpl.java
  21. 15 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/SysSmsConfigMapper.java
  22. 73 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysSmsConfigService.java
  23. 164 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysSmsConfigServiceImpl.java
  24. 4 0
      ruoyi-modules/ruoyi-resource/src/main/resources/application.yml
  25. 4 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTenantCatergoriesServiceImpl.java
  26. 3 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java
  27. 1 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/enums/SysStoreStatusEnum.java
  28. 5 5
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysStoreServiceImpl.java
  29. 17 0
      script/sql/business/create.sql
  30. 21 0
      script/sql/business/update.sql
  31. 0 0
      sessionStore/8091/root.data

+ 14 - 0
ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteSmsConfigService.java

@@ -0,0 +1,14 @@
+package org.dromara.resource.api;
+
+import org.dromara.resource.api.domain.RemoteSmsConfig;
+
+import java.util.List;
+
+public interface RemoteSmsConfigService {
+
+    RemoteSmsConfig getSingleConfig();
+
+    List<RemoteSmsConfig> getConfigList();
+
+    RemoteSmsConfig getConfigById(String id);
+}

+ 28 - 0
ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteSmsConfig.java

@@ -0,0 +1,28 @@
+package org.dromara.resource.api.domain;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+public class RemoteSmsConfig implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private String configId;
+
+    private String supplier;
+
+    private String accessKeyId;
+
+    private String accessKeySecret;
+
+    private String signature;
+
+    private Integer maximum;
+
+    private String sdkAppId;
+
+}

+ 6 - 3
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java

@@ -87,11 +87,14 @@ public interface CacheNames {
     String ONLINE_TOKEN = "online_tokens";
 
     /**
-     * 区域站点
+     * 区域站点名
+     * @Author: Huanyi
      */
     String SYS_AREA_STATION_NAME = "sys_area_station_name#30d";
 
-    String SYS_TENANT_NAME = "sys_tenant_name#30d";
-
+    /**
+     * 商户分类名
+     * @Author: Huanyi
+     */
     String SYS_TENANT_CATERGORIES_NAME = "sys_tenant_catergories_name#30d";
 }

+ 10 - 0
ruoyi-common/ruoyi-common-sms/pom.xml

@@ -28,5 +28,15 @@
             <artifactId>ruoyi-common-redis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api-resource</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-dubbo</artifactId>
+        </dependency>
+
     </dependencies>
 </project>

+ 66 - 0
ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/DataSourceSmsReadConfig.java

@@ -0,0 +1,66 @@
+package org.dromara.common.sms.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.common.sms.model.SmsModel;
+import org.dromara.common.sms.utils.SmsUtils;
+import org.dromara.resource.api.RemoteSmsConfigService;
+import org.dromara.resource.api.domain.RemoteSmsConfig;
+import org.dromara.sms4j.core.datainterface.SmsReadConfig;
+import org.dromara.sms4j.provider.config.BaseConfig;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 短信服务读取配置
+ */
+
+@AutoConfiguration
+@Slf4j
+public class DataSourceSmsReadConfig implements SmsReadConfig {
+
+    @DubboReference
+    private RemoteSmsConfigService service;
+
+    @Override
+    public BaseConfig getSupplierConfig(String configId) {
+        RemoteSmsConfig config = service.getConfigById(configId);
+        SmsModel model = new SmsModel();
+        model.setConfigId(config.getConfigId());
+        model.setSupplier(config.getSupplier());
+        model.setAccessKeyId(config.getAccessKeyId());
+        model.setAccessKeySecret(config.getAccessKeySecret());
+        model.setSignature(config.getSignature());
+        model.setMaximum(config.getMaximum());
+        model.setSdkAppId(config.getSdkAppId());
+        return SmsUtils.createConfigBySupplier(model);
+    }
+
+    @Override
+    public List<BaseConfig> getSupplierConfigList() {
+        log.warn(">>> 开始动态加载厂商配置列表");
+        List<RemoteSmsConfig> remotes = service.getConfigList();
+        List<SmsModel> models = new ArrayList<>();
+        remotes.forEach(remote -> {
+            SmsModel model = new SmsModel();
+            model.setConfigId(remote.getConfigId());
+            model.setSupplier(remote.getSupplier());
+            model.setAccessKeyId(remote.getAccessKeyId());
+            model.setAccessKeySecret(remote.getAccessKeySecret());
+            model.setSignature(remote.getSignature());
+            model.setMaximum(remote.getMaximum());
+            model.setSdkAppId(remote.getSdkAppId());
+            models.add(model);
+        });
+
+        List<BaseConfig> configs = new ArrayList<>();
+        for (SmsModel model : models) {
+            BaseConfig config = SmsUtils.createConfigBySupplier(model);
+            configs.add(config);
+        }
+        return configs;
+    }
+
+}

+ 12 - 0
ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java

@@ -1,12 +1,16 @@
 package org.dromara.common.sms.config;
 
+import jakarta.annotation.Resource;
 import org.dromara.common.redis.config.RedisConfiguration;
 import org.dromara.common.sms.core.dao.PlusSmsDao;
 import org.dromara.common.sms.handler.SmsExceptionHandler;
 import org.dromara.sms4j.api.dao.SmsDao;
+import org.dromara.sms4j.core.factory.SmsFactory;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.EventListener;
 
 /**
  * 短信配置类
@@ -16,6 +20,9 @@ import org.springframework.context.annotation.Primary;
 @AutoConfiguration(after = {RedisConfiguration.class})
 public class SmsAutoConfiguration {
 
+    @Resource
+    private DataSourceSmsReadConfig config;
+
     @Primary
     @Bean
     public SmsDao smsDao() {
@@ -30,4 +37,9 @@ public class SmsAutoConfiguration {
         return new SmsExceptionHandler();
     }
 
+    @EventListener
+    public void init(ContextRefreshedEvent event) {
+        SmsFactory.createSmsBlend(config);
+    }
+
 }

+ 22 - 0
ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/model/SmsModel.java

@@ -0,0 +1,22 @@
+package org.dromara.common.sms.model;
+
+import lombok.Data;
+
+@Data
+public class SmsModel {
+
+    private String configId;
+
+    private String supplier;
+
+    private String accessKeyId;
+
+    private String accessKeySecret;
+
+    private String signature;
+
+    private Integer maximum;
+
+    private String sdkAppId;
+
+}

+ 56 - 0
ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/utils/SmsUtils.java

@@ -0,0 +1,56 @@
+package org.dromara.common.sms.utils;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.sms.model.SmsModel;
+import org.dromara.sms4j.aliyun.config.AlibabaConfig;
+import org.dromara.sms4j.provider.config.BaseConfig;
+import org.dromara.sms4j.tencent.config.TencentConfig;
+import org.dromara.sms4j.yunpian.config.YunpianConfig;
+
+import java.util.Map;
+import java.util.function.Supplier;
+
+@Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class SmsUtils {
+
+    /**
+     * 定义一个映射表:厂商标识 -> 配置类构造器 <br>
+     * 由于{@code Sms4f}在运行时,会自动强转{@code GaseConfig}至对应的配置,直接放过会报错。
+     * @Author: Huanyi
+     */
+    private static final Map<String, Supplier<BaseConfig>> CONFIG_FACTORY_MAP = Map.of(
+        "alibaba", AlibabaConfig::new,
+        "tencent", TencentConfig::new,
+        "yunpian", YunpianConfig::new
+    );
+
+    /**
+     * 核心方法:根据 supplier 字符串动态创建对应的配置对象
+     * @Author: Huanyi
+     */
+    public static BaseConfig createConfigBySupplier(SmsModel model) {
+        Supplier<BaseConfig> factory = CONFIG_FACTORY_MAP.get(model.getSupplier());
+        if (factory == null) {
+            log.error("不支持的短信厂商:{}", model.getSupplier());
+            throw new IllegalArgumentException("Unsupported SMS supplier: " + model.getSupplier());
+        }
+
+        BaseConfig config = factory.get();
+
+        config.setAccessKeyId(model.getAccessKeyId());
+        config.setAccessKeySecret(model.getAccessKeySecret());
+        config.setSignature(model.getSignature());
+        config.setConfigId(model.getConfigId());
+        config.setMaximum(model.getMaximum());
+
+        if ("tencent".equals(model.getSupplier())) {
+            config.setSdkAppId(model.getSdkAppId());
+        }
+
+        return config;
+    }
+
+}

+ 1 - 0
ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1,2 @@
 org.dromara.common.sms.config.SmsAutoConfiguration
+org.dromara.common.sms.config.DataSourceSmsReadConfig

+ 5 - 0
ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java

@@ -41,8 +41,13 @@ public interface TransConstant {
 
     /**
      * 区域站点ID转站点名
+     * @Author: Huanyi
      */
     String AREA_STATION_ID_TO_NAME = "area_station_id_to_name";
 
+    /**
+     * 商户分类ID转名称
+     * @Author: Huanyi
+     */
     String TENANT_CATERORIES_ID_TO_NAME = "tenant_catergories_id_to_name";
 }

+ 5 - 0
ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/AreaStationTranslationImpl.java

@@ -8,6 +8,11 @@ import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.common.translation.core.TranslationInterface;
 import org.dromara.system.api.RemoteAreaStationService;
 
+/**
+ * 区域站点ID翻译为名称
+ * @Author: Huanyi
+ */
+
 @AllArgsConstructor
 @TranslationType(type = TransConstant.AREA_STATION_ID_TO_NAME)
 public class AreaStationTranslationImpl implements TranslationInterface<String> {

+ 5 - 0
ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/TenantCatergoriesNameTranslationImpl.java

@@ -8,6 +8,11 @@ import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.common.translation.core.TranslationInterface;
 import org.dromara.system.api.RemoteTenantCatergoriesService;
 
+/**
+ * 商户分类的ID翻译为名称
+ * @Author: Huanyi
+ */
+
 @AllArgsConstructor
 @TranslationType(type = TransConstant.TENANT_CATERORIES_ID_TO_NAME)
 public class TenantCatergoriesNameTranslationImpl implements TranslationInterface<String> {

+ 5 - 0
ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/TenantNameTranslationImpl.java

@@ -7,6 +7,11 @@ import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.common.translation.core.TranslationInterface;
 import org.dromara.system.api.RemoteTenantService;
 
+/**
+ * 租户ID翻译为公司名称
+ * @Author: Huanyi
+ */
+
 @AllArgsConstructor
 @TranslationType(type = TransConstant.TENANT_ID_TO_NAME)
 public class TenantNameTranslationImpl implements TranslationInterface<String> {

+ 1 - 1
ruoyi-modules/ruoyi-gen/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9202
+  port: 9211
 
 # Spring
 spring:

+ 106 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysSmsConfigController.java

@@ -0,0 +1,106 @@
+package org.dromara.resource.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.resource.domain.vo.SysSmsConfigVo;
+import org.dromara.resource.domain.bo.SysSmsConfigBo;
+import org.dromara.resource.service.ISysSmsConfigService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 短信配置
+ * 前端访问路由地址为:/resource/smsConfig
+ *
+ * @author Huanyi
+ * @date 2026-02-26
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/smsConfig")
+public class SysSmsConfigController extends BaseController {
+
+    private final ISysSmsConfigService sysSmsConfigService;
+
+    /**
+     * 查询短信配置列表
+     */
+    @SaCheckPermission("resource:smsConfig:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysSmsConfigVo> list(SysSmsConfigBo bo, PageQuery pageQuery) {
+        return sysSmsConfigService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出短信配置列表
+     */
+    @SaCheckPermission("resource:smsConfig:export")
+    @Log(title = "短信配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysSmsConfigBo bo, HttpServletResponse response) {
+        List<SysSmsConfigVo> list = sysSmsConfigService.queryList(bo);
+        ExcelUtil.exportExcel(list, "短信配置", SysSmsConfigVo.class, response);
+    }
+
+    /**
+     * 获取短信配置详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("resource:smsConfig:query")
+    @GetMapping("/{id}")
+    public R<SysSmsConfigVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(sysSmsConfigService.queryById(id));
+    }
+
+    /**
+     * 新增短信配置
+     */
+    @SaCheckPermission("resource:smsConfig:add")
+    @Log(title = "短信配置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysSmsConfigBo bo) {
+        return toAjax(sysSmsConfigService.insertByBo(bo));
+    }
+
+    /**
+     * 修改短信配置
+     */
+    @SaCheckPermission("resource:smsConfig:edit")
+    @Log(title = "短信配置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysSmsConfigBo bo) {
+        return toAjax(sysSmsConfigService.updateByBo(bo));
+    }
+
+    /**
+     * 删除短信配置
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("resource:smsConfig:remove")
+    @Log(title = "短信配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(sysSmsConfigService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

+ 7 - 2
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysSmsController.java

@@ -11,6 +11,8 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.ratelimiter.annotation.RateLimiter;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.resource.domain.SysSmsConfig;
+import org.dromara.resource.service.ISysSmsConfigService;
 import org.dromara.sms4j.api.SmsBlend;
 import org.dromara.sms4j.api.entity.SmsResponse;
 import org.dromara.sms4j.core.factory.SmsFactory;
@@ -34,6 +36,8 @@ import java.util.LinkedHashMap;
 @RequestMapping("/sms")
 public class SysSmsController extends BaseController {
 
+    private final ISysSmsConfigService smsConfigService;
+
     /**
      * 短信验证码
      *
@@ -49,8 +53,9 @@ public class SysSmsController extends BaseController {
         String templateId = "";
         LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
         map.put("code", code);
-        SmsBlend smsBlend = SmsFactory.getSmsBlend("tx1");
-        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map);
+        SysSmsConfig config = smsConfigService.getAvailableConfig();
+        SmsBlend smsBlend = SmsFactory.getSmsBlend(String.valueOf(config.getId()));
+        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, config.getTemplateId(), map);
         if (!smsResponse.isSuccess()) {
             log.error("验证码短信发送异常 => {}", smsResponse);
             return R.fail(smsResponse.getData().toString());

+ 66 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysSmsConfig.java

@@ -0,0 +1,66 @@
+package org.dromara.resource.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 短信配置对象 sys_sms_config
+ *
+ * @author Huanyi
+ * @date 2026-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_sms_config")
+public class SysSmsConfig extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 供应商
+     */
+    private String supplier;
+
+    /**
+     * AccessKey
+     */
+    private String accessKeyId;
+
+    /**
+     * AccessKeySecret
+     */
+    private String accessKeySecret;
+
+    /**
+     * 短信签名
+     */
+    private String signature;
+
+    /**
+     * sdk-app-id
+     */
+    private String sdkAppId;
+
+    /**
+     * 模板ID
+     */
+    private String templateId;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

+ 71 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysSmsConfigBo.java

@@ -0,0 +1,71 @@
+package org.dromara.resource.domain.bo;
+
+import org.dromara.resource.domain.SysSmsConfig;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 短信配置业务对象 sys_sms_config
+ *
+ * @author Huanyi
+ * @date 2026-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysSmsConfig.class, reverseConvertGenerate = false)
+public class SysSmsConfigBo extends BaseEntity {
+
+    /**
+     * 序号
+     */
+    @NotNull(message = "序号不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 供应商
+     */
+    @NotBlank(message = "供应商不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String supplier;
+
+    /**
+     * AccessKey
+     */
+    @NotBlank(message = "AccessKey不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String accessKeyId;
+
+    /**
+     * AccessKeySecret
+     */
+    @NotBlank(message = "AccessKeySecret不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String accessKeySecret;
+
+    /**
+     * 短信签名
+     */
+    @NotBlank(message = "短信签名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String signature;
+
+    /**
+     * sdk-app-id
+     */
+    @NotBlank(message = "sdk-app-id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sdkAppId;
+
+    /**
+     * 模板ID
+     */
+    @NotBlank(message = "模板ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String templateId;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

+ 80 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysSmsConfigVo.java

@@ -0,0 +1,80 @@
+package org.dromara.resource.domain.vo;
+
+import org.dromara.resource.domain.SysSmsConfig;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 短信配置视图对象 sys_sms_config
+ *
+ * @author Huanyi
+ * @date 2026-02-26
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysSmsConfig.class)
+public class SysSmsConfigVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @ExcelProperty(value = "序号")
+    private Long id;
+
+    /**
+     * 供应商
+     */
+    @ExcelProperty(value = "供应商")
+    private String supplier;
+
+    /**
+     * AccessKey
+     */
+    @ExcelProperty(value = "AccessKey")
+    private String accessKeyId;
+
+    /**
+     * AccessKeySecret
+     */
+    @ExcelProperty(value = "AccessKeySecret")
+    private String accessKeySecret;
+
+    /**
+     * 短信签名
+     */
+    @ExcelProperty(value = "短信签名")
+    private String signature;
+
+    /**
+     * sdk-app-id
+     */
+    @ExcelProperty(value = "sdk-app-id")
+    private String sdkAppId;
+
+    /**
+     * 模板ID
+     */
+    @ExcelProperty(value = "模板ID")
+    private String templateId;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态")
+    private Integer status;
+
+
+}

+ 76 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteSmsConfigServiceImpl.java

@@ -0,0 +1,76 @@
+package org.dromara.resource.dubbo;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.resource.api.RemoteSmsConfigService;
+import org.dromara.resource.api.domain.RemoteSmsConfig;
+import org.dromara.resource.domain.SysSmsConfig;
+import org.dromara.resource.mapper.SysSmsConfigMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service
+@DubboService
+public class RemoteSmsConfigServiceImpl implements RemoteSmsConfigService {
+
+    private final SysSmsConfigMapper baseMapper;
+
+    @Override
+    public RemoteSmsConfig getSingleConfig() {
+        SysSmsConfig config = baseMapper.selectOne(
+            Wrappers.lambdaQuery(SysSmsConfig.class)
+                .eq(SysSmsConfig::getStatus, 0)
+                .last("LIMIT 1")
+        );
+        RemoteSmsConfig remote = new RemoteSmsConfig();
+        remote.setConfigId(String.valueOf(config.getId()));
+        remote.setSupplier(config.getSupplier());
+        remote.setAccessKeyId(config.getAccessKeyId());
+        remote.setAccessKeySecret(config.getAccessKeySecret());
+        remote.setSignature(config.getSignature());
+        remote.setMaximum(30);
+        remote.setSdkAppId(config.getSdkAppId());
+        return remote;
+    }
+
+    @Override
+    public List<RemoteSmsConfig> getConfigList() {
+        List<SysSmsConfig> configs = baseMapper.selectList(
+            Wrappers.lambdaQuery(SysSmsConfig.class)
+                .eq(SysSmsConfig::getStatus, 0)
+        );
+
+        return configs.stream()
+            .map(e -> {
+                RemoteSmsConfig config = new RemoteSmsConfig();
+                config.setConfigId(String.valueOf(e.getId()));
+                config.setSupplier(e.getSupplier());
+                config.setAccessKeyId(e.getAccessKeyId());
+                config.setAccessKeySecret(e.getAccessKeySecret());
+                config.setSignature(e.getSignature());
+                config.setMaximum(30);
+                config.setSdkAppId(e.getSdkAppId());
+                return config;
+            })
+            .toList();
+    }
+
+    @Override
+    public RemoteSmsConfig getConfigById(String id) {
+        SysSmsConfig config = baseMapper.selectById(Long.valueOf(id));
+        RemoteSmsConfig remote = new RemoteSmsConfig();
+        remote.setConfigId(String.valueOf(config.getId()));
+        remote.setSupplier(config.getSupplier());
+        remote.setAccessKeyId(config.getAccessKeyId());
+        remote.setAccessKeySecret(config.getAccessKeySecret());
+        remote.setSignature(config.getSignature());
+        remote.setMaximum(30);
+        remote.setSdkAppId(config.getSdkAppId());
+        return remote;
+    }
+}

+ 15 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/SysSmsConfigMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.resource.mapper;
+
+import org.dromara.resource.domain.SysSmsConfig;
+import org.dromara.resource.domain.vo.SysSmsConfigVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 短信配置Mapper接口
+ *
+ * @author Huanyi
+ * @date 2026-02-26
+ */
+public interface SysSmsConfigMapper extends BaseMapperPlus<SysSmsConfig, SysSmsConfigVo> {
+
+}

+ 73 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysSmsConfigService.java

@@ -0,0 +1,73 @@
+package org.dromara.resource.service;
+
+import org.dromara.resource.domain.SysSmsConfig;
+import org.dromara.resource.domain.vo.SysSmsConfigVo;
+import org.dromara.resource.domain.bo.SysSmsConfigBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 短信配置Service接口
+ *
+ * @author Huanyi
+ * @date 2026-02-26
+ */
+public interface ISysSmsConfigService {
+
+    /**
+     * 查询短信配置
+     *
+     * @param id 主键
+     * @return 短信配置
+     */
+    SysSmsConfigVo queryById(Long id);
+
+    /**
+     * 分页查询短信配置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 短信配置分页列表
+     */
+    TableDataInfo<SysSmsConfigVo> queryPageList(SysSmsConfigBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的短信配置列表
+     *
+     * @param bo 查询条件
+     * @return 短信配置列表
+     */
+    List<SysSmsConfigVo> queryList(SysSmsConfigBo bo);
+
+    /**
+     * 新增短信配置
+     *
+     * @param bo 短信配置
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(SysSmsConfigBo bo);
+
+    /**
+     * 修改短信配置
+     *
+     * @param bo 短信配置
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(SysSmsConfigBo bo);
+
+    /**
+     * 校验并批量删除短信配置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    Long getAvailableId();
+
+    SysSmsConfig getAvailableConfig();
+}

+ 164 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysSmsConfigServiceImpl.java

@@ -0,0 +1,164 @@
+package org.dromara.resource.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.sms.config.DataSourceSmsReadConfig;
+import org.dromara.common.sms.model.SmsModel;
+import org.dromara.common.sms.utils.SmsUtils;
+import org.dromara.sms4j.core.factory.SmsFactory;
+import org.springframework.stereotype.Service;
+import org.dromara.resource.domain.bo.SysSmsConfigBo;
+import org.dromara.resource.domain.vo.SysSmsConfigVo;
+import org.dromara.resource.domain.SysSmsConfig;
+import org.dromara.resource.mapper.SysSmsConfigMapper;
+import org.dromara.resource.service.ISysSmsConfigService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 短信配置Service业务层处理
+ *
+ * @author Huanyi
+ * @date 2026-02-26
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class SysSmsConfigServiceImpl implements ISysSmsConfigService {
+
+    private final SysSmsConfigMapper baseMapper;
+
+    private final DataSourceSmsReadConfig config;
+
+    /**
+     * 查询短信配置
+     *
+     * @param id 主键
+     * @return 短信配置
+     */
+    @Override
+    public SysSmsConfigVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询短信配置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 短信配置分页列表
+     */
+    @Override
+    public TableDataInfo<SysSmsConfigVo> queryPageList(SysSmsConfigBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysSmsConfig> lqw = buildQueryWrapper(bo);
+        Page<SysSmsConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的短信配置列表
+     *
+     * @param bo 查询条件
+     * @return 短信配置列表
+     */
+    @Override
+    public List<SysSmsConfigVo> queryList(SysSmsConfigBo bo) {
+        LambdaQueryWrapper<SysSmsConfig> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysSmsConfig> buildQueryWrapper(SysSmsConfigBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysSmsConfig> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(SysSmsConfig::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getSupplier()), SysSmsConfig::getSupplier, bo.getSupplier());
+        lqw.eq(StringUtils.isNotBlank(bo.getAccessKeyId()), SysSmsConfig::getAccessKeyId, bo.getAccessKeyId());
+        lqw.eq(StringUtils.isNotBlank(bo.getAccessKeySecret()), SysSmsConfig::getAccessKeySecret, bo.getAccessKeySecret());
+        lqw.eq(StringUtils.isNotBlank(bo.getSignature()), SysSmsConfig::getSignature, bo.getSignature());
+        lqw.eq(StringUtils.isNotBlank(bo.getSdkAppId()), SysSmsConfig::getSdkAppId, bo.getSdkAppId());
+        lqw.eq(StringUtils.isNotBlank(bo.getTemplateId()), SysSmsConfig::getTemplateId, bo.getTemplateId());
+        lqw.eq(bo.getStatus() != null, SysSmsConfig::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增短信配置
+     *
+     * @param bo 短信配置
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(SysSmsConfigBo bo) {
+        SysSmsConfig add = MapstructUtils.convert(bo, SysSmsConfig.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        SmsFactory.reload(String.valueOf(bo.getId()), config);
+        return flag;
+    }
+
+    /**
+     * 修改短信配置
+     *
+     * @param bo 短信配置
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(SysSmsConfigBo bo) {
+        SysSmsConfig update = MapstructUtils.convert(bo, SysSmsConfig.class);
+        validEntityBeforeSave(update);
+        SmsFactory.reload(String.valueOf(bo.getId()), config);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysSmsConfig entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除短信配置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    @Override
+    public Long getAvailableId() {
+        return baseMapper.selectOne(
+            Wrappers.lambdaQuery(SysSmsConfig.class)
+                .eq(SysSmsConfig::getStatus, 0)
+                .last("LIMIT 1")
+        ).getId();
+    }
+
+    @Override
+    public SysSmsConfig getAvailableConfig() {
+        return baseMapper.selectOne(
+            Wrappers.lambdaQuery(SysSmsConfig.class)
+                .eq(SysSmsConfig::getStatus, 0)
+                .last("LIMIT 1")
+        );
+    }
+}

+ 4 - 0
ruoyi-modules/ruoyi-resource/src/main/resources/application.yml

@@ -11,6 +11,10 @@ spring:
     # 环境配置
     active: @profiles.active@
 
+sms:
+  # 配置源类型用于标定配置来源(interface,yaml)
+  config-type: interface
+
 --- # nacos 配置
 spring:
   cloud:

+ 4 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTenantCatergoriesServiceImpl.java

@@ -8,6 +8,10 @@ import org.dromara.system.mapper.SysTenantCategoriesMapper;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
+/**
+ * @Author: Huanyi
+ */
+
 @RequiredArgsConstructor
 @Service
 @DubboService

+ 3 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java

@@ -42,6 +42,9 @@ public class RemoteTenantServiceImpl implements RemoteTenantService {
         return MapstructUtils.convert(list, RemoteTenantVo.class);
     }
 
+    /**
+     * @Author: Huanyi
+     */
     @Override
     public String queryNameByTenantId(String tenantId) {
         return tenantService.queryByTenantId(tenantId).getCompanyName();

+ 1 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/enums/SysStoreStatusEnum.java

@@ -14,6 +14,7 @@ public enum SysStoreStatusEnum {
     UNDER_REVIEW(0, "待审核", "warning"),
     IN_OPERATION(1, "营业中", "success"),
     DUE(2, "已到期", "info"),
+    BANNED(3, "已禁用", "danger"),
     ;
     private final Integer value;
     private final String label;

+ 5 - 5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysStoreServiceImpl.java

@@ -22,10 +22,7 @@ import org.dromara.system.domain.SysStore;
 import org.dromara.system.mapper.SysStoreMapper;
 import org.dromara.system.service.ISysStoreService;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * 门店管理Service业务层处理
@@ -51,7 +48,10 @@ public class SysStoreServiceImpl implements ISysStoreService {
      */
     @Override
     public SysStoreVo queryById(Long id){
-        return baseMapper.selectVoById(id);
+        SysStoreVo vo = baseMapper.selectVoById(id);
+        Map<Long, List<Long>> map = storeServiceService.getByIds(List.of(id));
+        vo.setServices(map.get(id));
+        return vo;
     }
 
     /**

+ 17 - 0
script/sql/business/create.sql

@@ -87,3 +87,20 @@ CREATE TABLE `pet_system`.`sys_store_service`
     `service_id` bigint NOT NULL COMMENT '服务ID',
     PRIMARY KEY (`store_id`, `service_id`)
 ) ENGINE = innoDB COMMENT = '门店服务关系表';
+
+CREATE TABLE `pet_system`.`sys_sms_config`
+(
+    `id`                bigint PRIMARY KEY NOT NULL COMMENT '序号',
+    `supplier`          varchar(64)        NOT NULL COMMENT '供应商',
+    `access_key_id`     varchar(128)       NOT NULL COMMENT 'AccessKey',
+    `access_key_secret` varchar(128)       NOT NULL COMMENT 'AccessKeySecret',
+    `signature`         varchar(255)       NOT NULL COMMENT '短信签名',
+    `sdk_app_id`        varchar(255)       NOT NULL COMMENT 'sdk-app-id',
+    `template_id`       varchar(128)       NOT NULL COMMENT '模板ID',
+    `status`            tinyint DEFAULT 0 COMMENT '状态',
+    `create_dept`       bigint(20) COMMENT '创建部门',
+    `create_by`         bigint(20) COMMENT '创建者',
+    `create_time`       datetime COMMENT '创建时间',
+    `update_by`         bigint(20) COMMENT '更新者',
+    `update_time`       datetime COMMENT '更新时间'
+) ENGINE = innoDB COMMENT = '短信配置表';

+ 21 - 0
script/sql/business/update.sql

@@ -97,3 +97,24 @@ values(2026556930960998406, '区域站点删除', 2026556930960998402, '4',  '#'
 
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
 values(2026556930960998407, '区域站点导出', 2026556930960998402, '5',  '#', '', 1, 0, 'F', '0', '0', 'system:areaStation:export',       '#', 103, 1, sysdate(), null, null, '', 0);
+
+# 2026/02/26
+-- 菜单 SQL
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
+values(2026924472514756609, '短信配置', '1', '12', 'smsConfig', 'resource/smsConfig/index', 1, 0, 'C', '0', '0', 'resource:smsConfig:list', '#', 103, 1, sysdate(), null, null, '短信配置菜单', 0);
+
+-- 按钮 SQL
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
+values(2026924472514756610, '短信配置查询', 2026924472514756609, '1',  '#', '', 1, 0, 'F', '0', '0', 'resource:smsConfig:query',        '#', 103, 1, sysdate(), null, null, '', 0);
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
+values(2026924472514756611, '短信配置新增', 2026924472514756609, '2',  '#', '', 1, 0, 'F', '0', '0', 'resource:smsConfig:add',          '#', 103, 1, sysdate(), null, null, '', 0);
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
+values(2026924472514756612, '短信配置修改', 2026924472514756609, '3',  '#', '', 1, 0, 'F', '0', '0', 'resource:smsConfig:edit',         '#', 103, 1, sysdate(), null, null, '', 0);
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
+values(2026924472514756613, '短信配置删除', 2026924472514756609, '4',  '#', '', 1, 0, 'F', '0', '0', 'resource:smsConfig:remove',       '#', 103, 1, sysdate(), null, null, '', 0);
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
+values(2026924472514756614, '短信配置导出', 2026924472514756609, '5',  '#', '', 1, 0, 'F', '0', '0', 'resource:smsConfig:export',       '#', 103, 1, sysdate(), null, null, '', 0);

+ 0 - 0
sessionStore/8091/root.data