From 760fea77a7fcfaf59ceebffc3c4355e9cfa133ea Mon Sep 17 00:00:00 2001
From: 幻雨堂 <13281837894@163.com>
Date: 星期四, 29 二月 2024 10:52:48 +0800
Subject: [PATCH] 配置

---
 dujy-admin/src/main/resources/application-dev.yml                         |   45 ++++++++++++----------
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/util/MinioUtil.java |   34 +++++++++++++++-
 dujy-admin/src/main/resources/application.yml                             |   26 ++++++------
 3 files changed, 69 insertions(+), 36 deletions(-)

diff --git a/dujy-admin/src/main/resources/application-dev.yml b/dujy-admin/src/main/resources/application-dev.yml
index 9eda0cc..c8a4d27 100644
--- a/dujy-admin/src/main/resources/application-dev.yml
+++ b/dujy-admin/src/main/resources/application-dev.yml
@@ -36,23 +36,23 @@
       hibernate:
         format_sql: true
 
-  graphql:
-    path: /graphql
-    graphiql:
-      enabled: true
-      path: /graphiql
-    cors:
-      allow-credentials: true
-      allowed-headers: '*'
-      allowed-methods: '*'
-    schema:
-      locations:
-        - classpath*:graphql/
-      file-extensions:
-        - .graphql
-        - .gqls
-      printer:
-        enabled: true
+#  graphql:
+#    path: /graphql
+#    graphiql:
+#      enabled: true
+#      path: /graphiql
+#    cors:
+#      allow-credentials: true
+#      allowed-headers: '*'
+#      allowed-methods: '*'
+#    schema:
+#      locations:
+#        - classpath*:graphql/
+#      file-extensions:
+#        - .graphql
+#        - .gqls
+#      printer:
+#        enabled: true
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     # 鍔ㄦ�佹暟鎹簮鏂囨。 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
@@ -123,16 +123,16 @@
 spring.data:
   redis:
     # 鍦板潃
-    host: 162.14.79.111
+    host: 42.193.1.25
     # 绔彛锛岄粯璁や负6379
     port: 6379
-    password: 234#Wersdf!
+    password: ycl2018
     # 鏁版嵁搴撶储寮�
     database: 0
     # 瀵嗙爜(濡傛病鏈夊瘑鐮佽娉ㄩ噴鎺�)
     # password:
     # 杩炴帴瓒呮椂鏃堕棿
-    timeout: 10s
+    timeout: 20s
     # 鏄惁寮�鍚痵sl
     ssl.enabled: false
 
@@ -277,3 +277,8 @@
       client-id: 10**********6
       client-secret: 1f7d08**********5b7**********29e
       redirect-uri: ${justauth.address}/social-callback?source=gitlab
+minio:
+  endpoint: http://127.0.0.1:9000
+  accessKey: UqCoWBRAVf7DI1gcznSg
+  secretKey: UL4hmEIcgFpTmSaJEpYTiQDIWHEG4RavPxTyMjgX
+  bucketName: dujyimage
diff --git a/dujy-admin/src/main/resources/application.yml b/dujy-admin/src/main/resources/application.yml
index 97c5424..3cd691a 100644
--- a/dujy-admin/src/main/resources/application.yml
+++ b/dujy-admin/src/main/resources/application.yml
@@ -125,19 +125,19 @@
     - /actuator/**
 
 # 澶氱鎴烽厤缃�
-tenant:
-  # 鏄惁寮�鍚�
-  enable: true
-  # 鎺掗櫎琛�
-  excludes:
-    - sys_menu
-    - sys_tenant
-    - sys_tenant_package
-    - sys_role_dept
-    - sys_role_menu
-    - sys_user_post
-    - sys_user_role
-    - sys_client
+#tenant:
+#  # 鏄惁寮�鍚�
+#  enable: true
+#  # 鎺掗櫎琛�
+#  excludes:
+#    - sys_menu
+#    - sys_tenant
+#    - sys_tenant_package
+#    - sys_role_dept
+#    - sys_role_menu
+#    - sys_user_post
+#    - sys_user_role
+#    - sys_client
 
 # MyBatisPlus閰嶇疆
 # https://baomidou.com/config/
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/util/MinioUtil.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/util/MinioUtil.java
index d5ca1b3..079ef7f 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/util/MinioUtil.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/util/MinioUtil.java
@@ -5,7 +5,10 @@
 import io.minio.messages.DeleteError;
 import io.minio.messages.DeleteObject;
 import io.minio.messages.Item;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.compress.utils.IOUtils;
+import org.dromara.common.core.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
@@ -20,6 +23,7 @@
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -215,10 +219,34 @@
     }
 
     /**
-     * 鏌ョ湅鏂囦欢瀵硅薄
-     * @param bucketName 瀛樺偍bucket鍚嶇О
-     * @return 瀛樺偍bucket鍐呮枃浠跺璞′俊鎭�
+     * 涓嬭浇鏂囦欢
+     *
+     * @param originalName 鏂囦欢璺緞
      */
+    public InputStream downloadFile(String originalName, HttpServletResponse response) {
+        try {
+
+            InputStream file = minioClient.getObject(GetObjectArgs.builder().bucket(bucketName).object(originalName).build());
+            String filename = new String(originalName.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
+            if (StringUtils.isNotBlank(originalName)) {
+                filename = originalName;
+            }
+            response.setHeader("Content-Disposition", "attachment;filename=" + filename);
+            ServletOutputStream servletOutputStream = response.getOutputStream();
+            int len;
+            byte[] buffer = new byte[1024];
+            while ((len = file.read(buffer)) > 0) {
+                servletOutputStream.write(buffer, 0, len);
+            }
+            servletOutputStream.flush();
+            file.close();
+            servletOutputStream.close();
+            return file;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
 
     /**

--
Gitblit v1.8.0