Merge branch 'master' into eureka

# Conflicts:
#	sop-admin/sop-admin-server/src/main/resources/public/index.html

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/EurekaUri.java

@@ -4,6 +4,7 @@ import okhttp3.MediaType;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.internal.http.HttpMethod;
+import org.springframework.util.StringUtils;
 
 /**
  * https://github.com/Netflix/eureka/wiki/Eureka-REST-operations
@@ -60,16 +61,13 @@ public enum EurekaUri {
     }
 
     public Request getRequest(String url, String... args) {
-        if (url.endsWith("/")) {
-            url = url.substring(0, url.length() - 1);
-        }
+        url = StringUtils.trimTrailingCharacter(url, '/');
         String requestUrl = url + getUri(args);
-        Request request = this.getBuilder()
+        return this.getBuilder()
                 .url(requestUrl)
                 .addHeader("Content-Type", "application/json")
                 .addHeader("Accept", "application/json")
                 .build();
-        return request;
     }
 
     public Request.Builder getBuilder() {

sop-admin/sop-admin-server/src/main/resources/META-INF/sop-admin.properties

@@ -13,6 +13,8 @@ sop.sign-type=rsa
 nacos.config.server-addr=${register.url}
 nacos.discovery.server-addr=${register.url}
 
+registry.name=eureka
+
 # nacos cloud配置
 spring.cloud.nacos.discovery.server-addr=${register.url}
 

sop-admin/sop-admin-server/src/main/resources/application-dev.properties

@@ -7,6 +7,6 @@ mysql.username=root
 mysql.password=root
 
 # 注册中心地址
-register.url=127.0.0.1:8848
+register.url=http://localhost:1111/eureka/
 
 logging.level.com.gitee=debug

sop-auth/pom.xml

@@ -29,10 +29,9 @@
 		</dependency>
 		<!-- sop相关配置 end-->
 
-		<!-- 使用nacos注册中心 -->
 		<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>

sop-auth/src/main/resources/application-dev.properties

@@ -7,13 +7,13 @@ mysql.host=localhost:3306
 mysql.username=root
 mysql.password=root
 
-# nacos地址
-register.url=127.0.0.1:8848
+# 注册中心地址
+register.url=http://localhost:1111/eureka/
 
 # ------- 需要改的配置end -------
 
-# nacos cloud配置
-spring.cloud.nacos.discovery.server-addr=${register.url}
+# eureka地址
+eureka.client.serviceUrl.defaultZone=${register.url}
 
 # 数据库配置
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

sop-common/sop-bridge-eureka/src/main/java/com/gitee/sop/bridge/route/EurekaRegistryListener.java

@@ -1,6 +1,7 @@
 package com.gitee.sop.bridge.route;
 
 import com.gitee.sop.gatewaycommon.bean.InstanceDefinition;
+import com.gitee.sop.gatewaycommon.bean.SopConstants;
 import com.gitee.sop.gatewaycommon.route.BaseRegistryListener;
 import com.gitee.sop.gatewaycommon.route.RegistryEvent;
 import com.gitee.sop.gatewaycommon.route.ServiceHolder;
@@ -15,6 +16,8 @@ import org.springframework.context.ApplicationEvent;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -42,12 +45,19 @@ public class EurekaRegistryListener extends BaseRegistryListener {
                 .filter(application -> CollectionUtils.isNotEmpty(application.getInstances()))
                 .map(Application::getInstances)
                 .map(instanceInfos -> {
-                    // 根据更新时间倒叙
-                    instanceInfos.sort(Comparator.comparing(InstanceInfo::getLastUpdatedTimestamp).reversed());
-                    // 获取最新的个服务实例，说明这个服务实例刚刚重启过
-                    return instanceInfos.get(0);
+                    // 找到最新的一个
+                    Optional<InstanceInfo> instanceInfoOptional = instanceInfos
+                            .stream()
+                            .max(Comparator.comparing(InstanceInfo::getLastUpdatedTimestamp));
+                    return instanceInfoOptional.map(instanceInfo -> {
+                        String startupTime = instanceInfo.getMetadata().get(SopConstants.METADATA_KEY_TIME_STARTUP);
+                        if (startupTime == null) {
+                            return null;
+                        }
+                        return new ServiceHolder(instanceInfo.getAppName(), Long.parseLong(startupTime));
+                    }).orElse(null);
                 })
-                .map(instanceInfo -> new ServiceHolder(instanceInfo.getAppName(), instanceInfo.getLastUpdatedTimestamp()))
+                .filter(Objects::nonNull)
                 .filter(this::canOperator)
                 .collect(Collectors.toList());
 

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/configuration/ServiceConfiguration.java

@@ -1,17 +1,6 @@
 package com.gitee.sop.servercommon.configuration;
 
-import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
-import com.alibaba.cloud.nacos.NacosServiceManager;
-import com.alibaba.cloud.nacos.discovery.NacosWatch;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.core.env.Environment;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
-
-import java.util.Map;
 
 /**
  * @author tanghc
@@ -19,25 +8,4 @@ import java.util.Map;
 @Slf4j
 public class ServiceConfiguration extends SpringmvcConfiguration {
 
-    @Bean
-    @ConditionalOnMissingBean
-    @ConditionalOnProperty("spring.cloud.nacos.discovery.server-addr")
-    public NacosWatch nacosWatch(
-            NacosServiceManager nacosServiceManager,
-            NacosDiscoveryProperties nacosDiscoveryProperties,
-            ObjectProvider<ThreadPoolTaskScheduler> taskScheduler,
-            Environment environment
-    ) {
-        Map<String, String> metadata = nacosDiscoveryProperties.getMetadata();
-        String contextPath = environment.getProperty(METADATA_SERVER_CONTEXT_PATH);
-        // 将context-path信息加入到metadata中
-        if (contextPath != null) {
-            metadata.put(METADATA_SERVER_CONTEXT_PATH, contextPath);
-        }
-        // 在元数据中新增启动时间，不能修改这个值，不然网关拉取接口会有问题
-        // 如果没有这个值，网关会忽略这个服务
-        metadata.put("server.startup-time", String.valueOf(System.currentTimeMillis()));
-        return new NacosWatch(nacosServiceManager, nacosDiscoveryProperties, taskScheduler);
-    }
-
 }

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/configuration/SpringmvcConfiguration.java

@@ -37,6 +37,10 @@ public class SpringmvcConfiguration implements WebMvcConfigurer, BeanPostProcess
         ServiceConfig.getInstance().getI18nModules().add("i18n/isp/bizerror");
     }
 
+    static {
+        System.setProperty("eureka.instance.metadata-map.server.startup-time", String.valueOf(System.currentTimeMillis()));
+    }
+
     @Override
     public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
         if (bean instanceof RequestMappingHandlerAdapter) {

sop-example/sop-story/pom.xml

@@ -27,17 +27,18 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <!-- 使用nacos注册中心 -->
+        <!-- 使用nacos注册中心
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
+        -->
 
         <!-- 使用eureka注册中心 -->
-        <!--<dependency>
+        <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>-->
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>

sop-example/sop-story/src/main/resources/application-dev.properties

@@ -1,8 +1,9 @@
 server.port=2222
 spring.application.name=story-service
-register.url=127.0.0.1:8848
+register.url=http://localhost:1111/eureka/
 # \u6CE8\u518C\u4E2D\u5FC3
-spring.cloud.nacos.discovery.server-addr=${register.url}
+eureka.client.serviceUrl.defaultZone=${register.url}
+
 
 # \u4E0A\u4F20\u6587\u4EF6\u6700\u5927\u503C
 spring.servlet.multipart.max-file-size=20MB

sop-gateway/pom.xml

@@ -22,8 +22,7 @@
         -->
          <dependency>
             <groupId>com.gitee.sop</groupId>
-             <artifactId>sop-bridge-nacos</artifactId>
-<!--             <artifactId>sop-bridge-eureka</artifactId>-->
+            <artifactId>sop-bridge-eureka</artifactId>
             <version>${project.version}</version>
         </dependency>
 

sop-gateway/src/main/resources/application-dev.properties

@@ -7,7 +7,7 @@ mysql.username=root
 mysql.password=root
 
 # nacos\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740
-register.url=127.0.0.1:8848
+register.url=http://localhost:1111/eureka/
 
 # \u4E0A\u4F20\u6587\u4EF6\u6700\u5927\u5BB9\u91CF\uFF0C\u9ED8\u8BA410MB
 spring.servlet.multipart.max-file-size=10MB

sop-website/pom.xml

@@ -1,7 +1,7 @@
 <?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">
+         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>
 		<groupId>com.gitee.sop</groupId>
@@ -14,7 +14,7 @@
 	<artifactId>sop-website</artifactId>
 	<packaging>pom</packaging>
 
-	<modules>
-		<module>sop-website-server</module>
-	</modules>
+    <modules>
+        <module>sop-website-server</module>
+    </modules>
 </project>

sop-website/sop-website-server/pom.xml

@@ -23,8 +23,7 @@
         -->
         <dependency>
             <groupId>com.gitee.sop</groupId>
-            <artifactId>sop-bridge-nacos</artifactId>
-            <!--<artifactId>sop-bridge-eureka</artifactId>-->
+            <artifactId>sop-bridge-eureka</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -70,6 +69,13 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-api</artifactId>
+            <version>1.3.3</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -83,7 +89,6 @@
             <scope>test</scope>
         </dependency>
 
-
     </dependencies>
 
     <build>

sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/service/impl/EurekaServerService.java

@@ -53,7 +53,7 @@ public class EurekaServerService implements ServerService  {
             }
             List<EurekaInstance> instanceList = eurekaApplication.getInstance();
             return instanceList.stream()
-                    .map(eurekaInstance -> eurekaInstance.getIpAddr() + ":" + eurekaInstance.getPort())
+                    .map(eurekaInstance -> eurekaInstance.getIpAddr() + ":" + eurekaInstance.fetchPort())
                     .collect(Collectors.toList());
         }
         return Collections.emptyList();

sop-website/sop-website-server/src/main/resources/application-dev.properties

@@ -8,7 +8,7 @@ mysql.host=localhost:3306
 mysql.username=root
 mysql.password=root
 # 注册中心地址
-register.url=127.0.0.1:8848
+register.url=http://localhost:1111/eureka/
 
 # 网关内网地址
 # ！！沙箱环境是提供给外部的测试环境，不能把正式环境当做沙箱环境来使用。
@@ -17,8 +17,7 @@ gateway.url=http://localhost:8081
 logging.level.com.gitee=debug
 # ------- 需要改的配置end -------
 
-## nacos cloud配置
-spring.cloud.nacos.discovery.server-addr=${register.url}
+eureka.client.serviceUrl.defaultZone=${register.url}
 
 # 页面上显示的测试环境地址
 api.url-test=http://open-test.yourdomain.com