From 30a53b41f09d2eefd33513a409d472c2166ba1ea Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期三, 10 一月 2024 17:35:03 +0800 Subject: [PATCH] 1. 新增自动评估相关数据源的检查接口 --- pom.xml | 52 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 83c8788..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,17 +420,13 @@ <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/generatorConfig4ds1.xml</configurationFile>--> + <configurationFile>src/main/resources/generator/generatorConfig4ds3.xml</configurationFile> <overwrite>true</overwrite> <verbose>true</verbose> </configuration> <dependencies> - <!--<dependency>--> - <!--<groupId>org.mybatis.generator</groupId>--> - <!--<artifactId>mybatis-generator-core</artifactId>--> - <!--<version>1.3.6</version>--> - <!--</dependency>--> <dependency> <groupId>tk.mybatis</groupId> <artifactId>mapper</artifactId> @@ -437,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> @@ -475,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