From 12ada3a7e6680d5ab92901410e3cedd9b8077e56 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 16 十二月 2023 17:08:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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 ccd0d15..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
@@ -94,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);
@@ -193,15 +195,15 @@
@PostMapping("/oss/sign")
public CommonResult ossSign(@RequestBody OssFileDto dto) {
- log.info("鎺ユ敹鍒癴ile");
- DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
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 {
@@ -217,15 +219,9 @@
HttpEntity entity = response.getEntity();
InputStream is = entity.getContent();
- System.out.println("鑾峰彇瀹屾垚--" + dtf2.format(LocalDateTime.now()));
- DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+// MultipartFile file = getMultipartFile(is, fileName);
- String strDate2 = dtf.format(LocalDateTime.now());
-
- 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();
--
Gitblit v1.8.0