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

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

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