通知代码提交

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/config/minio/MinioConfig.java

@@ -1,6 +1,7 @@
 package vip.xiaonuo.disk.config.minio;
 
 import io.minio.MinioClient;
+import io.minio.SetBucketPolicyArgs;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -97,7 +98,36 @@ public class MinioConfig {
     @Bean
     public MinioClient getMinioClient()
     {
-        return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build();
+        MinioClient   minioClient=MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build();
+        // 设置存储桶策略为公开读取
+        String policy = "{\n" +
+                "  \"Version\": \"2012-10-17\",\n" +
+                "  \"Statement\": [\n" +
+                "    {\n" +
+                "      \"Effect\": \"Allow\",\n" +
+                "      \"Principal\": {\"AWS\": \"*\"},\n" +
+                "      \"Action\": [\"s3:GetBucketLocation\", \"s3:ListBucket\"],\n" +
+                "      \"Resource\": \"arn:aws:s3:::" + bucketName + "\"\n" +
+                "    },\n" +
+                "    {\n" +
+                "      \"Effect\": \"Allow\",\n" +
+                "      \"Principal\": {\"AWS\": \"*\"},\n" +
+                "      \"Action\": \"s3:GetObject\",\n" +
+                "      \"Resource\": \"arn:aws:s3:::" + bucketName + "/*\"\n" +
+                "    }\n" +
+                "  ]\n" +
+                "}";
+
+        try {
+            minioClient.setBucketPolicy(
+                    SetBucketPolicyArgs.builder()
+                            .bucket(bucketName)
+                            .config(policy)
+                            .build());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return minioClient;
     }
 
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/NoticeServiceImpl.java

@@ -54,11 +54,11 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
             typelist=Arrays.asList("3");
         }
         if("1".equals(StpLoginUserUtil.getLoginUser().getEduIdentity())){
-            typelist= Arrays.asList("1","2");
+            typelist= Arrays.asList("1","2","3");
             noticePageParam.setUserId(StpLoginUserUtil.getLoginUser().getId());
         }
         if("2".equals(StpLoginUserUtil.getLoginUser().getEduIdentity())){
-            typelist= Arrays.asList("1","2");
+            typelist= Arrays.asList("1","2","3");
         }
         return noticeMapper.page(CommonPageRequest.defaultPage(), noticePageParam,typelist);
     }