更新新增租户、新增用户、删除组织是发送真实短信

dsk-admin/src/main/java/com/dsk/web/controller/common/CaptchaController.java

@@ -5,7 +5,6 @@ import cn.hutool.captcha.AbstractCaptcha;
 import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.RandomUtil;
-import com.dsk.common.constant.CacheConstants;
 import com.dsk.common.constant.Constants;
 import com.dsk.common.constant.GlobalConstants;
 import com.dsk.common.core.domain.R;
@@ -13,8 +12,6 @@ import com.dsk.common.enums.CaptchaType;
 import com.dsk.common.exception.user.CaptchaException;
 import com.dsk.common.exception.user.CaptchaExpireException;
 import com.dsk.common.helper.LoginHelper;
-import com.dsk.common.utils.DingTalkUtil;
-import com.dsk.common.utils.MessageUtils;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.common.utils.email.MailUtils;
 import com.dsk.common.utils.redis.RedisUtils;
@@ -82,14 +79,13 @@ public class CaptchaController {
         // 验证码模板id 自行处理 (查数据库或写死均可)
         LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
         map.put("code", code);
-//        SmsBlend smsBlend = SmsFactory.createSmsBlend(SupplierType.ALIBABA);
-//        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map);
-//        if (!"OK".equals(smsResponse.getCode())) {
-//            log.error("验证码短信发送异常 => {}", smsResponse);
-//            return R.fail(smsResponse.getMessage());
-//        }
-        DingTalkUtil.sendDingTalkMsg("短信通知："+phonenumber+"登录验证码："+code+"，请尽快输入验证码完成验证，勿将验证码透露给他人，如非本人操作，请忽略本条短信。");
-
+        SmsBlend smsBlend = SmsFactory.createSmsBlend(SupplierType.ALIBABA);
+        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map);
+        if (!"OK".equals(smsResponse.getCode())) {
+            log.error("验证码短信发送异常 => {}", smsResponse);
+            return R.fail(smsResponse.getMessage());
+        }
+        //DingTalkUtil.sendDingTalkMsg("短信通知："+phonenumber+"登录验证码："+code+"，请尽快输入验证码完成验证，勿将验证码透露给他人，如非本人操作，请忽略本条短信。");
         return R.ok();
     }
 
@@ -108,19 +104,30 @@ public class CaptchaController {
     }
 
     /**
-     * 开发需要,临时发送短信验证码
+     * 发送短信验证码
      */
     @GetMapping("/getTempSmsCode")
     public R<Void> getTempSmsCode() {
         SysUser sysUser = userMapper.selectUserById(LoginHelper.getUserId());
-        String key = GlobalConstants.CAPTCHA_CODE_KEY + sysUser.getPhonenumber();
+        String phonenumber = sysUser.getPhonenumber();
+        String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
         String code = RandomUtil.randomNumbers(6);
         RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
-        return R.ok("验证码:" + code);
+        // 验证码模板id 自行处理 (查数据库或写死均可)
+        LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
+        map.put("code", code);
+        SmsBlend smsBlend = SmsFactory.createSmsBlend(SupplierType.ALIBABA);
+        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, "SMS_170345261", map);
+        if (!"OK".equals(smsResponse.getCode())) {
+            log.error("验证码短信发送异常 => {}", smsResponse);
+            return R.fail(smsResponse.getMessage());
+        }
+        //DingTalkUtil.sendDingTalkMsg("短信通知："+phonenumber+"登录验证码："+code+"，请尽快输入验证码完成验证，勿将验证码透露给他人，如非本人操作，请忽略本条短信。");
+        return R.ok();
     }
 
     /**
-     * 开发需要,临时校验短信验证码
+     * 校验短信验证码
      *
      * @param smsCode     验证码
      */

dsk-system/src/main/java/com/dsk/system/service/impl/ISysTenantServiceImpl.java

@@ -16,7 +16,6 @@ import com.dsk.common.core.domain.entity.SysDictData;
 import com.dsk.common.core.domain.entity.SysDictType;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.exception.ServiceException;
-import com.dsk.common.utils.DingTalkUtil;
 import com.dsk.common.utils.PasswordUtils;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.system.domain.*;
