Merge remote-tracking branch 'origin/master'

ch-core/src/main/java/com/wwdz/ch/core/notify/AliSmsSender.java

@@ -60,7 +60,7 @@ public class AliSmsSender implements SmsSender {
     public SmsResult sendWithTemplate(String phone, String verifyCode) {
         try {
             Map<String, Object> map = new HashMap<>();
-            map.put("msg", verifyCode + "短信验证码，1分钟内有效，请勿向任何人提供或泄露。");
+            map.put("msg", verifyCode + "短信验证码，5分钟内有效，请勿向任何人提供或泄露。");
             com.aliyun.dysmsapi20170525.Client client = createClient();
             com.aliyun.dysmsapi20170525.models.SendSmsRequest sendSmsRequest = new com.aliyun.dysmsapi20170525.models.SendSmsRequest()
                     .setPhoneNumbers(phone)

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java

@@ -217,7 +217,7 @@ public class UserServiceImpl implements UserService {
                 }
             }
 
-            redisUtil.set(key, code, 60);
+            redisUtil.set(key, code, 300);
             logger.info("【请求结束】请求验证码成功");
             return Result.success();
         } catch (Exception e) {