diff --git a/.gitignore b/.gitignore
index 860dac7..28586ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ data/maven/mavenRep
qiezi_front/yarn.lock
.idea
syncFile.sh
+.env
diff --git a/build.sh b/build.sh
index 9aa441a..845d3b3 100755
--- a/build.sh
+++ b/build.sh
@@ -7,7 +7,7 @@ export VUE_APP_QIEZI_KEY="d862c12a68ad4d579c6066ac2f064a07";
base=$(cd "$(dirname "$0")";pwd)
#
# 前端打包
-docker run --rm --user ${UID} -e VUE_APP_QIEZI_HOST=${VUE_APP_QIEZI_HOST} -e VUE_APP_QIEZI_KEY=${VUE_APP_QIEZI_KEY} -v $base/qiezi_front:/opt/front node:lts-slim bash -c "cd /opt/front && yarn --registry https://registry.npm.taobao.org && yarn build"
+docker run --rm --user ${UID} -e VUE_APP_QIEZI_HOST=${VUE_APP_QIEZI_HOST} -e VUE_APP_QIEZI_KEY=${VUE_APP_QIEZI_KEY} -v $base/qiezi_front:/opt/front node:lts-slim bash -c "cd /opt/front && yarn --registry https://registry.npmmirror.com && yarn build"
# 后端打包
docker run --rm --user ${UID} -v $base/data/maven/mavenRep:/var/maven/.m2: -v $base/data/maven/settings.xml:/usr/share/maven/conf/settings.xml -v $base/qieziBackend:/code maven:3-openjdk-11-slim bash -c "cd /code && mvn clean install"
diff --git a/docker-compose.yml b/docker-compose.yml
index d793d01..15b4767 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
- ${NGINX_PORT}:8080
qiezi_backend:
- image: openjdk:11.0
+ image: openjdk:11-slim
networks:
- qiezi_statistic
volumes:
diff --git a/qieziBackend/pom.xml b/qieziBackend/pom.xml
index e3b1dd5..a3ddb65 100644
--- a/qieziBackend/pom.xml
+++ b/qieziBackend/pom.xml
@@ -5,7 +5,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.3
+ 2.7.18
com.fanxb
@@ -30,10 +30,12 @@
org.springframework.boot
spring-boot-starter-web
+
+
- org.mybatis.spring.boot
- mybatis-spring-boot-starter
- 2.2.2
+ com.baomidou
+ mybatis-plus-boot-starter
+ 3.5.5
com.squareup.okhttp3
@@ -48,13 +50,15 @@
com.alibaba
fastjson
- 1.2.79
+ 2.0.9.graal
+
+
mysql
mysql-connector-java
- runtime
+ 8.0.33
org.projectlombok
@@ -71,14 +75,14 @@
cn.hutool
hutool-all
- 5.7.21
+ 5.8.25
com.alibaba
easyexcel
- 3.1.3
+ 3.3.4
diff --git a/qieziBackend/src/main/java/com/fanxb/backend/service/impl/ApplicationServiceImpl.java b/qieziBackend/src/main/java/com/fanxb/backend/service/impl/ApplicationServiceImpl.java
index 4b3fd02..e4853e9 100644
--- a/qieziBackend/src/main/java/com/fanxb/backend/service/impl/ApplicationServiceImpl.java
+++ b/qieziBackend/src/main/java/com/fanxb/backend/service/impl/ApplicationServiceImpl.java
@@ -229,10 +229,11 @@ public class ApplicationServiceImpl implements ApplicationService {
response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode(po.getName() + "-站点导出数据", StandardCharsets.UTF_8).replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
- ExcelWriter writer = EasyExcel.write(response.getOutputStream()).build();
- writer.write(hostList, EasyExcel.writerSheet(0, "站点数据").head(ReportHostBo.class).build());
- writer.write(hostDayList, EasyExcel.writerSheet(1, "站点日数据").head(ReportHostDayBo.class).build());
- writer.write(detailPageList, EasyExcel.writerSheet(2, "页面数据").head(ReportDetailPageBo.class).build());
- writer.finish();
+ try (ExcelWriter writer = EasyExcel.write(response.getOutputStream()).inMemory(true).build()) {
+ writer.write(hostList, EasyExcel.writerSheet(0, "站点数据").head(ReportHostBo.class).build());
+ writer.write(hostDayList, EasyExcel.writerSheet(1, "站点日数据").head(ReportHostDayBo.class).build());
+ writer.write(detailPageList, EasyExcel.writerSheet(2, "页面数据").head(ReportDetailPageBo.class).build());
+ writer.finish();
+ }
}
}
diff --git a/qieziBackend/src/main/resources/application.yml b/qieziBackend/src/main/resources/application.yml
index e7e7354..ab2c38a 100644
--- a/qieziBackend/src/main/resources/application.yml
+++ b/qieziBackend/src/main/resources/application.yml
@@ -40,7 +40,7 @@ spring:
url: jdbc:mysql://localhost:3306/qiezi?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
hikari:
maximum-pool-size: 10
-mybatis:
+mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# classpath后面加*，值里面的*才起作用
diff --git a/qiezi_front/src/views/download/index.vue b/qiezi_front/src/views/download/index.vue
index 82ce524..dd46cc9 100644
--- a/qiezi_front/src/views/download/index.vue
+++ b/qiezi_front/src/views/download/index.vue
@@ -11,7 +11,7 @@
下载
- download
+ download