From 26df39291330e8e53d887014f1bd7b1a639b9ae6 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Wed, 19 Oct 2022 10:26:04 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E5=8D=87=E7=BA=A7shiro=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                                              | 4 ++--
 .../main/java/io/metersphere/commons/utils/ShiroUtils.java   | 1 +
 frontend/pom.xml                                             | 2 ++
 frontend/vue.config.js                                       | 5 +++++
 pom.xml                                                      | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 51e16ef5ba..e5cab59ea4 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -20,7 +20,7 @@
         <!-- 第三方不包统一版本，如果不指定，Spring 会为我们选择匹配的版本 -->
         <dubbo.version>2.7.15</dubbo.version>
         <flyway.version>7.15.0</flyway.version>
-        <shiro.version>1.9.1</shiro.version>
+        <shiro.version>1.10.0</shiro.version>
         <mssql-jdbc.version>7.4.1.jre8</mssql-jdbc.version>
         <postgresql.version>42.3.2</postgresql.version>
         <java-websocket.version>1.5.3</java-websocket.version>
@@ -114,7 +114,7 @@
 
         <dependency>
             <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-spring-boot-starter</artifactId>
+            <artifactId>shiro-spring-boot-web-starter</artifactId>
             <version>${shiro.version}</version>
         </dependency>
         <dependency>
diff --git a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
index 08173be997..98609d3fec 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
@@ -18,6 +18,7 @@ public class ShiroUtils {
         filterChainDefinitionMap.put("/resource/md/get/**", "anon");
         filterChainDefinitionMap.put("/resource/ui/get/**", "anon");
         filterChainDefinitionMap.put("/*.worker.js", "anon");
+        filterChainDefinitionMap.put("/*.html", "anon");
         filterChainDefinitionMap.put("/login", "anon");
         filterChainDefinitionMap.put("/signin", "anon");
         filterChainDefinitionMap.put("/ldap/signin", "anon");
diff --git a/frontend/pom.xml b/frontend/pom.xml
index 97747cca00..72609e7f0e 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -10,6 +10,8 @@
     <version>${revision}</version>
   </parent>
 
+  <packaging>pom</packaging>
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>frontend</artifactId>
 
diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index 84d7b0320d..51076033fd 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -73,6 +73,11 @@ module.exports = {
       }
     },
   },
+  css: {
+    extract: {
+      ignoreOrder: true,
+    }
+  },
   chainWebpack: config => {
     // 报告模板打包成一个html
     config.plugin('html-planReport')
diff --git a/pom.xml b/pom.xml
index 63969a3c45..4993517f68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.0</version>
+        <version>2.7.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>