From 760e53aeef80c287ced8b6716336733867fc7565 Mon Sep 17 00:00:00 2001 From: kongzy <kongzy> Date: 星期四, 07 三月 2024 08:30:57 +0800 Subject: [PATCH] 新增需求 --- pom.xml | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4eb06f0..eb0598b 100644 --- a/pom.xml +++ b/pom.xml @@ -227,6 +227,7 @@ <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>5.1.40</version> +<!-- <version>8.0.20</version>--> </dependency> <dependency> <groupId>commons-beanutils</groupId> @@ -344,7 +345,7 @@ <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> - <version>1.2.75</version> + <version>2.0.17</version> </dependency> <dependency> <groupId>com.google.collections</groupId> @@ -394,7 +395,7 @@ <profile> <id>test</id> <properties> - <profile.active>cq</profile.active> + <profile.active>gslab</profile.active> </properties> <activation> <activeByDefault>true</activeByDefault> @@ -524,7 +525,6 @@ <build> <finalName>smartlab</finalName> <filters> - <filter>src/main/webapp/WEB-INF/${profile.active}/${profile.active}.properties</filter> </filters> <plugins> @@ -589,6 +589,10 @@ <include>message.properties</include> </includes> </resource> + <resource> + <directory>src/main/webapp/WEB-INF</directory> + <filtering>true</filtering> + </resource> </resources> </build> </project> -- Gitblit v1.9.2