Merge remote-tracking branch 'origin/master'

fuliqi

2023-12-16 12ada3a7e6680d5ab92901410e3cedd9b8077e56

 ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java

@@ -94,10 +94,12 @@
    @ApiOperation(value = "根据钉钉授权码获取token")
    @GetMapping("/dingLogin")
    public CommonResult<Map> dingLogin(@RequestParam String code) {
        log.info("一键登录参数code--------------->{}",code);
        HashMap<String, Object> map = new HashMap<>();
        //获取用户信息
        DingUserInfo dingUser = dingCommon.getDingUserInfo(code);
        //按ding登录
        log.info("用户信息------------------->{}",dingUser);
        String token = authService.dingLogin(dingUser);
        map.put("token", token);
        map.put("tokenHead", tokenHead);
@@ -193,13 +195,17 @@

    @PostMapping("/oss/sign")
    public CommonResult ossSign(@RequestBody OssFileDto dto) {
        log.info("接收到file");

        if (StringUtils.isNullOrEmpty(dto.getMediaId()) || StringUtils.isNullOrEmpty(dto.getExtension())) {
            return CommonResult.failed("参数不能为空！");
        }
        ExecutableClient executableClient = DdTest.getExecutableClient();
        CloseableHttpResponse response = null;
        OSS ossClient = null;

        DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

        System.out.println("开始获取--" + dtf2.format(LocalDateTime.now()));
        try {
            //从钉钉获取视频流
            String api = "/media/download";
@@ -212,13 +218,10 @@
            response = getClient.getB();
            HttpEntity entity = response.getEntity();
            InputStream is = entity.getContent();
            DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");

            String strDate2 = dtf2.format(LocalDateTime.now());
//            MultipartFile file = getMultipartFile(is, fileName);

            String fileName = strDate2 + RandomUtils.generateRandomInt(4) + "." + dto.getExtension();
            MultipartFile file = getMultipartFile(is, fileName);
            String url = ossService.uploadImages(file);
            String url = ossService.uploadImages(is,dto.getExtension());
            return CommonResult.success(url);
        } catch (Exception e) {
            e.printStackTrace();