（没成功，放弃尝试）去除注册中心 nacos；添加 Eureka；升级Spring Cloud版本为2022.0.1；JDK版本为17

2023-03-01 17:24:31 +08:00
parent 0f43fa20b6
commit b7d2a5efd4
25 changed files with 154 additions and 103 deletions
--- a/backend/.idea/encodings.xml
+++ b/backend/.idea/encodings.xml
@@ -3,6 +3,8 @@
  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
    <file url="file://$PROJECT_DIR$/microservice-common/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/microservice-common/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/microservice-eureka-server-8761/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/microservice-eureka-server-8761/src/main/resources" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/microservice-gateway/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/microservice-gateway/src/main/resources" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/microservice-provider-access-8002/src/main/java" charset="UTF-8" />
--- a/backend/.idea/misc.xml
+++ b/backend/.idea/misc.xml
@@ -11,5 +11,5 @@
      </list>
    </option>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK" />
 </project>
--- a/backend/.idea/runConfigurations/EurekaServerApp.xml
+++ b/backend/.idea/runConfigurations/EurekaServerApp.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="EurekaServerApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+    <option name="ACTIVE_PROFILES" />
+    <module name="microservice-eureka-server-8761" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.cxyxiaomo.epp.EurekaServerApp" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="com.cxyxiaomo.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
--- a/backend/.idea/runConfigurations/Gateway.xml
+++ b/backend/.idea/runConfigurations/Gateway.xml
@@ -1,6 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="Gateway" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
    <option name="ACTIVE_PROFILES" />
+    <option name="ALTERNATIVE_JRE_PATH" value="17" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
    <module name="microservice-gateway" />
    <option name="SPRING_BOOT_MAIN_CLASS" value="com.cxyxiaomo.epp.gateway.Gateway" />
    <option name="VM_PARAMETERS" value="-Xms64m -Xmx256m" />
--- a/backend/.idea/runConfigurations/MiniProgram.xml
+++ b/backend/.idea/runConfigurations/MiniProgram.xml
@@ -1,6 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="MiniProgram" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
    <option name="ACTIVE_PROFILES" />
+    <option name="ALTERNATIVE_JRE_PATH" value="17" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
    <option name="SPRING_BOOT_MAIN_CLASS" value="com.cxyxiaomo.epp.miniprogram.Application" />
    <option name="VM_PARAMETERS" value="-Xms64m -Xmx256m" />
    <method v="2">
--- a/backend/.idea/runConfigurations/UserProvider.xml
+++ b/backend/.idea/runConfigurations/UserProvider.xml
@@ -1,6 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="UserProvider" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
    <option name="ACTIVE_PROFILES" />
+    <option name="ALTERNATIVE_JRE_PATH" value="17" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
    <module name="microservice-provider-user-8001" />
    <option name="SPRING_BOOT_MAIN_CLASS" value="com.cxyxiaomo.epp.user.UserProvider" />
    <option name="VM_PARAMETERS" value="-Xms64m -Xmx256m" />
--- a/backend/.idea/runConfigurations/UserProvider_Remote.xml
+++ b/backend/.idea/runConfigurations/UserProvider_Remote.xml
@@ -1,6 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="UserProvider-Remote" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
    <option name="ACTIVE_PROFILES" />
+    <option name="ALTERNATIVE_JRE_PATH" value="17" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
    <envs>
      <env name="--spring.profiles.active" value="remote" />
    </envs>
--- a/backend/microservice-common/pom.xml
+++ b/backend/microservice-common/pom.xml
@@ -13,8 +13,8 @@

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
    </properties>

    <dependencies>
@@ -26,7 +26,6 @@
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-beans</artifactId>
-            <version>5.3.22</version>
        </dependency>
    </dependencies>
 </project>
