From 0c59552dc14c9023d4c0a9d57509cce1d5a6d6da Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:07:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervision/hc-socket-1129'
---
pom.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6d4c67e..a439640 100644
--- a/pom.xml
+++ b/pom.xml
@@ -437,8 +437,8 @@
<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>
+ <configurationFile>src/main/resources/generator/generatorConfig4ds1.xml</configurationFile>
+<!-- <configurationFile>src/main/resources/generator/generatorConfig4ds3.xml</configurationFile>-->
<overwrite>true</overwrite>
<verbose>true</verbose>
</configuration>
@@ -499,6 +499,12 @@
</properties>
</profile>
<profile>
+ <id>pro-https</id>
+ <properties>
+ <profileActive>pro-https</profileActive>
+ </properties>
+ </profile>
+ <profile>
<id>test</id>
<properties>
<profileActive>test</profileActive>
--
Gitblit v1.9.3