diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeMaterialController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeMaterialController.java index c8236c964e79bb62ce92ba696dac659a92f92889..d6a690538b2edec31e6c68d4d3f632adc5a5881c 100644 --- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeMaterialController.java +++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeMaterialController.java @@ -13,6 +13,7 @@ import com.linkwechat.wecom.domain.dto.WeMediaDto; import com.linkwechat.wecom.domain.vo.WeMaterialFileVO; import com.linkwechat.wecom.service.IWeMaterialService; import com.linkwechat.wecom.service.IWePosterService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; @@ -31,6 +32,7 @@ import java.util.stream.Collectors; * @author KEWEN * @date 2020-10-08 */ +@Api("企业微信素材管理") @RestController @RequestMapping("/wecom/material") public class WeMaterialController extends BaseController { @@ -149,7 +151,9 @@ public class WeMaterialController extends BaseController { @PostMapping("/uploadimg") @ApiOperation("上传素材图片") public AjaxResult uploadImg(MultipartFile file){ - return AjaxResult.success(materialService.uploadImg(file)); + WeMediaDto weMediaDto = materialService.uploadImg(file); + weMediaDto.setFileName(file.getResource().getFilename()); + return AjaxResult.success(weMediaDto); } } diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/config/SecurityConfig.java b/linkwe-framework/src/main/java/com/linkwechat/framework/config/SecurityConfig.java index 4bbe058887a13c87658fc44623f9bcaf79c1a466..42448b76ffe24274fc99e253ec5f15d221f20ea9 100644 --- a/linkwe-framework/src/main/java/com/linkwechat/framework/config/SecurityConfig.java +++ b/linkwe-framework/src/main/java/com/linkwechat/framework/config/SecurityConfig.java @@ -131,10 +131,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { //微信授权接口 .antMatchers("/weixin/auth/**").anonymous() - - //.antMatchers("/wecom/user/synchWeUser").anonymous() - - // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated() .and() diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeMediaDto.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeMediaDto.java index fa685402604dab0a6f796f6f1f0090ed21110735..cba57be2a31f49e65c8a50ee188a3355ab4729d5 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeMediaDto.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeMediaDto.java @@ -1,5 +1,7 @@ package com.linkwechat.wecom.domain.dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -7,6 +9,7 @@ import lombok.Data; * @Description: * @Date: create in 2020/9/24 0024 0:16 */ +@ApiModel @Data public class WeMediaDto extends WeResultDto{ /**媒体文件类型,分别有图片(image)、语音(voice)、视频(video),普通文件(file)*/ @@ -16,5 +19,9 @@ public class WeMediaDto extends WeResultDto{ /**媒体文件上传时间戳*/ private Long created_at; /**上传后得到的图片URL。永久有效*/ + @ApiModelProperty("图片路径") private String url; + + @ApiModelProperty("图片名称") + private String fileName; }