From 73caeb6a1f896d3f0af5f4f9d17416ae58ae5fe3 Mon Sep 17 00:00:00 2001 From: liu Date: Wed, 29 May 2024 17:51:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7jdk17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 32 ++++++++++++------- virtual-patient-common/pom.xml | 14 +++++--- virtual-patient-graph/pom.xml | 9 +----- .../nebula/config/SessionPool.java | 2 +- .../controller/GraphFileController.java | 4 +-- .../nebula/dto/graph/GraphExpand.java | 4 +-- .../graph/GraphVertexTatAttributeQuery.java | 4 +-- .../nebula/service/GraphFileService.java | 2 +- .../service/impl/GraphFileServiceImpl.java | 2 +- .../service/impl/GraphNebulaServiceImpl.java | 2 +- virtual-patient-rasa/pom.xml | 9 +----- .../rasa/config/ThreadPoolExecutorConfig.java | 2 ++ virtual-patient-web/pom.xml | 6 ++-- .../controller/AskPrimaryController.java | 2 +- .../src/main/resources/bootstrap-dev.yml | 4 +-- 15 files changed, 50 insertions(+), 48 deletions(-) diff --git a/pom.xml b/pom.xml index ff22f209..32a0ad48 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,18 @@ 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 3.2.5 + org.springframework.cloud + spring-cloud-dependencies-parent + 4.1.1 + + + + + + + com.supervision virtual-patient 1.0-SNAPSHOT @@ -33,13 +40,14 @@ 17 2023.0.1.0 2023.0.1 - 2.3.2 + 2.3.2 3.2.5 + 4.1.2 1.2.76 3.5.5 1.2.21 5.8.16 - 3.0.3 + 4.1.0 1.18.20 2.0.3.RELEASE 4.1.2 @@ -54,6 +62,12 @@ + + org.springframework.cloud + spring-cloud-starter-bootstrap + ${spring.cloud.starter.bootstrap} + + com.alibaba.cloud spring-cloud-alibaba-dependencies @@ -71,12 +85,6 @@ import - - com.alibaba.nacos - nacos-common - ${nacos.common.version} - - mysql mysql-connector-java @@ -128,7 +136,7 @@ com.github.xiaoymin - knife4j-spring-boot-starter + knife4j-openapi3-jakarta-spring-boot-starter ${knife4j.version} diff --git a/virtual-patient-common/pom.xml b/virtual-patient-common/pom.xml index 2d38d575..8fc78ff2 100644 --- a/virtual-patient-common/pom.xml +++ b/virtual-patient-common/pom.xml @@ -31,6 +31,11 @@ + + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter + + org.springframework.boot spring-boot-starter-data-redis @@ -73,10 +78,6 @@ mysql-connector-java - - com.github.xiaoymin - knife4j-spring-boot-starter - com.alibaba @@ -112,7 +113,10 @@ okhttp - + + io.swagger + swagger-annotations + diff --git a/virtual-patient-graph/pom.xml b/virtual-patient-graph/pom.xml index b70fa744..ba2e89f9 100644 --- a/virtual-patient-graph/pom.xml +++ b/virtual-patient-graph/pom.xml @@ -29,17 +29,9 @@ com.alibaba fastjson - - com.alibaba.nacos - nacos-common - - - com.alibaba.nacos - nacos-common - org.springframework.cloud @@ -112,6 +104,7 @@ provided + diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/config/SessionPool.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/config/SessionPool.java index 7af461c2..bfe27489 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/config/SessionPool.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/config/SessionPool.java @@ -8,9 +8,9 @@ import com.vesoft.nebula.client.graph.exception.IOErrorException; import com.vesoft.nebula.client.graph.exception.NotValidConnectionException; import com.vesoft.nebula.client.graph.net.NebulaPool; import com.vesoft.nebula.client.graph.net.Session; +import jakarta.annotation.PreDestroy; import lombok.extern.slf4j.Slf4j; -import javax.annotation.PreDestroy; import java.net.UnknownHostException; import java.util.Arrays; import java.util.List; diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/GraphFileController.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/GraphFileController.java index 4812fec1..85eecd9d 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/GraphFileController.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/GraphFileController.java @@ -6,12 +6,12 @@ import com.supervision.nebula.entity.GraphFile; import com.supervision.nebula.service.GraphFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphExpand.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphExpand.java index 16cc8235..39cc0743 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphExpand.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphExpand.java @@ -3,13 +3,13 @@ package com.supervision.nebula.dto.graph; import cn.hutool.core.util.StrUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; import java.util.List; @Data diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexTatAttributeQuery.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexTatAttributeQuery.java index 674b60ac..528fedbf 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexTatAttributeQuery.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexTatAttributeQuery.java @@ -3,13 +3,13 @@ package com.supervision.nebula.dto.graph; import cn.hutool.core.util.StrUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; @Data @NoArgsConstructor diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/service/GraphFileService.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/service/GraphFileService.java index cf9a704d..5c0ca435 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/service/GraphFileService.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/service/GraphFileService.java @@ -2,9 +2,9 @@ package com.supervision.nebula.service; import com.supervision.nebula.dto.ImportBean; import com.supervision.nebula.entity.GraphFile; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/service/impl/GraphFileServiceImpl.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/service/impl/GraphFileServiceImpl.java index 22179d93..6d5045bf 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/service/impl/GraphFileServiceImpl.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/service/impl/GraphFileServiceImpl.java @@ -20,6 +20,7 @@ import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.service.GraphFileService; import com.supervision.nebula.util.NebulaUtil; import com.supervision.nebula.vo.AttributeVo; +import jakarta.servlet.http.HttpServletResponse; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -30,7 +31,6 @@ import org.springframework.web.multipart.MultipartFile; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; -import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/virtual-patient-graph/src/main/java/com/supervision/service/impl/GraphNebulaServiceImpl.java b/virtual-patient-graph/src/main/java/com/supervision/service/impl/GraphNebulaServiceImpl.java index 9b245529..e3f80082 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/service/impl/GraphNebulaServiceImpl.java +++ b/virtual-patient-graph/src/main/java/com/supervision/service/impl/GraphNebulaServiceImpl.java @@ -14,6 +14,7 @@ import com.supervision.model.Process; import com.supervision.model.*; import com.supervision.service.*; import com.supervision.vo.*; +import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nebula.contrib.ngbatis.models.data.NgEdge; @@ -21,7 +22,6 @@ import org.nebula.contrib.ngbatis.models.data.NgSubgraph; import org.nebula.contrib.ngbatis.models.data.NgVertex; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/virtual-patient-rasa/pom.xml b/virtual-patient-rasa/pom.xml index 7f71b069..e6f099fa 100644 --- a/virtual-patient-rasa/pom.xml +++ b/virtual-patient-rasa/pom.xml @@ -32,16 +32,9 @@ com.alibaba fastjson - - com.alibaba.nacos - nacos-common - - - com.alibaba.nacos - nacos-common - + org.springframework.cloud diff --git a/virtual-patient-rasa/src/main/java/com/supervision/rasa/config/ThreadPoolExecutorConfig.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/config/ThreadPoolExecutorConfig.java index 953a09ee..4804ee2a 100644 --- a/virtual-patient-rasa/src/main/java/com/supervision/rasa/config/ThreadPoolExecutorConfig.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/config/ThreadPoolExecutorConfig.java @@ -1,5 +1,6 @@ package com.supervision.rasa.config; +import java.util.ArrayList; import java.util.concurrent.*; public class ThreadPoolExecutorConfig { @@ -10,6 +11,7 @@ public class ThreadPoolExecutorConfig { public static ThreadPoolExecutor getInstance() { + new ArrayList<>(); if (instance == null) { synchronized (ThreadPoolExecutorConfig.class) { // 加锁 if (instance == null) { diff --git a/virtual-patient-web/pom.xml b/virtual-patient-web/pom.xml index 9515ad2d..e502f137 100644 --- a/virtual-patient-web/pom.xml +++ b/virtual-patient-web/pom.xml @@ -33,11 +33,13 @@ + - com.alibaba.nacos - nacos-common + org.springframework.cloud + spring-cloud-starter-bootstrap + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java index 24c1ccdb..26e25190 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java @@ -12,12 +12,12 @@ import com.supervision.vo.ask.ModifyPrimaryDiseaseInfoReqVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.List; @Api(tags = "初步诊断") diff --git a/virtual-patient-web/src/main/resources/bootstrap-dev.yml b/virtual-patient-web/src/main/resources/bootstrap-dev.yml index e671cab3..98dd29cc 100644 --- a/virtual-patient-web/src/main/resources/bootstrap-dev.yml +++ b/virtual-patient-web/src/main/resources/bootstrap-dev.yml @@ -2,9 +2,9 @@ spring: cloud: nacos: config: - server-addr: 192.168.10.137:8848 + server-addr: 192.168.10.138:8848 file-extension: yml namespace: b9eea377-79ec-4ba5-9cc2-354f7bd5181e discovery: - server-addr: 192.168.10.137:8848 + server-addr: 192.168.10.138:8848 namespace: b9eea377-79ec-4ba5-9cc2-354f7bd5181e \ No newline at end of file