diff --git a/src/main/java/com/zhangmeng/minio/controller/MinioController.java b/src/main/java/com/zhangmeng/minio/controller/MinioController.java index feaf4ca..6856686 100644 --- a/src/main/java/com/zhangmeng/minio/controller/MinioController.java +++ b/src/main/java/com/zhangmeng/minio/controller/MinioController.java @@ -100,6 +100,8 @@ public class MinioController { @FXML public TableColumn file_bucket; public ImageView preview; + public TextField upload_path_dir; + private File upload_file; @@ -253,9 +255,13 @@ public class MinioController { AlertUtils.alert_warning("请选择上传的文件后再试!"); return; } - MinioUtils.upload_file(upload_file); - String objectUrl = MinioUtils.getPresignedObjectUrl(bucket_name.getText(), upload_file.getName()); - preview.setImage(new javafx.scene.image.Image(objectUrl)); + String uri = MinioUtils.upload_file(upload_file, upload_path_dir.getText()); + if (uri != null){ + String bucketName = backet_list.getSelectionModel().getSelectedItem(); + loadPreview(bucketName,uri); + reload(); + } + }); bucket_btn.setOnAction(event -> { diff --git a/src/main/java/com/zhangmeng/minio/utils/MinioUtils.java b/src/main/java/com/zhangmeng/minio/utils/MinioUtils.java index 8d88222..51817ec 100644 --- a/src/main/java/com/zhangmeng/minio/utils/MinioUtils.java +++ b/src/main/java/com/zhangmeng/minio/utils/MinioUtils.java @@ -203,6 +203,21 @@ public class MinioUtils { uploadFile(bucketName, file, newFileName, contentType); } + public static String upload_file(File file,String path){ + //文件名 + String fileName = file.getName(); + String newFileName = System.currentTimeMillis() + "." + getFileExtension(fileName); + String contentType = getContentType(file); + String bucketName = objectMap.get(current_bucket).toString(); + if (bucketName == null){ + AlertUtils.alert_warning("上传的bucket不能为空!"); + return null; + } + uploadFile(bucketName, file, path + "/" + newFileName, contentType); + return path + "/" + newFileName; + } + + public static String getContentType(File file) { String fileName = file.getName(); String extension = getFileExtension(fileName).toLowerCase(); diff --git a/src/main/resources/fxml/main.fxml b/src/main/resources/fxml/main.fxml index 3fef91c..8fff2ea 100644 --- a/src/main/resources/fxml/main.fxml +++ b/src/main/resources/fxml/main.fxml @@ -17,7 +17,7 @@ - + @@ -31,12 +31,14 @@