diff --git a/README.md b/README.md index 77ca354..5c6770e 100644 --- a/README.md +++ b/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,10 +43,31 @@ v1.4.4-beta | 2022-03-21 org.jeecgframework.jimureport jimureport-spring-boot-starter - 1.4.4-beta + 1.5.0-beta ``` +- 如果出现jsqlparser不兼容问题,请这么引用 + +``` + + org.jeecgframework.jimureport + jimureport-spring-boot-starter + ${jimureport.version} + + + minidao-spring-boot-starter + org.jeecgframework + + + + + org.jeecgframework + minidao-spring-boot-starter + 1.8.8 + +``` + 通过 http://jimureport.com/doc/log 查询最新版本号 diff --git a/jimureport-example/Dockerfile b/jimureport-example/Dockerfile index 1026f8c..afe8cb1 100644 --- a/jimureport-example/Dockerfile +++ b/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 \ No newline at end of file +CMD java -DMYSQL-HOST=jimureport-mysql -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jimureport-example-1.5.jar \ No newline at end of file diff --git a/jimureport-example/pom.xml b/jimureport-example/pom.xml index 933c127..fbb59de 100644 --- a/jimureport-example/pom.xml +++ b/jimureport-example/pom.xml @@ -5,14 +5,14 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0 + 2.6.6 jimureport-example org.jeecg jimureport-example - 1.4 + 1.5 http://www.jimureport.com 积木报表集成示例 @@ -37,7 +37,7 @@ - 1.4.4-beta + 1.5.0-beta 1.8 8.0.3 @@ -53,7 +53,6 @@ ${jimureport.version} - org.springframework.boot