合并master

Author: xujin

README.md

@@ -193,9 +193,9 @@ moss客户端主要用于内置预设自研端点和管理配置信息，使接
 
 #### 2.3.1 Moss-Client
 
-Moss客户端支持两种Spring Boot版本，分别是Spring Boot 1.5.X和Spring Boot 2.X，使用只需引入moss-client-starter即可。示例2.x的客户端如下所示。
+Moss客户端支持两种Spring Boot版本，分别是Spring Boot 1.5.X和Spring Boot 2.X，使用只需引入 moss-client 即可。示例2.x的客户端如下所示。
 
-1.引入moss-client-starter
+1.引入 moss-client
 
 ```xml
 <dependency>
@@ -234,39 +234,13 @@ info.version: @project.version@
 
 #### 2.3.2 导入IDE运行
 
-1.创建数据库moss，执行sql文件:/Moss/doc/sql/moss-init.sql
-
-2. 修改Moss/moss-web/src/main/resources/application.yml文件，数据库链接如下所示:
-
-```yml
-spring:
-  application:
-    name: halo-moss
-  datasource:
-    url: jdbc:mysql://ip:端口/moss?useUnicode=true&characterEncoding=utf8
-    ## 生产用户名和密码
-    username: 用户名
-    password: 密码
-    driver-class-name: com.mysql.jdbc.Driver
-    type: com.alibaba.druid.pool.DruidDataSource
-    filters: stat
-    maxActive: 20
-    initialSize: 1
-    maxWait: 60000
-    minIdle: 1
-    timeBetweenEvictionRunsMillis: 60000
-    minEvictableIdleTimeMillis: 300000
-    validationQuery: select 'x'
-    testWhileIdle: true
-    testOnBorrow: false
-    testOnReturn: false
-    poolPreparedStatements: true
-    maxOpenPreparedStatements: 20
-```
-
-3.运行主程序org.xujin.moss.MossApplication.java
-
-4.启动之后访问http://localhost:8080/，用户名:xujin和密码:123456
+1. 为方便快速演示，默认内置了 h2 数据库。
+3. 导入 IDEA 运行主程序org.xujin.moss.MossApplication.java
+4. 启动之后访问 http://localhost:8086/
+* 用户名 -  xujin
+* 密码 - 123456
+5. 如需修改后端数据库，将 moss-web/src/main/resources/config/application.yml 
+中 `spring.profiles.active` 的 h2 改为 mysql，并修改 application-mysql 中的连接地址、username/password。
 
 
 ## 3.Moss的实现细节
@@ -282,40 +256,27 @@ spring:
 * 注册到Eureka上的应用名为大写，而注册到Nacos上的应用名为小写,Moss需要忽略大小写匹配
 * 等等~~~~~~~~~~~~~
 
-## 4 GC日志路径设置:
+## 4 GC日志路径设置参考
 
--Xloggc:/opt/logs/gc.log -verbose.gc
+`-Xloggc:${YOUR_WORK_DIR}/logs/${APP_NAME}/gc.log -verbose.gc -XX:+PrintGCDateStamps`
 
-### 4.1 切换支持单Nacos
+```yaml
+logging:
+  registry:
+    files:
+    - name: gclog
+      path: logs/${spring.application.name}/gc.log
+```
 
-将moss-service/pom.xml中的依赖修改如下
 
-```xml
- <dependency>
-            <groupId>org.xujin.moss</groupId>
-            <artifactId>moss-adapter-multi-eureka</artifactId>
-            <version>1.0.0.RELEASE</version>
-        </dependency>
-```
-修改为
-```xml
-  <dependency>
-             <groupId>org.xujin.moss</groupId>
-             <artifactId>moss-adapter-single-nacos</artifactId>
-             <version>1.0.0.RELEASE</version>
-         </dependency>
-```
+### 4.1 切换支持注册中心
+默认的注册注册中心是 eureka，如果希望切换到其他注册中心，如 ZooKeeper,
+可以通过激活 profile 切换注册中心。在以下 pom 中已预设两种注册中心，使用时自行切换即可。
 
-yml文件配置如下
-```yml
-spring:
-  application:
-    name: halo-moss
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
-```
+* moss-web/pom.xml
+* moss-service/pom.xml
+* moss-client/moss-sample-2.1.x
+* moss-client/moss-sample-1.5.x
 
 ## 5.致谢
 
@@ -324,4 +285,3 @@ Moss中的moss-adapter-cloud和moss-core模块部分代码参考了 [Spring Boot
 ## 6.Stargazers over time
  
  [![Stargazers over time](https://starchart.cc/SpringCloud/Moss.svg)](https://starchart.cc/SpringCloud/Moss)
-       

moss-adapter/moss-adapter-multi-eureka/src/main/java/de/codecentric/boot/admin/server/cloud/extension/MossInstanceDiscoveryListener.java

@@ -12,6 +12,7 @@
 import de.codecentric.boot.admin.server.services.InstanceRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.event.HeartbeatEvent;
@@ -51,21 +52,24 @@ public class MossInstanceDiscoveryListener {
      * patterns (e.g. "foo*", "*foo", "foo*bar"). Default value is everything
      */
     private Set<String> services = new HashSet<>(Collections.singletonList("*"));
-
+    private MultRegisterCenter multRegisterCenter;
     public MossInstanceDiscoveryListener(
             InstanceRegistry registry,
             InstanceRepository repository) {
         this.registry = registry;
         this.repository = repository;
     }
-
+    @Autowired
+    public void setMultRegisterCenter(MultRegisterCenter multRegisterCenter) {
+        this.multRegisterCenter = multRegisterCenter;
+    }
     /**
      * 应用启动完Ready的事件
      * @param event
      */
     @EventListener
     public void onApplicationReady(ApplicationReadyEvent event) {
-        Map<String, MossEurekaAutoServiceRegistration> map= MultRegisterCenterServerMgmtConfig.getMultRegisterCenter().getMultRegistrationMap();
+        Map<String, MossEurekaAutoServiceRegistration> map= multRegisterCenter.getMultRegistrationMap();
         map.entrySet().forEach(e -> {
             cloudEurekaClient.set(e.getValue().getRegistration().getEurekaClient());
             discover();
@@ -83,15 +87,15 @@ public void onInstanceRegistered(InstanceRegisteredEvent<?> event) {
 
     @EventListener
     public void onParentHeartbeat(ParentHeartbeatEvent event) {
-        HeartbeatMonitor heartbeatMonitor= MultRegisterCenterServerMgmtConfig.getHeartbeatMonitorByClient((CloudEurekaClient) event.getSource());
+        HeartbeatMonitor heartbeatMonitor= getHeartbeatMonitorByClient((CloudEurekaClient) event.getSource());
         threadLocalmonitor.set(heartbeatMonitor);
         discoverIfNeeded((CloudEurekaClient) event.getSource(),event.getValue());
         threadLocalmonitor.remove();
     }
 
     @EventListener
     public void onApplicationEvent(HeartbeatEvent event) {
-        HeartbeatMonitor heartbeatMonitor= MultRegisterCenterServerMgmtConfig.getHeartbeatMonitorByClient((CloudEurekaClient) event.getSource());
+        HeartbeatMonitor heartbeatMonitor= getHeartbeatMonitorByClient((CloudEurekaClient) event.getSource());
         threadLocalmonitor.set(heartbeatMonitor);
         discoverIfNeeded((CloudEurekaClient) event.getSource(),event.getValue());
         threadLocalmonitor.remove();
@@ -153,7 +157,7 @@ public List<String> getServicesByEureka() {
     protected Mono<Void> removeStaleInstances(Set<InstanceId> registeredInstanceIds) {
         return repository.findAll()
                 .filter(Instance::isRegistered)
-                .filter(instance -> MultRegisterCenterServerMgmtConfig.getCodeByClient(cloudEurekaClient.get()).
+                .filter(instance -> getCodeByClient(cloudEurekaClient.get()).
                         equals(instance.getRegistration().getSource()))
                 .map(Instance::getId)
                 .filter(id -> !registeredInstanceIds.contains(id))
@@ -162,7 +166,12 @@ protected Mono<Void> removeStaleInstances(Set<InstanceId> registeredInstanceIds)
                 .then();
     }
 
-
+    private String getCodeByClient(CloudEurekaClient client) {
+        return multRegisterCenter.getMultEurekaCodeMap().get(client);
+    }
+    private HeartbeatMonitor getHeartbeatMonitorByClient(CloudEurekaClient client) {
+        return multRegisterCenter.getMultHeartbeatMonitorMap().get(client);
+    }
 
 
     protected boolean shouldRegisterService(final String serviceId) {
@@ -180,7 +189,7 @@ protected boolean matchesPattern(String serviceId, Set<String> patterns) {
     protected Mono<InstanceId> registerInstance(ServiceInstance instance) {
         try {
             Registration registration = converter.convert(instance).toBuilder().
-                    source(MultRegisterCenterServerMgmtConfig.getCodeByClient(cloudEurekaClient.get())).build();
+                    source(getCodeByClient(cloudEurekaClient.get())).build();
             log.debug("Registering discovered instance {}", registration);
             return registry.register(registration);
         } catch (Exception ex) {

moss-adapter/moss-adapter-multi-eureka/src/main/java/de/codecentric/boot/admin/server/cloud/extension/MossServerDiscoveryAutoConfiguration.java

@@ -1,37 +1,117 @@
 package de.codecentric.boot.admin.server.cloud.extension;
 
+import com.google.common.collect.Maps;
+import com.netflix.appinfo.ApplicationInfoManager;
+import com.netflix.appinfo.HealthCheckHandler;
+import com.netflix.discovery.EurekaClient;
 import de.codecentric.boot.admin.server.cloud.discovery.EurekaServiceInstanceConverter;
 import de.codecentric.boot.admin.server.cloud.discovery.ServiceInstanceConverter;
 import de.codecentric.boot.admin.server.config.AdminServerAutoConfiguration;
 import de.codecentric.boot.admin.server.config.AdminServerMarkerConfiguration;
 import de.codecentric.boot.admin.server.domain.entities.InstanceRepository;
 import de.codecentric.boot.admin.server.services.InstanceRegistry;
+import lombok.extern.slf4j.Slf4j;
+import org.moss.registry.adapter.MultRegisterCenterService;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.client.discovery.event.HeartbeatMonitor;
+import org.springframework.cloud.commons.util.InetUtils;
+import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
+import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
+import org.springframework.cloud.netflix.eureka.metadata.ManagementMetadataProvider;
+import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.env.ConfigurableEnvironment;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 @Configuration
 @ConditionalOnSingleCandidate(DiscoveryClient.class)
 @ConditionalOnBean(AdminServerMarkerConfiguration.Marker.class)
 @AutoConfigureAfter(value = AdminServerAutoConfiguration.class, name = {
-    "org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration",
-    "org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration"})
+        "org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration",
+        "org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration"})
+@Slf4j
 public class MossServerDiscoveryAutoConfiguration {
+    @Autowired
+    private ConfigurableEnvironment env;
+    @Autowired
+    private InetUtils inetUtils;
+    @Autowired
+    private ApplicationContext context;
+    @Autowired(required = false)
+    private ObjectProvider<HealthCheckHandler> healthCheckHandler;
 
     @Bean
     @ConditionalOnMissingBean
     public MossInstanceDiscoveryListener instanceDiscoveryListener(ServiceInstanceConverter serviceInstanceConverter,
-                                                               InstanceRegistry registry,
-                                                               InstanceRepository repository) {
+                                                                   InstanceRegistry registry,
+                                                                   InstanceRepository repository) {
         MossInstanceDiscoveryListener listener = new MossInstanceDiscoveryListener(registry, repository);
         listener.setConverter(serviceInstanceConverter);
         return listener;
     }
 
+    @Bean(destroyMethod = "shutdown")
+    public MultRegisterCenter initMultEureka(MultRegisterCenterService multRegisterCenterService,
+                                             MultRegisterCenterServerMgmtConfig mgmtConfig) {
+        Map<String, String> URL_MAP;
+        MultRegisterCenter multRegisterCenter;
+        log.info("start init MultRegisterCenter");
+        URL_MAP = multRegisterCenterService.getRegisterCenterList();
+        if (URL_MAP.isEmpty()) {
+            multRegisterCenter = new MultRegisterCenter(new ConcurrentHashMap<String, EurekaClient>(),
+                    new ConcurrentHashMap<String, MossEurekaAutoServiceRegistration>(),
+                    new ConcurrentHashMap<EurekaClient, HeartbeatMonitor>());
+            return multRegisterCenter;
+        }
+        Map<String, EurekaClient> multEurekaMap = Maps.newConcurrentMap();
+        Map<String, MossEurekaAutoServiceRegistration> multRegistrationMap = Maps.newConcurrentMap();
+        Map<EurekaClient, HeartbeatMonitor> multHeartbeatMonitorMap = new ConcurrentHashMap<EurekaClient, HeartbeatMonitor>();
+        URL_MAP.entrySet().forEach(e -> {
+            log.info("start init eureka server:{}", e.getKey() + "-" + e.getValue());
+            ManagementMetadataProvider managementMetadataProvider
+                    = mgmtConfig.serviceManagementMetadataProvider();
+            EurekaClientConfigBean configBean
+                    = mgmtConfig.eurekaClientConfigBean(env);
+            configBean.getServiceUrl().clear();
+            configBean.getServiceUrl().put(EurekaClientConfigBean.DEFAULT_ZONE, e.getValue());
+            EurekaInstanceConfigBean instanceConfigBean
+                    = mgmtConfig.eurekaInstanceConfigBean(inetUtils, env, managementMetadataProvider);
+            instanceConfigBean.setEnvironment(env);
+            ApplicationInfoManager manager
+                    = mgmtConfig.eurekaApplicationInfoManager(instanceConfigBean);
+            EurekaClient eurekaClient
+                    = mgmtConfig.eurekaClient(manager, configBean);
+            EurekaRegistration registration
+                    = mgmtConfig.eurekaRegistration(eurekaClient, instanceConfigBean, manager, healthCheckHandler);
+            MossEurekaAutoServiceRegistration autoServiceRegistration
+                    = mgmtConfig.eurekaAutoServiceRegistration(context, mgmtConfig.eurekaServiceRegistry(), registration, registration);
+            multEurekaMap.put(e.getKey(), eurekaClient);
+            multRegistrationMap.put(e.getKey(), autoServiceRegistration);
+            multHeartbeatMonitorMap.put(eurekaClient, new HeartbeatMonitor());
+            log.info("init eureka server:{} end!", e.getKey() + "-" + e.getValue());
+        });
+        multRegisterCenter = new MultRegisterCenter(multEurekaMap, multRegistrationMap, multHeartbeatMonitorMap);
+        log.info("init MultRegisterCenter End!");
+        return multRegisterCenter;
+    }
+
+    @Bean
+    @Primary
+    public MultRegisterCenterServerMgmtConfig multRegisterCenterServerMgmtConfig() {
+        return new MultRegisterCenterServerMgmtConfig();
+    }
+
     @Configuration
     @ConditionalOnMissingBean({ServiceInstanceConverter.class})
     public static class EurekaConverterConfiguration {