升级jdk17

pom.xml

@@ -5,11 +5,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.5</version>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-dependencies-parent</artifactId>
+        <version>4.1.1</version>
     </parent>
 
+
+    <!--    <parent>-->
+    <!--        <groupId>org.springframework.boot</groupId>-->
+    <!--        <artifactId>spring-boot-starter-parent</artifactId>-->
+    <!--        <version>3.2.5</version>-->
+    <!--    </parent>-->
+
     <groupId>com.supervision</groupId>
     <artifactId>virtual-patient</artifactId>
     <version>1.0-SNAPSHOT</version>
@@ -33,13 +40,14 @@
         <maven.compiler.target>17</maven.compiler.target>
         <alibaba.cloud.version>2023.0.1.0</alibaba.cloud.version>
         <spring.cloud.version>2023.0.1</spring.cloud.version>
-        <nacos.common.version>2.3.2</nacos.common.version>
+        <nacos.version>2.3.2</nacos.version>
         <spring.boot.version>3.2.5</spring.boot.version>
+        <spring.cloud.starter.bootstrap>4.1.2</spring.cloud.starter.bootstrap>
         <fastjson.version>1.2.76</fastjson.version>
         <mybatis-puls-spring-boot.version>3.5.5</mybatis-puls-spring-boot.version>
         <druid.version>1.2.21</druid.version>
         <hutool.version>5.8.16</hutool.version>
-        <knife4j.version>3.0.3</knife4j.version>
+        <knife4j.version>4.1.0</knife4j.version>
         <lombok.version>1.18.20</lombok.version>
         <tinyPinyin.version>2.0.3.RELEASE</tinyPinyin.version>
         <poi-ooxml.version>4.1.2</poi-ooxml.version>
@@ -54,6 +62,12 @@
     <dependencyManagement>
         <dependencies>
 
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-bootstrap</artifactId>
+                <version>${spring.cloud.starter.bootstrap}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
@@ -71,12 +85,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <dependency>
-                <groupId>com.alibaba.nacos</groupId>
-                <artifactId>nacos-common</artifactId>
-                <version>${nacos.common.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
@@ -128,7 +136,7 @@
 
             <dependency>
                 <groupId>com.github.xiaoymin</groupId>
-                <artifactId>knife4j-spring-boot-starter</artifactId>
+                <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
                 <version>${knife4j.version}</version>
             </dependency>
 

virtual-patient-common/pom.xml

@@ -31,6 +31,11 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
@@ -73,10 +78,6 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -112,7 +113,10 @@
             <artifactId>okhttp</artifactId>
         </dependency>
 
-
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+        </dependency>
 
 
     </dependencies>

virtual-patient-graph/pom.xml

@@ -29,17 +29,9 @@
                     <groupId>com.alibaba</groupId>
                     <artifactId>fastjson</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.alibaba.nacos</groupId>
-                    <artifactId>nacos-common</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-common</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -112,6 +104,7 @@
             <scope>provided</scope>
         </dependency>
 
+
     </dependencies>
 
     <build>

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;

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;
 
 /**

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

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

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;
 
 /**

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;

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;

virtual-patient-rasa/pom.xml

@@ -32,16 +32,9 @@
                     <groupId>com.alibaba</groupId>
                     <artifactId>fastjson</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.alibaba.nacos</groupId>
-                    <artifactId>nacos-common</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-common</artifactId>
-        </dependency>
+
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>

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) {

virtual-patient-web/pom.xml

@@ -33,11 +33,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-common</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
         </dependency>
 
+
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>

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 = "初步诊断")

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