Merge branch 'huacheng_test' into haucheng_panzhihua

yanghui

2022-11-04 1a6eb2ac656de3b35c64db8b9006db2ed9248872

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

@@ -47,7 +47,7 @@
            try {
                UUID uuid = UUID.randomUUID();
                StringBuilder s = new StringBuilder();
                s.append(uuid.toString().replace("-", "")).append("/");
                s.append(DateUtils.getCurrentDateyymd()).append("-original").append("/");
                MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
                        minioProperties.getSecretKey());
                // bucket 不存在，创建
@@ -70,6 +70,40 @@
        }
        return null;
    }
    /**
     * 文件上传
     *
     * @param file 要上传的文件
     * @return
     */
    public String uploadRetFileName(MultipartFile file, String name) {
        if (null != file) {
            try {
                UUID uuid = UUID.randomUUID();
                StringBuilder s = new StringBuilder();
                s.append(DateUtils.getCurrentDateyymd()).append("-original").append("/");
                MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
                        minioProperties.getSecretKey());
                // bucket 不存在，创建
                if (!minioClient.bucketExists(minioProperties.getBucket())) {
                    minioClient.makeBucket(minioProperties.getBucket());
                }
                // 得到文件流
                InputStream input = file.getInputStream();
                // 文件名
                // String fileName = uuid + "/images." + FilenameUtils.getExtension(file.getOriginalFilename());
                String fileName = s.append(name).toString();
                String contentType = file.getContentType();
                minioClient.putObject(minioProperties.getBucket(), fileName, input, "application/octet-stream");
                StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl());
                String url = fileUrl.append(fileName).toString();
                return fileName;
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
        return null;
    }

    /**
     * 文件上传