From f11afb84d32ed6d2b582ed193db2f9805cd365ec Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 18 十二月 2023 15:13:32 +0800 Subject: [PATCH] 工作通知定时任务 --- ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java b/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java index 13002eb..e96e969 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java +++ b/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; @@ -93,10 +94,12 @@ @ApiOperation(value = "鏍规嵁閽夐拤鎺堟潈鐮佽幏鍙杢oken") @GetMapping("/dingLogin") public CommonResult<Map> dingLogin(@RequestParam String code) { + log.info("涓�閿櫥褰曞弬鏁癱ode--------------->{}",code); HashMap<String, Object> map = new HashMap<>(); //鑾峰彇鐢ㄦ埛淇℃伅 DingUserInfo dingUser = dingCommon.getDingUserInfo(code); //鎸塪ing鐧诲綍 + log.info("鐢ㄦ埛淇℃伅------------------->{}",dingUser); String token = authService.dingLogin(dingUser); map.put("token", token); map.put("tokenHead", tokenHead); @@ -191,14 +194,18 @@ @PostMapping("/oss/sign") - public CommonResult ossSign(@RequestParam("mediaId") String mediaId, @RequestParam("extension") String extension) { - log.info("鎺ユ敹鍒癴ile"); - if (StringUtils.isNullOrEmpty(mediaId) || StringUtils.isNullOrEmpty(extension)) { + public CommonResult ossSign(@RequestBody OssFileDto dto) { + + 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"; @@ -207,17 +214,14 @@ 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(); - DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); - String strDate2 = dtf2.format(LocalDateTime.now()); +// MultipartFile file = getMultipartFile(is, fileName); - String fileName = strDate2 + RandomUtils.generateRandomInt(4) + "." + extension; - 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(); -- Gitblit v1.8.0