hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

从dev更新后 合并冲突 

2024年8月28日14:19:18
This commit is contained in:
xiang2lin 2024-08-28 14:19:23 +08:00
parent 1d3bf1d6e9
commit 9ad3b8d52b
1 changed files with 21 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
buildpackage/pom.xml
View File

@ -17,86 +17,39 @@
<artifactId>webapp</artifactId>
<version>${revision}</version>
</dependency>
<!-- &lt;!&ndash; 淘宝奇门sdk&ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.reabam.sdk</groupId>-->
<!-- <artifactId>reabam-sdk-java</artifactId>-->
<!-- <version>1.0</version>-->
<!-- <scope>system</scope>-->
<!-- <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/openapi-sdk-1.0.0.jar</systemPath>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.taobao.qmsdk</groupId>-->
<!-- <artifactId>taobao-sdk-java-auto</artifactId>-->
<!-- <version>1.1</version>-->
<!-- <scope>system</scope>-->
<!-- <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto-1.1.jar</systemPath>-->
<!-- </dependency>-->
<!-- &lt;!&ndash; 淘宝奇门sdk&ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.reabam.sdk</groupId>-->
<!-- <artifactId>reabam-sdk-java</artifactId>-->
<!-- <version>1.0</version>-->
<!-- <scope>system</scope>-->
<!-- <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/openapi-sdk-1.0.0.jar</systemPath>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.taobao.qmsdk</groupId>-->
<!-- <artifactId>taobao-sdk-java-auto</artifactId>-->
<!-- <version>1.1</version>-->
<!-- <scope>system</scope>-->
<!-- <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto-1.1.jar</systemPath>-->
<!-- </dependency>-->
</dependencies>
<profiles>
<profile>
<id>local</id> <!--本地环境-->
<id>xel</id> <!--本地环境-->
<properties>
<profile.active>local</profile.active>
<profile.active>xel</profile.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>dev</id> <!--开发环境-->
<id>kjs</id> <!--会稽山-->
<properties>
<profile.active>dev</profile.active>
</properties>
</profile>
<profile>
<id>ax</id> <!--澳星-->
<properties>
<profile.active>ax</profile.active>
</properties>
</profile>
<profile>
<id>hclocal</id> <!--何灿-->
<properties>
<profile.active>hclocal</profile.active>
</properties>
</profile>
<profile>
<id>llg</id> <!--吕磊钢-->
<properties>
<profile.active>llg</profile.active>
</properties>
</profile>
<profile>
<id>zqtlocal</id> <!--曾庆拓-->
<properties>
<profile.active>zqtlocal</profile.active>
</properties>
</profile>
<profile>
<id>yuqh</id> <!--于群辉-->
<properties>
<profile.active>yuqh</profile.active>
</properties>
</profile>
<profile>
<id>xel</id> <!--相二林-->
<properties>
<profile.active>xel</profile.active>
</properties>
</profile>
<profile>
<id>ydc</id> <!--英德赛-->
<properties>
<profile.active>ydc</profile.active>
</properties>
</profile>
<profile>
<id>yc</id> <!--越城区-->
<properties>
<profile.active>yc</profile.active>
<profile.active>kjs</profile.active>
</properties>
</profile>
</profiles>
@ -104,4 +57,4 @@
<finalName>kangarooDataCenterV3</finalName>
</build>
</project>
</project>