--- a/backend/microservice-eureka-server-8761/pom.xml
+++ b/backend/microservice-eureka-server-8761/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+    <!--<parent>-->
+    <!--    <artifactId>spring-boot-starter-parent</artifactId>-->
+    <!--    <groupId>org.springframework.boot</groupId>-->
+    <!--    <version>3.0.2</version>-->
+    <!--</parent>-->
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.cxyxiaomo</groupId>
+    <artifactId>microservice-eureka-server-8761</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <name>microservice-eureka-server</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Spring Cloud Dependencies -->
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>2022.0.1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+        </dependency>
+    </dependencies>
+</project>
--- a/backend/microservice-eureka-server-8761/src/main/java/com/cxyxiaomo/epp/EurekaServerApp.java
+++ b/backend/microservice-eureka-server-8761/src/main/java/com/cxyxiaomo/epp/EurekaServerApp.java
@@ -0,0 +1,13 @@
+package com.cxyxiaomo.epp;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
+
+@SpringBootApplication
+@EnableEurekaServer
+public class EurekaServerApp {
+    public static void main(String[] args) {
+        SpringApplication.run(EurekaServerApp.class, args);
+    }
+}
--- a/backend/microservice-eureka-server-8761/src/main/resources/application.yml
+++ b/backend/microservice-eureka-server-8761/src/main/resources/application.yml
@@ -0,0 +1,16 @@
+server:
+  port: 8761
+
+eureka:
+  instance:
+    hostname: localhost
+  client:
+    register-with-eureka: false   # 是否向注册中心注册自己
+    fetch-registry: false         # false表示自己端就是注册中心，我的职责就是维护服务实例，并不需要去检索服务
+    # 以上两个配置只需要在单机版配置，集群版不需要配这两个
+    service-url:
+      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
+
+spring:
+  application:
+    name: microservice-eureka-server
--- a/backend/microservice-eureka-server-8761/src/test/java/com/epp/AppTest.java
+++ b/backend/microservice-eureka-server-8761/src/test/java/com/epp/AppTest.java
@@ -0,0 +1,12 @@
+package com.epp;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest {
+    /**
+     * Rigorous Test :-)
+     */
+    public void shouldAnswerWithTrue() {
+    }
+}
--- a/backend/microservice-gateway/pom.xml
+++ b/backend/microservice-gateway/pom.xml
@@ -13,8 +13,8 @@

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
    </properties>

    <dependencies>
@@ -32,17 +32,6 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
        </dependency>
-        <!-- Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>snakeyaml</artifactId>
-                    <groupId>org.yaml</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
        <!-- logback -->
        <dependency>
            <groupId>ch.qos.logback</groupId>
--- a/backend/microservice-gateway/src/main/resources/application.yml
+++ b/backend/microservice-gateway/src/main/resources/application.yml
@@ -6,9 +6,6 @@ spring:
  application:
    name: microservice-gateway
  cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
    gateway:
      discovery:
        locator:
--- a/backend/microservice-provider-access-8002/pom.xml
+++ b/backend/microservice-provider-access-8002/pom.xml
@@ -13,8 +13,8 @@

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
    </properties>

    <dependencies>
@@ -67,21 +67,11 @@
        </dependency>

        <!-- Spring Boot -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test</artifactId>
-        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>

-        <!-- Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
        <!-- OpenFeign -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
--- a/backend/microservice-provider-access-8002/src/main/java/com/cxyxiaomo/epp/access/config/WebSocketConfig.java.bak
+++ b/backend/microservice-provider-access-8002/src/main/java/com/cxyxiaomo/epp/access/config/WebSocketConfig.java.bak
--- a/backend/microservice-provider-access-8002/src/main/java/com/cxyxiaomo/epp/access/controller/WebSocketServer.java.bak
+++ b/backend/microservice-provider-access-8002/src/main/java/com/cxyxiaomo/epp/access/controller/WebSocketServer.java.bak
--- a/backend/microservice-provider-access-8002/src/main/resources/application.yml
+++ b/backend/microservice-provider-access-8002/src/main/resources/application.yml
@@ -12,9 +12,6 @@ spring:
  application:
    name: microservice-provider-access
  cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    driver-class-name: com.mysql.cj.jdbc.Driver
--- a/backend/microservice-provider-test-8011/pom.xml
+++ b/backend/microservice-provider-test-8011/pom.xml
@@ -13,25 +13,16 @@

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
    </properties>

    <dependencies>
        <!-- Spring Boot -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test</artifactId>
-        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
-        <!-- Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
        <!-- logback -->
        <dependency>
            <groupId>ch.qos.logback</groupId>
--- a/backend/microservice-provider-test-8011/src/main/java/com/cxyxiaomo/epp/test/TestProvider.java
+++ b/backend/microservice-provider-test-8011/src/main/java/com/cxyxiaomo/epp/test/TestProvider.java
@@ -2,12 +2,10 @@ package com.cxyxiaomo.epp.test;

 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;

 // 启动类

