From 9bad713db5419c764117626d626bb3072bda4e4f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 11 一月 2022 11:30:53 +0800
Subject: [PATCH] fix 修复 index-tree.vue.vm 漏删 #end
---
pom.xml | 52 ++++++++++++++++++++--------------------------------
1 files changed, 20 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index 91fd51a..457ce4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<easyexcel.version>2.2.11</easyexcel.version>
<cglib.version>3.3.0</cglib.version>
<velocity.version>2.3</velocity.version>
- <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
+ <mybatis-plus.version>3.5.0</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
<hutool.version>5.7.18</hutool.version>
<okhttp.version>4.9.2</okhttp.version>
@@ -63,6 +63,15 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- hutool 鐨勪緷璧栭厤缃�-->
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-bom</artifactId>
+ <version>${hutool.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -157,36 +166,6 @@
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
<version>${p6spy.version}</version>
- </dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-core</artifactId>
- <version>${hutool.version}</version>
- </dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-http</artifactId>
- <version>${hutool.version}</version>
- </dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-captcha</artifactId>
- <version>${hutool.version}</version>
- </dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-extra</artifactId>
- <version>${hutool.version}</version>
- </dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-jwt</artifactId>
- <version>${hutool.version}</version>
</dependency>
<dependency>
@@ -317,8 +296,17 @@
</plugins>
<resources>
<resource>
- <!--鎵撳寘璇ョ洰褰曚笅鐨� application.yml -->
<directory>src/main/resources</directory>
+ <!-- 鍏抽棴杩囨护 -->
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <!-- 寮曞叆鎵�鏈� 鍖归厤鏂囦欢杩涜杩囨护 -->
+ <includes>
+ <include>application*</include>
+ <include>bootstrap*</include>
+ </includes>
<!-- 鍚敤杩囨护 鍗宠璧勬簮涓殑鍙橀噺灏嗕細琚繃婊ゅ櫒涓殑鍊兼浛鎹� -->
<filtering>true</filtering>
</resource>
--
Gitblit v1.9.3