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 @@ - - - - - @@ -267,10 +262,27 @@ **/*.sql **/*.xlsx + + static + + + + src/main/resources + + static + + false + + org.apache.maven.plugins + maven-surefire-plugin + + true + + org.springframework.boot spring-boot-maven-plugin 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/")