From 185823aa889e86e96871e5627d8b3a363c7fe133 Mon Sep 17 00:00:00 2001 From: Jone <515616805@qq.com> Date: Mon, 20 Mar 2023 18:17:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3pom=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-biz-common/pom.xml | 4 - hzims-service-api/assets-api/pom.xml | 3 - hzims-service-api/common-api/pom.xml | 1 - hzims-service-api/equipment-api/pom.xml | 3 - hzims-service-api/hzims-operational-api/pom.xml | 14 -- hzims-service-api/inspect-api/pom.xml | 1 - hzims-service-api/message-api/pom.xml | 3 - hzims-service-api/pom.xml | 2 - hzims-service-api/safeproduct-api/pom.xml | 4 - hzims-service-api/ticket-api/pom.xml | 5 - hzims-service-api/weather-api/pom.xml | 2 - hzims-service/assets/pom.xml | 1 - hzims-service/equipment/pom.xml | 1 - hzims-service/inspect/pom.xml | 19 +-- hzims-service/message/pom.xml | 15 -- hzims-service/operational/pom.xml | 64 +------ hzims-service/pom.xml | 6 - hzims-service/safeproduct/pom.xml | 14 -- hzims-service/ticket/pom.xml | 43 ----- hzims-service/weather/pom.xml | 21 --- pom.xml | 218 +++++++++++++++++++++++- 21 files changed, 216 insertions(+), 228 deletions(-) diff --git a/hzims-biz-common/pom.xml b/hzims-biz-common/pom.xml index 0b520b1..c2535c2 100644 --- a/hzims-biz-common/pom.xml +++ b/hzims-biz-common/pom.xml @@ -10,8 +10,6 @@ 4.0.0 hzims-biz-common - ${hzims.project.version} - ${project.artifactId} jar @@ -32,13 +30,11 @@ org.springblade blade-user-api - ${bladex.project.version} org.springblade blade-dict-api - ${bladex.project.version} org.springblade diff --git a/hzims-service-api/assets-api/pom.xml b/hzims-service-api/assets-api/pom.xml index 17eece9..27a4487 100644 --- a/hzims-service-api/assets-api/pom.xml +++ b/hzims-service-api/assets-api/pom.xml @@ -9,19 +9,16 @@ 4.0.0 assets-api - ${hzims.project.version} jar com.hnac.hzims ticket-api - ${hzims.project.version} com.hnac.hzinfo.data hzinfo-data-api - ${hzinfo.data.version} com.alibaba diff --git a/hzims-service-api/common-api/pom.xml b/hzims-service-api/common-api/pom.xml index d2d2a6b..dad68bd 100644 --- a/hzims-service-api/common-api/pom.xml +++ b/hzims-service-api/common-api/pom.xml @@ -4,7 +4,6 @@ 4.0.0 com.hnac.hzims common-api - ${hzims.project.version} common-api 公共api diff --git a/hzims-service-api/equipment-api/pom.xml b/hzims-service-api/equipment-api/pom.xml index b8e379c..4147b5a 100644 --- a/hzims-service-api/equipment-api/pom.xml +++ b/hzims-service-api/equipment-api/pom.xml @@ -9,7 +9,6 @@ 4.0.0 equipment-api - ${hzims.project.version} jar @@ -21,12 +20,10 @@ com.hnac.hzinfo.data hzinfo-data-api - ${hzinfo.data.version} org.springblade blade-system-api - 4.5.8-SNAPSHOT diff --git a/hzims-service-api/hzims-operational-api/pom.xml b/hzims-service-api/hzims-operational-api/pom.xml index 323eebf..539360f 100644 --- a/hzims-service-api/hzims-operational-api/pom.xml +++ b/hzims-service-api/hzims-operational-api/pom.xml @@ -9,7 +9,6 @@ hzims-operational-api ${project.artifactId} - ${hzims.project.version} jar @@ -22,8 +21,6 @@ org.springblade blade-user-api - ${bladex.project.version} - compile org.springblade @@ -34,20 +31,11 @@ com.hnac.hzims weather-api - ${hzims.project.version} - compile - - - com.hnac.hzims - weather-api - ${hzims.project.version} - compile com.hnac.hzims common-api - ${hzims.project.version} @@ -69,7 +56,6 @@ org.springblade blade-system-api - 4.5.8-SNAPSHOT diff --git a/hzims-service-api/inspect-api/pom.xml b/hzims-service-api/inspect-api/pom.xml index d3fdd75..a39874a 100644 --- a/hzims-service-api/inspect-api/pom.xml +++ b/hzims-service-api/inspect-api/pom.xml @@ -11,7 +11,6 @@ com.hnac.hzinfo inspect-api - ${bladex.project.version} jar diff --git a/hzims-service-api/message-api/pom.xml b/hzims-service-api/message-api/pom.xml index bc8057e..0be6322 100644 --- a/hzims-service-api/message-api/pom.xml +++ b/hzims-service-api/message-api/pom.xml @@ -9,19 +9,16 @@ 4.0.0 message-api - ${hzims.project.version} jar org.springblade blade-resource-api - 4.5.0.RELEASE com.hnac.hzims hzims-biz-common - ${hzims.project.version} diff --git a/hzims-service-api/pom.xml b/hzims-service-api/pom.xml index 370bde6..8f51cac 100644 --- a/hzims-service-api/pom.xml +++ b/hzims-service-api/pom.xml @@ -11,8 +11,6 @@ 4.0.0 hzims-service-api - ${project.artifactId} - ${hzims.project.version} pom 微服务API集合 diff --git a/hzims-service-api/safeproduct-api/pom.xml b/hzims-service-api/safeproduct-api/pom.xml index 4152230..5cec7fd 100644 --- a/hzims-service-api/safeproduct-api/pom.xml +++ b/hzims-service-api/safeproduct-api/pom.xml @@ -10,14 +10,10 @@ 4.0.0 safeproduct-api - ${project.artifactId} - ${hzims.project.version} org.springblade blade-system-api - 4.5.3.RELEASE - compile jar diff --git a/hzims-service-api/ticket-api/pom.xml b/hzims-service-api/ticket-api/pom.xml index 60233b7..3953799 100644 --- a/hzims-service-api/ticket-api/pom.xml +++ b/hzims-service-api/ticket-api/pom.xml @@ -9,7 +9,6 @@ 4.0.0 ticket-api - ${project.artifactId} jar @@ -17,14 +16,10 @@ com.hnac.hzims common-api - ${hzims.project.version} - compile com.hnac.hzims hzims-operational-api - ${hzims.project.version} - compile diff --git a/hzims-service-api/weather-api/pom.xml b/hzims-service-api/weather-api/pom.xml index 13cbd1e..05304fa 100644 --- a/hzims-service-api/weather-api/pom.xml +++ b/hzims-service-api/weather-api/pom.xml @@ -9,8 +9,6 @@ 4.0.0 weather-api - ${project.artifactId} - ${hzims.project.version} jar diff --git a/hzims-service/assets/pom.xml b/hzims-service/assets/pom.xml index c18d520..2e31875 100644 --- a/hzims-service/assets/pom.xml +++ b/hzims-service/assets/pom.xml @@ -8,7 +8,6 @@ 4.0.0-SNAPSHOT 4.0.0 - ${hzims.project.version} assets jar diff --git a/hzims-service/equipment/pom.xml b/hzims-service/equipment/pom.xml index f9273e0..ddb962c 100644 --- a/hzims-service/equipment/pom.xml +++ b/hzims-service/equipment/pom.xml @@ -8,7 +8,6 @@ 4.0.0-SNAPSHOT 4.0.0 - ${hzims.project.version} hzims-equipment jar diff --git a/hzims-service/inspect/pom.xml b/hzims-service/inspect/pom.xml index d67566d..7376582 100644 --- a/hzims-service/inspect/pom.xml +++ b/hzims-service/inspect/pom.xml @@ -13,24 +13,18 @@ com.hnac.hzinfo.inspect hzinfo-inspect - ${project.artifactId} - ${bladex.project.version} jar 2.7.6.RELEASE 4.5.6.RELEASE 4.0.0-SNAPSHOT + 1.4.13 org.springblade - blade-common - 4.5.6.RELEASE - - - org.springblade blade-starter-datascope ${bladex.project.version} @@ -53,11 +47,6 @@ org.springblade - blade-common - ${bladex.project.version} - - - org.springblade blade-core-boot ${bladex.project.version} @@ -73,11 +62,6 @@ org.springblade - blade-system-api - ${bladex.project.version} - - - org.springblade blade-dict-api ${bladex.project.version} @@ -229,6 +213,7 @@ com.spotify dockerfile-maven-plugin + ${docker.plugin.version} ${docker.username} ${docker.password} diff --git a/hzims-service/message/pom.xml b/hzims-service/message/pom.xml index 826aef1..fbed77b 100644 --- a/hzims-service/message/pom.xml +++ b/hzims-service/message/pom.xml @@ -9,7 +9,6 @@ 4.0.0 message - ${hzims.project.version} jar @@ -32,13 +31,6 @@ - org.springblade - blade-common - - ${bladex.projet.common.version} - - - ognl ognl 3.1.12 @@ -77,10 +69,6 @@ org.springblade - blade-starter-swagger - - - org.springblade blade-starter-oss-all @@ -102,7 +90,6 @@ org.springblade blade-system-api - ${bladex.project.version} @@ -130,8 +117,6 @@ com.hnac.hzims hzims-operational-api - ${hzims.project.version} - compile diff --git a/hzims-service/operational/pom.xml b/hzims-service/operational/pom.xml index 10532bb..839a0da 100644 --- a/hzims-service/operational/pom.xml +++ b/hzims-service/operational/pom.xml @@ -9,12 +9,10 @@ 4.0.0 hzims-operational - ${hzims.project.version} jar UTF-8 - 3.15 1.0.3 @@ -23,17 +21,14 @@ org.apache.poi poi - ${poi.version} org.apache.poi poi-ooxml - ${poi.version} org.apache.poi poi-ooxml-schemas - ${poi.version} @@ -47,8 +42,6 @@ org.springblade blade-common - - ${bladex.projet.common.version} org.springblade @@ -57,12 +50,10 @@ com.hnac.hzims hzims-operational-api - ${hzims.project.version} com.hnac.hzinfo inspect-api - 2.7.6.RELEASE org.springblade @@ -77,18 +68,14 @@ org.springframework.boot spring-boot-configuration-processor - ${spring.boot.version} - true org.springblade blade-dict-api - ${bladex.project.version} org.springblade blade-flow-api - ${bladex.project.version} com.xuxueli @@ -107,24 +94,20 @@ cn.afterturn easypoi-base - 3.2.0 cn.afterturn easypoi-annotation - 3.2.0 com.hikvision.ga artemis-http-client - 1.1.2 org.apache.httpcomponents httpclient - 4.5.2 @@ -138,84 +121,61 @@ com.hnac.hzims equipment-api - ${hzims.project.version} com.hnac.hzims message-api - ${hzims.project.version} com.hnac.hzims ticket-api - ${hzims.project.version} com.hnac.hzims assets-api - ${hzims.project.version} com.google.zxing core - 3.1.0 com.google.zxing javase - 3.1.0 org.springblade blade-user-api - 2.7.6.1.RELEASE org.apache.commons commons-collections4 - 4.4 - org.springframework.boot - spring-boot-starter-websocket - ${spring.boot.version} - - - - org.springblade - blade-common - ${bladex.project.version} - - - org.springframework.boot - spring-boot-starter-undertow - - + org.springframework.boot + spring-boot-starter-websocket cn.hutool hutool-http - 5.7.16 cn.hutool hutool-core - 5.7.16 @@ -224,25 +184,19 @@ org.java-websocket Java-WebSocket - 1.3.8 org.springblade blade-resource-api - ${bladex.project.version} com.itextpdf itextpdf - 5.5.10 - compile com.hnac.hzims weather-api - ${hzims.project.version} - compile com.alibaba @@ -253,26 +207,12 @@ blade-core-tool - org.apache.httpcomponents - httpclient - - org.springblade blade-system-api - 4.5.8-SNAPSHOT com.hnac.hzinfo.data hzinfo-data-sdk - ${hzinfo.data.version} - - - org.springblade - blade-core-boot - - - org.springblade - blade-core-boot diff --git a/hzims-service/pom.xml b/hzims-service/pom.xml index f4231c0..9cfd5d3 100644 --- a/hzims-service/pom.xml +++ b/hzims-service/pom.xml @@ -11,8 +11,6 @@ hzims-service - ${project.artifactId} - ${hzims.project.version} pom BladeX 微服务集合 @@ -34,17 +32,14 @@ com.hnac.hzims hzims-biz-common - ${hzims.project.version} org.springblade blade-user-api - ${bladex.project.version} org.springblade blade-system-api - ${bladex.project.version} org.springblade @@ -57,7 +52,6 @@ org.springblade blade-starter-datascope - ${bladex.project.version} diff --git a/hzims-service/safeproduct/pom.xml b/hzims-service/safeproduct/pom.xml index c589276..fc8c6cb 100644 --- a/hzims-service/safeproduct/pom.xml +++ b/hzims-service/safeproduct/pom.xml @@ -10,8 +10,6 @@ 4.0.0 safeproduct - ${project.artifactId} - ${hzims.project.version} jar @@ -40,22 +38,18 @@ com.hnac.hzims safeproduct-api - ${hzims.project.version} com.hnac.hzims hzims-operational-api - ${hzims.project.version} com.hnac.hzims equipment-api - ${hzims.project.version} com.hnac.hzims message-api - ${hzims.project.version} com.xuxueli @@ -88,27 +82,22 @@ org.springblade blade-resource-api - 4.5.0.RELEASE org.springblade blade-system-api - ${bladex.project.version} org.springblade blade-flow-api - 4.5.3.RELEASE org.springblade blade-dict-api - ${bladex.project.version} org.springblade blade-system-api - ${bladex.project.version} com.google.zxing @@ -138,7 +127,6 @@ org.xhtmlrenderer flying-saucer-pdf-itext5 9.0.7 - compile org.xhtmlrenderer @@ -154,8 +142,6 @@ com.hnac.hzims ticket-api - ${hzims.project.version} - compile diff --git a/hzims-service/ticket/pom.xml b/hzims-service/ticket/pom.xml index 20273f8..3c2b1e1 100644 --- a/hzims-service/ticket/pom.xml +++ b/hzims-service/ticket/pom.xml @@ -11,8 +11,6 @@ 4.0.0 com.hnac.hzims hzims-ticket - ${hzims.project.version} - hzims-ticket 1.8 @@ -25,11 +23,6 @@ - - org.springblade - blade-common - ${bladex.projet.common.version} - @@ -72,22 +65,18 @@ org.apache.poi poi - ${poi.version} org.apache.poi poi-ooxml - ${poi.version} org.apache.poi poi-ooxml-schemas - ${poi.version} org.apache.poi poi-scratchpad - ${poi.version} cn.afterturn @@ -103,18 +92,7 @@ org.springblade - blade-core-test - test - - - org.springblade blade-starter-http - ${bladex.project.version} - - - org.springblade - blade-resource-api - ${bladex.project.version} @@ -132,7 +110,6 @@ org.springblade blade-common - ${bladex.project.version} org.springblade @@ -141,7 +118,6 @@ com.hnac.hzims hzims-operational-api - ${hzims.project.version} org.springblade @@ -156,18 +132,14 @@ org.springframework.boot spring-boot-configuration-processor - ${spring.boot.version} - true org.springblade blade-dict-api - ${bladex.project.version} org.springblade blade-flow-api - 4.5.1.RELEASE com.xuxueli @@ -189,7 +161,6 @@ org.apache.httpcomponents httpclient - 4.5.2 @@ -210,13 +181,11 @@ org.springblade blade-resource-api - ${bladex.project.version} com.hnac.hzims ticket-api - ${hzims.project.version} @@ -239,26 +208,14 @@ com.hnac.hzims common-api - ${hzims.project.version} - compile com.hnac.hzims message-api - ${hzims.project.version} - compile - - - com.hnac.hzims - equipment-api - ${hzims.project.version} - compile com.hnac.hzims equipment-api - ${hzims.project.version} - compile diff --git a/hzims-service/weather/pom.xml b/hzims-service/weather/pom.xml index e870b87..df7dd37 100644 --- a/hzims-service/weather/pom.xml +++ b/hzims-service/weather/pom.xml @@ -11,8 +11,6 @@ 4.0.0 com.hnac.hzims hzims-weather - ${hzims.project.version} - hzims-weather 1.8 @@ -35,18 +33,10 @@ org.springblade blade-common - ${bladex.projet.common.version} - - - - org.springblade - blade-core-test - test org.springblade blade-starter-http - ${bladex.project.version} commons-collections @@ -77,13 +67,10 @@ org.springframework.boot spring-boot-configuration-processor - ${spring.boot.version} - true org.springblade blade-dict-api - ${bladex.project.version} com.xuxueli @@ -97,7 +84,6 @@ org.springblade blade-user-api - ${bladex.project.version} @@ -110,7 +96,6 @@ com.hnac.hzims weather-api - ${hzims.project.version} @@ -128,14 +113,8 @@ org.apache.httpcomponents httpmime - ${httpcomponents.version} - - - - - diff --git a/pom.xml b/pom.xml index 2cb8599..3745d85 100644 --- a/pom.xml +++ b/pom.xml @@ -10,6 +10,8 @@ 4.5.3.RELEASE + 4.5.8-SNAPSHOT + 4.0.0-SNAPSHOT 4.5.6.RELEASE UTF-81.8 @@ -35,6 +37,8 @@ blade 1.4.13 + 3.15 + UTF-8 UTF-8 @@ -46,7 +50,7 @@ hzims-biz-common - blade-gateway + hzims-service hzims-service-api @@ -61,11 +65,6 @@ import - com.hnac.hzims - hzims-biz-common - ${hzims.project.version} - - org.springframework.boot spring-boot-dependencies ${spring.boot.version} @@ -86,6 +85,213 @@ pom import + + org.springblade + blade-system-api + ${bladex.project.snapshot.version} + + + org.springblade + blade-common + ${bladex.projet.common.version} + + + org.springblade + blade-core-boot + ${bladex.project.version} + + + org.springblade + blade-user-api + ${bladex.project.version} + + + org.springframework.boot + spring-boot-configuration-processor + ${spring.boot.version} + + + org.springblade + blade-dict-api + ${bladex.project.version} + + + org.springblade + blade-starter-swagger + ${bladex.project.version} + + + org.springblade + blade-flow-api + ${bladex.project.version} + + + org.springblade + blade-resource-api + ${bladex.project.version} + + + org.springblade + blade-core-test + ${bladex.project.version} + test + + + com.hnac.hzinfo.data + hzinfo-data-api + ${hzinfo.data.version} + + + com.hnac.hzinfo.data + hzinfo-data-sdk + ${hzinfo.data.version} + compile + + + com.xuxueli + xxl-job-core + 2.1.2 + + + org.springframework.boot + spring-boot-starter-websocket + ${spring.boot.version} + + + + com.hnac.hzinfo + inspect-api + 2.7.6.RELEASE + + + com.hnac.hzims + hzims-operational-api + ${hzims.project.version} + + + com.hnac.hzims + weather-api + ${hzims.project.version} + + + com.hnac.hzims + hzims-biz-common + ${hzims.project.version} + + + com.hnac.hzims + equipment-api + ${hzims.project.version} + + + com.hnac.hzims + message-api + ${hzims.project.version} + + + com.hnac.hzims + ticket-api + ${hzims.project.version} + + + com.hnac.hzims + assets-api + ${hzims.project.version} + + + com.hnac.hzims + common-api + ${hzims.project.version} + + + com.hnac.hzims + safeproduct-api + ${hzims.project.version} + + + + + org.apache.poi + poi + ${poi.version} + + + org.apache.poi + poi-ooxml + ${poi.version} + + + org.apache.poi + poi-ooxml-schemas + ${poi.version} + + + org.apache.poi + poi-scratchpad + ${poi.version} + + + + cn.afterturn + easypoi-base + 3.2.0 + + + cn.afterturn + easypoi-annotation + 3.2.0 + + + com.hikvision.ga + artemis-http-client + 1.1.2 + + + + org.apache.httpcomponents + httpclient + 4.5.2 + + + + com.google.zxing + core + 3.1.0 + + + com.google.zxing + javase + 3.1.0 + + + + org.apache.commons + commons-collections4 + 4.4 + + + + cn.hutool + hutool-http + 5.7.16 + + + + cn.hutool + hutool-core + 5.7.16 + + + org.java-websocket + Java-WebSocket + 1.3.8 + + + + com.itextpdf + itextpdf + 5.5.10 +