From 58f63d0e061123b15f780d294272d8a461f183db Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期三, 23 七月 2025 17:41:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- pom.xml | 39 +++++++++++++++++++++++++++++---------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 0e8467b..0043e39 100644 --- a/pom.xml +++ b/pom.xml @@ -59,6 +59,8 @@ <!-- Log4j2鐖嗛浄婕忔礊 --> <log4j2.version>2.17.0</log4j2.version> <logback.version>1.2.9</logback.version> + <!-- webservice --> + <cxf.version>3.2.4</cxf.version> </properties> <modules> @@ -66,7 +68,10 @@ <module>lxzn-module-demo</module> <module>lxzn-module-system</module> <module>lxzn-module-mdc</module> - </modules> + <module>lxzn-module-eam</module> + <module>lxzn-module-flowable</module> + <module>lxzn-module-eam-common</module> + </modules> <repositories> <repository> @@ -176,6 +181,18 @@ <dependency> <groupId>org.jeecgframework.boot</groupId> <artifactId>lxzn-system-cloud-api</artifactId> + <version>${jeecgboot.version}</version> + </dependency> + <!-- system 寰湇鍔� api --> + <dependency> + <groupId>org.jeecgframework.boot</groupId> + <artifactId>lxzn-module-flowable</artifactId> + <version>${jeecgboot.version}</version> + </dependency> + <!-- system 寰湇鍔� api --> + <dependency> + <groupId>org.jeecgframework.boot</groupId> + <artifactId>lxzn-module-eam-common</artifactId> <version>${jeecgboot.version}</version> </dependency> @@ -394,7 +411,7 @@ <url>http://maven.jeecg.com:8090/nexus/content/repositories/snapshots/</url> </snapshotRepository> </distributionManagement> - + <!-- 鐜 --> <profiles> <!-- 寮�鍙� --> @@ -432,12 +449,14 @@ </properties> </profile> <!-- SpringCloud杩愯鐜 --> - <profile> - <id>SpringCloud</id> - <modules> - <!-- 寰湇鍔℃ā鍧�--> - <module>jeecg-server-cloud</module> - </modules> - </profile> +<!-- <profile>--> +<!-- <id>SpringCloud</id>--> +<!-- <modules>--> +<!-- <!– 寰湇鍔℃ā鍧�–>--> +<!-- <module>jeecg-server-cloud</module>--> +<!-- </modules>--> +<!-- </profile>--> + + </profiles> -</project> \ No newline at end of file +</project> -- Gitblit v1.9.3