From f8e789877177f87ad30dc418a2f4d74f7ebf43f8 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 26 Dec 2023 18:44:09 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20maven=E6=89=93=E5=8C=85=E8=84=9A?=
=?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
core/core-backend/pom.xml | 22 ++++++++++++++-----
core/core-frontend/config/common.ts | 2 +-
.../io/dataease/utils/WhitelistUtils.java | 2 +-
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml
index 31513ebd35..a844bbe46e 100644
--- a/core/core-backend/pom.xml
+++ b/core/core-backend/pom.xml
@@ -129,11 +129,6 @@
<include name="**"/>
</fileset>
</copy>
- <move todir="src/main/resources/static/dev2-front">
- <fileset dir="src/main/resources/static">
- <exclude name="*.html"/>
- </fileset>
- </move>
</target>
</configuration>
<goals>
@@ -267,10 +262,27 @@
<include>**/*.sql</include>
<include>**/*.xlsx</include>
</includes>
+ <excludes>
+ <exclude>static</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>static</include>
+ </includes>
+ <filtering>false</filtering>
</resource>
</resources>
<!-- springboot打包插件 -->
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/core/core-frontend/config/common.ts b/core/core-frontend/config/common.ts
index 4ecb03664d..db115774e3 100644
--- a/core/core-frontend/config/common.ts
+++ b/core/core-frontend/config/common.ts
@@ -21,7 +21,7 @@ export function pathResolve(dir: string) {
return resolve(root, '.', dir)
}
export default {
- base: '/dev2-front',
+ base: './',
plugins: [
Vue(),
VueJsx(),
diff --git a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java
index c6b86a7ca3..fc2119fb48 100644
--- a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java
+++ b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java
@@ -27,7 +27,7 @@ public class WhitelistUtils {
requestURI = requestURI.replaceFirst(AuthConstant.DE_API_PREFIX, "");
}
return WHITE_PATH.contains(requestURI)
- || StringUtils.endsWithAny(requestURI, ".ico", "js", ".css", "svg", "png", "jpg", "js.map", ".otf")
+ || StringUtils.endsWithAny(requestURI, ".ico", "js", ".css", "svg", "png", "jpg", "js.map", ".otf", ".ttf")
|| StringUtils.startsWithAny(requestURI, "data:image")
|| StringUtils.startsWithAny(requestURI, "/login/platformLogin/")
|| StringUtils.startsWithAny(requestURI, "/static-resource/")