Merge remote-tracking branch 'origin/test' into dev

yd-oss-api/src/main/java/com/yd/oss/api/service/impl/ApiOssServiceImpl.java

@@ -57,6 +57,8 @@ public class ApiOssServiceImpl implements ApiOssService {
             BeanUtils.copyProperties(result,response);
             response.setFileBizId(ossUploadFileDto.getFileBizId());
             response.setUrl(ossUploadFileDto.getUrl());
+            response.setCreateTime(ossUploadFileDto.getCreateTime());
+            response.setCreatorName(ossUploadFileDto.getCreatorName());
             return Result.success(response);
         } catch (IOException e) {
             log.error("文件上传失败", e);

yd-oss-api/src/main/java/com/yd/oss/api/service/impl/ApiOssStsServiceImpl.java

@@ -152,7 +152,7 @@ public class ApiOssStsServiceImpl implements ApiOssStsService {
         // 获取当前登录用户信息
         AuthUserDto authUserDto = SecurityUtil.getCurrentLoginUser();
         String userId = authUserDto.getUserBizId();
-        String userName = authUserDto.getUsername();
+        String realName = authUserDto.getRealName();
 
         List<OssFile> saveOssFileList = new ArrayList<>();
         List<ApiOssFileResponse> fileResponses = new ArrayList<>();
@@ -198,7 +198,7 @@ public class ApiOssStsServiceImpl implements ApiOssStsService {
                 file.setUploadTime(LocalDateTime.now());
                 file.setUploadUser(userId);
                 file.setCreatorId(userId);
-                file.setCreatorName(userName);
+                file.setCreatorName(realName);
                 file.setUpdaterId(userId);
                 file.setCreateTime(LocalDateTime.now());
                 file.setUpdateTime(LocalDateTime.now());

yd-oss-feign/src/main/java/com/yd/oss/feign/response/ApiUploadResponse.java

 package com.yd.oss.feign.response;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -50,4 +52,15 @@ public class ApiUploadResponse {
      * 文件业务ID唯一标识
      */
     private String fileBizId;
+
+    /**
+     * 创建人名
+     */
+    private String creatorName;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDateTime createTime;
 }

yd-oss-service/src/main/java/com/yd/oss/service/dto/OssUploadFileResDto.java

 package com.yd.oss.service.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -49,4 +50,14 @@ public class OssUploadFileResDto {
      * 上传时间
      */
     private LocalDateTime uploadTime;
+
+    /**
+     * 创建人名
+     */
+    private String creatorName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
 }

yd-oss-service/src/main/java/com/yd/oss/service/service/impl/AliYunOssServiceImpl.java

@@ -35,6 +35,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.*;
 import java.net.URL;
 import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.UUID;
 
@@ -159,6 +160,7 @@ public class AliYunOssServiceImpl implements OssService {
                                              String objectBizId, String objectName,
                                              String objectTableName, String objectType,
                                              String creatorId, String creatorName) {
+        LocalDateTime now = LocalDateTime.now();
         long startTime = System.currentTimeMillis();
         String operationResult = "success";
         String errorMessage = null;
@@ -205,11 +207,12 @@ public class AliYunOssServiceImpl implements OssService {
             AuthUserDto authUserDto = SecurityUtil.getCurrentLoginUser();
             if (authUserDto != null) {
                 ossFile.setCreatorId(authUserDto.getUserBizId());
-                ossFile.setCreatorName(authUserDto.getUsername());
+                ossFile.setCreatorName(authUserDto.getRealName());
             } else {
                 ossFile.setCreatorId(creatorId);
                 ossFile.setCreatorName(creatorName);
             }
+            ossFile.setCreateTime(now);
             ossFileService.saveFileMetadata(ossFile);
 
             // 记录成功操作日志
@@ -232,6 +235,8 @@ public class AliYunOssServiceImpl implements OssService {
             ossUploadFileDto.setUrl(publicUrl);
             ossUploadFileDto.setFileSize(fileSize);
             ossUploadFileDto.setFileType(fileType);
+            ossUploadFileDto.setCreateTime(now);
+            ossUploadFileDto.setCreatorName(ossFile.getCreatorName());
             return ossUploadFileDto;
         } catch (Exception e) {
             operationResult = "failure";