zhanghua
2023-10-26 7fa8a26800a55a73fb41885182fa20b6716cb302
bug修改
2个文件已修改
1个文件已添加
28 ■■■■ 已修改文件
ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/dto/video/OssFileDto.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/application-dev.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java
@@ -18,6 +18,7 @@
import com.ycl.config.DdTest;
import com.ycl.config.DingConfig;
import com.ycl.controller.BaseController;
import com.ycl.dto.video.OssFileDto;
import com.ycl.entity.dingding.DingUserInfo;
import com.ycl.service.auth.AuthService;
import com.ycl.service.ding.BookRemarkService;
@@ -191,9 +192,9 @@
    @PostMapping("/oss/sign")
    public CommonResult ossSign(@RequestParam("mediaId") String mediaId, @RequestParam("extension") String extension) {
    public CommonResult ossSign(@RequestBody OssFileDto dto) {
        log.info("接收到file");
        if (StringUtils.isNullOrEmpty(mediaId) || StringUtils.isNullOrEmpty(extension)) {
        if (StringUtils.isNullOrEmpty(dto.getMediaId()) || StringUtils.isNullOrEmpty(dto.getExtension())) {
            return CommonResult.failed("参数不能为空!");
        }
        ExecutableClient executableClient = DdTest.getExecutableClient();
@@ -207,7 +208,7 @@
            String token = getToken();
            //设置参数
            getClient.addParameter("access_token", token);
            getClient.addParameter("media_id", mediaId);
            getClient.addParameter("media_id", dto.getMediaId());
            response = getClient.getB();
            HttpEntity entity = response.getEntity();
            InputStream is = entity.getContent();
@@ -215,7 +216,7 @@
            String strDate2 = dtf2.format(LocalDateTime.now());
            String fileName = strDate2 + RandomUtils.generateRandomInt(4) + "." + extension;
            String fileName = strDate2 + RandomUtils.generateRandomInt(4) + "." + dto.getExtension();
            MultipartFile file = getMultipartFile(is, fileName);
            String url = ossService.uploadImages(file);
            return CommonResult.success(url);
ycl-platform/src/main/java/com/ycl/dto/video/OssFileDto.java
New file
@@ -0,0 +1,11 @@
package com.ycl.dto.video;
import lombok.Data;
@Data
public class OssFileDto {
    public String base64;
    public String fileName;
    public String mediaId;
    public String extension;
}
ycl-platform/src/main/resources/application-dev.yml
@@ -75,10 +75,10 @@
aliyun:
  oss:
    endpoint: https://oss-cn-chengdu.aliyuncs.com
    keyId: LTAI5tRpMjypcziJ2WAWEKsV
    keySecret: U7CPi1JqOWvTbdLR99duJ8ev3tcjRp
    bucketName: upload-bzh-new
    endpoint: https://oss-cn-zhangjiakou.aliyuncs.com
    keyId: LTAIDlTWjHW0IVyW
    keySecret: 6fO78NmgyF49TK5GWFAzXuSAexl9PL
    bucketName: hcjs-mte-internal
#专有钉钉参数
zzding :