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 13c510c6b..1c4bcc8de 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 @@ -21,7 +21,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.io.File; import java.util.List; import java.util.concurrent.TimeUnit; @@ -126,26 +125,23 @@ public class SysWxSaleAccountController extends BaseController { String oriFileName = file.getOriginalFilename(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); - String url = serverConfig.getUrl() + fileName; +// String url = serverConfig.getUrl() + fileName; String oriFilePath = filePath + fileName.substring(fileName.indexOf("upload") + 6); -// String accessToken = "ddd"; String accessToken = redisCache.getCacheObject(WxTokenUtils.KEY_ACCESS_TOKEN); if (StringUtils.isEmpty(accessToken)) { WxAccessToken wxAccessToken = WxTokenUtils.fetchAccessToken(); - redisCache.setCacheObject(WxTokenUtils.KEY_ACCESS_TOKEN, wxAccessToken.getAccessToken(), wxAccessToken.getExpiresIn(), TimeUnit.SECONDS); accessToken = wxAccessToken.getAccessToken(); + redisCache.setCacheObject(WxTokenUtils.KEY_ACCESS_TOKEN, accessToken, wxAccessToken.getExpiresIn(), TimeUnit.SECONDS); } WxFileUploadResult result = WxTokenUtils.uploadImage(oriFilePath, oriFileName, accessToken); AjaxResult ajax = AjaxResult.success(); ajax.put("fileName", fileName); - ajax.put("wxInfo", result); - ajax.put("file", oriFilePath); - ajax.put("accessToken", accessToken); - ajax.put("url", url); + ajax.put("mediaId", result.getMediaId()); + ajax.put("mediaUrl", result.getUrl()); return ajax; } catch (Exception e) { return AjaxResult.error(e.getMessage()); 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 2b370eb85..5a42a8bab 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 @@ -68,12 +68,8 @@ public class WxTokenUtils { builder.append(line); builder.append(System.getProperty("line.separator")); } - String resultStr = builder.toString(); - JSONObject obj = JSONObject.parseObject(resultStr); - WxFileUploadResult result = JSONObject.toJavaObject(obj, WxFileUploadResult.class); - result.setMediaId(filePath); - result.setUrl(resultStr); - return result; + JSONObject obj = JSONObject.parseObject(builder.toString()); + return JSONObject.toJavaObject(obj, WxFileUploadResult.class); }