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

tangxiaobao

2021-09-10 48c69142c8fd6ef7e32b504cebd5aaa591fc89b3

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

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java

@@ -184,11 +184,11 @@
    @PostMapping(value = "/minio/upload/file", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R minipuploadImage(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            log.info("开始上传文件" + DateUtils.getCurrentDateString());
            log.info("开始上传文件" + DateUtils.getCurrentDateStr_MS());
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
            String imageUrl = minioUtil.upload(file, name);
            log.info("上传文件结束" + DateUtils.getCurrentDateString());
            log.info("上传文件结束" + DateUtils.getCurrentDateStr_MS());
            return R.ok(imageUrl);
        } catch (Exception e) {
            log.error("上传照片失败【{}】", e.getMessage());

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/config/MinioUtil.java

@@ -56,10 +56,10 @@
                UUID uuid = UUID.randomUUID();
                StringBuilder s = new StringBuilder();
                s.append(uuid.toString().replace("-", "")).append("/");
                log.info("开始连接minio服务器" + DateUtils.getCurrentDateString());
                log.info("开始连接minio服务器" + DateUtils.getCurrentDateStr_MS());
                MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
                    minioProperties.getSecretKey());
                log.info("结束连接minio服务器" + DateUtils.getCurrentDateString());
                log.info("结束连接minio服务器" + DateUtils.getCurrentDateStr_MS());
                // bucket 不存在，创建
                if (!minioClient.bucketExists(minioProperties.getBucket())) {
                    log.info("bucket 不存在，创建");