Merge branch 'dev' into master

# Conflicts: # mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java # mhd_product/pom.xml
2025-12-17 23:27:46 +08:00
parent 8bc07e8090 84a4ee1e76
commit b00308b729
87 changed files with 1339 additions and 209 deletions
@@ -15,10 +15,12 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
+
@Service
 public class MinIoUploadService {
-    @Autowired(required=false)
+
    private MinioClient minioClient;
+
    private static String bucket="ngwl";
    private static String host="http://10.102.192.5:6000";
    private static String accessKey="minioadmin";
@@ -32,7 +34,7 @@ public class MinIoUploadService {

    /**
     * 上传到minio
-     * @param
+     * @param fileName
     * @throws Exception
     */

@@ -65,7 +67,7 @@ public class MinIoUploadService {
                    .stream(inputStream,inputStream.available(),-1).build();
            //文件名称相同会覆盖
            minioClient.putObject(objectArgs);
-            String url =host+ "/"+bucket + "/"+fileName;
+            String url =host+"/browser/"+bucket + "/"+fileName;

 //
            return url;