github
/
JimuReport
mirror of https://github.com/jeecgboot/JimuReport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

1.3.78版本发布

dependabot/maven/jimureport-example/org.xerial-sqlite-jdbc-3.41.2.2
zhangdaiscott 2021-08-14 13:17:41 +08:00
parent 38f26c9e61
commit 1b7431e4d2
16 changed files with 175 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -1,10 +1,10 @@
# JimuReport - 积木报表
v1.3.75 | 20210809
v1.3.78 | 20210812
[![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://jimureport.com)
[![](https://img.shields.io/badge/version-1.3.64-brightgreen.svg)](https://github.com/zhangdaiscott/JimuReport)
[![](https://img.shields.io/badge/version-1.3.78-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)
@ -44,7 +44,7 @@ v1.3.75 | 20210809
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-spring-boot-starter</artifactId>
<version>1.3.75</version>
<version>1.3.78</version>
</dependency>
```
最新版本可以从 http://jimureport.com/doc/log 中查询到
@ -54,7 +54,9 @@ v1.3.75 | 20210809
[jimureport.sql](https://github.com/zhangdaiscott/JimuReport/blob/master/db "jimureport.sql")
- 免安装运行版
[Quickstart版本](https://static.jeecg.com/files/jimureport/jimureport-quickstart.zip)
开发文档

2
db/jimureport.mysql5.7.create.sql
View File

@ -1615,4 +1615,6 @@ INSERT INTO `tmp_report_data_income` VALUES ('中石油控股或有控股权', 3
INSERT INTO `tmp_report_data_income` VALUES ('中石油参股', 72062.45, 0.00, 0.00, 0.00, 0.00, 0.00, 72062.75);
INSERT INTO `tmp_report_data_income` VALUES ('非中石油', 1486526.90, 212070.72, 0.00, 0.00, 0.00, 226415.09, 1698597.62);
ALTER TABLE `jimu_report_link`
ADD COLUMN `expression` varchar(255) NULL COMMENT '表达式' AFTER `link_chart_id`;
SET FOREIGN_KEY_CHECKS = 1;

0
jimureport-samples/jimureport-demo/.gitignore → jimureport-example/.gitignore vendored
View File

0
jimureport-samples/jimureport-demo/Dockerfile → jimureport-example/Dockerfile
View File

0
jimureport-samples/jimureport-demo/README.md → jimureport-example/README.md
View File

0
jimureport-samples/jimureport-demo/db/Dockerfile → jimureport-example/db/Dockerfile
View File

3
jimureport-samples/jimureport-demo/db/jimureport.mysql5.7.create.sql → jimureport-example/db/jimureport.mysql5.7.create.sql
View File

@ -1618,4 +1618,7 @@ INSERT INTO `tmp_report_data_income` VALUES ('中石油控股或有控股权', 3
INSERT INTO `tmp_report_data_income` VALUES ('中石油参股', 72062.45, 0.00, 0.00, 0.00, 0.00, 0.00, 72062.75);
INSERT INTO `tmp_report_data_income` VALUES ('非中石油', 1486526.90, 212070.72, 0.00, 0.00, 0.00, 226415.09, 1698597.62);
ALTER TABLE `jimu_report_link`
ADD COLUMN `expression` varchar(255) NULL COMMENT '表达式' AFTER `link_chart_id`;
SET FOREIGN_KEY_CHECKS = 1;

0
jimureport-samples/jimureport-demo/docker-compose.yml → jimureport-example/docker-compose.yml
View File

55
jimureport-samples/jimureport-demo/pom.xml → jimureport-example/pom.xml
View File

@ -39,14 +39,7 @@
<java.version>1.8</java.version>
<minio.version>8.0.3</minio.version>
<!-- DB驱动 -->
<postgresql.version>42.2.6</postgresql.version>
<ojdbc6.version>11.2.0.3</ojdbc6.version>
<sqljdbc4.version>4.0</sqljdbc4.version>
<mysql-connector-java.version>8.0.20</mysql-connector-java.version>
<sqlit.version>3.7.2</sqlit.version>
<hsqldb.version>2.2.8</hsqldb.version>
<h2.version>1.4.197</h2.version>
<derby.version>10.11.1.1</derby.version>
</properties>
@ -55,7 +48,7 @@
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-spring-boot-starter</artifactId>
<version>1.3.7</version>
<version>1.3.78</version>
</dependency>
@ -89,24 +82,24 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>sqljdbc4</artifactId>
<version>${sqljdbc4.version}</version>
<version>4.0</version>
<scope>runtime</scope>
</dependency>
<!-- oracle驱动-->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>${ojdbc6.version}</version>
<version>11.2.0.3</version>
<scope>runtime</scope>
</dependency>
<!-- postgresql驱动-->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
<version>42.2.6</version>
<scope>runtime</scope>
</dependency>
<!-- 达梦驱动 -->
<!-- 达梦驱动
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
@ -118,56 +111,56 @@
<artifactId>DmDialectForHibernate</artifactId>
<version>5.3</version>
<scope>runtime</scope>
</dependency>
<!-- sqlite -->
</dependency> -->
<!-- sqlite
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>${sqlit.version}</version>
<version>3.7.2</version>
<scope>runtime</scope>
</dependency>
<!--hsqldb-->
</dependency> -->
<!--hsqldb
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
<version>2.2.8</version>
<scope>runtime</scope>
</dependency>
<!--h2-->
</dependency>-->
<!--h2
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
<version>1.4.197</version>
<scope>runtime</scope>
</dependency>
<!--derby-->
</dependency>-->
<!--derby
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<version>${derby.version}</version>
<version>10.11.1.1</version>
<scope>runtime</scope>
</dependency>
<!--db2-->
</dependency>-->
<!--db2
<dependency>
<groupId>com.ibm.db2</groupId>
<artifactId>jcc</artifactId>
<version>11.5.0.0</version>
<scope>runtime</scope>
</dependency>
<!--神通-->
</dependency>-->
<!--神通
<dependency>
<groupId>com.csicit.thirdparty</groupId>
<artifactId>oscar</artifactId>
<version>1.0.1</version>
<scope>runtime</scope>
</dependency>
<!--人大金仓-->
</dependency>-->
<!--人大金仓
<dependency>
<groupId>kingbase</groupId>
<artifactId>kingbase8</artifactId>
<version>8</version>
<scope>runtime</scope>
</dependency>
</dependency>-->
</dependencies>
<build>

0
jimureport-samples/jimureport-demo/src/main/java/com/example/jmreport/JimuReportApplication.java → jimureport-example/src/main/java/com/example/jmreport/JimuReportApplication.java
View File

0
jimureport-samples/jimureport-demo/src/main/java/org/jeecg/modules/jmreport/controller/IndexController.java → jimureport-example/src/main/java/org/jeecg/modules/jmreport/controller/IndexController.java
View File

0
jimureport-samples/jimureport-demo/src/main/java/org/jeecg/modules/jmreport/controller/TestController.java → jimureport-example/src/main/java/org/jeecg/modules/jmreport/controller/TestController.java
View File

43
jimureport-example/src/main/resources/application-mysql.yml Normal file
View File

@ -0,0 +1,43 @@
server:
port: 8089
spring:
#配置静态资源
mvc:
static-path-pattern: /**
resource:
static-locations: classpath:/static/
#配置数据库
datasource:
url: jdbc:mysql://${MYSQL-HOST:127.0.0.1}:${MYSQL-PORT:3306}/${MYSQL-DB:jimureport}?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true
username: root
password: root
driver-class-name: com.mysql.cj.jdbc.Driver
#Minidao配置
minidao :
base-package: org.jeecg.modules.jmreport.*
#DB类型（mysql|postgresql|oracle|sqlserver|other）
db-type: mysql
#JimuReport[上传配置]
jeecg :
# local|minio|alioss
uploadType: local
# local
path :
#文件路径
upload: /opt/upload
# alioss
oss:
endpoint: ??
accessKey: ??
secretKey: ??
bucketName: jimureport
# minio
minio:
minio_url: http://minio.jeecg.com
minio_name: ??
minio_pass: ??
bucketName: ??
#输出sql日志
logging:
level:
org.jeecg.modules.jmreport : info

48
jimureport-example/src/main/resources/application-oracle.yml Normal file
View File

@ -0,0 +1,48 @@
server:
port: 8085
spring:
#配置静态资源
mvc:
static-path-pattern: /**
resource:
static-locations: classpath:/static/
#配置数据库
datasource:
url: jdbc:oracle:thin:@192.168.1.199:1521:helowin
username: jeecgbootbpm
password: jeecg196283
driver-class-name: oracle.jdbc.OracleDriver
#Minidao配置
minidao :
base-package: org.jeecg.modules.jmreport.*
#DB类型（mysql|postgresql|oracle|sqlserver|other）
db-type: sqlserver
#JimuReport[上传配置]
jeecg :
jmreport:
#自定义项目前缀
customPrePath:
#接口超时设置（毫秒）
connect-timeout: 300000
# local|minio|alioss
uploadType: local
# local
path :
#文件路径
upload: /opt/upload
# alioss
oss:
endpoint: ??
accessKey: ??
secretKey: ??
bucketName: jimureport
# minio
minio:
minio_url: http://minio.jeecg.com
minio_name: ??
minio_pass: ??
bucketName: ??
#输出sql日志
logging:
level:
org.jeecg.modules.jmreport : debug

48
jimureport-example/src/main/resources/application-sqlsever.yml Normal file
View File

@ -0,0 +1,48 @@
server:
port: 8085
spring:
#配置静态资源
mvc:
static-path-pattern: /**
resource:
static-locations: classpath:/static/
#配置数据库
datasource:
url: jdbc:sqlserver://192.168.1.199:1433;SelectMethod=cursor;DatabaseName=jimureport
username: sa
password: jeecg2019@Pas
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#Minidao配置
minidao :
base-package: org.jeecg.modules.jmreport.*
#DB类型（mysql|postgresql|oracle|sqlserver|other）
db-type: sqlserver
#JimuReport[上传配置]
jeecg :
jmreport:
#自定义项目前缀
customPrePath:
#接口超时设置（毫秒）
connect-timeout: 300000
# local|minio|alioss
uploadType: local
# local
path :
#文件路径
upload: /opt/upload
# alioss
oss:
endpoint: ??
accessKey: ??
secretKey: ??
bucketName: jimureport
# minio
minio:
minio_url: http://minio.jeecg.com
minio_name: ??
minio_pass: ??
bucketName: ??
#输出sql日志
logging:
level:
org.jeecg.modules.jmreport : debug

2
jimureport-samples/jimureport-demo/src/main/resources/application.yml → jimureport-example/src/main/resources/application.yml
View File

@ -15,8 +15,6 @@ spring:
#Minidao配置
minidao :
base-package: org.jeecg.modules.jmreport.*
#DB类型（mysql|postgresql|oracle|sqlserver|other）
db-type: mysql
#JimuReport[上传配置]
jeecg :
# local|minio|alioss