From 36242bb87a8c7cec84eef095b1aa37b675354516 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sat, 29 Jun 2024 21:18:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=8F=88=E6=8B=8D=E4=BA=91?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SchisandraOssUpController.java | 190 +++++++++++------- .../dto/SchisandraOssTencentDTO.java | 2 + .../oss/core/StandardOssClient.java | 1 + .../application/oss/core/up/UpOssClient.java | 17 +- .../oss/core/up/UpOssConfiguration.java | 10 +- .../oss/domain/bo/SchisandraOssTencentBO.java | 2 + .../basic/entity/SchisandraOssTencent.java | 6 +- 7 files changed, 147 insertions(+), 81 deletions(-) diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssUpController.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssUpController.java index 4416115..3748d4c 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssUpController.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssUpController.java @@ -1,18 +1,25 @@ package com.schisandra.oss.application.controller; +import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSON; import com.google.common.base.Preconditions; import com.schisandra.oss.application.convert.SchisandraOssUpDTOConverter; import com.schisandra.oss.application.dto.SchisandraOssUpDTO; +import com.schisandra.oss.application.oss.core.up.UpOssClient; +import com.schisandra.oss.application.oss.core.up.UpOssConfiguration; +import com.schisandra.oss.application.oss.model.OssInfo; import com.schisandra.oss.common.entity.Result; import com.schisandra.oss.domain.bo.SchisandraOssUpBO; import com.schisandra.oss.domain.service.SchisandraOssUpDomainService; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; /** * 又拍云对象存储配置表 controller @@ -28,36 +35,111 @@ public class SchisandraOssUpController { @Resource private SchisandraOssUpDomainService schisandraOssUpDomainService; + @Resource + private UpOssConfiguration upOssConfiguration; + /** - * 新增又拍云对象存储配置表 + * @description: 初始化 + * @param: [] + * @return: void + * @author: landaiqing + * @date: 2024/6/28 上午11:36 */ - @RequestMapping("add") + @PostMapping("init") + public void init(@RequestParam("userId") String userId) { + try { + upOssConfiguration.upOssClient(userId); + log.info("用户:{} 又拍云oss初始化成功", userId); + } catch (Exception e) { + log.error("用户:{} 又拍云oss初始化失败", userId); + } + + } + + /** + * @description: 获取指定文件信息 + * @param: [userId，fileName] + * @return: com.schisandra.oss.common.entity.Result + * @author: landaiqing + * @date: 2024/6/28 上午11:42 + */ + @PostMapping("getInfo") + public Result getInfo(@RequestParam("userId") String userId, @RequestParam("fileName") String fileName) { + UpOssClient bean = SpringUtil.getBean(userId); + OssInfo info = bean.getInfo(fileName); + return Result.ok(info); + } + + /** + * @description: 单个文件上传 + * @param: [userId, fileName, file, isOverride] + * @return: com.schisandra.oss.common.entity.Result + * @author: landaiqing + * @date: 2024/6/28 下午3:00 + */ + @SneakyThrows + @PostMapping("upload") + public Result upload(@RequestParam("userId") String userId, @RequestParam("file") MultipartFile file, @RequestParam("isOverride") Boolean isOverride) { + UpOssClient bean = SpringUtil.getBean(userId); + String originalFileName = file.getOriginalFilename(); + InputStream is = file.getInputStream(); + OssInfo ossInfo = bean.upLoad(is, originalFileName, isOverride); + return Result.ok(ossInfo); + } + + /** + * @description: 删除文件 + * @param: [userId, fileName] + * @return: com.schisandra.oss.common.entity.Result + * @author: landaiqing + * @date: 2024/6/28 下午3:21 + */ + @PostMapping("deleteFile") + public Result deleteFile(@RequestParam("userId") String userId, @RequestParam("fileName") String fileName) { + UpOssClient bean = SpringUtil.getBean(userId); + bean.delete(fileName); + return Result.ok(); + } + + /** + * @description: 下载文件 + * @param: [userId, fileName, response] + * @return: com.schisandra.oss.common.entity.Result + * @author: landaiqing + * @date: 2024/6/28 下午3:55 + */ + @SneakyThrows + @GetMapping("download") + public Result download(@RequestParam("userId") String userId, @RequestParam("fileName") String fileName, HttpServletResponse response) { + UpOssClient bean = SpringUtil.getBean(userId); + ServletOutputStream output = response.getOutputStream(); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); + response.setContentType("application/octet-stream"); + response.setCharacterEncoding("UTF-8"); + bean.downLoad(output, fileName); + return Result.ok(); + } + + + /** + * @description: 新增又拍云对象存储配置 + * @param: [schisandraOssUpDTO] + * @return: com.schisandra.oss.common.entity.Result + * @author: landaiqing + * @date: 2024/6/28 下午3:14 + */ + @PostMapping("add") public Result add(@RequestBody SchisandraOssUpDTO schisandraOssUpDTO) { try { if (log.isInfoEnabled()) { log.info("SchisandraOssUpController.add.dto:{}", JSON.toJSONString(schisandraOssUpDTO)); } - Preconditions.checkNotNull(schisandraOssUpDTO.getId(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getUserId(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getBasePath(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getBucketName(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getUserName(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getPassword(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getTimeout(), "默认的超时时间：30秒不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getApiDomain(), "默认为自动识别接入点不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getPartSize(), "分片大小,默认5MB不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getTaskNum(), "并发线程数,默认等于CPU的核数不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getStatus(), "状态不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getOpenAdvancedSetup(), "是否开启高级设置不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getCreatedBy(), "创建人不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getCreatedTime(), "创建时间不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getUpdateTime(), "更新时间不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getUpdateBy(), "更新人不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getIsDeleted(), "是否删除 0 未删除 1已删除不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getExtraJson(), "额外字段不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getCreateBucket(), "当桶不存在，是否创建不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getCheckBucket(), "启动检测桶，是否存在不能为空"); + Preconditions.checkNotNull(schisandraOssUpDTO.getUserId(), "UserId不能为空"); + Preconditions.checkNotNull(schisandraOssUpDTO.getBasePath(), "BasePath不能为空"); + Preconditions.checkNotNull(schisandraOssUpDTO.getBucketName(), "BucketName不能为空"); + Preconditions.checkNotNull(schisandraOssUpDTO.getUserName(), "UserName不能为空"); + Preconditions.checkNotNull(schisandraOssUpDTO.getPassword(), "Password不能为空"); SchisandraOssUpBO SchisandraOssUpBO = SchisandraOssUpDTOConverter.INSTANCE.convertDTOToBO(schisandraOssUpDTO); return Result.ok(schisandraOssUpDomainService.add(SchisandraOssUpBO)); } catch (Exception e) { @@ -68,35 +150,19 @@ public class SchisandraOssUpController { } /** - * 修改又拍云对象存储配置表 + * @description: 修改又拍云对象存储配置 + * @param: [schisandraOssUpDTO] + * @return: com.schisandra.oss.common.entity.Result + * @author: landaiqing + * @date: 2024/6/28 下午3:14 */ - @RequestMapping("update") + @PostMapping("update") public Result update(@RequestBody SchisandraOssUpDTO schisandraOssUpDTO) { try { if (log.isInfoEnabled()) { log.info("SchisandraOssUpController.update.dto:{}", JSON.toJSONString(schisandraOssUpDTO)); } - Preconditions.checkNotNull(schisandraOssUpDTO.getId(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getUserId(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getBasePath(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getBucketName(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getUserName(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getPassword(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getTimeout(), "默认的超时时间：30秒不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getApiDomain(), "默认为自动识别接入点不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getPartSize(), "分片大小,默认5MB不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getTaskNum(), "并发线程数,默认等于CPU的核数不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getStatus(), "状态不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getOpenAdvancedSetup(), "是否开启高级设置不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getCreatedBy(), "创建人不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getCreatedTime(), "创建时间不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getUpdateTime(), "更新时间不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getUpdateBy(), "更新人不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getIsDeleted(), "是否删除 0 未删除 1已删除不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getExtraJson(), "额外字段不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getCreateBucket(), "当桶不存在，是否创建不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getCheckBucket(), "启动检测桶，是否存在不能为空"); SchisandraOssUpBO schisandraOssUpBO = SchisandraOssUpDTOConverter.INSTANCE.convertDTOToBO(schisandraOssUpDTO); return Result.ok(schisandraOssUpDomainService.update(schisandraOssUpBO)); } catch (Exception e) { @@ -106,36 +172,22 @@ public class SchisandraOssUpController { } + /** - * 删除又拍云对象存储配置表 + * @description: 删除又拍云对象存储配置 + * @param: [schisandraOssUpDTO] + * @return: com.schisandra.oss.common.entity.Result + * @author: landaiqing + * @date: 2024/6/28 下午3:14 */ - @RequestMapping("delete") + @DeleteMapping("delete") public Result delete(@RequestBody SchisandraOssUpDTO schisandraOssUpDTO) { try { if (log.isInfoEnabled()) { log.info("SchisandraOssUpController.delete.dto:{}", JSON.toJSONString(schisandraOssUpDTO)); } - Preconditions.checkNotNull(schisandraOssUpDTO.getId(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getUserId(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getBasePath(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getBucketName(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getUserName(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getPassword(), "不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getTimeout(), "默认的超时时间：30秒不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getApiDomain(), "默认为自动识别接入点不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getPartSize(), "分片大小,默认5MB不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getTaskNum(), "并发线程数,默认等于CPU的核数不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getStatus(), "状态不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getOpenAdvancedSetup(), "是否开启高级设置不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getCreatedBy(), "创建人不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getCreatedTime(), "创建时间不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getUpdateTime(), "更新时间不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getUpdateBy(), "更新人不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getIsDeleted(), "是否删除 0 未删除 1已删除不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getExtraJson(), "额外字段不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getCreateBucket(), "当桶不存在，是否创建不能为空"); - Preconditions.checkNotNull(schisandraOssUpDTO.getCheckBucket(), "启动检测桶，是否存在不能为空"); + Preconditions.checkNotNull(schisandraOssUpDTO.getId(), "Id不能为空"); SchisandraOssUpBO schisandraOssUpBO = SchisandraOssUpDTOConverter.INSTANCE.convertDTOToBO(schisandraOssUpDTO); return Result.ok(schisandraOssUpDomainService.delete(schisandraOssUpBO)); } catch (Exception e) { diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/dto/SchisandraOssTencentDTO.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/dto/SchisandraOssTencentDTO.java index 85b277a..f069b20 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/dto/SchisandraOssTencentDTO.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/dto/SchisandraOssTencentDTO.java @@ -44,6 +44,8 @@ public class SchisandraOssTencentDTO implements Serializable { */ private String secretKey; + private String appId; + /** * 地域 */ diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/StandardOssClient.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/StandardOssClient.java index d5c05e4..d46174c 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/StandardOssClient.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/StandardOssClient.java @@ -22,6 +22,7 @@ import com.schisandra.oss.application.oss.utils.OssPathUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.junit.Test; import java.io.File; import java.io.InputStream; diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/up/UpOssClient.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/up/UpOssClient.java index fac1a46..43cf865 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/up/UpOssClient.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/up/UpOssClient.java @@ -20,36 +20,35 @@ import com.schisandra.oss.application.oss.utils.OssPathUtil; import com.upyun.ParallelUploader; import com.upyun.RestManager; import com.upyun.UpException; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import okhttp3.Headers; import okhttp3.Response; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.io.*; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** + * @author zlg * @description: * @param: * @return: - * @author zlg * @date: 2024/6/25 14:40 */ @Slf4j @Data @AllArgsConstructor @NoArgsConstructor +@Component public class UpOssClient implements StandardOssClient { public static final String REST_OBJECT_NAME = "restManager"; public static final String PARALLEL_OBJECT_NAME = "parallelUploader"; - private RestManager restManager; private ParallelUploader parallelUploader; private UpOssConfig upOssConfig; @@ -206,8 +205,8 @@ public class UpOssClient implements StandardOssClient { Response fileInfo = restManager.getFileInfo(key); Headers headers = fileInfo.headers(); ossInfo.setLength(headers.get(RestManager.PARAMS.X_UPYUN_FILE_SIZE.getValue())); - ossInfo.setCreateTime(DateUtil.date(headers.getDate(RestManager.PARAMS.X_UPYUN_FILE_DATE.getValue())).toString(DatePattern.NORM_DATETIME_PATTERN)); - ossInfo.setLastUpdateTime(DateUtil.date(headers.getDate(RestManager.PARAMS.X_UPYUN_FILE_DATE.getValue())).toString(DatePattern.NORM_DATETIME_PATTERN)); + ossInfo.setCreateTime(DateUtil.date(Long.parseLong(Objects.requireNonNull(headers.get(RestManager.PARAMS.X_UPYUN_FILE_DATE.getValue())))).toString(DatePattern.NORM_DATETIME_PATTERN)); + ossInfo.setLastUpdateTime(DateUtil.date(Long.parseLong(Objects.requireNonNull(headers.get(RestManager.PARAMS.X_UPYUN_FILE_DATE.getValue())))).toString(DatePattern.NORM_DATETIME_PATTERN)); } else { ossInfo = getDirectoryOssInfo(key); } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/up/UpOssConfiguration.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/up/UpOssConfiguration.java index 82da424..5b73b37 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/up/UpOssConfiguration.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/up/UpOssConfiguration.java @@ -52,26 +52,32 @@ public class UpOssConfiguration { public StandardOssClient upOssClient(String userId) { SchisandraOssUpBO schisandraOssUpBO = schisandraOssUpDomainService.getUpOssConfig(userId); SchisandraOssUpDTO schisandraOssUpDTO = SchisandraOssUpDTOConverter.INSTANCE.convertBOToDTO(schisandraOssUpBO); + log.info("Up oss配置信息获取成功：{}", schisandraOssUpDTO); if (ObjectUtil.isEmpty(schisandraOssUpDTO)) { log.error("Up oss配置信息获取失败"); return null; } String userName = schisandraOssUpDTO.getUserName(); String password = schisandraOssUpDTO.getPassword(); + String bucketName = schisandraOssUpDTO.getBucketName(); + String basePath = schisandraOssUpDTO.getBasePath(); UpOssConfig upOssConfig = new UpOssConfig(); upOssConfig.setUserName(userName); upOssConfig.setPassword(password); + upOssConfig.setBucketName(bucketName); + upOssConfig.setBasePath(basePath); + SpringUtil.registerBean(userId, upOssClient(upOssConfig)); return upOssClient(upOssConfig); } - private StandardOssClient upOssClient(UpOssConfig upOssConfig) { + private UpOssClient upOssClient(UpOssConfig upOssConfig) { RestManager restManager = restManager(upOssConfig); ParallelUploader parallelUploader = parallelUploader(upOssConfig); return upOssClient(restManager, parallelUploader, upOssConfig); } - public StandardOssClient upOssClient(RestManager restManager, ParallelUploader parallelUploader, UpOssConfig upOssConfig) { + public UpOssClient upOssClient(RestManager restManager, ParallelUploader parallelUploader, UpOssConfig upOssConfig) { return new UpOssClient(restManager, parallelUploader, upOssConfig); } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/bo/SchisandraOssTencentBO.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/bo/SchisandraOssTencentBO.java index 2d01d0c..08d04ec 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/bo/SchisandraOssTencentBO.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/bo/SchisandraOssTencentBO.java @@ -44,6 +44,8 @@ public class SchisandraOssTencentBO implements Serializable { */ private String secretKey; + private String appId; + /** * 地域 */ diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/entity/SchisandraOssTencent.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/entity/SchisandraOssTencent.java index 709ecaf..ddc3dae 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/entity/SchisandraOssTencent.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/entity/SchisandraOssTencent.java @@ -55,7 +55,11 @@ public class SchisandraOssTencent implements Serializable { */ @Column("secret_key") private String secretKey; - + /** + * + */ + @Column("app_id") + private String appId; /** * 地域 */ From c18505f3dab72fccbb706c861c0331c1dc9046f3 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Wed, 3 Jul 2024 12:59:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E5=BE=AE=E4=BF=A1=E5=85=AC?= =?UTF-8?q?=E4=BC=97=E5=8F=B7=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/api/SchisandraAuthFeignService.java | 1 + .../SchisandraAuthUserController.java | 7 +- .../SchisandraOssAliController.java | 1 - schisandra-cloud-storage-wechat/pom.xml | 5 + .../wechat/config/{ => job}/XxlJobConfig.java | 2 +- .../config/websocket/WebSocketConfig.java | 15 ++ .../websocket/WebSocketServerConfig.java | 29 ++++ .../{ => wx}/WebClientDefaultConfig.java | 2 +- .../wechat/config/{ => wx}/WxConfig.java | 2 +- .../config/{ => wx}/WxDetailConfig.java | 2 +- .../wechat/controller/WxController.java | 9 +- .../wechat/job/GenerateAccessTokenJob.java | 2 +- .../service/impl/WxMpEventServiceImpl.java | 49 ++++-- .../wechat/websocket/WeChatSocket.java | 139 ++++++++++++++++++ 14 files changed, 240 insertions(+), 25 deletions(-) rename schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/{ => job}/XxlJobConfig.java (98%) create mode 100644 schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/websocket/WebSocketConfig.java create mode 100644 schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/websocket/WebSocketServerConfig.java rename schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/{ => wx}/WebClientDefaultConfig.java (95%) rename schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/{ => wx}/WxConfig.java (90%) rename schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/{ => wx}/WxDetailConfig.java (90%) create mode 100644 schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/websocket/WeChatSocket.java diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/src/main/java/com/schisandra/auth/api/SchisandraAuthFeignService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/src/main/java/com/schisandra/auth/api/SchisandraAuthFeignService.java index 4a493aa..b5778b8 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/src/main/java/com/schisandra/auth/api/SchisandraAuthFeignService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/src/main/java/com/schisandra/auth/api/SchisandraAuthFeignService.java @@ -1,5 +1,6 @@ package com.schisandra.auth.api; +import com.schisandra.auth.entity.Result; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java index f8dfca7..a9c4828 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java @@ -1,6 +1,5 @@ package com.schisandra.auth.application.controller; -import cn.dev33.satoken.stp.SaTokenInfo; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; @@ -29,10 +28,12 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpRequest; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -364,7 +365,7 @@ public class SchisandraAuthUserController { public Result getClientToken(String clientId) { String key = redisUtil.buildKey(WX_LOGIN_TOKEN, clientId); String result = redisUtil.get(key); - if(StringUtils.isBlank(result)){ + if (StringUtils.isBlank(result)) { return Result.fail(); } return Result.ok(JSONObject.parseObject(result)); diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java index 4db0104..a89b3d3 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java @@ -137,7 +137,6 @@ public class SchisandraOssAliController { * @throws XmlParserException * @throws InternalException */ - @PostMapping("seleteBucket") public Result seleteBucket(@RequestParam String userId) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { Preconditions.checkNotNull(userId, "不能为空"); diff --git a/schisandra-cloud-storage-wechat/pom.xml b/schisandra-cloud-storage-wechat/pom.xml index 5289014..96c8c25 100644 --- a/schisandra-cloud-storage-wechat/pom.xml +++ b/schisandra-cloud-storage-wechat/pom.xml @@ -124,6 +124,11 @@ schisandra-cloud-storage-auth-api 1.0-SNAPSHOT + + org.springframework.boot + spring-boot-starter-websocket + 2.4.2 + diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/XxlJobConfig.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/job/XxlJobConfig.java similarity index 98% rename from schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/XxlJobConfig.java rename to schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/job/XxlJobConfig.java index 2390236..a5de2ed 100644 --- a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/XxlJobConfig.java +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/job/XxlJobConfig.java @@ -1,4 +1,4 @@ -package com.schisandra.wechat.config; +package com.schisandra.wechat.config.job; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import org.slf4j.Logger; diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/websocket/WebSocketConfig.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/websocket/WebSocketConfig.java new file mode 100644 index 0000000..5db8832 --- /dev/null +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/websocket/WebSocketConfig.java @@ -0,0 +1,15 @@ +package com.schisandra.wechat.config.websocket; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; + +@Configuration +public class WebSocketConfig { + + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } + +} diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/websocket/WebSocketServerConfig.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/websocket/WebSocketServerConfig.java new file mode 100644 index 0000000..52d01a4 --- /dev/null +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/websocket/WebSocketServerConfig.java @@ -0,0 +1,29 @@ +package com.schisandra.wechat.config.websocket; + +import com.alibaba.nacos.common.utils.CollectionUtils; +import org.springframework.stereotype.Component; + +import javax.websocket.HandshakeResponse; +import javax.websocket.server.HandshakeRequest; +import javax.websocket.server.ServerEndpointConfig; +import java.util.List; +import java.util.Map; + +@Component +public class WebSocketServerConfig extends ServerEndpointConfig.Configurator { + + @Override + public boolean checkOrigin(String originHeaderValue) { + return true; + } + + @Override + public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response) { + Map> parameterMap = request.getParameterMap(); + List erpList = parameterMap.get("clientId"); + if(!CollectionUtils.isEmpty(erpList)){ + sec.getUserProperties().put("clientId", erpList.get(0)); + } + } + +} diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/WebClientDefaultConfig.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/wx/WebClientDefaultConfig.java similarity index 95% rename from schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/WebClientDefaultConfig.java rename to schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/wx/WebClientDefaultConfig.java index 09a6d12..a9bf92e 100644 --- a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/WebClientDefaultConfig.java +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/wx/WebClientDefaultConfig.java @@ -1,4 +1,4 @@ -package com.schisandra.wechat.config; +package com.schisandra.wechat.config.wx; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Bean; diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/WxConfig.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/wx/WxConfig.java similarity index 90% rename from schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/WxConfig.java rename to schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/wx/WxConfig.java index ff02e2b..7fa90a6 100644 --- a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/WxConfig.java +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/wx/WxConfig.java @@ -1,4 +1,4 @@ -package com.schisandra.wechat.config; +package com.schisandra.wechat.config.wx; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/WxDetailConfig.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/wx/WxDetailConfig.java similarity index 90% rename from schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/WxDetailConfig.java rename to schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/wx/WxDetailConfig.java index 4693670..9302426 100644 --- a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/WxDetailConfig.java +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/config/wx/WxDetailConfig.java @@ -1,4 +1,4 @@ -package com.schisandra.wechat.config; +package com.schisandra.wechat.config.wx; import lombok.Data; diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/controller/WxController.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/controller/WxController.java index 5ba9d5e..f544ca1 100644 --- a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/controller/WxController.java +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/controller/WxController.java @@ -1,11 +1,12 @@ package com.schisandra.wechat.controller; import com.schisandra.wechat.common.entity.Result; -import com.schisandra.wechat.config.WxConfig; +import com.schisandra.wechat.config.wx.WxConfig; import com.schisandra.wechat.dto.AccessTokenResult; import com.schisandra.wechat.dto.MpQrCodeCreateRequest; import com.schisandra.wechat.dto.MpQrCodeCreateResult; import com.schisandra.wechat.service.WXService; +import com.schisandra.wechat.websocket.WeChatSocket; import lombok.extern.slf4j.Slf4j; import org.apache.logging.log4j.util.Strings; import org.springframework.web.bind.annotation.GetMapping; @@ -14,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.UUID; /** * @Classname WxController @@ -32,8 +32,9 @@ public class WxController { @Resource private WXService wxService; @Resource - WxConfig wxConfig; - + private WxConfig wxConfig; + @Resource + private WeChatSocket weChatSocket; /** * @description: 获取微信access_token * @param: [] diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/job/GenerateAccessTokenJob.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/job/GenerateAccessTokenJob.java index 4cd3f5c..27f3f31 100644 --- a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/job/GenerateAccessTokenJob.java +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/job/GenerateAccessTokenJob.java @@ -1,6 +1,6 @@ package com.schisandra.wechat.job; -import com.schisandra.wechat.config.WxConfig; +import com.schisandra.wechat.config.wx.WxConfig; import com.schisandra.wechat.service.WXService; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WxMpEventServiceImpl.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WxMpEventServiceImpl.java index 94bc64d..4637ca3 100644 --- a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WxMpEventServiceImpl.java +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/service/impl/WxMpEventServiceImpl.java @@ -5,21 +5,23 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.schisandra.wechat.aes.AesException; import com.schisandra.wechat.common.exception.ParameterException; -import com.schisandra.wechat.config.WxConfig; +import com.schisandra.wechat.common.redis.RedisUtil; +import com.schisandra.wechat.config.wx.WxConfig; import com.schisandra.wechat.dto.MpBaseEventRequest; import com.schisandra.wechat.dto.MpCommonRequest; import com.schisandra.wechat.dto.MpSubscribeEventRequest; import com.schisandra.wechat.dto.MpTextEventRequest; import com.schisandra.wechat.rpc.AuthUserRpc; import com.schisandra.wechat.service.WxMpEventService; +import com.schisandra.wechat.websocket.WeChatSocket; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.logging.log4j.util.Strings; -import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import java.io.IOException; import java.security.MessageDigest; import java.util.Arrays; @@ -30,9 +32,7 @@ import java.util.Objects; @Slf4j public class WxMpEventServiceImpl implements WxMpEventService { @Resource - ApplicationContext applicationContext; - @Resource - WxConfig wxConfig; + private WxConfig wxConfig; @Resource private AuthUserRpc authUserRpc; @@ -68,20 +68,33 @@ public class WxMpEventServiceImpl implements WxMpEventService { MpTextEventRequest mpTextEventRequest = mapper.convertValue(object, MpTextEventRequest.class); log.info(mpTextEventRequest.toString()); log.info("推送消息：MpTextEventRequest..."); -// applicationContext.publishEvent(mpTextEventRequest); + //... } if ("event".equals(mpBaseEventRequest.getMsgType())) { MpSubscribeEventRequest mpSubscribeEventRequest = mapper.convertValue(object, MpSubscribeEventRequest.class); log.info(mpSubscribeEventRequest.toString()); log.info("推送消息：MpSubscribeEventRequest..."); -// applicationContext.publishEvent(mpSubscribeEventRequest); + // ... if ("subscribe".equals(mpSubscribeEventRequest.getEvent()) && Strings.isNotBlank(mpSubscribeEventRequest.getEventKey())) { String[] keys = mpSubscribeEventRequest.getEventKey().split("_"); if ("qrscene".equals(keys[0]) && "ScanReg".equals(keys[1])) { log.info("AppId：{}，ClientId：{}", keys[2], keys[3]); - authUserRpc.wechatRegister(keys[2], mpSubscribeEventRequest.getFromUserName(), keys[3]); - return null; + Boolean result = authUserRpc.wechatRegister(keys[2], mpSubscribeEventRequest.getFromUserName(), keys[3]); + String replyContent; + if (result){ + replyContent = "登录成功！"; + }else{ + replyContent = "登录失败！"; + } + String content = "\n" + + " \n" + + " \n" + + " 12345678\n" + + " \n" + + " \n" + + ""; + return content; } } @@ -90,9 +103,21 @@ public class WxMpEventServiceImpl implements WxMpEventService { String[] keys = mpSubscribeEventRequest.getEventKey().split("_"); if ("ScanReg".equals(keys[0])) { log.info("AppId：{}，ClientId：{}", keys[1], keys[2]); - authUserRpc.wechatRegister(keys[1], mpSubscribeEventRequest.getFromUserName(), keys[2]); - - return null; + Boolean result = authUserRpc.wechatRegister(keys[1], mpSubscribeEventRequest.getFromUserName(), keys[2]); + String replyContent; + if (result){ + replyContent = "登录成功！"; + }else{ + replyContent = "登录失败！"; + } + String content = "\n" + + " \n" + + " \n" + + " 12345678\n" + + " \n" + + " \n" + + ""; + return content; } } } diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/websocket/WeChatSocket.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/websocket/WeChatSocket.java new file mode 100644 index 0000000..1429ff5 --- /dev/null +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/websocket/WeChatSocket.java @@ -0,0 +1,139 @@ +package com.schisandra.wechat.websocket; + + +import com.schisandra.wechat.config.websocket.WebSocketServerConfig; +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.websocket.*; +import javax.websocket.server.ServerEndpoint; +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicInteger; + +@Slf4j +@ServerEndpoint(value = "/wx/socket", configurator = WebSocketServerConfig.class) +@Component +public class WeChatSocket { + + /** + * 记录当前在线连接数 + */ + private static final AtomicInteger onlineCount = new AtomicInteger(0); + + /** + * 存放所有在线的客户端 + */ + private static final Map clients = new ConcurrentHashMap<>(); + + /** + * 与某个客户端的连接会话，需要通过它来给客户端发送数据 + */ + @Getter + private Session session; + + /** + * clientId唯一标识 + */ + private String clientId = ""; + + /** + * 连接建立成功调用的方法 + */ + @OnOpen + public void onOpen(Session session, EndpointConfig conf) throws IOException { + //获取用户信息 + try { + Map usclientIdroperties = conf.getUserProperties(); + String clientId = (String) usclientIdroperties.get("clientId"); + this.clientId = clientId; + this.session = session; + if (clients.containsKey(this.clientId)) { + clients.get(this.clientId).session.close(); + clients.remove(this.clientId); + onlineCount.decrementAndGet(); + } + clients.put(this.clientId, this); + onlineCount.incrementAndGet(); + log.info("有新连接加入：{}，当前在线人数为：{}", clientId, onlineCount.get()); + sendMessage("连接成功", this.session); + } catch (Exception e) { + log.error("建立链接错误{}", e.getMessage(), e); + } + } + + /** + * 连接关闭调用的方法 + */ + @OnClose + public void onClose() { + try { + if (clients.containsKey(clientId)) { + clients.get(clientId).session.close(); + clients.remove(clientId); + onlineCount.decrementAndGet(); + } + log.info("有一连接关闭：{}，当前在线人数为：{}", this.clientId, onlineCount.get()); + } catch (Exception e) { + log.error("连接关闭错误，错误原因{}", e.getMessage(), e); + } + } + + /** + * 收到客户端消息后调用的方法 + */ + @OnMessage + public void onMessage(String message, Session session) { + log.info("服务端收到客户端[{}]的消息:{}", this.clientId, message); + //心跳机制 + if (message.equals("ping")) { + this.sendMessage("pong", session); + } + } + + @OnError + public void onError(Session session, Throwable error) { + log.error("Socket:{},发生错误,错误原因{}", clientId, error.getMessage(), error); + try { + session.close(); + } catch (Exception e) { + log.error("onError.Exception{}", e.getMessage(), e); + } + } + + /** + * 指定发送消息 + */ + public void sendMessage(String message, Session session) { + log.info("服务端给客户端[{}]发送消息{}", this.clientId, message); + try { + session.getBasicRemote().sendText(message); + } catch (IOException e) { + log.error("{}发送消息发生异常，异常原因{}", this.clientId, message); + } + } + + /** + * 群发消息 + */ + public void sendMessage(String message) { + for (Map.Entry sessionEntry : clients.entrySet()) { + String clientId = sessionEntry.getKey(); + WeChatSocket socket = sessionEntry.getValue(); + Session session = socket.session; + log.info("服务端给客户端[{}]发送消息{}", clientId, message); + try { + session.getBasicRemote().sendText(message); + } catch (IOException e) { + log.error("{}发送消息发生异常，异常原因{}", this.clientId, message); + } + } + } + + public WeChatSocket getSocket(String userName) { + return clients.get(userName); + } + +} \ No newline at end of file From 2ee64275b86d31efd56855e3f2c9c5d41f7a0909 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Thu, 4 Jul 2024 19:33:24 +0800 Subject: [PATCH 3/4] feat: update --- .../auth/common/utils/TreeUtils.java | 28 ++++++++- ...sandraAuthPermissionDomainServiceImpl.java | 57 ++++++++++--------- .../impl/SchisandraSocialUserServiceImpl.java | 2 +- .../SchisandraOssMinioController.java | 7 +-- 4 files changed, 60 insertions(+), 34 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/TreeUtils.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/TreeUtils.java index 60d50b7..ade7df1 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/TreeUtils.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/TreeUtils.java @@ -2,11 +2,33 @@ package com.schisandra.auth.common.utils; import java.lang.reflect.Field; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import java.util.function.Function; + +/** + * @ClassName: Tree + * @Author: landaiqing + * @Description: + * @CreateTime: 2024/01/05 15:32 + */ + public class TreeUtils { + + /** + * @param nodesList 数据 + * @param pid 父ID + * @param idFieldName ID字段名称 + * @param parentIdFieldName 父ID字段名称 + * @param childrenFieldName 子集字段名称 + * @param function 操作子集函数 通常可以做排序 如：stream -> stream.sorted(Comparator.comparing(TreeNode::getId, Comparator.reverseOrder())) 根据ID倒序 + * 如果不想排序直接 stream -> stream + * @param + * @param + * @return + */ public static List buildTree(List nodesList, R pid, String idFieldName, String parentIdFieldName, String childrenFieldName, Function, Stream> function) { + Map> map = nodesList.stream().collect(Collectors.groupingBy(a -> { try { Field field = a.getClass().getDeclaredField(parentIdFieldName); @@ -18,6 +40,7 @@ public class TreeUtils { })); List roots = new ArrayList<>(); + // 逐层构建树结构 roots.addAll(function.apply(Optional.ofNullable(map.get(pid)).orElse(new ArrayList<>()).stream()).collect(Collectors.toList())); Queue queue = new LinkedList<>(roots); @@ -41,7 +64,8 @@ public class TreeUtils { throw new RuntimeException("Error reading id field: " + e.getMessage()); } } + return roots; } -} +} \ No newline at end of file diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java index 8513c04..66b06a4 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java @@ -77,55 +77,58 @@ public class SchisandraAuthPermissionDomainServiceImpl implements SchisandraAuth /** * @description: 更新 - * @param: [schisandraAuthPermissionBO] - * @return: java.lang.Object + * @param: [schisandraAuthPermissionBO] + * @return: java.lang.Object * @author zhang * @date: 2024/4/17 17:06 - */ + */ @Override public int update(SchisandraAuthPermissionBO schisandraAuthPermissionBO) { SchisandraAuthPermission schisandraAuthPermission = SchisandraAuthPermissionBOConverter.INSTANCE.convertBOToEntity(schisandraAuthPermissionBO); return schisandraAuthPermissionService.update(schisandraAuthPermission); } -/** - * @description: 删除 - * @param: [schisandraAuthPermissionBO] - * @return: java.lang.Object - * @author zhang - * @date: 2024/4/17 17:06 - */ + + /** + * @description: 删除 + * @param: [schisandraAuthPermissionBO] + * @return: java.lang.Object + * @author zhang + * @date: 2024/4/17 17:06 + */ @Override public Object delete(SchisandraAuthPermissionBO schisandraAuthPermissionBO) { SchisandraAuthPermission schisandraAuthPermission = SchisandraAuthPermissionBOConverter.INSTANCE.convertBOToEntity(schisandraAuthPermissionBO); - boolean schisandraAuthPermission1 =schisandraAuthPermissionService.deleteById(schisandraAuthPermission.getId()); + boolean schisandraAuthPermission1 = schisandraAuthPermissionService.deleteById(schisandraAuthPermission.getId()); return schisandraAuthPermission1; } -/** - * @description: 插入 - * @param: [schisandraAuthPermissionBO] - * @return: java.lang.Object - * @author zhang - * @date: 2024/4/17 17:06 - */ + + /** + * @description: 插入 + * @param: [schisandraAuthPermissionBO] + * @return: java.lang.Object + * @author zhang + * @date: 2024/4/17 17:06 + */ @Override public Object insert(SchisandraAuthPermissionBO schisandraAuthPermissionBO) { SchisandraAuthPermission schisandraAuthPermission = SchisandraAuthPermissionBOConverter.INSTANCE.convertBOToEntity(schisandraAuthPermissionBO); - SchisandraAuthPermission schisandraAuthPermission1 =schisandraAuthPermissionService.insert(schisandraAuthPermission); + SchisandraAuthPermission schisandraAuthPermission1 = schisandraAuthPermissionService.insert(schisandraAuthPermission); return schisandraAuthPermission1; } -/** - * @description: 查询 - * @param: [schisandraAuthPermissionBO] - * @return: java.lang.Object - * @author zhang - * @date: 2024/4/17 17:07 - */ + + /** + * @description: 查询 + * @param: [schisandraAuthPermissionBO] + * @return: java.lang.Object + * @author zhang + * @date: 2024/4/17 17:07 + */ @Override public SchisandraAuthPermissionBO select(SchisandraAuthPermissionBO schisandraAuthPermissionBO) { SchisandraAuthPermission schisandraAuthPermission = SchisandraAuthPermissionBOConverter.INSTANCE.convertBOToEntity(schisandraAuthPermissionBO); - SchisandraAuthPermission schisandraAuthPermission1 =schisandraAuthPermissionService.queryById(schisandraAuthPermission.getId()); + SchisandraAuthPermission schisandraAuthPermission1 = schisandraAuthPermissionService.queryById(schisandraAuthPermission.getId()); SchisandraAuthPermissionBO schisandraAuthPermissionBO1 = SchisandraAuthPermissionBOConverter.INSTANCE.convertEntityToBO(schisandraAuthPermission1); return schisandraAuthPermissionBO1; } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSocialUserServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSocialUserServiceImpl.java index 110c474..6228975 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSocialUserServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSocialUserServiceImpl.java @@ -102,7 +102,7 @@ public class SchisandraSocialUserServiceImpl implements SchisandraSocialUserServ } /** - * @description: 根据appId和openId查询用户 + * @description: 根据openId查询用户 * @param: [appId, openId] * @return: com.schisandra.auth.infra.basic.entity.SchisandraSocialUser * @author: landaiqing diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java index bdbb761..6c88421 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java @@ -29,7 +29,6 @@ import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.util.HashMap; import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; /** * controller @@ -82,12 +81,12 @@ public class SchisandraOssMinioController { * @date: 2024/6/26 13:55 */ @GetMapping("listMinioDir") - public Result listMinioInfo(@RequestParam String target, @RequestParam String userId, @RequestParam String dirName,@RequestParam String bucket) throws Exception { - Preconditions.checkNotNull(target, "不能为空"); + public Result listMinioInfo( @RequestParam String userId, @RequestParam String dirName,@RequestParam String bucket) throws Exception { + Preconditions.checkNotNull(bucket, "不能为空"); Preconditions.checkNotNull(userId, "不能为空"); MinioOssClient bean = SpringUtil.getBean(userId); bean.getMinioOssConfig().setBucketName(bucket); - return Result.ok(bean.listDir(target, dirName)); + return Result.ok(bean.listDir(bucket, dirName)); } /** From d6a5ffc7082b77d8b21009c073d3a4719d8917d5 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sat, 13 Jul 2024 11:30:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?styles:=20=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SchisandraAuthPermissionController.java | 8 ++- .../dto/SchisandraAuthPermissionDTO.java | 21 +------- .../domain/bo/SchisandraAuthPermissionBO.java | 2 +- ...sandraAuthPermissionDomainServiceImpl.java | 4 +- .../entity/SchisandraAuthPermission.java | 2 +- .../mapper/SchisandraAuthPermissionDao.xml | 2 +- .../SchisandraOssAliController.java | 43 +++++++-------- .../SchisandraOssMinioController.java | 53 +++++++++---------- .../SchisandraOssQiniuController.java | 31 +++++------ .../SchisandraOssSftpController.java | 31 +++++------ .../controller/SchisandraOssUpController.java | 10 ++-- .../oss/core/aws/model/AwsOssConfig.java | 2 +- ...chisandraFileHeatmapDomainServiceImpl.java | 3 +- .../SchisandraOssAliDomainServiceImpl.java | 3 +- .../basic/entity/SchisandraOssTencent.java | 5 -- 15 files changed, 92 insertions(+), 128 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthPermissionController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthPermissionController.java index 5e5cf4c..794aab0 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthPermissionController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthPermissionController.java @@ -120,7 +120,13 @@ public class SchisandraAuthPermissionController { return Result.fail("删除权限信息失败"); } } - + /** + * @description: 查询用户菜单权限 + * @param: [userId] + * @return: com.schisandra.auth.common.entity.Result + * @author: landaiqing + * @date: 2024/7/8 下午4:09 + */ @GetMapping("selectUserPermission") public Result selectUserPermission(@RequestParam("userId") Long userId) { if (userId == null) { diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthPermissionDTO.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthPermissionDTO.java index a34c2e3..2d1b4b8 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthPermissionDTO.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthPermissionDTO.java @@ -32,7 +32,7 @@ public class SchisandraAuthPermissionDTO implements Serializable { /** * 权限路径 */ - private String menuUrl; + private String path; /** * 权限状态 */ @@ -49,25 +49,6 @@ public class SchisandraAuthPermissionDTO implements Serializable { * 权限标识 */ private String permissionKey; - /** - * 创建人 - */ - private String createdBy; - /** - * 创建时间 - */ - private Date createdTime; - /** - * 更新人 - */ - private String updateBy; - /** - * 更新时间 - */ - private Date updateTime; - /** - * 是否删除 - */ private Integer isDeleted; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthPermissionBO.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthPermissionBO.java index b97be44..51d29cc 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthPermissionBO.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthPermissionBO.java @@ -26,7 +26,7 @@ SchisandraAuthPermissionBO implements Serializable { private Integer type; - private String menuUrl; + private String path; private Integer status; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java index 66b06a4..6f0badf 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java @@ -52,11 +52,11 @@ public class SchisandraAuthPermissionDomainServiceImpl implements SchisandraAuth public Result selectUserPermissionTree(Long userId) { SchisandraAuthUserRole schisandraAuthRole = schisandraAuthUserRoleService.queryById(userId); if (schisandraAuthRole == null||schisandraAuthRole.getRoleId()==null) { - return Result.ok("用户没有角色"); + return Result.fail("用户没有角色"); } List schisandraAuthRolePermissions = schisandraAuthRolePermissionService.queryByRoleId(schisandraAuthRole.getRoleId()); if (schisandraAuthRolePermissions.size()==0){ - return Result.ok("当前角色用户没有权限"); + return Result.fail("当前角色用户没有权限"); } List schisandraAuthPermissions =new ArrayList<>(); List schisandraAuthPermissionParents = new ArrayList<>(); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraAuthPermission.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraAuthPermission.java index 7991858..0d0f338 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraAuthPermission.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraAuthPermission.java @@ -29,7 +29,7 @@ public class SchisandraAuthPermission implements Serializable { private Integer type; - private String menuUrl; + private String path; private Integer status; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthPermissionDao.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthPermissionDao.xml index d054d07..e795086 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthPermissionDao.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthPermissionDao.xml @@ -7,7 +7,7 @@ - + diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java index a9a510f..1966461 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java @@ -2,21 +2,16 @@ package com.schisandra.oss.application.controller; import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSON; - import com.google.common.base.Preconditions; - import com.schisandra.oss.application.convert.SchisandraOssAliDTOConverter; import com.schisandra.oss.application.dto.SchisandraOssAliDTO; import com.schisandra.oss.application.oss.core.ali.AliOssClient; import com.schisandra.oss.application.oss.core.ali.AliOssConfiguration; - import com.schisandra.oss.application.oss.model.OssInfo; import com.schisandra.oss.common.entity.Result; import com.schisandra.oss.domain.bo.SchisandraOssAliBO; import com.schisandra.oss.domain.redis.RedisUtil; import com.schisandra.oss.domain.service.SchisandraOssAliDomainService; - -import com.schisandra.oss.infra.basic.dao.SchisandraOssAliDao; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -33,7 +28,7 @@ import java.util.List; /** - * controller + * controller * * @author landaiqing * @since 2024-05-14 20:45:32 @@ -54,6 +49,7 @@ public class SchisandraOssAliController { /** * 返回ali表所有数据 + * * @return */ @GetMapping("returnAll") @@ -62,9 +58,8 @@ public class SchisandraOssAliController { } - @GetMapping("init") - public void init(@RequestParam String userId){ + public void init(@RequestParam String userId) { if (log.isInfoEnabled()) { log.info("SchisandraOssAliController.init.userId:{}", userId); } @@ -98,7 +93,6 @@ public class SchisandraOssAliController { } - /** * 修改 */ @@ -146,19 +140,19 @@ public class SchisandraOssAliController { * @date: 2024/7/5 13:55 */ @GetMapping("listDir") - public Result listAliDir(@RequestParam String userId,@RequestParam String bucket,@RequestParam String prefix) throws Exception { + public Result listAliDir(@RequestParam String userId, @RequestParam String bucket, @RequestParam String prefix) throws Exception { Preconditions.checkNotNull(userId, "不能为空"); AliOssClient bean = SpringUtil.getBean(userId); bean.getAliOssConfig().setBucketName(bucket); - if(prefix==null) - prefix=""; - return Result.ok(bean.listAliInfo(bucket,prefix)); + if (prefix == null) + prefix = ""; + return Result.ok(bean.listAliInfo(bucket, prefix)); } - /** * 查找bucket + * * @param userId */ @PostMapping("seleteBucket") @@ -186,6 +180,7 @@ public class SchisandraOssAliController { /** * 删除bucket + * * @param userId * @param bucket * @return @@ -213,15 +208,15 @@ public class SchisandraOssAliController { Preconditions.checkNotNull(bucket, "不能为空"); //设置热力图 - Date date =new Date(); + Date date = new Date(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); String formattedDate = dateFormat.format(date); - String key = redisUtil.buildKey(USER_OSS_PREFIX+":"+userId,formattedDate); - int count=1; - if (redisUtil.exist(key)){ - count= Integer.parseInt(redisUtil.get(key)); - redisUtil.set(key, String.valueOf(count+1)); - }else { + String key = redisUtil.buildKey(USER_OSS_PREFIX + ":" + userId, formattedDate); + int count = 1; + if (redisUtil.exist(key)) { + count = Integer.parseInt(redisUtil.get(key)); + redisUtil.set(key, String.valueOf(count + 1)); + } else { redisUtil.set(key, String.valueOf(1)); } // 获取文件输入流 @@ -232,7 +227,6 @@ public class SchisandraOssAliController { } - /** * @description: 下载文件 * @param: [schisandraOssMinioDTO] @@ -250,8 +244,9 @@ public class SchisandraOssAliController { response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filePath.substring(filePath.lastIndexOf("/") + 1), "UTF-8")); response.setContentType("application/octet-stream"); response.setCharacterEncoding("UTF-8"); - bean.downLoad(output,filePath); + bean.downLoad(output, filePath); } + /** * @description: 删除文件 * @param: [schisandraOssAliDTO] @@ -287,7 +282,7 @@ public class SchisandraOssAliController { bean.getAliOssConfig().setBucketName(bucket); try { bean.rename(oldFileName, newFileName); - }catch (Exception e){ + } catch (Exception e) { return Result.fail(e.getMessage()); } return Result.ok(); diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java index 9519ad9..afae80e 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java @@ -3,21 +3,16 @@ package com.schisandra.oss.application.controller; import cn.hutool.core.util.ZipUtil; import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSON; -import com.amazonaws.util.IOUtils; import com.google.common.base.Preconditions; -import com.google.gson.Gson; import com.schisandra.oss.application.convert.SchisandraOssMinioDTOConverter; -import com.schisandra.oss.application.dto.SchisandraOssAliDTO; import com.schisandra.oss.application.dto.SchisandraOssMinioDTO; import com.schisandra.oss.application.oss.core.minio.MinioOssClient; import com.schisandra.oss.application.oss.core.minio.MinioOssConfiguration; -import com.schisandra.oss.application.oss.model.OssInfo; import com.schisandra.oss.common.entity.Result; import com.schisandra.oss.domain.bo.SchisandraOssMinioBO; import com.schisandra.oss.domain.redis.RedisUtil; import com.schisandra.oss.domain.service.SchisandraOssMinioDomainService; import io.minio.errors.*; -import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -31,8 +26,7 @@ import java.net.URLEncoder; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.text.SimpleDateFormat; -import java.util.*; -import java.util.concurrent.atomic.AtomicInteger; +import java.util.Date; import java.util.HashMap; import java.util.List; @@ -60,6 +54,7 @@ public class SchisandraOssMinioController { /** * 返回minio表所有数据 + * * @return */ @GetMapping("returnAll") @@ -89,6 +84,7 @@ public class SchisandraOssMinioController { log.error("用户: {}-> minio 初始化完成！", userId); } } + /** * @description: 获取文件目录信息 * @param: [target, userId, dirName] @@ -97,7 +93,7 @@ public class SchisandraOssMinioController { * @date: 2024/6/26 13:55 */ @GetMapping("listMinioDir") - public Result listMinioInfo( @RequestParam String userId, @RequestParam String dirName,@RequestParam String bucket) throws Exception { + public Result listMinioInfo(@RequestParam String userId, @RequestParam String dirName, @RequestParam String bucket) throws Exception { Preconditions.checkNotNull(userId, "不能为空"); MinioOssClient bean = SpringUtil.getBean(userId); bean.getMinioOssConfig().setBucketName(bucket); @@ -112,21 +108,21 @@ public class SchisandraOssMinioController { * @date: 2024/6/26 13:56 */ @GetMapping("downloadMinioFile") - public void getMinioFile(@RequestParam String bucket, @RequestParam String userId, @RequestParam List listObjectsArgs , HttpServletResponse response) throws Exception { + public void getMinioFile(@RequestParam String bucket, @RequestParam String userId, @RequestParam List listObjectsArgs, HttpServletResponse response) throws Exception { Preconditions.checkNotNull(bucket, "不能为空"); Preconditions.checkNotNull(userId, "不能为空"); Preconditions.checkNotNull(listObjectsArgs, "不能为空"); MinioOssClient bean = SpringUtil.getBean(userId); bean.getMinioOssConfig().setBucketName(bucket); - HashMap list=bean.getTargetDir(listObjectsArgs); + HashMap list = bean.getTargetDir(listObjectsArgs); ServletOutputStream output = response.getOutputStream(); response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("下载.zip", "UTF-8")); response.setContentType("application/octet-stream"); response.setCharacterEncoding("UTF-8"); String[] path = new String[list.size()]; - InputStream[] inputStreams= new InputStream[list.size()]; - path=list.keySet().toArray(path); - inputStreams=list.values().toArray(inputStreams); + InputStream[] inputStreams = new InputStream[list.size()]; + path = list.keySet().toArray(path); + inputStreams = list.values().toArray(inputStreams); ZipUtil.zip(output, path, inputStreams); } @@ -161,15 +157,15 @@ public class SchisandraOssMinioController { Preconditions.checkNotNull(fileName, "不能为空"); Preconditions.checkNotNull(bucket, "不能为空"); //设置热力图 - Date date =new Date(); + Date date = new Date(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); String formattedDate = dateFormat.format(date); - String key = redisUtil.buildKey(USER_OSS_PREFIX+":"+userId,formattedDate); - int count=1; - if (redisUtil.exist(key)){ - count= Integer.parseInt(redisUtil.get(key)); - redisUtil.set(key, String.valueOf(count+1)); - }else { + String key = redisUtil.buildKey(USER_OSS_PREFIX + ":" + userId, formattedDate); + int count = 1; + if (redisUtil.exist(key)) { + count = Integer.parseInt(redisUtil.get(key)); + redisUtil.set(key, String.valueOf(count + 1)); + } else { redisUtil.set(key, String.valueOf(1)); } @@ -200,11 +196,12 @@ public class SchisandraOssMinioController { bean.getMinioOssConfig().setBucketName(bucket); try { bean.rename(oldFileName, newFileName); - }catch (Exception e){ + } catch (Exception e) { return Result.fail(e.getMessage()); } return Result.ok(); } + /** * @description: 拷贝文件 * @param: [userId, bucket, oldFilePath, newFilePath] @@ -223,11 +220,12 @@ public class SchisandraOssMinioController { bean.getMinioOssConfig().setBucketName(bucket); try { bean.copy(oldFilePath, newFilePath); - }catch (Exception e){ + } catch (Exception e) { return Result.fail(e.getMessage()); } return Result.ok(); } + /** * @description: 预览文件 * @param: [userId, bucket, filePath] @@ -249,6 +247,7 @@ public class SchisandraOssMinioController { } } + /** * @description: 分享文件 * @param: [userId, bucket, filePath] @@ -264,7 +263,7 @@ public class SchisandraOssMinioController { MinioOssClient bean = SpringUtil.getBean(userId); bean.getMinioOssConfig().setBucketName(bucket); try { - return Result.ok(bean.shareMinioFile(filePath,time)); + return Result.ok(bean.shareMinioFile(filePath, time)); } catch (Exception e) { return Result.fail(e.getMessage()); } @@ -283,6 +282,7 @@ public class SchisandraOssMinioController { MinioOssClient bean = SpringUtil.getBean(userId); return Result.ok(bean.selectAllBucket()); } + /** * @description: 创建bucket * @param: [userId, bucket] @@ -389,7 +389,7 @@ public class SchisandraOssMinioController { log.error("容器获取失败！"); return null; } - return Result.ok(bean.getInfo(fileName,true)); + return Result.ok(bean.getInfo(fileName, true)); } @GetMapping("getAllMinioInfo") @@ -400,11 +400,6 @@ public class SchisandraOssMinioController { } - - - - - private void parameterCheck(SchisandraOssMinioDTO schisandraOssMinioDTO) { Preconditions.checkNotNull(schisandraOssMinioDTO.getId(), "不能为空"); Preconditions.checkNotNull(schisandraOssMinioDTO.getUserId(), "不能为空"); diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssQiniuController.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssQiniuController.java index 2063c2f..3001428 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssQiniuController.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssQiniuController.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON; import com.google.common.base.Preconditions; import com.schisandra.oss.application.convert.SchisandraOssQiniuDTOConverter; import com.schisandra.oss.application.dto.SchisandraOssQiniuDTO; -import com.schisandra.oss.application.dto.SchisandraOssUpDTO; import com.schisandra.oss.application.oss.core.qiniu.QiNiuOssClient; import com.schisandra.oss.application.oss.core.qiniu.QiNiuOssConfiguration; import com.schisandra.oss.application.oss.model.OssInfo; @@ -16,6 +15,7 @@ import com.schisandra.oss.domain.service.SchisandraOssQiniuDomainService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; + import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; @@ -48,6 +48,7 @@ public class SchisandraOssQiniuController { /** * 返回七牛表所有数据 + * * @return */ @GetMapping("returnAll") @@ -86,7 +87,7 @@ public class SchisandraOssQiniuController { bean.getQiNiuOssConfig().setBucketName(bucket); try { bean.rename(oldFileName, newFileName); - }catch (Exception e){ + } catch (Exception e) { return Result.fail(e.getMessage()); } return Result.ok(); @@ -110,7 +111,7 @@ public class SchisandraOssQiniuController { bean.getQiNiuOssConfig().setBucketName(bucket); try { bean.copy(oldFilePath, newFilePath); - }catch (Exception e){ + } catch (Exception e) { return Result.fail(e.getMessage()); } return Result.ok(); @@ -125,7 +126,7 @@ public class SchisandraOssQiniuController { * @date: 2024/7/8 13:56 */ @GetMapping("downloadFile") - public void download_open(@RequestParam String userId,@RequestParam String endpoint, @RequestParam String filename,HttpServletResponse response) throws IOException { + public void download_open(@RequestParam String userId, @RequestParam String endpoint, @RequestParam String filename, HttpServletResponse response) throws IOException { QiNiuOssClient bean = SpringUtil.getBean(userId); bean.getQiNiuOssConfig().setEndpoint(endpoint); ServletOutputStream output = response.getOutputStream(); @@ -134,7 +135,7 @@ public class SchisandraOssQiniuController { response.setCharacterEncoding("UTF-8"); response.setContentType("application/vnd.ms-excel"); response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "utf-8")); - bean.downLoad_open(output,filename,endpoint); + bean.downLoad_open(output, filename, endpoint); } @@ -169,15 +170,15 @@ public class SchisandraOssQiniuController { Preconditions.checkNotNull(bucket, "不能为空"); //设置热力图 - Date date =new Date(); + Date date = new Date(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); String formattedDate = dateFormat.format(date); - String key = redisUtil.buildKey(USER_OSS_PREFIX+":"+userId,formattedDate); - int count=1; - if (redisUtil.exist(key)){ - count= Integer.parseInt(redisUtil.get(key)); - redisUtil.set(key, String.valueOf(count+1)); - }else { + String key = redisUtil.buildKey(USER_OSS_PREFIX + ":" + userId, formattedDate); + int count = 1; + if (redisUtil.exist(key)) { + count = Integer.parseInt(redisUtil.get(key)); + redisUtil.set(key, String.valueOf(count + 1)); + } else { redisUtil.set(key, String.valueOf(1)); } @@ -219,19 +220,20 @@ public class SchisandraOssQiniuController { /** * 创建桶createbucket + * * @param userId * @param bucket * @return */ @PostMapping("createBucket") - public Result createBucket(@RequestParam String userId, @RequestParam String bucket,@RequestParam String region) { + public Result createBucket(@RequestParam String userId, @RequestParam String bucket, @RequestParam String region) { Preconditions.checkNotNull(userId, "不能为空"); Preconditions.checkNotNull(bucket, "不能为空"); QiNiuOssClient bean = SpringUtil.getBean(userId); bean.getQiNiuOssConfig().setBucketName(bucket); bean.getQiNiuOssConfig().setRegion(region); try { - return Result.ok(bean.createBucket(bucket,region)); + return Result.ok(bean.createBucket(bucket, region)); } catch (IOException e) { throw new RuntimeException(e); } @@ -259,7 +261,6 @@ public class SchisandraOssQiniuController { } - /** * 新增七牛云对象存储配置表 */ diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssSftpController.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssSftpController.java index 579d0b9..c0ac107 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssSftpController.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssSftpController.java @@ -5,10 +5,6 @@ import com.alibaba.fastjson.JSON; import com.google.common.base.Preconditions; import com.schisandra.oss.application.convert.SchisandraOssSftpDTOConverter; import com.schisandra.oss.application.dto.SchisandraOssSftpDTO; -import com.schisandra.oss.application.dto.SchisandraOssUpDTO; -import com.schisandra.oss.application.oss.core.ali.AliOssClient; -import com.schisandra.oss.application.oss.core.ftp.FtpOssClient; -import com.schisandra.oss.application.oss.core.ftp.FtpOssConfiguration; import com.schisandra.oss.application.oss.core.qiniu.QiNiuOssClient; import com.schisandra.oss.application.oss.core.sftp.SftpOssClient; import com.schisandra.oss.application.oss.core.sftp.SftpOssConfiguration; @@ -55,6 +51,7 @@ public class SchisandraOssSftpController { /** * 返回up表所有数据 + * * @return */ @GetMapping("returnAll") @@ -77,7 +74,7 @@ public class SchisandraOssSftpController { QiNiuOssClient bean = SpringUtil.getBean(userId); try { bean.copy(oldFilePath, newFilePath); - }catch (Exception e){ + } catch (Exception e) { return Result.fail(e.getMessage()); } return Result.ok(); @@ -87,7 +84,7 @@ public class SchisandraOssSftpController { * 重命名 */ @PostMapping("renameFile") - public Result renameSftpFile(@RequestParam String userId, @RequestParam String oldFileName, @RequestParam String newFileName) throws IOException { + public Result renameSftpFile(@RequestParam String userId, @RequestParam String oldFileName, @RequestParam String newFileName) throws IOException { Preconditions.checkNotNull(userId, "不能为空"); Preconditions.checkNotNull(oldFileName, "不能为空"); @@ -95,7 +92,7 @@ public class SchisandraOssSftpController { SftpOssClient bean = SpringUtil.getBean(userId); try { bean.rename(oldFileName, newFileName); - }catch (Exception e){ + } catch (Exception e) { return Result.fail(e.getMessage()); } return Result.ok(); @@ -131,7 +128,7 @@ public class SchisandraOssSftpController { */ @GetMapping("downloadFile") - public void downloadSftpFile(@RequestParam String userId, @RequestParam String filename, HttpServletResponse response) throws IOException { + public void downloadSftpFile(@RequestParam String userId, @RequestParam String filename, HttpServletResponse response) throws IOException { SftpOssClient bean = SpringUtil.getBean(userId); ServletOutputStream output = response.getOutputStream(); @@ -139,7 +136,7 @@ public class SchisandraOssSftpController { response.setCharacterEncoding("UTF-8"); response.setContentType("application/vnd.ms-excel"); response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "utf-8")); - bean.downLoad(output,filename); + bean.downLoad(output, filename); } /** @@ -147,21 +144,21 @@ public class SchisandraOssSftpController { */ @PostMapping("uploadFile") @SneakyThrows - public Result uploadSftpFile(@RequestParam String userId , @RequestParam MultipartFile file, @RequestParam String fileName) { + public Result uploadSftpFile(@RequestParam String userId, @RequestParam MultipartFile file, @RequestParam String fileName) { Preconditions.checkNotNull(userId, "不能为空"); Preconditions.checkNotNull(fileName, "不能为空"); //设置热力图 - Date date =new Date(); + Date date = new Date(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); String formattedDate = dateFormat.format(date); - String key = redisUtil.buildKey(USER_OSS_PREFIX+":"+userId,formattedDate); - int count=1; - if (redisUtil.exist(key)){ - count= Integer.parseInt(redisUtil.get(key)); - redisUtil.set(key, String.valueOf(count+1)); - }else { + String key = redisUtil.buildKey(USER_OSS_PREFIX + ":" + userId, formattedDate); + int count = 1; + if (redisUtil.exist(key)) { + count = Integer.parseInt(redisUtil.get(key)); + redisUtil.set(key, String.valueOf(count + 1)); + } else { redisUtil.set(key, String.valueOf(1)); } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssUpController.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssUpController.java index fd59990..b064553 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssUpController.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssUpController.java @@ -1,12 +1,10 @@ package com.schisandra.oss.application.controller; -import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSON; import com.google.common.base.Preconditions; import com.schisandra.oss.application.convert.SchisandraOssUpDTOConverter; import com.schisandra.oss.application.dto.SchisandraOssUpDTO; -import com.schisandra.oss.application.oss.core.up.UpOssConfiguration; import com.schisandra.oss.application.oss.core.up.UpOssClient; import com.schisandra.oss.application.oss.core.up.UpOssConfiguration; import com.schisandra.oss.application.oss.model.OssInfo; @@ -15,18 +13,14 @@ import com.schisandra.oss.domain.bo.SchisandraOssUpBO; import com.schisandra.oss.domain.service.SchisandraOssUpDomainService; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.util.List; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; +import java.util.List; /** * 又拍云对象存储配置表 controller @@ -43,8 +37,10 @@ public class SchisandraOssUpController { private SchisandraOssUpDomainService schisandraOssUpDomainService; @Resource private UpOssConfiguration upOssConfiguration; + /** * 返回up表所有数据 + * * @return */ @GetMapping("returnAll") diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/aws/model/AwsOssConfig.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/aws/model/AwsOssConfig.java index ce271ee..4e070d6 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/aws/model/AwsOssConfig.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/aws/model/AwsOssConfig.java @@ -29,7 +29,7 @@ public class AwsOssConfig { private AwsRegion region; - private DefaultsMode mode; + private DefaultsMode mode; private AwsOssClientConfig clientConfig; /** diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java index 1c6d89c..6380cd4 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java @@ -1,8 +1,7 @@ package com.schisandra.oss.domain.service.impl; -import com.schisandra.oss.common.enums.IsDeletedFlagEnum; -import com.schisandra.oss.domain.convert.SchisandraFileHeatmapBOConverter; import com.schisandra.oss.domain.bo.SchisandraFileHeatmapBO; +import com.schisandra.oss.domain.convert.SchisandraFileHeatmapBOConverter; import com.schisandra.oss.domain.service.SchisandraFileHeatmapDomainService; import com.schisandra.oss.infra.basic.entity.SchisandraFileHeatmap; import com.schisandra.oss.infra.basic.service.SchisandraFileHeatmapService; diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssAliDomainServiceImpl.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssAliDomainServiceImpl.java index f9cdfa3..8cd21c3 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssAliDomainServiceImpl.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssAliDomainServiceImpl.java @@ -8,7 +8,6 @@ import com.schisandra.oss.domain.service.SchisandraOssAliDomainService; import com.schisandra.oss.infra.basic.entity.SchisandraOssAli; import com.schisandra.oss.infra.basic.service.SchisandraOssAliService; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -58,7 +57,7 @@ public class SchisandraOssAliDomainServiceImpl implements SchisandraOssAliDomain @Override - public List selectAll(){ + public List selectAll() { List list = schisandraOssAliService.selectAll(); List schisandraOssAliBO_list = new ArrayList<>(); for (SchisandraOssAli schisandraOssAli : list) { diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/entity/SchisandraOssTencent.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/entity/SchisandraOssTencent.java index 3358974..a19a402 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/entity/SchisandraOssTencent.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/entity/SchisandraOssTencent.java @@ -60,11 +60,6 @@ public class SchisandraOssTencent implements Serializable { */ @Column("app_id") private String appId; - /** - * 地域 - */ - @Column("app_id") - private String appId; @Column("region") private String region;