Merge remote-tracking branch 'remotes/origin/developer' into developerA

# Conflicts:
#	src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -16,6 +16,7 @@ import com.caimei365.user.model.vo.ServiceProviderVo;
 import com.caimei365.user.service.RegisterService;
 import com.caimei365.user.components.RedisService;
 import com.caimei365.user.utils.AliyunSmsUtil;
+import com.caimei365.user.utils.CodeUtil;
 import com.caimei365.user.utils.Md5Util;
 import com.caimei365.user.utils.ValidateUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -201,10 +202,10 @@ public class RegisterServiceImpl implements RegisterService {
         user.setClubId(club.getClubId());
         registerMapper.updateUserClubId(user.getUserId(), club.getClubId());
         // 注册成功短信
-        boolean smsFlag = AliyunSmsUtil.sendSms(clubRegisterDto.getBindMobile(), 7, "{name:" + clubRegisterDto.getBindMobile() + ",password:" + clubRegisterDto.getPassword() + "}");
+        boolean smsFlag = AliyunSmsUtil.sendSms(clubRegisterDto.getBindMobile(), 10, "{name:"+ clubRegisterDto.getBindMobile() +"}");
         if (!smsFlag) {
             // 短信发送失败重试一次
-            AliyunSmsUtil.sendSms(clubRegisterDto.getBindMobile(), 7, "{name:" + clubRegisterDto.getBindMobile() + ",password:" + clubRegisterDto.getPassword() + "}");
+            AliyunSmsUtil.sendSms(clubRegisterDto.getBindMobile(), 10, "{name:"+ clubRegisterDto.getBindMobile() +"}");
         }
         /*
             绑定微信，成为机构运营人员
@@ -628,10 +629,10 @@ public class RegisterServiceImpl implements RegisterService {
             logTxt = String.format(logTxt, "普通机构", mobile, initPassword);
         }
         // 发送短信
-        boolean smsFlag = AliyunSmsUtil.sendSms(mobile, smsType, "{\"name\":\""+ mobile +"\", \"password:\":\""+ initPassword +"\"}");
+        boolean smsFlag = AliyunSmsUtil.sendSms(mobile, smsType, "{name:"+ mobile +",password:"+ initPassword +"}");
         if (!smsFlag) {
             // 短信发送失败重试一次
-            AliyunSmsUtil.sendSms(mobile, smsType, "{\"name\":\""+ mobile +"\", \"password:\":\""+ initPassword +"\"}");
+            AliyunSmsUtil.sendSms(mobile, smsType, "{name:"+ mobile +",password:"+ initPassword +"}");
         }
         // 打印短信内容
         log.info(logTxt);

src/main/java/com/caimei365/user/utils/AliyunSmsUtil.java

@@ -99,19 +99,13 @@ public class AliyunSmsUtil {
             request.setTemplateParam(templateParam);
             //请求失败这里会抛ClientException异常
             SendSmsResponse sendSmsResponse = acsClient.getAcsResponse(request);
-            if(sendSmsResponse.getCode() != null){
-                //请求成功
-                log.info(">阿里云短信接口返回的数据: "
-                          +"Code="+ sendSmsResponse.getCode()
-                          +",Message=" + sendSmsResponse.getMessage()
-                          +",RequestId=" + sendSmsResponse.getRequestId()
-                          +",BizId=" + sendSmsResponse.getBizId());
-                if ("OK".equals(sendSmsResponse.getCode())){
-                    return true;
-                }
-            }
-            log.info(sendSmsResponse.toString());
-            return false;
+            log.info(">阿里云短信接口返回的数据: "
+                      +"Code="+ sendSmsResponse.getCode()
+                      +",Message=" + sendSmsResponse.getMessage()
+                      +",RequestId=" + sendSmsResponse.getRequestId()
+                      +",BizId=" + sendSmsResponse.getBizId());
+            //请求成功
+            return sendSmsResponse.getCode() != null && "OK".equals(sendSmsResponse.getCode());
         } catch (ClientException e) {
             log.error(e.getErrCode(), e.getErrMsg(), e.getErrorDescription());
             return false;

src/test/java/com/caimei365/user/UserApplicationTests.java

@@ -1,5 +1,7 @@
 package com.caimei365.user;
 
+import com.caimei365.user.utils.AliyunSmsUtil;
+import com.caimei365.user.utils.CodeUtil;
 import com.caimei365.user.utils.ValidateUtil;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -7,11 +9,18 @@ import org.springframework.boot.test.context.SpringBootTest;
 @SpringBootTest
 class UserApplicationTests {
 
-    @Test
+    /*@Test
     void contextLoads() {
         boolean b = ValidateUtil.validateEmail("182126@qq.com");
         System.out.println(b);
-    }
+    }*/
+
+//    @Test
+//    void sms(){
+//        String mobile = "15814011616";
+//        String randomCode = CodeUtil.generateCodeInt(8);
+//        AliyunSmsUtil.sendSms(mobile, 7, "{name:"+ mobile +",password:"+ randomCode +"}");
+//    }
 
 
 }