From 196bb14112448857a885e32dc4149e308e00b01a Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期四, 15 八月 2024 11:57:15 +0800 Subject: [PATCH] 2024.8.15 各项修正 --- pom.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 48 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index f5e580b..07b9561 100644 --- a/pom.xml +++ b/pom.xml @@ -121,9 +121,9 @@ <!-- https://mvnrepository.com/artifact/com.alibaba/druid --> <dependency> - <groupId>com.alibaba</groupId> - <artifactId>druid</artifactId> - <version>1.1.6</version> + <groupId>com.alibaba</groupId> + <artifactId>druid</artifactId> + <version>1.1.6</version> </dependency> <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson --> @@ -375,6 +375,18 @@ <artifactId>pinyin4j</artifactId> <version>2.5.1</version> </dependency> + <!-- https://mvnrepository.com/artifact/net.sf.cssbox/pdf2dom --> + <dependency> + <groupId>net.sf.cssbox</groupId> + <artifactId>pdf2dom</artifactId> + <version>2.0.3</version> + </dependency> + <!-- https://mvnrepository.com/artifact/com.google.zxing/core --> + <dependency> + <groupId>com.google.zxing</groupId> + <artifactId>core</artifactId> + <version>3.4.0</version> + </dependency> </dependencies> @@ -472,12 +484,31 @@ </dependency> </dependencies> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <configuration> + <delimiters>@</delimiters> + <useDefaultDelimiters>false</useDefaultDelimiters> + </configuration> + </plugin> </plugins> <resources> <resource> <directory>src/main/resources</directory> <filtering>true</filtering> + <excludes> + <exclude>font/</exclude> + </excludes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <includes> + <include>font/</include> + </includes> </resource> </resources> </build> @@ -486,7 +517,7 @@ <profile> <id>dev</id> <properties> - <profile.active>dev</profile.active> + <profileActive>dev</profileActive> </properties> <activation> <activeByDefault>true</activeByDefault> @@ -495,11 +526,20 @@ <profile> <id>pro</id> <properties> - <profile.active>pro</profile.active> + <profileActive>pro</profileActive> </properties> - <activation> - <activeByDefault>false</activeByDefault> - </activation> + </profile> + <profile> + <id>proapp</id> + <properties> + <profileActive>proapp</profileActive> + </properties> + </profile> + <profile> + <id>test</id> + <properties> + <profileActive>test</profileActive> + </properties> </profile> </profiles> -- Gitblit v1.9.3