From f148832b67f6ae83b84afd54ec839d5c3240175b Mon Sep 17 00:00:00 2001
From: "476474485@qq.com" <q8928627q>
Date: Wed, 15 May 2024 11:55:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=AF=E6=9C=A8=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        | 34 ++++++++++++--
 pom.xml                                       | 46 ++++++++++++++++++-
 2 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/buildpackage/src/main/resources/application.yml b/buildpackage/src/main/resources/application.yml
index cfd08cee..bcb64c18 100644
--- a/buildpackage/src/main/resources/application.yml
+++ b/buildpackage/src/main/resources/application.yml
@@ -72,6 +72,34 @@ mybatis-plus:
   global-config:
     db-config:
       id-type: auto  # 主键策略
-ax:
-  url:
-
+# 积木报表工具
+#JimuReport[minidao配置]
+minidao :
+  base-package: org.jeecg.modules.jmreport.desreport.dao*
+  db-type: mysql
+#JimuReport[上传配置]
+jeecg :
+  jmreport:
+    # 自动保存
+    autoSave: true
+    # 单位毫秒 默认5*60*1000
+    interval: 10000
+  # local|minio|alioss
+  uploadType: local
+  # local
+  path :
+    #文件路径
+    upload: D:\images
+  # alioss
+  oss:
+    endpoint: oss-cn-beijing.aliyuncs.com
+    accessKey: ??
+    secretKey: ??
+    staticDomain: ??
+    bucketName: ??
+  # minio
+  minio:
+    minio_url: http://minio.jeecg.com
+    minio_name: ??
+    minio_pass: ??
+    bucketName: ??
diff --git a/pom.xml b/pom.xml
index 268d942d..82782720 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,9 @@
         <unit.version>4.12</unit.version>
         <quartz.version>2.3.0</quartz.version>
         <org.springframework.version>5.3.23</org.springframework.version>
-
+        <minio.version>8.0.3</minio.version>
+        <postgresql.version>42.2.6</postgresql.version>
+        <jimureport.version>1.7.4</jimureport.version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -326,11 +328,34 @@
             <version>1.6.1</version>
         </dependency>
 
-        <!--        缓存-->
+        <!--  缓存-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-cache</artifactId>
         </dependency>
+
+
+        <!-- JimuReport 积木报表 -->
+        <dependency>
+            <groupId>org.jeecgframework.jimureport</groupId>
+            <artifactId>jimureport-spring-boot-starter</artifactId>
+            <version>${jimureport.version}</version>
+        </dependency>
+        <!-- minio oss-->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>${minio.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <!-- postgresql驱动 -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgresql.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -419,6 +444,23 @@
             </snapshots>
         </repository>
 
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun Repository</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>jeecg</id>
+            <name>jeecg Repository</name>
+            <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+
     </repositories>
 
 </project>