@@ -25,15 +24,17 @@ import com.dsk.system.domain.vo.SysTenantVo;
 import com.dsk.system.mapper.*;
 import com.dsk.system.service.ISysTenantService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.core.factory.SmsFactory;
+import org.dromara.sms4j.provider.enumerate.SupplierType;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 企业Service业务层处理
@@ -43,6 +44,7 @@ import java.util.List;
  */
 @RequiredArgsConstructor
 @Service
+@Slf4j
 public class ISysTenantServiceImpl implements ISysTenantService {
 
     private final SysTenantMapper baseMapper;
@@ -236,14 +238,23 @@ public class ISysTenantServiceImpl implements ISysTenantService {
         }
         configMapper.insertBatch(sysConfigList);
 
+        ////此处暂用钉钉机器人模拟发送短信
+        //String content = "【短信通知】："
+        //        + bo.getContactUserName()
+        //        + ",您好，您已经成功开通数字化经营管理系统，请使用手机号码登录，初始密码为"
+        //        + password
+        //        + "。友情提示：为了您的账号安全，请勿泄露密码。";
+        //DingTalkUtil.sendDingTalkMsg(content);
+
         //租户新增成功,发送短信通知租户
-        //此处暂用钉钉机器人模拟发送短信
-        String content = "【短信通知】："
-                + bo.getContactUserName()
-                + ",您好，您已经成功开通数字化经营管理系统，请使用手机号码登录，初始密码为"
-                + password
-                + "。友情提示：为了您的账号安全，请勿泄露密码。";
-        DingTalkUtil.sendDingTalkMsg(content);
+        LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
+        map.put("company", bo.getContactUserName());
+        map.put("pwd",password);
+        SmsBlend smsBlend = SmsFactory.createSmsBlend(SupplierType.ALIBABA);
+        SmsResponse smsResponse = smsBlend.sendMessage(bo.getContactPhone(), "SMS_463175230", map);
+        if (!"OK".equals(smsResponse.getCode())) {
+            log.error("新增租户通知短信发送异常 => {}", smsResponse);
+        }
         return true;
     }
 

dsk-system/src/main/java/com/dsk/system/service/impl/SysUserServiceImpl.java

@@ -18,7 +18,6 @@ import com.dsk.common.core.service.UserService;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.helper.DataBaseHelper;
 import com.dsk.common.helper.LoginHelper;
-import com.dsk.common.utils.DingTalkUtil;
 import com.dsk.common.utils.PasswordUtils;
 import com.dsk.common.utils.StreamUtils;
 import com.dsk.common.utils.StringUtils;
@@ -27,11 +26,16 @@ import com.dsk.system.mapper.*;
 import com.dsk.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.core.factory.SmsFactory;
+import org.dromara.sms4j.provider.enumerate.SupplierType;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -273,13 +277,23 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         // 新增用户信息
         int rows = baseMapper.insert(user);
         if (rows > 0) {
-            //租户新增成功,发送短信通知租户
+
             //此处暂用钉钉机器人模拟发送短信
-            String content = "短信通知："+user.getNickName()
-                    + "您好，您已经成功开通数字化经营管理系统，请使用手机号码登录，初始密码为"
-                    + password
-                    + "。友情提示：为了您的账号安全，请勿泄露密码。";
-            DingTalkUtil.sendDingTalkMsg(content);
+            //String content = "短信通知："+user.getNickName()
+            //        + "您好，您已经成功开通数字化经营管理系统，请使用手机号码登录，初始密码为"
+            //        + password
+            //        + "。友情提示：为了您的账号安全，请勿泄露密码。";
+            //DingTalkUtil.sendDingTalkMsg(content);
+
+            //租户新增成功,发送短信通知租户
+            LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
+            map.put("company", user.getNickName());
+            map.put("pwd",password);
+            SmsBlend smsBlend = SmsFactory.createSmsBlend(SupplierType.ALIBABA);
+            SmsResponse smsResponse = smsBlend.sendMessage(user.getPhonenumber(), "SMS_463175230", map);
+            if (!"OK".equals(smsResponse.getCode())) {
+                log.error("新增用户通知短信发送异常 => {}", smsResponse);
+            }
         }
         // 新增用户岗位关联
         insertUserPost(user);