图片上传

This commit is contained in:
huangdeliang 2021-02-01 16:11:13 +08:00
parent 9c8d3bffd4
commit 973606f319
2 changed files with 6 additions and 14 deletions

View File

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

View File

@ -68,12 +68,8 @@ public class WxTokenUtils {
builder.append(line); builder.append(line);
builder.append(System.getProperty("line.separator")); builder.append(System.getProperty("line.separator"));
} }
String resultStr = builder.toString(); JSONObject obj = JSONObject.parseObject(builder.toString());
JSONObject obj = JSONObject.parseObject(resultStr); return JSONObject.toJavaObject(obj, WxFileUploadResult.class);
WxFileUploadResult result = JSONObject.toJavaObject(obj, WxFileUploadResult.class);
result.setMediaId(filePath);
result.setUrl(resultStr);
return result;
} }