From b2725c3bbce609fac9751c5d42b56ff20ed1d262 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Mon, 1 Feb 2021 12:45:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/custom/SysWxSaleAccountController.java | 3 ++- .../java/com/stdiet/custom/utils/WxTokenUtils.java | 10 ++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxSaleAccountController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxSaleAccountController.java index 4d9bd4d63..f44813cad 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxSaleAccountController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxSaleAccountController.java @@ -122,6 +122,7 @@ public class SysWxSaleAccountController extends BaseController { try { // 上传文件路径 String filePath = RuoYiConfig.getUploadPath(); + String oriFileName = file.getOriginalFilename(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); String url = serverConfig.getUrl() + fileName; @@ -132,7 +133,7 @@ public class SysWxSaleAccountController extends BaseController { redisCache.setCacheObject(WxTokenUtils.KEY_ACCESS_TOKEN, wxAccessToken.getAccessToken(), wxAccessToken.getExpiresIn(), TimeUnit.SECONDS); } - WxFileUploadResult result = WxTokenUtils.uploadImage(filePath, accessToken); + WxFileUploadResult result = WxTokenUtils.uploadImage(filePath, oriFileName, accessToken); if (result == null) { return AjaxResult.error("上传微信失败"); } 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 a75365921..b6f60106f 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 @@ -1,7 +1,6 @@ package com.stdiet.custom.utils; import com.alibaba.fastjson.JSONObject; -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; @@ -9,7 +8,6 @@ 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; -import org.springframework.beans.factory.annotation.Autowired; import java.io.File; import java.io.InputStream; @@ -19,8 +17,8 @@ import java.security.NoSuchAlgorithmException; public class WxTokenUtils { - public static final String KEY_ACCESS_TOKEN="wx:access_token"; - public static final String KEY_ACCESS_TOKEN_WATHER="wx:access_token_watcher"; + public static final String KEY_ACCESS_TOKEN = "wx:access_token"; + public static final String KEY_ACCESS_TOKEN_WATHER = "wx:access_token_watcher"; // 与接口配置信息中的Token要一致 private static String token = "shengtangdiet"; @@ -32,7 +30,6 @@ public class WxTokenUtils { private static String uploadMaterialUrl = "https://api.weixin.qq.com/cgi-bin/material/add_material"; - public static WxAccessToken fetchAccessToken() { try { String resStr = HttpUtils.sendGet(tokenUrl, "grant_type=client_credential&appid=" + appId + "&secret=" + appSecret); @@ -48,11 +45,12 @@ public class WxTokenUtils { } } - public static WxFileUploadResult uploadImage(String filePath, String accessToken) { + public static WxFileUploadResult uploadImage(String filePath, String fileName, String accessToken) { try { String url = uploadMaterialUrl + "?access_token" + accessToken + "&type=image"; HttpPostUtil post = new HttpPostUtil(url); post.addParameter("media", new File(filePath)); + post.addParameter("name", fileName); String resultStr = post.send(); JSONObject obj = JSONObject.parseObject(resultStr); WxFileUploadResult result = JSONObject.toJavaObject(obj, WxFileUploadResult.class);