JimuReport v1.5.0-beta版本发布

README.md

@@ -1,10 +1,10 @@
 # JimuReport - 积木报表
 
-v1.4.4-beta | 2022-03-21
+v1.5.0-beta | 2022-04-18
 
 
 [![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://jimureport.com)
-[![](https://img.shields.io/badge/version-1.4.4-brightgreen.svg)](https://github.com/zhangdaiscott/JimuReport)
+[![](https://img.shields.io/badge/version-1.5.0-brightgreen.svg)](https://github.com/zhangdaiscott/JimuReport)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/JimuReport.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/JimuReport)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/JimuReport.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/JimuReport)
 
@@ -43,7 +43,28 @@ v1.4.4-beta | 2022-03-21
 <dependency>
   <groupId>org.jeecgframework.jimureport</groupId>
   <artifactId>jimureport-spring-boot-starter</artifactId>
-  <version>1.4.4-beta</version>
+  <version>1.5.0-beta</version>
+</dependency>
+``` 
+
+- 如果出现jsqlparser不兼容问题，请这么引用
+
+```
+<dependency>
+    <groupId>org.jeecgframework.jimureport</groupId>
+    <artifactId>jimureport-spring-boot-starter</artifactId>
+    <version>${jimureport.version}</version>
+    <exclusions>
+        <exclusion>
+            <artifactId>minidao-spring-boot-starter</artifactId>
+            <groupId>org.jeecgframework</groupId>
+        </exclusion>
+    </exclusions>
+</dependency>
+<dependency>
+    <groupId>org.jeecgframework</groupId>
+    <artifactId>minidao-spring-boot-starter</artifactId>
+    <version>1.8.8</version>
 </dependency>
 ```
 

jimureport-example/Dockerfile

@@ -10,6 +10,6 @@ WORKDIR /jimureport
 
 EXPOSE 8085
 
-ADD ./target/jimureport-example-1.4.jar ./
+ADD ./target/jimureport-example-1.5.jar ./
 
-CMD java -DMYSQL-HOST=jimureport-mysql -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jimureport-example-1.4.jar
+CMD java -DMYSQL-HOST=jimureport-mysql -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jimureport-example-1.5.jar

jimureport-example/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.6</version>
         <relativePath/>
     </parent>
 
     <name>jimureport-example</name>
     <groupId>org.jeecg</groupId>
     <artifactId>jimureport-example</artifactId>
-    <version>1.4</version>
+    <version>1.5</version>
 
     <url>http://www.jimureport.com</url>
     <description>积木报表集成示例</description>
@@ -37,7 +37,7 @@
     </repositories>
 
     <properties>
-        <jimureport.version>1.4.4-beta</jimureport.version>
+        <jimureport.version>1.5.0-beta</jimureport.version>
         <java.version>1.8</java.version>
         <minio.version>8.0.3</minio.version>
         <!-- DB驱动 -->
@@ -53,7 +53,6 @@
             <version>${jimureport.version}</version>
         </dependency>
 
-
         <!-- SpringBoot-->
         <dependency>
             <groupId>org.springframework.boot</groupId>