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

@@ -14,6 +14,7 @@ import com.caimei365.user.model.po.ShopPo;
 import com.caimei365.user.model.po.UserPo;
 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.Md5Util;
 import com.caimei365.user.utils.ValidateUtil;
@@ -166,7 +167,7 @@ public class RegisterServiceImpl implements RegisterService {
             保存数据库 user
          */
         int insertFlag = registerMapper.insertClubUser(user);
-        log.info("插入数据库User表，获得userId:" + user.getUserId());
+        log.info("插入数据库User表，获得userId:"+user.getUserId());
         if (insertFlag < 1) {
             throw new RuntimeException("插入数据库异常user:" + user.toString());
         }
@@ -246,7 +247,7 @@ public class RegisterServiceImpl implements RegisterService {
                 保存数据库 operation
              */
             int insertOperationFlag = registerMapper.insertOperation(operation);
-            log.info("插入数据库cm_mall_operation_user表，获得id:" + operation.getId());
+            log.info("插入数据库cm_mall_operation_user表，获得id:"+operation.getId());
             if (insertOperationFlag < 1) {
                 log.info(operation.getUserId() + " 插入数据库异常operation:" + operation.toString());
             }
@@ -378,7 +379,7 @@ public class RegisterServiceImpl implements RegisterService {
         club.setSocialCreditCode(upgradeDto.getSocialCreditCode());
         // 分类: 1医美, 2生美
         club.setFirstClubType(upgradeDto.getFirstClubType());
-        if (upgradeDto.getFirstClubType() == 1) {
+        if (upgradeDto.getFirstClubType() == 1){
             // 医美二级分类: 1诊所、2门诊、3医院
             club.setSecondClubType(upgradeDto.getSecondClubType());
             // 门诊和医院则需要填写科室
@@ -627,10 +628,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);