Merge remote-tracking branch 'origin/master'

src/main/java/com/bsd/say/entities/LoveLetter.java

@@ -9,7 +9,7 @@ public class LoveLetter extends BaseEntity{
     /**
      * 用户id(谁写的爱意情书)
      */
-    private Long userId;
+    private String openId;
 
     /**
      * 情书类型

src/main/java/com/bsd/say/entities/Record.java

@@ -44,4 +44,6 @@ public class Record extends BaseEntity{
 
     private String address;//领取一等奖地址
 
+    private String letterOpenId;
+
 }

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

@@ -160,9 +160,7 @@ public class WeixinService extends WxOpenServiceImpl {
      * 通过accessToken刷新ticket
      */
     public String getTicket() {
-        String result1 = HttpRequestUtils.sendGet("https://api.weq.me/wx/token.php?id=15969759463491&key=1234567890123456");
+        String access_token = fetchAccessToken();
-        JSONObject result2 = JSONObject.parseObject(result1);
-        String access_token = result2.getString("access_token");
         String getTicketNewUrl = getTicketUrl + access_token + "&type=jsapi";
         String ticketResult = HttpRequestUtils.sendGet(getTicketNewUrl);
         JSONObject ticketJson = JSONObject.parseObject(ticketResult);