From 88035ac4b924cd0e884db29350d5c7b0f3eb43b8 Mon Sep 17 00:00:00 2001 From: Jone <515616805@qq.com> Date: Fri, 11 Aug 2023 09:56:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9C=80=E6=96=B0=E7=89=88po?= =?UTF-8?q?m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service-api/hzims-operational-api/pom.xml | 1 - hzims-service-api/inspect-api/pom.xml | 16 +- .../areamonthly/feign/TicketFeignClient.java | 6 - hzims-service/assets/pom.xml | 1 - hzims-service/equipment/pom.xml | 5 +- hzims-service/hzims-scheduled/pom.xml | 4 +- hzims-service/inspect/pom.xml | 31 +-- hzims-service/operational/pom.xml | 2 +- hzims-service/pom.xml | 5 +- hzims-service/safeproduct/pom.xml | 3 +- hzims-service/ticket/pom.xml | 2 +- pom.xml | 255 +++++---------------- 12 files changed, 75 insertions(+), 256 deletions(-) diff --git a/hzims-service-api/hzims-operational-api/pom.xml b/hzims-service-api/hzims-operational-api/pom.xml index 7b370f2..4d40f42 100644 --- a/hzims-service-api/hzims-operational-api/pom.xml +++ b/hzims-service-api/hzims-operational-api/pom.xml @@ -16,7 +16,6 @@ com.hnac.hzims safeproduct-api - ${hzims.project.version} org.springblade diff --git a/hzims-service-api/inspect-api/pom.xml b/hzims-service-api/inspect-api/pom.xml index 5b20afc..9e092a8 100644 --- a/hzims-service-api/inspect-api/pom.xml +++ b/hzims-service-api/inspect-api/pom.xml @@ -3,27 +3,22 @@ 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"> - BladeX - org.springblade - 2.7.6.RELEASE - + hzims-service-api + com.hnac.hzims + 4.0.0-SNAPSHOT 4.0.0 - com.hnac.hzinfo inspect-api + ${project.artifactId} jar - - 2.7.6.RELEASE - org.springblade blade-starter-mybatis - ${bladex.project.version} lettuce-core @@ -34,7 +29,6 @@ org.springblade blade-starter-tenant - ${bladex.project.version} org.springframework.cloud @@ -62,12 +56,10 @@ com.hnac.hzims common-api - 4.0.0-SNAPSHOT com.hnac.hzims safeproduct-api - 4.0.0-SNAPSHOT compile diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/feign/TicketFeignClient.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/feign/TicketFeignClient.java index 1995d69..7b23e63 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/feign/TicketFeignClient.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/feign/TicketFeignClient.java @@ -1,8 +1,5 @@ package com.hnac.hzims.ticket.areamonthly.feign; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity; import com.hnac.hzims.ticket.allTicket.vo.TicketInfoEvaluateVO; import com.hnac.hzims.ticket.areamonthly.dto.TicketInfoEvaluateDto; @@ -42,7 +39,6 @@ public interface TicketFeignClient { * 获取操作票详情数据 */ @GetMapping("/standard/ticket/detail") - @ApiOperationSupport(order = 40) @ApiOperation(value = "详情") R detail(@RequestParam Long id); @@ -54,7 +50,6 @@ public interface TicketFeignClient { * @return */ @PostMapping("/allTicket/ticketEvaluate/list") - @ApiOperationSupport(order = 10) @ApiOperation(value = "查询工作票评论") R> list(@RequestBody TicketInfoEvaluateEntity req); @@ -66,7 +61,6 @@ public interface TicketFeignClient { * @return */ @PostMapping("/allTicket/ticketEvaluate/save") - @ApiOperationSupport(order = 20) @ApiOperation(value = "新增") public R save(@RequestBody TicketInfoEvaluateDto req); diff --git a/hzims-service/assets/pom.xml b/hzims-service/assets/pom.xml index ca4b3b0..eb28d65 100644 --- a/hzims-service/assets/pom.xml +++ b/hzims-service/assets/pom.xml @@ -15,7 +15,6 @@ org.springblade blade-common - ${bladex.projet.common.version} org.springblade diff --git a/hzims-service/equipment/pom.xml b/hzims-service/equipment/pom.xml index 3bab467..5838c4a 100644 --- a/hzims-service/equipment/pom.xml +++ b/hzims-service/equipment/pom.xml @@ -61,7 +61,6 @@ com.hnac.hzinfo.data hzinfo-data-sdk - ${hzinfo.data.version} @@ -77,12 +76,10 @@ org.springblade blade-dict-api - ${bladex.project.version} org.springblade blade-common - ${bladex.projet.common.version} com.hnac.hzims @@ -94,7 +91,7 @@ commons-collections4 - com.hnac.hzinfo + com.hnac.hzims inspect-api diff --git a/hzims-service/hzims-scheduled/pom.xml b/hzims-service/hzims-scheduled/pom.xml index a904ab8..e1a0e7d 100644 --- a/hzims-service/hzims-scheduled/pom.xml +++ b/hzims-service/hzims-scheduled/pom.xml @@ -43,7 +43,7 @@ hzims-operational-api - com.hnac.hzinfo + com.hnac.hzims inspect-api @@ -210,4 +210,4 @@ - \ No newline at end of file + diff --git a/hzims-service/inspect/pom.xml b/hzims-service/inspect/pom.xml index f3610b8..6641d35 100644 --- a/hzims-service/inspect/pom.xml +++ b/hzims-service/inspect/pom.xml @@ -4,23 +4,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - BladeX - org.springblade - 2.7.6.RELEASE - + com.hnac.hzims + hzims-service + 4.0.0-SNAPSHOT 4.0.0 - com.hnac.hzinfo.inspect + com.hnac.hzims hzinfo-inspect - 4.0.0-SNAPSHOT jar - 2.7.6.RELEASE - 4.5.6.RELEASE - 4.0.0-SNAPSHOT 1.4.13 @@ -28,12 +23,10 @@ org.springblade blade-starter-datascope - ${bladex.project.version} com.hzinfo.framework hnac-framework-mqtt-starters - ${bladex.project.version} org.eclipse.paho.client.mqttv3 @@ -50,27 +43,22 @@ org.springblade blade-core-boot - ${bladex.project.version} org.springblade blade-starter-swagger - ${bladex.project.version} org.springblade blade-core-tool - ${bladex.project.version} org.springblade blade-dict-api - ${bladex.project.version} org.springblade blade-user-api - ${bladex.project.version} org.springblade @@ -94,27 +82,22 @@ org.springblade blade-starter-http - ${bladex.project.version} com.hnac.hzims safeproduct-api - ${hzims.project.version} com.hnac.hzims equipment-api - ${hzims.project.version} com.hnac.hzims hzims-operational-api - ${hzims.project.version} - com.hnac.hzinfo + com.hnac.hzims inspect-api - ${bladex.project.version} com.hikvision.ga @@ -129,7 +112,6 @@ org.springblade blade-resource-api - ${bladex.project.version} io.minio @@ -144,7 +126,6 @@ com.hnac.hzims message-api - ${hzims.project.version} @@ -197,14 +178,12 @@ org.springblade blade-system-api - ${bladex.system.version} org.springblade blade-common - ${bladex.system.version} diff --git a/hzims-service/operational/pom.xml b/hzims-service/operational/pom.xml index a2e3f33..03d3536 100644 --- a/hzims-service/operational/pom.xml +++ b/hzims-service/operational/pom.xml @@ -44,7 +44,7 @@ hzims-operational-api - com.hnac.hzinfo + com.hnac.hzims inspect-api diff --git a/hzims-service/pom.xml b/hzims-service/pom.xml index f5d7053..e61f072 100644 --- a/hzims-service/pom.xml +++ b/hzims-service/pom.xml @@ -17,8 +17,7 @@ assets - topvision - + equipment safeproduct operational @@ -60,10 +59,10 @@ middle-api + cn.afterturn easypoi-spring-boot-starter - ${easpoi.version} diff --git a/hzims-service/safeproduct/pom.xml b/hzims-service/safeproduct/pom.xml index 7d1539d..c33eae4 100644 --- a/hzims-service/safeproduct/pom.xml +++ b/hzims-service/safeproduct/pom.xml @@ -16,7 +16,6 @@ org.springblade blade-common - ${bladex.projet.common.version} org.springblade @@ -126,7 +125,7 @@ compile - com.hnac.hzinfo + com.hnac.hzims inspect-api diff --git a/hzims-service/ticket/pom.xml b/hzims-service/ticket/pom.xml index 32c529b..40afd83 100644 --- a/hzims-service/ticket/pom.xml +++ b/hzims-service/ticket/pom.xml @@ -17,7 +17,7 @@ UTF-8 UTF-8 2.3.7.RELEASE - 3.17 + 3.2.0 1.0.3 1.9.6 diff --git a/pom.xml b/pom.xml index 44a5d88..3f290ea 100644 --- a/pom.xml +++ b/pom.xml @@ -2,6 +2,11 @@ 4.0.0 + + org.springblade + BladeX + 5.0.0.RELEASE + com.hnac.hzims hzims-back @@ -9,108 +14,54 @@ pom - 4.5.3.RELEASE - 4.5.8-SNAPSHOT - - 4.0.0-SNAPSHOT - 4.5.8-SNAPSHOT - UTF-81.8 - 3.8.1 - UTF-8 - 5.0.1-SNAPSHOT - - - 6.4.2 - 2.7.5 - 2.1.14.RELEASE - Greenwich.SR6 - Cairo-SR8 - - 192.168.0.157 - http://${docker.registry.url}:2375 - admin - Harbor12345 - blade - 1.4.13 - + 5.0.0.RELEASE + + 5.0.1-SNAPSHOT + UTF-8 - UTF-8 1.8 + UTF-8 + + 4.0.0-SNAPSHOT + + 4.4.0 + http://192.168.65.246:9000 2743eef4724b4e61f7fc43ae4d8f51e458856771 - 4.4.0 hzims-biz-common - blade-gateway hzims-service hzims-service-api - - org.springblade.platform - blade-bom - ${bladex.project.version} - pom - import - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring.cloud.version} - pom - import - - - io.spring.platform - platform-bom - ${spring.platform.version} - pom - import - - - org.springblade - blade-system-api - ${bladex.project.snapshot.version} - + org.springblade blade-common - ${bladex.projet.common.version} + ${bladex.project.version} org.springblade - blade-core-boot + blade-starter-datascope ${bladex.project.version} org.springblade - blade-user-api + blade-system-api ${bladex.project.version} - org.springframework.boot - spring-boot-configuration-processor - ${spring.boot.version} - - org.springblade - blade-dict-api + blade-user-api ${bladex.project.version} org.springblade - blade-starter-swagger + blade-dict-api ${bladex.project.version} @@ -124,21 +75,9 @@ ${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 + ${hzinfo.data.sdk.version} com.xuxueli @@ -146,15 +85,16 @@ 2.1.2 - org.springframework.boot - spring-boot-starter-websocket - ${spring.boot.version} + com.baomidou + dynamic-datasource-spring-boot-starter + 3.3.2 + - com.hnac.hzinfo + com.hnac.hzims inspect-api - 2.7.6.RELEASE + ${hzims.project.version} com.hnac.hzims @@ -183,12 +123,12 @@ com.hnac.hzims - ticket-api + middle-api ${hzims.project.version} com.hnac.hzims - middle-api + ticket-api ${hzims.project.version} @@ -211,6 +151,7 @@ topvision-api ${hzims.project.version} + com.hikvision.ga artemis-http-client @@ -262,6 +203,11 @@ itextpdf 5.5.10 + + cn.afterturn + easypoi-spring-boot-starter + ${easpoi.version} + @@ -269,7 +215,11 @@ org.projectlombok lombok - provided + + + org.springblade + blade-core-test + test @@ -286,96 +236,33 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - true - ${project.build.finalName} - - - - - repackage - - - - - - com.spotify - dockerfile-maven-plugin - ${docker.plugin.version} - - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - package - - run - - - - - - - - - - - - - com.spotify - dockerfile-maven-plugin - - true - - - org.springframework.boot spring-boot-maven-plugin - maven-compiler-plugin - ${maven.plugin.version} + org.apache.maven.plugins + maven-surefire-plugin - ${java.version} - ${java.version} - UTF-8 - - -parameters - + true + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + attach-sources + verify + + jar-no-fork + + + + + org.sonarsource.scanner.maven sonar-maven-plugin 3.9.1.2184 @@ -383,30 +270,4 @@ - - - aliyun-repos - https://maven.aliyun.com/nexus/content/groups/public/ - - false - - - - blade-release - Release Repository - http://nexus.bladex.vip/repository/maven-releases/ - - - - - - - aliyun-plugin - https://maven.aliyun.com/nexus/content/groups/public/ - - false - - - -