Merge branch 'master' into master-gitlab

pom.xml

@@ -56,9 +56,15 @@
         <okhttp.version>4.12.0</okhttp.version>
         <easyexcel.version>3.2.0</easyexcel.version>
         <!-- 积木报表-->
-        <jeccg.jimureport.version>1.9.4</jeccg.jimureport.version>
         <openai-java.version>0.34.1</openai-java.version>
         <dashscope-sdk-java.version>2.12.0</dashscope-sdk-java.version>
+        <jeccg.jimureport.version>2.1.0</jeccg.jimureport.version>
+        <jeccg.jimureport-nosql.version>2.0.0</jeccg.jimureport-nosql.version>
+        <jeccg.jimureport-echarts.version>2.1.0</jeccg.jimureport-echarts.version>
+        <jeccg.jimubi.version>1.9.5</jeccg.jimubi.version>
+<!--        <google.guava.version>30.1.1-jre</google.guava.version>-->
+        <protobuf-java.version>3.25.1</protobuf-java.version> <!-- 检查版本是否兼容 -->
+
     </properties>
 
     <!-- 依赖声明 -->
@@ -343,23 +349,42 @@
                 <artifactId>okhttp</artifactId>
                 <version>${okhttp.version}</version>
             </dependency>
-
+            <!-- minio oss-->
+            <dependency>
+                <groupId>io.minio</groupId>
+                <artifactId>minio</artifactId>
+                <version>${minio.version}</version>
+                <optional>true</optional>
+            </dependency>
             <!-- JimuReport -->
             <dependency>
                 <groupId>org.jeecgframework.jimureport</groupId>
                 <artifactId>jimureport-spring-boot-starter</artifactId>
                 <version>${jeccg.jimureport.version}</version>
             </dependency>
+            <!-- mongo、redis和文件数据集支持包，按需引入 -->
             <dependency>
                 <groupId>org.jeecgframework.jimureport</groupId>
                 <artifactId>jimureport-nosql-starter</artifactId>
-                <version>${jeccg.jimureport.version}</version>
+                <version>${jeccg.jimureport-nosql.version}</version>
             </dependency>
+            <!-- 后台导出接口Echart图表支持包，按需引入 -->
+            <dependency>
+                <groupId>org.jeecgframework.jimureport</groupId>
+                <artifactId>jimureport-echarts-starter</artifactId>
+                <version>${jeccg.jimureport-echarts.version}</version>
+            </dependency>
+            <!-- 积木大屏和仪表盘支持包，按需引入 -->
             <dependency>
                 <groupId>org.jeecgframework.jimureport</groupId>
                 <artifactId>jimubi-spring-boot-starter</artifactId>
                 <version>${jeccg.jimubi.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>${protobuf-java.version}</version>
+            </dependency>
 
             <!-- https://mvnrepository.com/artifact/com.openai/openai-java -->
             <dependency>