From 244585a1a99dde5b3078a7ece66b087168eb22c5 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Sat, 30 Jan 2021 17:59:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/domain/wechat/WxFileUploadResult.java | 16 ++++++++++++++++
 .../com/stdiet/custom/utils/WxTokenUtils.java    | 12 ++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/domain/wechat/WxFileUploadResult.java

diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/wechat/WxFileUploadResult.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/wechat/WxFileUploadResult.java
new file mode 100644
index 000000000..53632c655
--- /dev/null
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/wechat/WxFileUploadResult.java
@@ -0,0 +1,16 @@
+package com.stdiet.custom.domain.wechat;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class WxFileUploadResult implements Serializable {
+
+    @JSONField(name = "media_id")
+    private String mediaId;
+
+    @JSONField(name = "url")
+    private String url;
+}
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/utils/WxTokenUtils.java b/stdiet-custom/src/main/java/com/stdiet/custom/utils/WxTokenUtils.java
index 019a271a1..2626560f1 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/utils/WxTokenUtils.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/utils/WxTokenUtils.java
@@ -2,10 +2,12 @@ package com.stdiet.custom.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.stdiet.common.annotation.Log;
+import com.stdiet.common.core.redis.RedisCache;
 import com.stdiet.common.utils.StringUtils;
 import com.stdiet.common.utils.http.HttpUtils;
 import com.stdiet.custom.domain.WxXmlData;
 import com.stdiet.custom.domain.wechat.WxAccessToken;
+import com.stdiet.custom.domain.wechat.WxFileUploadResult;
 import com.thoughtworks.xstream.XStream;
 import org.apache.commons.io.IOUtils;
 
@@ -19,8 +21,10 @@ public class WxTokenUtils {
 
     // 与接口配置信息中的Token要一致
     private static String token = "shengtangdiet";
-    private static String appId = "wx4a9c1fc9dba53202";
-    private static String appSecret = "fff029ade5d3575df755f4cf9e52f8da";
+//    private static String appId = "wx4a9c1fc9dba53202";
+//    private static String appSecret = "fff029ade5d3575df755f4cf9e52f8da";
+private static String appId = "wx11c6f62133e58d57";
+        private static String appSecret = "239eff8a38be32f2feafa924410b3c11";
     private static String tokenUrl = "https://api.weixin.qq.com/cgi-bin/token";
 
     public static WxAccessToken fetchAccessToken() {
@@ -38,6 +42,10 @@ public class WxTokenUtils {
         }
     }
 
+//    public static WxFileUploadResult uploadImage() {
+//
+//    }
+
     /**
      * 验证签名
      *