From 44d7e91f27c2c08c690ea40f52064d0ab1cb321d Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Sun, 21 Dec 2025 11:36:33 +0800
Subject: [PATCH] =?UTF-8?q?v2.2.1=E5=8F=91=E5=B8=83=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=A4=9Asheet=E6=8A=A5=E8=A1=A8=E5=92=8C=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jimureport-example/pom.xml                    | 34 ++++++++++++++++---
 .../src/main/resources/application-dev.yml    | 18 +++++++++-
 .../src/main/resources/application-prod.yml   | 23 +++++++++++++
 3 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/jimureport-example/pom.xml b/jimureport-example/pom.xml
index 02dccf3..712ca80 100644
--- a/jimureport-example/pom.xml
+++ b/jimureport-example/pom.xml
@@ -9,8 +9,8 @@
         <relativePath/>
     </parent>
 
+    <groupId>org.jeecgframework.jimureport</groupId>
     <name>jimureport-example</name>
-    <groupId>org.jeecg</groupId>
     <artifactId>jimureport-example</artifactId>
     <version>2.2</version>
 
@@ -47,12 +47,13 @@
     <properties>
         <java.version>17</java.version>
         <minio.version>8.0.3</minio.version>
+        <druid.version>1.2.24</druid.version>
         <!-- DB驱动 -->
         <mysql-connector-java.version>8.0.27</mysql-connector-java.version>
         <!-- 积木报表版本 -->
-        <jimureport.version>2.2.0</jimureport.version>
+        <jimureport.version>2.2.1</jimureport.version>
         <jimubi.version>2.2.0</jimubi.version>
-        <jimureport-echarts.version>2.1.1</jimureport-echarts.version>
+        <jimureport-echarts.version>2.2.0</jimureport-echarts.version>
         <jimureport-nosql.version>2.1.0</jimureport-nosql.version>
         <!-- SQL解析引擎 -->
         <jsqlparser.version>4.9</jsqlparser.version>
@@ -65,6 +66,11 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!-- 积木报表 -->
         <dependency>
@@ -77,6 +83,12 @@
             <groupId>org.jeecgframework.jimureport</groupId>
             <artifactId>jimureport-nosql-starter</artifactId>
             <version>${jimureport-nosql.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>httpclient</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- 后台导出接口Echart图表支持包，按需引入 -->
         <dependency>
@@ -135,11 +147,21 @@
                     <artifactId>guava</artifactId>
                     <groupId>com.google.guava</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-compress</artifactId>
+                </exclusion>
             </exclusions>
             <optional>true</optional>
         </dependency>
 
         <!-- ============================数据库驱动========================== -->
+        <!-- druid -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>${druid.version}</version>
+        </dependency>
         <!--mysql-->
         <dependency>
             <groupId>mysql</groupId>
@@ -186,7 +208,7 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.34.0</version>
+            <version>3.39.3.0</version>
             <scope>runtime</scope>
         </dependency>
         <!--hsqldb-->
@@ -247,6 +269,10 @@
                     <artifactId>fastjson</artifactId>
                     <groupId>com.alibaba</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>error_prone_annotations</artifactId>
+                    <groupId>com.google.errorprone</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!-- ============================数据库驱动========================== -->
diff --git a/jimureport-example/src/main/resources/application-dev.yml b/jimureport-example/src/main/resources/application-dev.yml
index affa78b..4b40264 100644
--- a/jimureport-example/src/main/resources/application-dev.yml
+++ b/jimureport-example/src/main/resources/application-dev.yml
@@ -20,7 +20,7 @@ spring:
   #Redis配置
   data:
     redis:
-      database: 0
+      database: 1
       host: 127.0.0.1
       port: 6379
       password:
@@ -83,6 +83,17 @@ jeecg:
       #ssl: true
       # smtp端口
       #port: 465
+    # 自动化导出
+    automate:
+      export:
+        # 开启自动导出,默认false
+        enable-auto-export: true
+        # 非必须，文件过期时间，单位天，默认：30
+        expired: 30
+        # 非必须，积木报表view页面地址
+        #jimu-view-path: "https://???/jmreport/view/"
+        # 非必须，下载的报表的存放目录(服务器上的目录)
+        #download-path: "/???/???"
     #多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离)
     saasMode:
     # 签名密钥
@@ -91,6 +102,8 @@ jeecg:
     firewall:
       # 数据源安全 (开启后，不允许使用平台数据源、SQL解析加签并且不允许查询数据库)
       dataSourceSafe: false
+      # SQL解析安全 false: 数据库解析(默认,稳定性好) true: jsqlparser解析(不走数据库,安全级别高) v2.2.1+新增
+      sqlParseSafe: true
       # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可放开限制）
       lowCodeMode: dev
       # sql注入检查级别（strict:严格, basic:简单校验, none:不校验）
@@ -107,6 +120,9 @@ jeecg:
     row: 200
     #自定义API接口的前缀 #{api_base_path}和#{domainURL}的值
     apiBasePath: http://192.168.1.11:8085
+    #数据量最大限制（适用于无分页模式、打印全部等场景，默认：100000）v2.2.1+新增
+    #说明：1.无分页模式-查询时最多返回该数量的记录 2.打印全部-最多处理该数量的记录
+    max-data-rows: 100000
     pageSize:
       - 10
       - 20
diff --git a/jimureport-example/src/main/resources/application-prod.yml b/jimureport-example/src/main/resources/application-prod.yml
index c2903b7..62faba8 100644
--- a/jimureport-example/src/main/resources/application-prod.yml
+++ b/jimureport-example/src/main/resources/application-prod.yml
@@ -69,6 +69,29 @@ jeecg:
     bucketName: ??
   #大屏报表参数设置
   jmreport:
+    # 邮件发送
+    mail:
+      # 是否开启
+      enabled: false
+      host: "???"
+      sender: "???"
+      username: "??@??.com"
+      password: "???"
+      # 是否开启ssl
+#      ssl: true
+      # smtp端口
+#      port: 465
+    # 自动化导出
+    automate:
+      export:
+        # 开启自动导出,默认false
+        enable-auto-export: true
+        # 非必须，文件过期时间，单位天，默认：30
+        expired: 30
+        # 非必须，积木报表view页面地址
+        #jimu-view-path: "https://???/jmreport/view/"
+        # 非必须，下载的报表的存放目录(服务器上的目录)
+        #download-path: "/???/???"
     #多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离)
     saasMode:
     # 签名密钥