From c1becf4cbd2e99601ce011c14b8742427249cfb4 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 09 一月 2024 17:25:05 +0800
Subject: [PATCH] 1. 多项调整
---
pom.xml | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2d674a9..0bb7353 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
<!-- tk.mybatis -->
<mapper.plugin>tk.mybatis.mapper.generator.MapperPlugin</mapper.plugin>
<mapper.Mapper>tk.mybatis.mapper.common.Mapper</mapper.Mapper>
+ <resource.delimiters>@</resource.delimiters>
</properties>
<dependencies>
@@ -419,6 +420,7 @@
<artifactId>mybatis-generator-maven-plugin</artifactId>
<version>1.3.2</version>
<configuration>
+<!-- <configurationFile>src/main/resources/generator/generatorConfig4ds1.xml</configurationFile>-->
<configurationFile>src/main/resources/generator/generatorConfig4ds3.xml</configurationFile>
<overwrite>true</overwrite>
<verbose>true</verbose>
@@ -432,26 +434,34 @@
</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>
<filtering>true</filtering>
<directory>src/main/resources</directory>
- <excludes>
- <exclude>application-dev.yml</exclude>
- <exclude>application-pro.yml</exclude>
- <exclude>application.yml</exclude>
- </excludes>
+<!-- <excludes>-->
+<!-- <exclude>application-dev.yml</exclude>-->
+<!-- <exclude>application-pro.yml</exclude>-->
+<!-- <exclude>application.yml</exclude>-->
+<!-- </excludes>-->
</resource>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>application-${profileActive}.yml</include>
- <include>application.yml</include>
- </includes>
- </resource>
+<!-- <resource>-->
+<!-- <filtering>true</filtering>-->
+<!-- <directory>src/main/resources</directory>-->
+<!-- <includes>-->
+<!-- <include>application-${profileActive}.yml</include>-->
+<!-- <include>application.yml</include>-->
+<!-- </includes>-->
+<!-- </resource>-->
</resources>
</build>
@@ -470,9 +480,12 @@
<properties>
<profileActive>pro</profileActive>
</properties>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
+ </profile>
+ <profile>
+ <id>test</id>
+ <properties>
+ <profileActive>test</profileActive>
+ </properties>
</profile>
</profiles>
--
Gitblit v1.9.3