From a8b9cc975388c32b7aee552ec9f901e3c87756d8 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Sat, 27 May 2017 15:31:35 +0800
Subject: [PATCH]

---
 src/META-INF/application-template.xml    |  2 +-
 src/org/redkale/boot/Application.java    | 41 +++++++++++++++++++++---
 src/org/redkale/boot/NodeHttpServer.java |  4 +++
 src/org/redkale/boot/NodeServer.java     |  4 +++
 src/org/redkale/watch/WatchNode.java     |  2 +-
 src/org/redkale/watch/WatchNumber.java   |  2 +-
 src/org/redkale/watch/Watchable.java     |  2 +-
 7 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/META-INF/application-template.xml b/src/META-INF/application-template.xml
index 4551239d8..cc0549ef9 100644
--- a/src/META-INF/application-template.xml
+++ b/src/META-INF/application-template.xml
@@ -97,7 +97,7 @@
     </resources> 
     <!--
         protocol: required  server所启动的协议，Redkale内置的有HTTP、SNCP、WATCH，SNCP使用TCP实现; 
-        name: 服务的名称，用于监控识别，一个配置文件中的server.name不能重复,命名规则: 字母、数字、下划线、减号
+        name: 服务的名称，用于监控识别，一个配置文件中的server.name不能重复,命名规则: 字母、数字、下划线
         host:  服务所占address ， 默认: 0.0.0.0
         port:  required 服务所占端口 
         root:  如果是web类型服务，则包含页面  默认:{APP_HOME}/root
diff --git a/src/org/redkale/boot/Application.java b/src/org/redkale/boot/Application.java
index 035243a00..4f820100f 100644
--- a/src/org/redkale/boot/Application.java
+++ b/src/org/redkale/boot/Application.java
@@ -366,14 +366,45 @@ public final class Application {
             public void load(ResourceFactory rf, final Object src, String resourceName, Field field, final Object attachment) {
                 try {
                     Resource res = field.getAnnotation(Resource.class);
-                    if (res == null || !res.name().isEmpty()) return;
+                    if (res == null) return;
                     if (!(src instanceof WatchService) || Sncp.isRemote((Service) src)) return; //远程模式不得注入 
                     Class type = field.getType();
                     if (type == Application.class) {
                         field.set(src, application);
-//                } else if (type == WatchFactory.class) {
-//                    field.set(src, application.watchFactory);
+                    } else if (type == NodeSncpServer.class) {
+                        NodeServer server = null;
+                        for (NodeServer ns : application.getNodeServers()) {
+                            if (ns.getClass() == NodeSncpServer.class) continue;
+                            if (res.name().equals(ns.server.getName())) {
+                                server = ns;
+                                break;
+                            }
+                        }
+                        field.set(src, server);
+                    } else if (type == NodeHttpServer.class) {
+                        NodeServer server = null;
+                        for (NodeServer ns : application.getNodeServers()) {
+                            if (ns.getClass() == NodeHttpServer.class) continue;
+                            if (res.name().equals(ns.server.getName())) {
+                                server = ns;
+                                break;
+                            }
+                        }
+                        field.set(src, server);
+                    } else if (type == NodeWatchServer.class) {
+                        NodeServer server = null;
+                        for (NodeServer ns : application.getNodeServers()) {
+                            if (ns.getClass() == NodeWatchServer.class) continue;
+                            if (res.name().equals(ns.server.getName())) {
+                                server = ns;
+                                break;
+                            }
+                        }
+                        field.set(src, server);
                     }
+//                    if (type == WatchFactory.class) {
+//                        field.set(src, application.watchFactory);
+//                    }
                 } catch (Exception e) {
                     logger.log(Level.SEVERE, "Resource inject error", e);
                 }
@@ -383,8 +414,8 @@ public final class Application {
             public boolean autoNone() {
                 return false;
             }
-            
-        }, Application.class, WatchFactory.class);
+
+        }, Application.class, WatchFactory.class, NodeSncpServer.class, NodeHttpServer.class, NodeWatchServer.class);
         //--------------------------------------------------------------------------
         initResources();
     }
diff --git a/src/org/redkale/boot/NodeHttpServer.java b/src/org/redkale/boot/NodeHttpServer.java
index d71c8791b..29b41af8f 100644
--- a/src/org/redkale/boot/NodeHttpServer.java
+++ b/src/org/redkale/boot/NodeHttpServer.java
@@ -46,6 +46,10 @@ public class NodeHttpServer extends NodeServer {
         return new HttpServer(application.getStartTime());
     }
 
+    public HttpServer getHttpServer() {
+        return httpServer;
+    }
+
     @Override
     public InetSocketAddress getSocketAddress() {
         return httpServer == null ? null : httpServer.getSocketAddress();
diff --git a/src/org/redkale/boot/NodeServer.java b/src/org/redkale/boot/NodeServer.java
index a09483d8f..92562e85a 100644
--- a/src/org/redkale/boot/NodeServer.java
+++ b/src/org/redkale/boot/NodeServer.java
@@ -604,6 +604,10 @@ public abstract class NodeServer {
         return false;
     }
 
+    public ResourceFactory getResourceFactory() {
+        return resourceFactory;
+    }
+
     public InetSocketAddress getSncpAddress() {
         return sncpAddress;
     }
diff --git a/src/org/redkale/watch/WatchNode.java b/src/org/redkale/watch/WatchNode.java
index 422d953db..0759ee055 100644
--- a/src/org/redkale/watch/WatchNode.java
+++ b/src/org/redkale/watch/WatchNode.java
@@ -10,7 +10,7 @@ package org.redkale.watch;
  * <p> 详情见: https://redkale.org
  * @author zhangjx
  */
-public interface WatchNode {
+interface WatchNode {
 
     public String getName();
 
diff --git a/src/org/redkale/watch/WatchNumber.java b/src/org/redkale/watch/WatchNumber.java
index 0b546fef7..e0e919d4c 100644
--- a/src/org/redkale/watch/WatchNumber.java
+++ b/src/org/redkale/watch/WatchNumber.java
@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.*;
  * <p> 详情见: https://redkale.org
  * @author zhangjx
  */
-public final class WatchNumber extends AtomicLong implements WatchNode {
+final class WatchNumber extends AtomicLong implements WatchNode {
 
     private final boolean interval;
 
diff --git a/src/org/redkale/watch/Watchable.java b/src/org/redkale/watch/Watchable.java
index ddb7676f3..0cf7ee171 100644
--- a/src/org/redkale/watch/Watchable.java
+++ b/src/org/redkale/watch/Watchable.java
@@ -21,7 +21,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 @Documented
 @Target({FIELD, METHOD})
 @Retention(RUNTIME)
-public @interface Watchable {
+@interface Watchable {
 
     String name();