Merge pull request 'dev' (#9) from dev into main

Reviewed-on: #9

.gitignore

@@ -2,3 +2,4 @@ data/maven/mavenRep
 qiezi_front/yarn.lock
 .idea
 syncFile.sh
+.env

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"
 

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:

qieziBackend/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.3</version>
+        <version>2.7.18</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.fanxb</groupId>
@@ -30,10 +30,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter -->
         <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.2.2</version>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.5.5</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
@@ -48,13 +50,15 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.79</version>
+            <version>2.0.9.graal</version>
         </dependency>
 
+
+        <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
+            <version>8.0.33</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -71,14 +75,14 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.7.21</version>
+            <version>5.8.25</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.alibaba/easyexcel -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>3.1.3</version>
+            <version>3.3.4</version>
         </dependency>
     </dependencies>
 

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();
+        }
     }
 }

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后面加*，值里面的*才起作用

qiezi_front/src/views/download/index.vue

@@ -11,7 +11,7 @@
       <a-button type="primary" @click="onSubmit">下载</a-button>
     </a-form-item>
   </a-form>
-  <a id="download" :href="'/qiezi/api/application/download?key=' + form.key + '&secret=' + form.secret" download class="download-a">download</a>
+  <a id="download" target="_blank" :href="'/qiezi/api/application/download?key=' + form.key + '&secret=' + form.secret" class="download-a">download</a>
 </template>
 
 <script setup>