From e34d97426e936bdd2b1e38c72cda02bed2e673a7 Mon Sep 17 00:00:00 2001 From: liwen Date: Thu, 13 Jun 2024 17:24:18 +0800 Subject: [PATCH] =?UTF-8?q?update:=20pom=E6=96=87=E4=BB=B6=E6=94=B9?= =?UTF-8?q?=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-biz-common/pom.xml | 23 +--- hzims-service-api/alarm-api/pom.xml | 7 +- hzims-service-api/assets-api/pom.xml | 5 +- hzims-service-api/basic-api/pom.xml | 7 +- hzims-service-api/common-api/pom.xml | 11 +- hzims-service-api/equipment-api/pom.xml | 10 +- hzims-service-api/hzims-operational-api/pom.xml | 42 ++----- hzims-service-api/inspect-api/pom.xml | 37 ++---- hzims-service-api/message-api/pom.xml | 6 +- hzims-service-api/middle-api/pom.xml | 2 - hzims-service-api/pom.xml | 25 ++-- hzims-service-api/safeproduct-api/pom.xml | 21 +--- hzims-service-api/ticket-api/pom.xml | 2 - hzims-service-api/topvision-api/pom.xml | 1 - hzims-service-api/weather-api/pom.xml | 1 - hzims-service/assets/pom.xml | 39 ++---- hzims-service/equipment/pom.xml | 70 ++++------- hzims-service/hzims-alarm/pom.xml | 73 +++-------- hzims-service/hzims-basic/pom.xml | 86 ++++--------- hzims-service/hzims-big-model/pom.xml | 25 +--- hzims-service/hzims-middle/pom.xml | 77 +++--------- hzims-service/hzims-scheduled/pom.xml | 96 +++++--------- hzims-service/inspect/pom.xml | 126 +++++-------------- hzims-service/message/pom.xml | 65 ++-------- hzims-service/operational/pom.xml | 142 +++++++-------------- hzims-service/pom.xml | 25 +--- hzims-service/safeproduct/pom.xml | 59 ++------- hzims-service/ticket/pom.xml | 161 ++++++------------------ hzims-service/topvision/pom.xml | 29 +---- hzims-service/weather/pom.xml | 55 +------- pom.xml | 41 ++---- 31 files changed, 325 insertions(+), 1044 deletions(-) diff --git a/hzims-biz-common/pom.xml b/hzims-biz-common/pom.xml index 4908ce6..daf1aaf 100644 --- a/hzims-biz-common/pom.xml +++ b/hzims-biz-common/pom.xml @@ -8,43 +8,26 @@ 4.0.0-SNAPSHOT 4.0.0 - hzims-biz-common jar org.springblade - blade-core-launch - - - org.springblade - blade-core-auto - provided + blade-common org.springblade - blade-common + blade-system-api + com.alibaba fastjson - - org.springblade - blade-user-api - - org.springblade - blade-dict-api - - - org.springblade - blade-starter-datascope - - com.hikvision.ga artemis-http-client diff --git a/hzims-service-api/alarm-api/pom.xml b/hzims-service-api/alarm-api/pom.xml index d5c5b91..f255b03 100644 --- a/hzims-service-api/alarm-api/pom.xml +++ b/hzims-service-api/alarm-api/pom.xml @@ -7,13 +7,14 @@ com.hnac.hzims 4.0.0-SNAPSHOT + 4.0.0 + alarm-api + jar + com.hnac.hzims middle-api - 4.0.0 - alarm-api - jar diff --git a/hzims-service-api/assets-api/pom.xml b/hzims-service-api/assets-api/pom.xml index 95df005..baec893 100644 --- a/hzims-service-api/assets-api/pom.xml +++ b/hzims-service-api/assets-api/pom.xml @@ -16,10 +16,7 @@ com.hnac.hzims ticket-api - + com.alibaba easyexcel diff --git a/hzims-service-api/basic-api/pom.xml b/hzims-service-api/basic-api/pom.xml index cf979da..7ca9b4c 100644 --- a/hzims-service-api/basic-api/pom.xml +++ b/hzims-service-api/basic-api/pom.xml @@ -7,13 +7,14 @@ com.hnac.hzims 4.0.0-SNAPSHOT + 4.0.0 + basic-api + jar + com.alibaba easyexcel - 4.0.0 - basic-api - jar diff --git a/hzims-service-api/common-api/pom.xml b/hzims-service-api/common-api/pom.xml index e238dbf..84f2ff3 100644 --- a/hzims-service-api/common-api/pom.xml +++ b/hzims-service-api/common-api/pom.xml @@ -1,23 +1,20 @@ - 4.0.0 - com.hnac.hzims - common-api - common-api - 公共api - hzims-service-api com.hnac.hzims 4.0.0-SNAPSHOT + 4.0.0 + common-api + common-api + 公共api 1.8 UTF-8 UTF-8 - 2.3.7.RELEASE diff --git a/hzims-service-api/equipment-api/pom.xml b/hzims-service-api/equipment-api/pom.xml index ecdd9c5..ff4ceef 100644 --- a/hzims-service-api/equipment-api/pom.xml +++ b/hzims-service-api/equipment-api/pom.xml @@ -12,19 +12,11 @@ jar - - - - - - org.springblade blade-system-api + com.hnac.hzinfo.data hzinfo-data-sdk diff --git a/hzims-service-api/hzims-operational-api/pom.xml b/hzims-service-api/hzims-operational-api/pom.xml index 4dc32e8..ec51d72 100644 --- a/hzims-service-api/hzims-operational-api/pom.xml +++ b/hzims-service-api/hzims-operational-api/pom.xml @@ -6,67 +6,46 @@ 4.0.0-SNAPSHOT 4.0.0 - hzims-operational-api ${project.artifactId} jar - - com.hnac.hzims - safeproduct-api - - org.springblade - blade-user-api + blade-system-api org.springblade blade-flow-api - 2.7.6.RELEASE - compile + - com.hnac.hzims - weather-api + com.hnac.hzinfo.data + hzinfo-data-sdk com.hnac.hzims - common-api + safeproduct-api - - - com.hnac.hzinfo.data - hzinfo-data-sdk + com.hnac.hzims + weather-api - - - - - - - org.springblade - blade-system-api + com.hnac.hzims + common-api - - com.hnac.hzims hzims-biz-common - com.hnac.hzims middle-api + cn.afterturn easypoi-base @@ -74,5 +53,4 @@ compile - diff --git a/hzims-service-api/inspect-api/pom.xml b/hzims-service-api/inspect-api/pom.xml index 9e092a8..9db9392 100644 --- a/hzims-service-api/inspect-api/pom.xml +++ b/hzims-service-api/inspect-api/pom.xml @@ -8,28 +8,26 @@ 4.0.0-SNAPSHOT 4.0.0 - inspect-api ${project.artifactId} jar - - org.springblade - blade-starter-mybatis - - - lettuce-core - io.lettuce - - + blade-common + - org.springblade - blade-starter-tenant + com.hnac.hzims + common-api + + + com.hnac.hzims + safeproduct-api + compile + org.springframework.cloud spring-cloud-starter-openfeign @@ -48,21 +46,6 @@ io.swagger swagger-models - - org.springblade - blade-core-auto - provided - - - com.hnac.hzims - common-api - - - com.hnac.hzims - safeproduct-api - compile - - diff --git a/hzims-service-api/message-api/pom.xml b/hzims-service-api/message-api/pom.xml index c09c119..06fa3da 100644 --- a/hzims-service-api/message-api/pom.xml +++ b/hzims-service-api/message-api/pom.xml @@ -14,11 +14,7 @@ org.springblade - blade-resource-api + blade-system-api - - - - diff --git a/hzims-service-api/middle-api/pom.xml b/hzims-service-api/middle-api/pom.xml index 198b15e..4d037a1 100644 --- a/hzims-service-api/middle-api/pom.xml +++ b/hzims-service-api/middle-api/pom.xml @@ -8,7 +8,6 @@ hzims-service-api 4.0.0-SNAPSHOT - middle-api @@ -17,7 +16,6 @@ UTF-8 - ${project.name}-${project.version} diff --git a/hzims-service-api/pom.xml b/hzims-service-api/pom.xml index 9974fff..ac97413 100644 --- a/hzims-service-api/pom.xml +++ b/hzims-service-api/pom.xml @@ -7,9 +7,7 @@ hzims-back 4.0.0-SNAPSHOT - 4.0.0 - hzims-service-api pom 微服务API集合 @@ -34,23 +32,19 @@ - com.hnac.hzims - hzims-biz-common + org.springblade + blade-common org.springblade - blade-starter-mybatis - - - lettuce-core - io.lettuce - - + blade-system-api + - org.springblade - blade-starter-tenant + com.hnac.hzims + hzims-biz-common + org.springframework.cloud spring-cloud-starter-openfeign @@ -69,11 +63,6 @@ io.swagger swagger-models - - org.springblade - blade-core-auto - provided - diff --git a/hzims-service-api/safeproduct-api/pom.xml b/hzims-service-api/safeproduct-api/pom.xml index 7543bda..23f80e9 100644 --- a/hzims-service-api/safeproduct-api/pom.xml +++ b/hzims-service-api/safeproduct-api/pom.xml @@ -8,8 +8,9 @@ 4.0.0-SNAPSHOT 4.0.0 - safeproduct-api + jar + org.springblade @@ -17,28 +18,18 @@ - com.alibaba - easyexcel - - com.hnac.hzims middle-api - - org.springblade - blade-user-api - - - org.springblade - blade-dict-api - cn.afterturn easypoi-spring-boot-starter ${easpoi.version} + + com.alibaba + easyexcel + - jar - diff --git a/hzims-service-api/ticket-api/pom.xml b/hzims-service-api/ticket-api/pom.xml index dad632f..cd3fe02 100644 --- a/hzims-service-api/ticket-api/pom.xml +++ b/hzims-service-api/ticket-api/pom.xml @@ -7,12 +7,10 @@ 4.0.0-SNAPSHOT 4.0.0 - ticket-api jar - com.hnac.hzims common-api diff --git a/hzims-service-api/topvision-api/pom.xml b/hzims-service-api/topvision-api/pom.xml index 0a71b41..65bb34b 100644 --- a/hzims-service-api/topvision-api/pom.xml +++ b/hzims-service-api/topvision-api/pom.xml @@ -8,7 +8,6 @@ 4.0.0-SNAPSHOT 4.0.0 - topvision-api ${project.artifactId} jar diff --git a/hzims-service-api/weather-api/pom.xml b/hzims-service-api/weather-api/pom.xml index 05304fa..0bd3278 100644 --- a/hzims-service-api/weather-api/pom.xml +++ b/hzims-service-api/weather-api/pom.xml @@ -7,7 +7,6 @@ 4.0.0-SNAPSHOT 4.0.0 - weather-api jar diff --git a/hzims-service/assets/pom.xml b/hzims-service/assets/pom.xml index eb28d65..593e6f0 100644 --- a/hzims-service/assets/pom.xml +++ b/hzims-service/assets/pom.xml @@ -18,34 +18,9 @@ org.springblade - blade-core-boot - - - org.springblade - blade-starter-swagger - - - org.springblade - blade-starter-oss-all - - - org.springblade - blade-starter-excel - - - org.springblade - blade-core-test - test - - - org.springblade - blade-core-auto - provided - - - org.springblade - blade-dict-api + blade-system-api + com.hnac.hzims assets-api @@ -55,10 +30,6 @@ ticket-api - com.xuxueli - xxl-job-core - - com.hnac.hzims message-api compile @@ -67,11 +38,15 @@ com.hnac.hzims equipment-api + + + com.xuxueli + xxl-job-core + - diff --git a/hzims-service/equipment/pom.xml b/hzims-service/equipment/pom.xml index e2286e6..107fb68 100644 --- a/hzims-service/equipment/pom.xml +++ b/hzims-service/equipment/pom.xml @@ -14,38 +14,46 @@ org.springblade - blade-core-boot + blade-common org.springblade - blade-starter-swagger + blade-system-api + - org.springblade - blade-starter-oss-all + com.hnac.hzinfo.data + hzinfo-data-sdk + - com.baomidou - dynamic-datasource-spring-boot-starter - 2.5.6 + com.hnac.hzims + equipment-api - org.springblade - blade-core-test - test + com.hnac.hzims + hzims-operational-api + compile - org.springblade - blade-core-auto - provided + com.hnac.hzims + inspect-api + + + com.hnac.hzims + assets-api + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.6 + + cn.hutool hutool-http 5.7.16 - com.hnac.hzinfo read-data @@ -61,48 +69,14 @@ - - - com.hnac.hzinfo.data - hzinfo-data-sdk - - - - com.hnac.hzims - equipment-api - - com.xuxueli xxl-job-core - - - org.springblade - blade-dict-api - - - org.springblade - blade-common - - - com.hnac.hzims - hzims-operational-api - compile - org.apache.commons commons-collections4 - - com.hnac.hzims - inspect-api - - - com.hnac.hzims - assets-api - - diff --git a/hzims-service/hzims-alarm/pom.xml b/hzims-service/hzims-alarm/pom.xml index 6525fd7..2b63c1d 100644 --- a/hzims-service/hzims-alarm/pom.xml +++ b/hzims-service/hzims-alarm/pom.xml @@ -24,30 +24,29 @@ org.springblade blade-common - org.springblade - blade-core-boot - - - org.springblade - blade-starter-redis - - + blade-system-api - - org.springblade - blade-starter-redis - - - org.springframework.boot - spring-boot-starter-data-redis - - + com.hnac.hzims + alarm-api + 4.0.0-SNAPSHOT + compile + + + com.hnac.hzims + equipment-api + + + com.hnac.hzims + hzims-operational-api + + + com.hnac.hzims + message-api - org.springframework.boot @@ -59,27 +58,10 @@ - - redis.clients jedis - - - org.springblade - blade-starter-swagger - - - org.springblade - blade-core-test - test - - - org.springblade - blade-core-auto - provided - org.springframework.boot @@ -101,15 +83,12 @@ com.baomidou mybatis-plus-generator - org.apache.velocity velocity-engine-core 2.2 - - com.github.xiaoymin @@ -117,24 +96,6 @@ ${swagger-bootstrap-ui.version} - com.hnac.hzims - alarm-api - 4.0.0-SNAPSHOT - compile - - - com.hnac.hzims - equipment-api - - - com.hnac.hzims - hzims-operational-api - - - com.hnac.hzims - message-api - - com.xuxueli xxl-job-core diff --git a/hzims-service/hzims-basic/pom.xml b/hzims-service/hzims-basic/pom.xml index a542199..40f6d6e 100644 --- a/hzims-service/hzims-basic/pom.xml +++ b/hzims-service/hzims-basic/pom.xml @@ -15,7 +15,6 @@ 1.8 UTF-8 UTF-8 - 2.6.13 1.9.6 @@ -24,30 +23,35 @@ org.springblade blade-common - org.springblade - blade-core-boot - - - org.springblade - blade-starter-redis - - + blade-system-api - - org.springblade - blade-starter-redis - - - org.springframework.boot - spring-boot-starter-data-redis - - + com.hnac.hzims + alarm-api + 4.0.0-SNAPSHOT + compile + + + com.hnac.hzims + basic-api + 4.0.0-SNAPSHOT + compile + + + com.hnac.hzims + equipment-api + + + com.hnac.hzims + hzims-operational-api + + + com.hnac.hzims + message-api - org.springframework.boot @@ -59,27 +63,10 @@ - - redis.clients jedis - - - org.springblade - blade-starter-swagger - - - org.springblade - blade-core-test - test - - - org.springblade - blade-core-auto - provided - org.springframework.boot @@ -101,15 +88,12 @@ com.baomidou mybatis-plus-generator - org.apache.velocity velocity-engine-core 2.2 - - com.github.xiaoymin @@ -117,30 +101,6 @@ ${swagger-bootstrap-ui.version} - com.hnac.hzims - alarm-api - 4.0.0-SNAPSHOT - compile - - - com.hnac.hzims - basic-api - 4.0.0-SNAPSHOT - compile - - - com.hnac.hzims - equipment-api - - - com.hnac.hzims - hzims-operational-api - - - com.hnac.hzims - message-api - - com.xuxueli xxl-job-core diff --git a/hzims-service/hzims-big-model/pom.xml b/hzims-service/hzims-big-model/pom.xml index ece5cf6..19bc3a3 100644 --- a/hzims-service/hzims-big-model/pom.xml +++ b/hzims-service/hzims-big-model/pom.xml @@ -14,31 +14,14 @@ org.springblade - blade-core-boot - - - org.springblade - blade-starter-redis - - + blade-common - - - org.springblade - blade-starter-swagger - - org.springblade - blade-core-test - test + blade-system-api - org.springblade - blade-core-cloud - - com.hnac.hzims big-model-api 4.0.0-SNAPSHOT @@ -61,10 +44,6 @@ com.xuxueli xxl-job-core - - org.springblade - blade-system-api - diff --git a/hzims-service/hzims-middle/pom.xml b/hzims-service/hzims-middle/pom.xml index 920d06e..a23d7f3 100644 --- a/hzims-service/hzims-middle/pom.xml +++ b/hzims-service/hzims-middle/pom.xml @@ -16,7 +16,6 @@ 1.8 UTF-8 UTF-8 - 2.6.13 1.9.6 @@ -25,30 +24,29 @@ org.springblade blade-common - org.springblade - blade-core-boot - - - org.springblade - blade-starter-redis - - + blade-system-api - - org.springblade - blade-starter-redis - - - org.springframework.boot - spring-boot-starter-data-redis - - + com.hnac.hzims + hzims-operational-api + + + com.hnac.hzims + ticket-api + + + com.hnac.hzims + middle-api + + + com.hnac.hzims + alarm-api + 4.0.0-SNAPSHOT + compile - org.springframework.boot @@ -60,68 +58,27 @@ - - redis.clients jedis - - - org.springblade - blade-starter-swagger - - - org.springblade - blade-core-test - test - - - org.springblade - blade-core-auto - provided - - - com.baomidou mybatis-plus-generator - org.apache.velocity velocity-engine-core 2.2 - - com.github.xiaoymin swagger-bootstrap-ui ${swagger-bootstrap-ui.version} - - com.hnac.hzims - hzims-operational-api - - - com.hnac.hzims - ticket-api - - - - com.hnac.hzims - middle-api - - - com.hnac.hzims - alarm-api - 4.0.0-SNAPSHOT - compile - diff --git a/hzims-service/hzims-scheduled/pom.xml b/hzims-service/hzims-scheduled/pom.xml index f28251e..b637c53 100644 --- a/hzims-service/hzims-scheduled/pom.xml +++ b/hzims-service/hzims-scheduled/pom.xml @@ -7,37 +7,35 @@ hzims-service 4.0.0-SNAPSHOT - 4.0.0 hzims-scheduled jar + UTF-8 1.0.3 1.9.6 + - redis.clients - jedis - 2.9.3 - - org.springblade - blade-core-boot + blade-common org.springblade - blade-core-cloud + blade-system-api org.springblade - blade-common + blade-flow-api + - org.springblade - blade-starter-swagger + com.hnac.hzinfo.data + hzinfo-data-sdk + com.hnac.hzims hzims-operational-api @@ -52,22 +50,34 @@ 4.0.0-SNAPSHOT - org.springblade - blade-core-test - test + com.hnac.hzims + equipment-api - org.springblade - blade-core-auto - provided + com.hnac.hzims + message-api - org.springblade - blade-dict-api + com.hnac.hzims + ticket-api - org.springblade - blade-flow-api + com.hnac.hzims + assets-api + + + com.hnac.hzims + weather-api + + + com.hnac.hzims + basic-api + + + + redis.clients + jedis + 2.9.3 com.xuxueli @@ -101,22 +111,6 @@ freemarker - com.hnac.hzims - equipment-api - - - com.hnac.hzims - message-api - - - com.hnac.hzims - ticket-api - - - com.hnac.hzims - assets-api - - com.google.zxing core @@ -125,10 +119,6 @@ javase - org.springblade - blade-user-api - - org.apache.commons commons-collections4 @@ -155,38 +145,14 @@ Java-WebSocket - org.springblade - blade-resource-api - - com.itextpdf itextpdf - com.hnac.hzims - weather-api - - - com.hnac.hzims - basic-api - - com.alibaba fastjson - org.springblade - blade-core-tool - - - org.springblade - blade-system-api - - - com.hnac.hzinfo.data - hzinfo-data-sdk - - com.github.xiaoymin swagger-bootstrap-ui ${swagger-bootstrap-ui.version} diff --git a/hzims-service/inspect/pom.xml b/hzims-service/inspect/pom.xml index 6641d35..8b85c87 100644 --- a/hzims-service/inspect/pom.xml +++ b/hzims-service/inspect/pom.xml @@ -2,16 +2,12 @@ - com.hnac.hzims hzims-service 4.0.0-SNAPSHOT - 4.0.0 - - com.hnac.hzims hzinfo-inspect jar @@ -22,82 +18,61 @@ org.springblade - blade-starter-datascope - - - com.hzinfo.framework - hnac-framework-mqtt-starters - - - org.eclipse.paho.client.mqttv3 - org.eclipse.paho - - - - - org.eclipse.paho - org.eclipse.paho.client.mqttv3 - 1.2.1 - - - - org.springblade - blade-core-boot - - - org.springblade - blade-starter-swagger + blade-common org.springblade - blade-core-tool + blade-system-api org.springblade - blade-dict-api + blade-flow-api + - org.springblade - blade-user-api + com.hnac.hzims + safeproduct-api - org.springblade - blade-flow-api - 4.5.3.RELEASE + com.hnac.hzims + equipment-api - - - - - - com.xuxueli - xxl-job-core + com.hnac.hzims + hzims-operational-api - org.springblade - blade-core-test - test + com.hnac.hzims + inspect-api - org.springblade - blade-starter-http + com.hnac.hzims + message-api com.hnac.hzims - safeproduct-api + hzims-biz-common + 4.0.0-SNAPSHOT + - com.hnac.hzims - equipment-api + com.hzinfo.framework + hnac-framework-mqtt-starters + + + org.eclipse.paho.client.mqttv3 + org.eclipse.paho + + - com.hnac.hzims - hzims-operational-api + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.1 - com.hnac.hzims - inspect-api + com.xuxueli + xxl-job-core com.hikvision.ga @@ -110,24 +85,10 @@ 2.6.9 - org.springblade - blade-resource-api - - io.minio minio 6.0.7 - - org.springblade - blade-starter-oss-minio - 2.7.3.RELEASE - - - com.hnac.hzims - message-api - - @@ -135,13 +96,11 @@ - com.alibaba easyexcel 2.2.7 - com.itextpdf @@ -164,8 +123,6 @@ javase 2.2 - - org.springframework @@ -173,35 +130,12 @@ 5.0.5.RELEASE compile - - - - org.springblade - blade-system-api - - - - - org.springblade - blade-common - - org.apache.commons commons-compress 1.18 - - - - - - com.hnac.hzims - hzims-biz-common - 4.0.0-SNAPSHOT - - diff --git a/hzims-service/message/pom.xml b/hzims-service/message/pom.xml index 2dcf390..1419f90 100644 --- a/hzims-service/message/pom.xml +++ b/hzims-service/message/pom.xml @@ -6,7 +6,6 @@ hzims-service 4.0.0-SNAPSHOT - 4.0.0 message jar @@ -18,89 +17,40 @@ org.springblade - blade-core-boot - - - lettuce-core - io.lettuce - - + blade-common org.springblade - blade-core-cloud + blade-system-api + + + + com.hnac.hzims + message-api org.springframework.boot spring-boot-starter-thymeleaf - ognl ognl 3.1.12 - redis.clients jedis - - - org.springblade - blade-common - - - org.springblade - blade-starter-swagger - - - org.springblade - blade-core-test - test - - - org.springblade - blade-core-auto - provided - - - org.springblade - blade-starter-oss-all - com.baomidou dynamic-datasource-spring-boot-starter 2.5.6 - com.xuxueli xxl-job-core - - - org.springblade - blade-resource-api - ${bladex.project.version} - - - org.springblade - blade-system-api - 5.0.2-SNAPSHOT - - - - - - - com.hnac.hzims - message-api - ${hzims.project.version} - - - org.springframework.boot @@ -119,7 +69,6 @@ spring-boot-starter-mail - cn.hutool diff --git a/hzims-service/operational/pom.xml b/hzims-service/operational/pom.xml index 688077c..8699334 100644 --- a/hzims-service/operational/pom.xml +++ b/hzims-service/operational/pom.xml @@ -6,7 +6,6 @@ hzims-service 4.0.0-SNAPSHOT - 4.0.0 hzims-operational jar @@ -18,75 +17,88 @@ - - com.documents4j - documents4j-local - ${documents4j.version} + org.springblade + blade-common - com.documents4j - documents4j-transformer-msoffice-word - ${documents4j.version} + org.springblade + blade-system-api - com.documents4j - documents4j-UTIL-ALL - ${documents4j.version} + org.springblade + blade-flow-api - redis.clients - jedis - 2.9.3 + com.hnac.hzinfo.data + hzinfo-data-sdk + - org.springblade - blade-core-boot + com.hnac.hzims + alarm-api + 4.0.0-SNAPSHOT + compile - org.springblade - blade-core-cloud + com.hnac.hzims + hzims-operational-api - org.springblade - blade-common + com.hnac.hzims + inspect-api - org.springblade - blade-starter-swagger + com.hnac.hzims + equipment-api com.hnac.hzims - hzims-operational-api + message-api com.hnac.hzims - inspect-api + ticket-api - org.springblade - blade-core-test - test + com.hnac.hzims + safeproduct-api - org.springblade - blade-core-auto - provided + com.hnac.hzims + assets-api - org.springblade - blade-dict-api + com.hnac.hzims + weather-api + + - org.springblade - blade-flow-api + com.documents4j + documents4j-local + ${documents4j.version} + + + com.documents4j + documents4j-transformer-msoffice-word + ${documents4j.version} + + + com.documents4j + documents4j-UTIL-ALL + ${documents4j.version} + + + redis.clients + jedis + 2.9.3 com.xuxueli xxl-job-core - org.apache.poi @@ -113,7 +125,6 @@ easypoi-annotation 4.4.0 - org.apache.poi @@ -147,27 +158,6 @@ - com.hnac.hzims - equipment-api - - - com.hnac.hzims - message-api - - - com.hnac.hzims - ticket-api - - - com.hnac.hzims - safeproduct-api - - - com.hnac.hzims - assets-api - - - com.google.zxing core @@ -175,11 +165,6 @@ com.google.zxing javase - - - org.springblade - blade-user-api - org.apache.commons @@ -213,40 +198,13 @@ - org.springblade - blade-resource-api - - com.itextpdf itextpdf - com.hnac.hzims - weather-api - - com.alibaba fastjson - - org.springblade - blade-core-tool - - - org.springblade - blade-system-api - - - com.hnac.hzinfo.data - hzinfo-data-sdk - - - com.hnac.hzims - alarm-api - - - - com.github.xiaoymin @@ -259,12 +217,6 @@ 3.9.1 compile - - com.hnac.hzims - alarm-api - 4.0.0-SNAPSHOT - compile - diff --git a/hzims-service/pom.xml b/hzims-service/pom.xml index 3bd858a..4978414 100644 --- a/hzims-service/pom.xml +++ b/hzims-service/pom.xml @@ -3,13 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.hnac.hzims hzims-back 4.0.0-SNAPSHOT - hzims-service pom BladeX 微服务集合 @@ -33,33 +31,19 @@ - com.hnac.hzims - hzims-biz-common - - - org.springblade - blade-user-api - - org.springblade blade-system-api + - org.springblade - blade-starter-tenant - - - org.springblade - blade-starter-api-crypto - - - org.springblade - blade-starter-datascope + com.hnac.hzims + hzims-biz-common com.hnac.hzims middle-api + @@ -67,5 +51,4 @@ easypoi-spring-boot-starter - diff --git a/hzims-service/safeproduct/pom.xml b/hzims-service/safeproduct/pom.xml index 43b1806..487ee72 100644 --- a/hzims-service/safeproduct/pom.xml +++ b/hzims-service/safeproduct/pom.xml @@ -8,7 +8,6 @@ 4.0.0-SNAPSHOT 4.0.0 - safeproduct jar @@ -19,16 +18,13 @@ org.springblade - blade-core-boot - - - org.springblade - blade-starter-swagger + blade-system-api org.springblade - blade-starter-oss-all + blade-flow-api + com.hnac.hzims safeproduct-api @@ -52,6 +48,15 @@ message-api + com.hnac.hzims + inspect-api + + + com.hnac.hzims + ticket-api + + + com.xuxueli xxl-job-core @@ -66,41 +71,11 @@ 2.5.6 - org.springblade - blade-starter-excel - - org.apache.poi ooxml-schemas 1.1 - org.springblade - blade-core-test - test - - - org.springblade - blade-core-auto - provided - - - org.springblade - blade-resource-api - - - org.springblade - blade-system-api - - - org.springblade - blade-flow-api - - - org.springblade - blade-dict-api - - com.google.zxing core 3.1.0 @@ -136,22 +111,12 @@ compile - com.hnac.hzims - inspect-api - - - com.hnac.hzims - ticket-api - - - com.aspose aspose-words 15.8.0 system ${project.basedir}/lib/aspose-words-15.8.0-jdk16.jar - cn.afterturn easypoi-spring-boot-starter diff --git a/hzims-service/ticket/pom.xml b/hzims-service/ticket/pom.xml index 3ce24e7..e9f2585 100644 --- a/hzims-service/ticket/pom.xml +++ b/hzims-service/ticket/pom.xml @@ -1,24 +1,20 @@ - com.hnac.hzims hzims-service 4.0.0-SNAPSHOT - 4.0.0 - com.hnac.hzims hzims-ticket + jar 1.8 UTF-8 UTF-8 - 2.3.7.RELEASE - 3.2.0 1.0.3 1.9.6 @@ -26,6 +22,43 @@ + + org.springblade + blade-common + + + org.springblade + blade-system-api + + + org.springblade + blade-flow-api + + + + com.hnac.hzims + hzims-operational-api + + + com.hnac.hzims + ticket-api + + + com.hnac.hzims + common-api + + + com.hnac.hzims + message-api + + + com.hnac.hzims + equipment-api + + + com.hnac.hzims + middle-api + @@ -43,27 +76,22 @@ documents4j-UTIL-ALL ${documents4j.version} - com.itextpdf itextpdf 5.5.10 - com.itextpdf itext-asian 5.2.0 - - e-iceblue spire.xls.free 3.9.1 - org.apache.poi @@ -75,53 +103,22 @@ poi-ooxml ${poi.version} - cn.hutool hutool-core 5.7.16 - - - org.springblade - blade-starter-http - - commons-collections commons-collections - org.springblade - blade-core-boot - - - org.springblade - blade-starter-redis - - - - - com.aspose aspose-words 15.8.0 system ${project.basedir}/lib/aspose-words-15.8.0-jdk16.jar - - - org.springblade - blade-starter-redis - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - org.springframework.boot spring-boot-starter-data-redis @@ -132,125 +129,47 @@ - org.springframework.boot spring-boot-configuration-processor true - - - - org.springblade - blade-core-cloud - - - org.springblade - blade-common - - - org.springblade - blade-starter-swagger - - - com.hnac.hzims - hzims-operational-api - - - org.springblade - blade-core-test - test - - - org.springblade - blade-core-auto - provided - - - org.springblade - blade-dict-api - - - org.springblade - blade-flow-api - com.xuxueli xxl-job-core - - - org.springblade - blade-starter-excel - - com.hikvision.ga artemis-http-client 1.1.2 - org.apache.httpcomponents httpclient - - - org.springblade - blade-user-api - ${bladex.project.version} - - org.apache.commons commons-collections4 4.4 - - org.springblade - blade-resource-api - - - - com.hnac.hzims - ticket-api - - - com.baomidou mybatis-plus-generator - org.apache.velocity velocity-engine-core 2.2 - org.springframework spring-test - - - com.hnac.hzims - common-api - - - com.hnac.hzims - message-api - - - com.hnac.hzims - equipment-api - - redis.clients jedis @@ -268,10 +187,6 @@ - - com.hnac.hzims - middle-api - diff --git a/hzims-service/topvision/pom.xml b/hzims-service/topvision/pom.xml index e959aa6..c4d35c5 100644 --- a/hzims-service/topvision/pom.xml +++ b/hzims-service/topvision/pom.xml @@ -2,15 +2,12 @@ - com.hnac.hzims hzims-service 4.0.0-SNAPSHOT - 4.0.0 - topvision jar @@ -21,40 +18,20 @@ org.springblade - blade-core-boot - - - org.springblade - blade-starter-swagger - - - org.springblade - blade-starter-oss-all + blade-system-api + com.hnac.hzims topvision-api + com.baomidou dynamic-datasource-spring-boot-starter 2.5.6 - org.springblade - blade-core-test - test - - - org.springblade - blade-core-auto - provided - - - org.springblade - blade-starter-http - - org.mybatis.generator mybatis-generator-core 1.3.2 diff --git a/hzims-service/weather/pom.xml b/hzims-service/weather/pom.xml index b59b81d..b55f4cd 100644 --- a/hzims-service/weather/pom.xml +++ b/hzims-service/weather/pom.xml @@ -1,15 +1,12 @@ - com.hnac.hzims hzims-service 4.0.0-SNAPSHOT - 4.0.0 - com.hnac.hzims hzims-weather @@ -29,82 +26,42 @@ org.springblade - blade-starter-http - - - commons-collections - commons-collections - - - org.springblade - blade-core-boot - - - org.springblade - blade-core-cloud - - - org.springblade - blade-starter-swagger - - - org.springblade - blade-core-test - test + blade-system-api + - org.springblade - blade-core-auto - provided + com.hnac.hzims + weather-api - org.springblade - blade-dict-api + commons-collections + commons-collections com.xuxueli xxl-job-core - - org.springblade - blade-starter-excel - - - - org.springblade - blade-user-api - - org.apache.commons commons-collections4 4.4 - - - com.hnac.hzims - weather-api - - org.springframework spring-test - com.google.guava guava ${guava.version} - org.apache.httpcomponents httpmime - diff --git a/pom.xml b/pom.xml index 226f1e4..00e93c4 100644 --- a/pom.xml +++ b/pom.xml @@ -14,15 +14,11 @@ pom - 5.1.1.RELEASE - - - - + 5.1.3.RELEASE + 5.1.3.RELEASE UTF-8 1.8 UTF-8 - 4.0.0-SNAPSHOT 4.4.0 @@ -43,41 +39,25 @@ org.springblade blade-common - - 5.1.1.RELEASE.fix.2 + ${hzinfo.platform.version} org.springblade blade-system-api - ${bladex.project.version} - - - org.springblade - blade-user-api - - 5.1.1.RELEASE.fix.4 - - - org.springblade - blade-dict-api - ${bladex.project.version} + ${hzinfo.platform.version} org.springblade blade-flow-api - ${bladex.project.version} - - - org.springblade - blade-resource-api - ${bladex.project.version} + ${hzinfo.platform.version} + com.hnac.hzinfo.data hzinfo-data-sdk - - 5.1.1.RELEASE.fix.4 + ${data.sdk.version} + com.xuxueli xxl-job-core @@ -220,11 +200,6 @@ org.projectlombok lombok - - org.springblade - blade-core-test - test -