diff --git a/README.md b/README.md index 8c1b7606..cd90b18b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,10 @@ ## 在线体验 ####   电脑在线体验: [https://report.anji-plus.com/index.html](https://report.anji-plus.com/index.html "链接")  体验账号：guest 密码：guest ####   在线文档: [https://report.anji-plus.com/report-doc/](https://report.anji-plus.com/report-doc/ "doc")
-####   在线提问: [https://gitee.com/anji-plus/report/issues](https://gitee.com/anji-plus/report/issues "issue") +####   在线提问: [https://gitee.com/anji-plus/report/issues](https://gitee.com/anji-plus/report/issues "issue")
+ +## 发行版本 +####   下载链接：[https://gitee.com/anji-plus/report/releases](https://gitee.com/anji-plus/report/releases "下载链接")
## 功能概述 ####   组件介绍 diff --git a/doc/docs/guide/dashboard.md b/doc/docs/guide/dashboard.md index 5e9ad59b..9025d298 100644 --- a/doc/docs/guide/dashboard.md +++ b/doc/docs/guide/dashboard.md @@ -1,2 +1,19 @@ ## 介绍 -待完善 +## 新增大屏 +![img.png](../picture/dashboard/img.png) + +## 大屏简介 +![img_2.png](../picture/dashboard/img_2.png) + +## 工具简介 +### 1、文本框 +![img_3.png](../picture/dashboard/img_3.png) +![img_4.png](../picture/dashboard/img_4.png) +![img_5.png](../picture/dashboard/img_5.png) +![img_6.png](../picture/dashboard/img_6.png) + +### 2、滚动文本 +### 3、超链接 +### 4、当前时间 +### 5、图片 +![img_7.png](../picture/dashboard/img_7.png) \ No newline at end of file diff --git a/doc/docs/guide/dataset.md b/doc/docs/guide/dataset.md index 5e9ad59b..1ac1202a 100644 --- a/doc/docs/guide/dataset.md +++ b/doc/docs/guide/dataset.md @@ -1,2 +1,6 @@ ## 介绍 -待完善 +## 1、mysql数据集 +在数据源处添加了mysql的数据源后，即可使用。 +![img_1.png](../picture/dateset/img_1.png) +目前，查询参数和数据转化功能待补全中，建议等完善了再使用。 + diff --git a/doc/docs/picture/dashboard/img.png b/doc/docs/picture/dashboard/img.png new file mode 100644 index 00000000..67a0a19a Binary files /dev/null and b/doc/docs/picture/dashboard/img.png differ diff --git a/doc/docs/picture/dashboard/img_2.png b/doc/docs/picture/dashboard/img_2.png new file mode 100644 index 00000000..b88d1e22 Binary files /dev/null and b/doc/docs/picture/dashboard/img_2.png differ diff --git a/doc/docs/picture/dashboard/img_3.png b/doc/docs/picture/dashboard/img_3.png new file mode 100644 index 00000000..e909b216 Binary files /dev/null and b/doc/docs/picture/dashboard/img_3.png differ diff --git a/doc/docs/picture/dashboard/img_4.png b/doc/docs/picture/dashboard/img_4.png new file mode 100644 index 00000000..96051d8c Binary files /dev/null and b/doc/docs/picture/dashboard/img_4.png differ diff --git a/doc/docs/picture/dashboard/img_5.png b/doc/docs/picture/dashboard/img_5.png new file mode 100644 index 00000000..28981384 Binary files /dev/null and b/doc/docs/picture/dashboard/img_5.png differ diff --git a/doc/docs/picture/dashboard/img_6.png b/doc/docs/picture/dashboard/img_6.png new file mode 100644 index 00000000..340638f9 Binary files /dev/null and b/doc/docs/picture/dashboard/img_6.png differ diff --git a/doc/docs/picture/dashboard/img_7.png b/doc/docs/picture/dashboard/img_7.png new file mode 100644 index 00000000..4f7bba79 Binary files /dev/null and b/doc/docs/picture/dashboard/img_7.png differ diff --git a/doc/docs/picture/dateset/img_1.png b/doc/docs/picture/dateset/img_1.png new file mode 100644 index 00000000..a4a519b1 Binary files /dev/null and b/doc/docs/picture/dateset/img_1.png differ diff --git a/pom.xml b/pom.xml index 2c9084df..9d9c07ce 100644 --- a/pom.xml +++ b/pom.xml @@ -22,59 +22,16 @@ 2.0.1.RELEASE - 1.0.0-SNAPSHOT - 1.0.0.RELEASE - 1.0.0-SNAPSHOT - 1.0.0.RELEASE true - - com.anjiplus.template.gaea - template-gaea-auth - ${project.version} - - - com.anjiplus.template.gaea - template-gaea-business - ${project.version} - - - com.anjiplus.template.gaea - template-gaea-common - ${project.version} - - - - com.anjiplus.template.gaea - template-gaea-generator - ${gaea.generator.version} - - com.anji-plus spring-boot-gaea ${gaea.version} - - com.anji-plus - spring-boot-starter-gaea-security - ${gaea.security.version} - - - - com.anji-plus - spring-boot-starter-gaea-export - ${gaea.export.version} - - - - com.anji-plus - spring-boot-starter-gaea-log - ${gaea.log.version} - @@ -90,15 +47,4 @@ - - - - nexus-releases - http://nexus.anji-plus.com:8081/repository/maven-releases/ - - - nexus-snapshots - http://nexus.anji-plus.com:8081/repository/maven-snapshots/ - - diff --git a/report-core/pom.xml b/report-core/pom.xml index ccfc264d..4a994834 100644 --- a/report-core/pom.xml +++ b/report-core/pom.xml @@ -65,14 +65,14 @@ 2.10.6 - - com.anji-plus - spring-boot-starter-gaea-export - - - com.anji-plus - spring-boot-starter-gaea-log - + + + + + + + + org.flywaydb @@ -81,18 +81,6 @@ - - org.apache.httpcomponents - httpclient - 4.5.2 - - - - org.apache.httpcomponents - httpcore - 4.4.5 - - com.alibaba druid diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/file/service/impl/GaeaFileServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/file/service/impl/GaeaFileServiceImpl.java index d918748f..7c4e9196 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/file/service/impl/GaeaFileServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/file/service/impl/GaeaFileServiceImpl.java @@ -1,15 +1,15 @@ package com.anjiplus.template.gaea.business.modules.file.service.impl; -import com.alibaba.excel.util.FileUtils; import com.anji.plus.gaea.constant.BaseOperationEnum; import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper; import com.anji.plus.gaea.exception.BusinessException; import com.anji.plus.gaea.exception.BusinessExceptionBuilder; -import com.anjiplus.template.gaea.business.modules.file.util.StringPatternUtil; import com.anjiplus.template.gaea.business.code.ResponseCode; import com.anjiplus.template.gaea.business.modules.file.dao.GaeaFileMapper; import com.anjiplus.template.gaea.business.modules.file.entity.GaeaFile; import com.anjiplus.template.gaea.business.modules.file.service.GaeaFileService; +import com.anjiplus.template.gaea.business.modules.file.util.FileUtils; +import com.anjiplus.template.gaea.business.modules.file.util.StringPatternUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/file/util/FileUtils.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/file/util/FileUtils.java new file mode 100644 index 00000000..c0cb07e1 --- /dev/null +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/file/util/FileUtils.java @@ -0,0 +1,31 @@ +package com.anjiplus.template.gaea.business.modules.file.util; + +import lombok.extern.slf4j.Slf4j; + +import java.io.*; + +/** + * Created by raodeming on 2021/7/8. + */ +@Slf4j +public class FileUtils { + public static byte[] readFileToByteArray(File file) { + byte[] buffer = null; + try { + FileInputStream fis = new FileInputStream(file); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + byte[] b = new byte[1024]; + int n; + while ((n = fis.read(b)) != -1) { + bos.write(b, 0, n); + } + fis.close(); + bos.close(); + buffer = bos.toByteArray(); + } catch (IOException e) { + log.error("{}", e); + } + return buffer; + } + +} diff --git a/report-core/src/main/resources/bootstrap-dev.yml b/report-core/src/main/resources/bootstrap-dev.yml index 83a3fbb0..7eae1aa9 100644 --- a/report-core/src/main/resources/bootstrap-dev.yml +++ b/report-core/src/main/resources/bootstrap-dev.yml @@ -46,6 +46,8 @@ spring: user: ${spring.datasource.username} password: ${spring.datasource.password} placeholder-replacement: false + init-sqls: + - CREATE DATABASE IF NOT EXISTS `aj_report` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; generator: enabled: true workspace: /workspace/gaea diff --git a/report-ui/src/views/home/index.vue b/report-ui/src/views/home/index.vue index 1790bb13..89018a78 100644 --- a/report-ui/src/views/home/index.vue +++ b/report-ui/src/views/home/index.vue @@ -1,9 +1,9 @@