From 3f45cf8f9f1d42dad1b28a3d92911291c961fb8f Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Jan 2022 12:38:50 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81qrcode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/douyin/miniapp/api/TtAccessToken.java | 13 ------------- .../com/iformall/douyin/miniapp/api/TtMaQrcode.java | 6 +++++- .../miniapp/api/impl/TtMaQrcodeServiceImpl.java | 1 + .../douyin/miniapp/api/impl/TtMaServiceImpl.java | 6 ++---- 4 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtAccessToken.java diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtAccessToken.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtAccessToken.java deleted file mode 100644 index 0b48250eb..000000000 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtAccessToken.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.iformall.douyin.miniapp.api; - -import cn.binarywang.wx.miniapp.bean.AbstractWxMaQrcodeWrapper; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; - -@Data -@EqualsAndHashCode(callSuper = false) -public class TtAccessToken extends AbstractWxMaQrcodeWrapper { - private String accessToken; -} diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaQrcode.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaQrcode.java index f650ca37c..7554a77f3 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaQrcode.java +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaQrcode.java @@ -12,8 +12,12 @@ import java.io.Serializable; */ @Data @EqualsAndHashCode(callSuper = false) -public class TtMaQrcode extends TtAccessToken implements Serializable { +public class TtMaQrcode extends AbstractWxMaQrcodeWrapper implements Serializable { + private static final long serialVersionUID = 5777119669111011584L; + + private String accessToken; + private String appname; private String path; private int width = 430; diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaQrcodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaQrcodeServiceImpl.java index d12fb77aa..e1d75dc9c 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaQrcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaQrcodeServiceImpl.java @@ -8,6 +8,7 @@ import lombok.AllArgsConstructor; import me.chanjar.weixin.common.error.WxErrorException; import java.io.File; +import java.lang.reflect.Field; /** * @author Binary Wang diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaServiceImpl.java index 97f76f6b8..53cd2a799 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaServiceImpl.java @@ -227,13 +227,11 @@ public class TtMaServiceImpl implements TtMaService, RequestHttp