Merge remote-tracking branch 'origin/master'

src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java

@@ -248,9 +248,8 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
                     recordMapper.updateById(record);
                 }else {
                     //短信验证失败
-                    ajaxResult.setRetmsg("FAIL");
                     ajaxResult.setRetcode(AjaxResult.FAILED);
-                    ajaxResult.setRetmsg("TIME OUT OR ERROR");
+                    ajaxResult.setRetmsg("验证码错误或已超时，请重新填写");
                 }
             }
         }

src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java

@@ -291,14 +291,14 @@ public class CouponServiceImpl extends BaseServiceImpl<CouponMapper, Coupon> imp
                             }
                         }else {
                             ajaxResult.setRetcode(AjaxResult.FAILED);
-                            ajaxResult.setRetmsg(resultJson.getString("errorMessage"));
+                            ajaxResult.setRetmsg(resultJson.getString("领取失败"));
                         }
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
                 }else {
                     ajaxResult.setRetcode(AjaxResult.FAILED);
-                    ajaxResult.setRetmsg("验证码错误请重新填写");
+                    ajaxResult.setRetmsg("验证码错误或已超时，请重新填写");
                 }
                 return ajaxResult;
             }

src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
         max-active: 8
         max-wait: -1
   datasource:
-    url:  jdbc:mysql://106.15.109.152:3306/bsd_asy?characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
+    url:  jdbc:mysql://47.100.216.66:3306/bsd_asy?characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
     username: root
     password: Bsd@2019
     driver-class-name: com.mysql.jdbc.Driver