From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore

---
 ruoyi-common/src/main/java/com/ruoyi/common/config/SmsProperties.java |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/SmsProperties.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/SmsProperties.java
new file mode 100644
index 0000000..7a45914
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/SmsProperties.java
@@ -0,0 +1,38 @@
+package com.ruoyi.common.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "sms")
+public class SmsProperties {
+
+    public static final String ENABLE_KEY = "sms.enable";
+
+    private Boolean enable;
+
+    private String appId;
+
+    private String secretid;
+
+    private String secretkey;
+    /**
+     * 短信签名
+     */
+    private String sign;
+
+    /**
+     * 账单提醒 ,同一个用户离上次发送短信的最小间隔
+     * 单位分钟
+     */
+    private Integer billSmsDelayPeriod = 60;
+    /**
+     * 账单提醒 ,同一个用户离上次发送邮件的最小间隔
+     * 单位分钟
+     */
+    private Integer billMailDelayPeriod = 60;
+
+
+}

--
Gitblit v1.7.1