diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java index ef3a71dac..4824d85e0 100644 --- a/src/main/java/org/redkale/boot/Application.java +++ b/src/main/java/org/redkale/boot/Application.java @@ -2437,7 +2437,7 @@ public final class Application { try { if (source instanceof Service) { long s = System.currentTimeMillis(); - ((Service) source).destroy(Sncp.isSncpDyn((Service) source) ? Sncp.getConf((Service) source) : null); + ((Service) source).destroy(Sncp.isSncpDyn((Service) source) ? Sncp.getResourceConf((Service) source) : null); logger.info(source + " destroy in " + (System.currentTimeMillis() - s) + " ms"); // } else { // source.getClass().getMethod("close").invoke(source); @@ -2454,7 +2454,7 @@ public final class Application { try { if (source instanceof Service) { long s = System.currentTimeMillis(); - ((Service) source).destroy(Sncp.isSncpDyn((Service) source) ? Sncp.getConf((Service) source) : null); + ((Service) source).destroy(Sncp.isSncpDyn((Service) source) ? Sncp.getResourceConf((Service) source) : null); logger.info(source + " destroy in " + (System.currentTimeMillis() - s) + " ms"); // } else { // source.getClass().getMethod("close").invoke(source); diff --git a/src/main/java/org/redkale/boot/NodeHttpServer.java b/src/main/java/org/redkale/boot/NodeHttpServer.java index 226494c1d..23993cb97 100644 --- a/src/main/java/org/redkale/boot/NodeHttpServer.java +++ b/src/main/java/org/redkale/boot/NodeHttpServer.java @@ -388,7 +388,7 @@ public class NodeHttpServer extends NodeServer { } stream.forEach((service) -> { try { - final Class stype = Sncp.getServiceType(service); + final Class stype = Sncp.getResourceType(service); final String name = Sncp.getResourceName(service); RestService rs = (RestService) stype.getAnnotation(RestService.class); if (rs == null || rs.ignore()) { @@ -430,7 +430,7 @@ public class NodeHttpServer extends NodeServer { mappings[i] = prefix2 + mappings[i]; } synchronized (rests) { - rests.add(new AbstractMap.SimpleEntry<>(Sncp.getServiceType(service).getName() + "#" + name, mappings)); + rests.add(new AbstractMap.SimpleEntry<>(Sncp.getResourceType(service).getName() + "#" + name, mappings)); } } } finally { diff --git a/src/main/java/org/redkale/boot/NodeServer.java b/src/main/java/org/redkale/boot/NodeServer.java index 95edbdcc4..8b8e7bd64 100644 --- a/src/main/java/org/redkale/boot/NodeServer.java +++ b/src/main/java/org/redkale/boot/NodeServer.java @@ -616,7 +616,7 @@ public abstract class NodeServer { } else { localServices.stream().forEach(y -> { long s = System.currentTimeMillis(); - y.init(Sncp.getConf(y)); + y.init(Sncp.getResourceConf(y)); long e = System.currentTimeMillis() - s; String serstr = Sncp.toSimpleString(y, maxNameLength, maxTypeLength); if (slist != null) { @@ -847,7 +847,7 @@ public abstract class NodeServer { if (finest) { logger.finest(y + " is destroying"); } - y.destroy(Sncp.getConf(y)); + y.destroy(Sncp.getResourceConf(y)); if (finest) { logger.finest(y + " was destroyed"); } diff --git a/src/main/java/org/redkale/cluster/ClusterAgent.java b/src/main/java/org/redkale/cluster/ClusterAgent.java index 3e190eabd..2ca724000 100644 --- a/src/main/java/org/redkale/cluster/ClusterAgent.java +++ b/src/main/java/org/redkale/cluster/ClusterAgent.java @@ -14,8 +14,8 @@ import java.util.logging.Logger; import org.redkale.annotation.AutoLoad; import org.redkale.annotation.*; import org.redkale.annotation.ResourceListener; -import static org.redkale.boot.Application.*; import org.redkale.boot.*; +import static org.redkale.boot.Application.*; import org.redkale.convert.ConvertDisabled; import org.redkale.convert.json.JsonConvert; import org.redkale.mq.MessageMultiConsumer; @@ -403,7 +403,7 @@ public abstract class ClusterAgent { this.serviceName = generateServiceName(ns, protocol, service); this.checkid = generateCheckId(ns, protocol, service); this.checkName = generateCheckName(ns, protocol, service); - this.serviceType = Sncp.getServiceType(service).getName(); + this.serviceType = Sncp.getResourceType(service).getName(); this.protocol = protocol; InetSocketAddress addr = ns.getSocketAddress(); String host = addr.getHostString(); diff --git a/src/main/java/org/redkale/net/http/HttpServer.java b/src/main/java/org/redkale/net/http/HttpServer.java index 7ff03d48d..aa542e95d 100644 --- a/src/main/java/org/redkale/net/http/HttpServer.java +++ b/src/main/java/org/redkale/net/http/HttpServer.java @@ -282,7 +282,7 @@ public class HttpServer extends Server serviceType = Sncp.getServiceType(service); + final Class serviceType = Sncp.getResourceType(service); if (name != null) { for (final HttpServlet item : ((HttpDispatcherServlet) this.dispatcher).getServlets()) { if (!(item instanceof HttpServlet)) { @@ -343,7 +343,7 @@ public class HttpServer extends Server