diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 9ee7745..19ea574 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -3,15 +3,15 @@ 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"> - main + hzims-back com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 blade-gateway ${project.artifactId} - ${bladex.project.version} + ${hzims.project.version} jar @@ -33,7 +33,7 @@ com.hnac.hzims hzims-biz-common - 2.5.1.RELEASE + ${hzims.project.version} org.springblade diff --git a/hzims-biz-common/pom.xml b/hzims-biz-common/pom.xml index cdc1afa..0b520b1 100644 --- a/hzims-biz-common/pom.xml +++ b/hzims-biz-common/pom.xml @@ -3,13 +3,14 @@ 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"> - main + hzims-back com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 hzims-biz-common + ${hzims.project.version} ${project.artifactId} jar diff --git a/hzims-service-api/assets-api/pom.xml b/hzims-service-api/assets-api/pom.xml index a19c0b1..17eece9 100644 --- a/hzims-service-api/assets-api/pom.xml +++ b/hzims-service-api/assets-api/pom.xml @@ -5,7 +5,7 @@ hzims-service-api com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 assets-api @@ -16,7 +16,7 @@ com.hnac.hzims ticket-api - 2.5.1.RELEASE + ${hzims.project.version} com.hnac.hzinfo.data @@ -28,8 +28,4 @@ easyexcel - - - 2.5.1.RELEASE - diff --git a/hzims-service-api/common-api/pom.xml b/hzims-service-api/common-api/pom.xml index aa84647..d2d2a6b 100644 --- a/hzims-service-api/common-api/pom.xml +++ b/hzims-service-api/common-api/pom.xml @@ -4,14 +4,14 @@ 4.0.0 com.hnac.hzims common-api - 2.5.1.RELEASE + ${hzims.project.version} common-api 公共api hzims-service-api com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT diff --git a/hzims-service-api/equipment-api/pom.xml b/hzims-service-api/equipment-api/pom.xml index 3695f73..3e0cc5f 100644 --- a/hzims-service-api/equipment-api/pom.xml +++ b/hzims-service-api/equipment-api/pom.xml @@ -5,7 +5,7 @@ hzims-service-api com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 equipment-api @@ -30,8 +30,4 @@ compile - - - 2.5.1.RELEASE - diff --git a/hzims-service-api/hzims-operational-api/pom.xml b/hzims-service-api/hzims-operational-api/pom.xml index 92a2d57..a1bffb1 100644 --- a/hzims-service-api/hzims-operational-api/pom.xml +++ b/hzims-service-api/hzims-operational-api/pom.xml @@ -3,7 +3,7 @@ hzims-service-api com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 @@ -12,16 +12,12 @@ ${hzims.project.version} jar - - 2.5.1.RELEASE - - com.hnac.hzims safeproduct-api - 2.5.1.RELEASE + ${hzims.project.version} org.springblade @@ -38,26 +34,26 @@ com.hnac.hzims weather-api - 2.5.1.RELEASE + ${hzims.project.version} compile com.hnac.hzims weather-api - 2.5.1.RELEASE + ${hzims.project.version} compile com.hnac.hzims common-api - 2.5.1.RELEASE + ${hzims.project.version} com.hnac.hzinfo.data diff --git a/hzims-service-api/inspect-api/pom.xml b/hzims-service-api/inspect-api/pom.xml index f003f25..d3fdd75 100644 --- a/hzims-service-api/inspect-api/pom.xml +++ b/hzims-service-api/inspect-api/pom.xml @@ -56,7 +56,7 @@ com.hnac.hzims common-api - 2.5.1.RELEASE + 4.0.0-SNAPSHOT diff --git a/hzims-service-api/message-api/pom.xml b/hzims-service-api/message-api/pom.xml index 90d9ca5..bc8057e 100644 --- a/hzims-service-api/message-api/pom.xml +++ b/hzims-service-api/message-api/pom.xml @@ -5,17 +5,13 @@ hzims-service-api com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 message-api ${hzims.project.version} jar - - 2.5.1.RELEASE - - org.springblade @@ -25,6 +21,7 @@ com.hnac.hzims hzims-biz-common + ${hzims.project.version} diff --git a/hzims-service-api/pom.xml b/hzims-service-api/pom.xml index c2e7b9b..ddccc54 100644 --- a/hzims-service-api/pom.xml +++ b/hzims-service-api/pom.xml @@ -3,16 +3,16 @@ 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"> - main com.hnac.hzims - 2.5.1.RELEASE + hzims-back + 4.0.0-SNAPSHOT 4.0.0 hzims-service-api ${project.artifactId} - 2.5.1.RELEASE + ${hzims.project.version} pom 微服务API集合 diff --git a/hzims-service-api/safeproduct-api/pom.xml b/hzims-service-api/safeproduct-api/pom.xml index 0ae21c7..4152230 100644 --- a/hzims-service-api/safeproduct-api/pom.xml +++ b/hzims-service-api/safeproduct-api/pom.xml @@ -5,7 +5,7 @@ hzims-service-api com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 diff --git a/hzims-service-api/spare-api/pom.xml b/hzims-service-api/spare-api/pom.xml index adfb5ce..b45831f 100644 --- a/hzims-service-api/spare-api/pom.xml +++ b/hzims-service-api/spare-api/pom.xml @@ -5,7 +5,7 @@ hzims-service-api com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 diff --git a/hzims-service-api/ticket-api/pom.xml b/hzims-service-api/ticket-api/pom.xml index cc0cee0..60233b7 100644 --- a/hzims-service-api/ticket-api/pom.xml +++ b/hzims-service-api/ticket-api/pom.xml @@ -4,7 +4,7 @@ hzims-service-api com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 @@ -17,13 +17,13 @@ com.hnac.hzims common-api - 2.5.1.RELEASE + ${hzims.project.version} compile com.hnac.hzims hzims-operational-api - 2.5.1.RELEASE + ${hzims.project.version} compile diff --git a/hzims-service-api/topvision-api/pom.xml b/hzims-service-api/topvision-api/pom.xml index 64e525c..0a71b41 100644 --- a/hzims-service-api/topvision-api/pom.xml +++ b/hzims-service-api/topvision-api/pom.xml @@ -5,7 +5,7 @@ hzims-service-api com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 diff --git a/hzims-service-api/weather-api/pom.xml b/hzims-service-api/weather-api/pom.xml index 22beffe..13cbd1e 100644 --- a/hzims-service-api/weather-api/pom.xml +++ b/hzims-service-api/weather-api/pom.xml @@ -4,7 +4,7 @@ hzims-service-api com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 diff --git a/hzims-service/assets/pom.xml b/hzims-service/assets/pom.xml index fc49a04..f5fecc0 100644 --- a/hzims-service/assets/pom.xml +++ b/hzims-service/assets/pom.xml @@ -5,7 +5,7 @@ hzims-service com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 ${hzims.project.version} @@ -57,7 +57,7 @@ com.hnac.hzims ticket-api - 2.5.1.RELEASE + ${hzims.project.version} com.xuxueli @@ -66,7 +66,7 @@ com.hnac.hzims message-api - 2.5.1.RELEASE + ${hzims.project.version} compile diff --git a/hzims-service/equipment/pom.xml b/hzims-service/equipment/pom.xml index aa1b6c3..753c1ce 100644 --- a/hzims-service/equipment/pom.xml +++ b/hzims-service/equipment/pom.xml @@ -5,7 +5,7 @@ hzims-service com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 ${hzims.project.version} @@ -102,7 +102,7 @@ com.hnac.hzims equipment-api - 2.5.1.RELEASE + ${hzims.project.version} @@ -123,7 +123,7 @@ com.hnac.hzims hzims-operational-api - 2.5.1.RELEASE + ${hzims.project.version} compile diff --git a/hzims-service/inspect/pom.xml b/hzims-service/inspect/pom.xml index 5f13d87..4786b00 100644 --- a/hzims-service/inspect/pom.xml +++ b/hzims-service/inspect/pom.xml @@ -20,6 +20,7 @@ 2.7.6.RELEASE 4.5.6.RELEASE + 4.0.0-SNAPSHOT @@ -107,17 +108,17 @@ com.hnac.hzims safeproduct-api - 2.5.1.RELEASE + ${hzims.project.version} com.hnac.hzims equipment-api - 2.5.1.RELEASE + ${hzims.project.version} com.hnac.hzims hzims-operational-api - 2.5.1.RELEASE + ${hzims.project.version} com.hnac.hzinfo diff --git a/hzims-service/message/pom.xml b/hzims-service/message/pom.xml index 45f5288..f2b5db0 100644 --- a/hzims-service/message/pom.xml +++ b/hzims-service/message/pom.xml @@ -4,7 +4,7 @@ com.hnac.hzims hzims-service - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 @@ -123,7 +123,7 @@ com.hnac.hzims hzims-operational-api - 2.5.1.RELEASE + ${hzims.project.version} compile diff --git a/hzims-service/operational/pom.xml b/hzims-service/operational/pom.xml index 286428f..a3ed1b7 100644 --- a/hzims-service/operational/pom.xml +++ b/hzims-service/operational/pom.xml @@ -4,7 +4,7 @@ com.hnac.hzims hzims-service - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 @@ -137,25 +137,25 @@ com.hnac.hzims equipment-api - 2.5.1.RELEASE + ${hzims.project.version} com.hnac.hzims message-api - 2.5.1.RELEASE + ${hzims.project.version} com.hnac.hzims ticket-api - 2.5.1.RELEASE + ${hzims.project.version} com.hnac.hzims assets-api - 2.5.1.RELEASE + ${hzims.project.version} @@ -240,7 +240,7 @@ com.hnac.hzims weather-api - 2.5.1.RELEASE + ${hzims.project.version} compile diff --git a/hzims-service/pom.xml b/hzims-service/pom.xml index 257d35c..031a0c6 100644 --- a/hzims-service/pom.xml +++ b/hzims-service/pom.xml @@ -6,26 +6,26 @@ com.hnac.hzims - main - 2.5.1.RELEASE + hzims-back + 4.0.0-SNAPSHOT hzims-service ${project.artifactId} - 2.5.1.RELEASE + ${hzims.project.version} pom BladeX 微服务集合 assets - spare + topvision equipment safeproduct operational - message + ticket weather @@ -34,6 +34,7 @@ com.hnac.hzims hzims-biz-common + ${hzims.project.version} org.springblade diff --git a/hzims-service/safeproduct/pom.xml b/hzims-service/safeproduct/pom.xml index c3ecfd3..c5c6431 100644 --- a/hzims-service/safeproduct/pom.xml +++ b/hzims-service/safeproduct/pom.xml @@ -5,7 +5,7 @@ hzims-service com.hnac.hzims - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 @@ -149,7 +149,7 @@ com.hnac.hzims ticket-api - 2.5.1.RELEASE + ${hzims.project.version} compile diff --git a/hzims-service/safeproduct/safeproduct.iml b/hzims-service/safeproduct/safeproduct.iml deleted file mode 100644 index bd02e66..0000000 --- a/hzims-service/safeproduct/safeproduct.iml +++ /dev/null @@ -1,352 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hzims-service/spare/pom.xml b/hzims-service/spare/pom.xml index 4b39c9e..88c1e6d 100644 --- a/hzims-service/spare/pom.xml +++ b/hzims-service/spare/pom.xml @@ -6,7 +6,7 @@ com.hnac.hzims hzims-service - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 diff --git a/hzims-service/ticket/hzims-ticket.iml b/hzims-service/ticket/hzims-ticket.iml deleted file mode 100644 index 5f2ad0c..0000000 --- a/hzims-service/ticket/hzims-ticket.iml +++ /dev/null @@ -1,346 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hzims-service/ticket/pom.xml b/hzims-service/ticket/pom.xml index c9d1a55..5f5d5ee 100644 --- a/hzims-service/ticket/pom.xml +++ b/hzims-service/ticket/pom.xml @@ -5,7 +5,7 @@ com.hnac.hzims hzims-service - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 @@ -211,7 +211,7 @@ com.hnac.hzims ticket-api - 2.5.1.RELEASE + ${hzims.project.version} @@ -234,25 +234,25 @@ com.hnac.hzims common-api - 2.5.1.RELEASE + ${hzims.project.version} compile com.hnac.hzims message-api - 2.5.1.RELEASE + ${hzims.project.version} compile com.hnac.hzims equipment-api - 2.5.1.RELEASE + ${hzims.project.version} compile com.hnac.hzims equipment-api - 2.5.1.RELEASE + ${hzims.project.version} compile diff --git a/hzims-service/topvision/pom.xml b/hzims-service/topvision/pom.xml index b2311da..1f28104 100644 --- a/hzims-service/topvision/pom.xml +++ b/hzims-service/topvision/pom.xml @@ -6,7 +6,7 @@ com.hnac.hzims hzims-service - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 diff --git a/hzims-service/weather/pom.xml b/hzims-service/weather/pom.xml index 69b46c2..f1c2d6d 100644 --- a/hzims-service/weather/pom.xml +++ b/hzims-service/weather/pom.xml @@ -5,7 +5,7 @@ com.hnac.hzims hzims-service - 2.5.1.RELEASE + 4.0.0-SNAPSHOT 4.0.0 @@ -103,7 +103,7 @@ com.hnac.hzims weather-api - 2.5.1.RELEASE + ${hzims.project.version} diff --git a/pom.xml b/pom.xml index 4c6218b..c467291 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,6 @@ blade-gateway hzims-service hzims-service-api - diff --git a/script/docker/app/.env b/script/docker/app/.env index d50dab0..7165c3e 100644 --- a/script/docker/app/.env +++ b/script/docker/app/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=2.5.1.RELEASE +TAG=4.0.0-SNAPSHOT