From 6c20d9244db2ee2f69ab4d523cfd797728b6116c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=AC=A3?= <xin.huang@ribo.com.cn>
Date: Tue, 11 Aug 2020 16:11:55 +0800
Subject: [PATCH 1/2] msg

---
 .../java/com/bsd/say/service/impl/AwardListServiceImpl.java   | 3 +--
 src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java b/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java
index ce0e3e0..303a23d 100644
--- a/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java
+++ b/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java
@@ -247,9 +247,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("验证码错误或已超时，请重新填写");
                 }
             }
         }
diff --git a/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java b/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java
index 515d4cb..b9f0d21 100644
--- a/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java
+++ b/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;
             }

From b48e39a73810c2f9732b1749a5c8d69b7bba3281 Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Tue, 11 Aug 2020 16:49:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=A2=E5=8F=B8=E7=99=BBmysql=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=20=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8213cd0..0181ea2 100644
--- a/src/main/resources/application.yml
+++ b/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