submit

zhichen-admin/src/main/java/com/zhichen/controller/distribution/SellerSmsController.java

@@ -4,6 +4,7 @@ import com.zhichen.common.core.controller.BaseController;
 import com.zhichen.common.core.domain.AjaxResult;
 import com.zhichen.modules.alisms.bo.SmsAddBo;
 import com.zhichen.modules.alisms.service.IAliSmsService;
+import com.zhichen.modules.alisms.service.TengXunSmsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -25,13 +26,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/app/common/seller/sms")
 public class SellerSmsController extends BaseController {
 
-    private final IAliSmsService iSmsService;
+//    private final IAliSmsService iSmsService;
+    private final TengXunSmsService tengXunSmsService;
 
 
     @ApiOperation("获取业务员注册短信")
     @PostMapping("/register")
     public AjaxResult register(@RequestBody SmsAddBo bo) {
-        iSmsService.sendSellerRegisterSms(bo.getTel());
+        tengXunSmsService.sendSellerRegisterSms(bo.getTel());
         return AjaxResult.success();
     }
 
@@ -39,14 +41,14 @@ public class SellerSmsController extends BaseController {
     @ApiOperation("获取业务员登录短信")
     @PostMapping("/login")
     public AjaxResult login(@RequestBody SmsAddBo bo) {
-        iSmsService.sendSellerLoginSms(bo.getTel());
+        tengXunSmsService.sendSellerLoginSms(bo.getTel());
         return AjaxResult.success();
     }
 
     @ApiOperation("获取业务员忘记短信")
     @PostMapping("/forget")
     public AjaxResult forget(@RequestBody SmsAddBo bo) {
-        iSmsService.sendSellerForgetSms(bo.getTel());
+        tengXunSmsService.sendSellerForgetSms(bo.getTel());
         return AjaxResult.success();
     }
 

zhichen-admin/src/main/java/com/zhichen/controller/user/SmsController.java

@@ -4,6 +4,7 @@ import com.zhichen.common.core.controller.BaseController;
 import com.zhichen.common.core.domain.AjaxResult;
 import com.zhichen.modules.alisms.bo.SmsAddBo;
 import com.zhichen.modules.alisms.service.IAliSmsService;
+import com.zhichen.modules.alisms.service.TengXunSmsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -25,13 +26,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/app/common/sms")
 public class SmsController extends BaseController {
 
-    private final IAliSmsService iSmsService;
+//    private final IAliSmsService iSmsService;
+    private final TengXunSmsService tengXunSmsService;
 
 
     @ApiOperation("获取注册短信")
     @PostMapping("/register")
     public AjaxResult register(@RequestBody SmsAddBo bo) {
-        iSmsService.sendRegisterSms(bo.getTel());
+        tengXunSmsService.sendRegisterSms(bo.getTel());
         return AjaxResult.success();
     }
 
@@ -39,7 +41,7 @@ public class SmsController extends BaseController {
     @ApiOperation("获取登录短信")
     @PostMapping("/login")
     public AjaxResult login(@RequestBody SmsAddBo bo) {
-        iSmsService.sendLoginSms(bo.getTel());
+        tengXunSmsService.sendLoginSms(bo.getTel());
         return AjaxResult.success();
     }
 

zhichen-api/src/main/java/com/zhichen/controller/cmmon/CommonController.java

@@ -15,6 +15,7 @@ import com.zhichen.framework.web.service.WxLoginService;
 import com.zhichen.modules.activity.vo.ActivityGoodsPriceVo;
 import com.zhichen.modules.alisms.bo.SmsAddBo;
 import com.zhichen.modules.alisms.service.IAliSmsService;
+import com.zhichen.modules.alisms.service.TengXunSmsService;
 import com.zhichen.modules.base.bo.ConfigQueryBo;
 import com.zhichen.modules.course.bo.CourseQueryBo;
 import com.zhichen.modules.course.bo.CourseTopicGoodsQueryBo;
@@ -98,7 +99,10 @@ public class CommonController extends BaseController {
 
     private final IUserService iUserService;
 
-    private final IAliSmsService iSmsService;
+//    private final IAliSmsService iSmsService;
+
+    private final TengXunSmsService tengXunSmsService;
+
 
     @PostMapping("/returnStream")
     public AjaxResult returnStream(MultipartFile file, HttpServletResponse response) throws IOException {
@@ -432,7 +436,7 @@ public class CommonController extends BaseController {
     @ApiOperation("获取登录短信")
     @PostMapping("/live/sms")
     public AjaxResult liveSms(@RequestBody SmsAddBo bo) {
-        iSmsService.sendLiveSms(bo.getTel());
+        tengXunSmsService.sendLiveSms(bo.getTel());
         return AjaxResult.success();
     }
 

zhichen-api/src/main/java/com/zhichen/controller/user/SmsController.java

@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/app/common/sms")
 public class SmsController extends BaseController {
 
-    private final IAliSmsService iSmsService;
+//    private final IAliSmsService iSmsService;
     private final RedisCache redisCache;
     private final TengXunSmsService tengXunSmsService;
 
@@ -36,7 +36,7 @@ public class SmsController extends BaseController {
     @PostMapping("/register")
     public AjaxResult register(@RequestBody SmsAddBo bo) {
         checkImageCode(bo.getImageUuid(),bo.getImageCode());
-        iSmsService.sendRegisterSms(bo.getTel());
+        tengXunSmsService.sendRegisterSms(bo.getTel());
         return AjaxResult.success();
     }
 
@@ -44,7 +44,7 @@ public class SmsController extends BaseController {
     @PostMapping("/login")
     public AjaxResult login(@RequestBody SmsAddBo bo) {
         checkImageCode(bo.getImageUuid(),bo.getImageCode());
-        iSmsService.sendLoginSms(bo.getTel());
+        tengXunSmsService.sendLoginSms(bo.getTel());
         return AjaxResult.success();
     }
 
@@ -52,14 +52,14 @@ public class SmsController extends BaseController {
     @PostMapping("/forget")
     public AjaxResult forget(@RequestBody SmsAddBo bo) {
         checkImageCode(bo.getImageUuid(),bo.getImageCode());
-        iSmsService.sendForgetSms(bo.getTel());
+        tengXunSmsService.sendForgetSms(bo.getTel());
         return AjaxResult.success();
     }
 
     @ApiOperation("获取绑定新手机短信")
     @PostMapping("/bindNew")
     public AjaxResult bindNew(@RequestBody SmsAddBo bo) {
-        iSmsService.sendBindNewTelSms(bo.getTel());
+        tengXunSmsService.sendBindNewTelSms(bo.getTel());
         return AjaxResult.success();
     }
 
@@ -90,7 +90,7 @@ public class SmsController extends BaseController {
 
     @PostMapping("/ceshi")
     public AjaxResult ceshi(@RequestBody SmsAddBo bo) {
-        tengXunSmsService.ceshi(bo.getTel());
+        tengXunSmsService.sendLoginSms(bo.getTel());
         return AjaxResult.success();
     }
 }

zhichen-common/src/main/java/com/zhichen/common/utils/TengXunSmsUtils.java

@@ -44,7 +44,8 @@ public class TengXunSmsUtils {
         req.setTemplateId(templateId);
 
         // 设置模板参数（若无模板参数，可忽略）
-        String[] templateParams = {param};
+//        String[] templateParams = {param};
+        String[] templateParams = param.split(",");
         req.setTemplateParamSet(templateParams);
 
         // 设置目标手机号（需带国家/地区码）

zhichen-system/src/main/java/com/zhichen/modules/alisms/service/impl/TengXunSmsServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
+import com.tencentcloudapi.sms.v20210111.models.SendStatus;
 import com.zhichen.common.constant.Constants;
 import com.zhichen.common.core.domain.entity.SysUser;
 import com.zhichen.common.core.redis.RedisCache;
@@ -143,9 +144,8 @@ public class TengXunSmsServiceImpl implements TengXunSmsService {
         String key = Constants.REGISTER_SMS + tel;
         redisCache.setCacheObject(key,code,5, TimeUnit.MINUTES);//5分钟
         try{
-            Map<String,Object> param = new HashMap<>();
-            param.put("code",code);
-            SendSmsResponse response = TengXunSmsUtils.sendSms(tel,SIGNNAME,REGISTERTEMPLATECODE, JSON.toJSONString(param),ACCESSKEYID,ACCESSKEYSECRET,SDKAPPID);
+            String format = String.format("%s,5", code);
+            SendSmsResponse response = TengXunSmsUtils.sendSms(tel,SIGNNAME,REGISTERTEMPLATECODE, format,ACCESSKEYID,ACCESSKEYSECRET,SDKAPPID);
             if(response.getSendStatusSet()[0].getCode().equals("OK")){
                 SmsAddBo smsAddBo = new SmsAddBo();
                 smsAddBo.setCode(code);
@@ -176,9 +176,9 @@ public class TengXunSmsServiceImpl implements TengXunSmsService {
         String key = Constants.FORGET_SMS + tel;
         redisCache.setCacheObject(key,code,5, TimeUnit.MINUTES);//5分钟
         try{
-            Map<String,Object> param = new HashMap<>();
-            param.put("code",code);
-            SendSmsResponse response = TengXunSmsUtils.sendSms(tel,SIGNNAME,FORGETTEMPLATECODE, JSON.toJSONString(param),ACCESSKEYID,ACCESSKEYSECRET,SDKAPPID);
+//            Map<String,Object> param = new HashMap<>();
+//            param.put("code",code);
+            SendSmsResponse response = TengXunSmsUtils.sendSms(tel,SIGNNAME,FORGETTEMPLATECODE, code,ACCESSKEYID,ACCESSKEYSECRET,SDKAPPID);
             if(response.getSendStatusSet()[0].getCode().equals("OK")){
                 SmsAddBo smsAddBo = new SmsAddBo();
                 smsAddBo.setCode(code);
@@ -211,10 +211,10 @@ public class TengXunSmsServiceImpl implements TengXunSmsService {
         String key = Constants.LOGIN_SMS + tel;
         redisCache.setCacheObject(key,code,5, TimeUnit.MINUTES);//5分钟
         try{
-            Map<String,Object> param = new HashMap<>();
-            param.put("code",code);
-            SendSmsResponse response = TengXunSmsUtils.sendSms(tel,SIGNNAME,LOGINTEMPLATECODE, JSON.toJSONString(param),ACCESSKEYID,ACCESSKEYSECRET,SDKAPPID);
-            if(response.getSendStatusSet()[0].getCode().equals("OK")){
+//            Map<String,Object> param = new HashMap<>();
+//            param.put("code",code);
+            SendSmsResponse response = TengXunSmsUtils.sendSms(tel,SIGNNAME,LOGINTEMPLATECODE, code,ACCESSKEYID,ACCESSKEYSECRET,SDKAPPID);
+            if(response.getSendStatusSet()[0].getCode().equals("Ok")){
                 SmsAddBo smsAddBo = new SmsAddBo();
                 smsAddBo.setCode(code);
                 smsAddBo.setTel(tel);