@SpringBootApplication
-@EnableDiscoveryClient
 public class TestProvider {
    public static void main(String[] args) {
        SpringApplication.run(TestProvider.class, args);
--- a/backend/microservice-provider-test-8011/src/main/resources/application.yml
+++ b/backend/microservice-provider-test-8011/src/main/resources/application.yml
@@ -6,6 +6,3 @@ spring:
  application:
    name: microservice-provider-test
  cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
--- a/backend/microservice-provider-user-8001/pom.xml
+++ b/backend/microservice-provider-user-8001/pom.xml
@@ -13,8 +13,8 @@

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
    </properties>

    <dependencies>
@@ -67,28 +67,16 @@
        </dependency>

        <!-- Spring Boot -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test</artifactId>
-        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>

-        <!-- Nacos -->
+        <!-- Eureka Discovery Client -->
        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
        </dependency>
-
-        <!-- 热部署 -->
-        <!--<dependency>-->
-        <!--    <groupId>org.springframework.boot</groupId>-->
-        <!--    <artifactId>spring-boot-devtools</artifactId>-->
-        <!--    <version>2.7.5</version>-->
-        <!--</dependency>-->
-
    </dependencies>


--- a/backend/microservice-provider-user-8001/src/main/java/com/cxyxiaomo/epp/user/UserProvider.java
+++ b/backend/microservice-provider-user-8001/src/main/java/com/cxyxiaomo/epp/user/UserProvider.java
@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;

+// import org.springframework.cloud.netflix.eureka.server.EnableEurekaClient;
 // 启动类

@SpringBootApplication
--- a/backend/microservice-provider-user-8001/src/main/resources/application.yml
+++ b/backend/microservice-provider-user-8001/src/main/resources/application.yml
@@ -11,13 +11,13 @@ mybatis:
 spring:
  application:
    name: microservice-provider-user
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    driver-class-name: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://127.0.0.1:3306/epp?useUnicode=true&characterEncoding=utf8&useSSL=false
    username: root
    password: root
+eureka:
+  client:
+    service-url:
+      defaultZone: http://localhost:8761/eureka/
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -13,6 +13,7 @@
    <!-- 打包方式 -->
    <packaging>pom</packaging>
    <modules>
+        <module>microservice-eureka-server-8761</module>
        <module>microservice-gateway</module>
        <module>microservice-common</module>
        <module>microservice-provider-user-8001</module>
@@ -22,10 +23,10 @@

    <!-- 统一管理jar包版本 -->
    <properties>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
        <junit.version>4.13.2</junit.version>
        <log4j.version>1.2.17</log4j.version>
        <lombok.version>1.18.24</lombok.version>
@@ -43,7 +44,7 @@
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>2021.0.4</version>
+                <version>2022.0.1</version>
                <type>pom</type>
                <scope>import</scope>
            </dependency>
@@ -51,45 +52,32 @@
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-gateway</artifactId>
-                <version>3.1.4</version>
+                <version>4.0.1</version>
            </dependency>
            <!-- Spring Cloud Starter Load Balancer -->
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-loadbalancer</artifactId>
-                <version>3.1.4</version>
-            </dependency>
-            <!-- Spring Boot -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.7.5</version>
-            </dependency>
-            <!-- Spring Boot Test -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-test</artifactId>
-                <version>2.7.5</version>
+                <version>4.0.1</version>
            </dependency>
            <!-- Spring Boot Starter Web -->
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-web</artifactId>
-                <version>2.6.3</version>
+                <version>3.0.2</version>
            </dependency>

-            <!-- Nacos -->
-            <!-- 服务注册发现 -->
+            <!-- Eureka Discovery Server -->
            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-                <version>2021.1</version>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+                <version>4.0.0</version>
            </dependency>
-            <!-- 配置中心依赖管理 -->
+            <!-- Eureka Discovery Client -->
            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-                <version>2021.1</version>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+                <version>4.0.0</version>
            </dependency>

            <!-- OpenFeign -->
@@ -131,7 +119,7 @@
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-websocket</artifactId>
-                <version>2.7.6</version>
+                <version>3.0.2</version>
            </dependency>

            <!-- Fastjson -->
@@ -174,12 +162,12 @@
            <dependency>
                <groupId>org.slf4j</groupId>
                <artifactId>slf4j-api</artifactId>
-                <version>2.0.3</version>
+                <version>2.0.6</version>
            </dependency>
            <dependency>
                <groupId>org.slf4j</groupId>
                <artifactId>slf4j-simple</artifactId>
-                <version>2.0.3</version>
+                <version>2.0.6</version>
            </dependency>

            <!-- Test -->
@@ -199,6 +187,12 @@
                <version>${lombok.version}</version>
                <optional>true</optional>
            </dependency>
+
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>6.0.4</version>
+            </dependency>
        </dependencies>
    </dependencyManagement>