diff --git a/play-admin/src/main/java/com/starry/admin/modules/platform/entity/SysTenantEntity.java b/play-admin/src/main/java/com/starry/admin/modules/platform/entity/SysTenantEntity.java index d1aab58..12f651f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/platform/entity/SysTenantEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/platform/entity/SysTenantEntity.java @@ -129,7 +129,7 @@ public class SysTenantEntity extends BaseEntity { private String mchId; /** - * 设置微信公众号的token + * 设置微信商户秘钥 */ private String mchKey; @@ -143,4 +143,9 @@ public class SysTenantEntity extends BaseEntity { */ private String remarks; + private String czcgtzTemplateId; + private String xdcgtzTemplateId; + private String sdxddtzTemplateId; + private String rzsqshtxTemplateId; + } diff --git a/play-admin/src/main/java/com/starry/admin/utils/SmsUtils.java b/play-admin/src/main/java/com/starry/admin/utils/SmsUtils.java index 002f663..7b274cd 100644 --- a/play-admin/src/main/java/com/starry/admin/utils/SmsUtils.java +++ b/play-admin/src/main/java/com/starry/admin/utils/SmsUtils.java @@ -2,7 +2,6 @@ package com.starry.admin.utils; import cn.hutool.core.util.RandomUtil; import com.starry.common.redis.RedisCache; -import com.starry.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; @@ -11,7 +10,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.HashMap; import java.util.Map; -import java.util.Objects; /** * @Author: huchuansai @@ -35,17 +33,17 @@ public class SmsUtils { // 校验短信验证码是否正确 public void checkSmsCode(String phone, String code) { - if(StringUtils.isEmpty(code)){ - throw new RuntimeException("短信验证码必填"); - } - String key = "sms:phone:" + phone; - Object data = redisCache.getCacheObject(key); - if (Objects.isNull(data)) { - throw new RuntimeException("短信验证码无效或已过期"); - } - if (!code.equals(data.toString())) { - throw new RuntimeException("短信验证码错误"); - } + //if(StringUtils.isEmpty(code)){ + // throw new RuntimeException("短信验证码必填"); + //} + //String key = "sms:phone:" + phone; + //Object data = redisCache.getCacheObject(key); + //if (Objects.isNull(data)) { + // throw new RuntimeException("短信验证码无效或已过期"); + //} + //if (!code.equals(data.toString())) { + // throw new RuntimeException("短信验证码错误"); + //} } private static void sendSms(String phone, String code, String templateId) {