diff --git a/src/org/redkale/boot/NodeServer.java b/src/org/redkale/boot/NodeServer.java index 87f7676f8..d5c7bef1d 100644 --- a/src/org/redkale/boot/NodeServer.java +++ b/src/org/redkale/boot/NodeServer.java @@ -409,7 +409,7 @@ public abstract class NodeServer { }); localServices.clear(); localServices.addAll(swlist); - this.loadPersistData(); + //this.loadPersistData(); final List slist = sb == null ? null : new CopyOnWriteArrayList<>(); CountDownLatch clds = new CountDownLatch(localServices.size()); localServices.stream().forEach(y -> { @@ -438,8 +438,9 @@ public abstract class NodeServer { maxClassNameLength = Math.max(maxClassNameLength, Sncp.getResourceType(y).getName().length() + 1); } + //尚未完整实现， 先屏蔽 @SuppressWarnings("unchecked") - protected void loadPersistData() throws Exception { + private void loadPersistData() throws Exception { File home = application.getHome(); if (home == null || !home.isDirectory()) return; File cachedir = new File(home, "cache"); @@ -447,55 +448,58 @@ public abstract class NodeServer { int port = this.server.getSocketAddress().getPort(); final String prefix = "persist-" + port + "-"; final BsonConvert convert = BsonFactory.create().skipAllIgnore(true).getConvert(); - for (final File file : cachedir.listFiles((dir, name) -> name.startsWith(prefix))) { - if (!file.getName().endsWith(".bat")) continue; - String classAndResname = file.getName().substring(prefix.length(), file.getName().length() - 4); //去掉尾部的.bat - int pos = classAndResname.indexOf('-'); - String servtype = pos > 0 ? classAndResname.substring(0, pos) : classAndResname; - String resname = pos > 0 ? classAndResname.substring(pos + 1) : ""; + synchronized (this.application) { + for (final File file : cachedir.listFiles((dir, name) -> name.startsWith(prefix))) { + if (!file.getName().endsWith(".bat")) continue; + String classAndResname = file.getName().substring(prefix.length(), file.getName().length() - 4); //去掉尾部的.bat + int pos = classAndResname.indexOf('-'); + String servtype = pos > 0 ? classAndResname.substring(0, pos) : classAndResname; + String resname = pos > 0 ? classAndResname.substring(pos + 1) : ""; - FileInputStream in = new FileInputStream(file); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - int b; - while ((b = in.read()) != '\n') out.write(b); - final String[] fieldNames = out.toString().split(","); - int timeout = (int) ((System.currentTimeMillis() - file.lastModified()) / 1000); - for (final Service service : this.localServices) { - if (!servtype.equals(Sncp.getResourceType(service).getName())) continue; - if (!resname.equals(Sncp.getResourceName(service))) continue; - for (final String fieldName : fieldNames) { - Field field = null; - Class clzz = service.getClass(); - do { - try { - field = clzz.getDeclaredField(fieldName); - break; - } catch (Exception e) { - } - } while ((clzz = clzz.getSuperclass()) != Object.class); - field.setAccessible(true); - Object val = convert.convertFrom(field.getGenericType(), in); - Persist persist = field.getAnnotation(Persist.class); - if (persist.timeout() == 0 || persist.timeout() >= timeout) { - if (Modifier.isFinal(field.getModifiers())) { - if (Map.class.isAssignableFrom(field.getType())) { - ((Map) field.get(service)).putAll((Map) val); - } else if (Collection.class.isAssignableFrom(field.getType())) { - ((Collection) field.get(service)).addAll((Collection) val); + FileInputStream in = new FileInputStream(file); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + int b; + while ((b = in.read()) != '\n') out.write(b); + final String[] fieldNames = out.toString().split(","); + int timeout = (int) ((System.currentTimeMillis() - file.lastModified()) / 1000); + for (final Service service : this.localServices) { + if (!servtype.equals(Sncp.getResourceType(service).getName())) continue; + if (!resname.equals(Sncp.getResourceName(service))) continue; + for (final String fieldName : fieldNames) { + Field field = null; + Class clzz = service.getClass(); + do { + try { + field = clzz.getDeclaredField(fieldName); + break; + } catch (Exception e) { + } + } while ((clzz = clzz.getSuperclass()) != Object.class); + field.setAccessible(true); + Object val = convert.convertFrom(field.getGenericType(), in); + Persist persist = field.getAnnotation(Persist.class); + if (persist.timeout() == 0 || persist.timeout() >= timeout) { + if (Modifier.isFinal(field.getModifiers())) { + if (Map.class.isAssignableFrom(field.getType())) { + ((Map) field.get(service)).putAll((Map) val); + } else if (Collection.class.isAssignableFrom(field.getType())) { + ((Collection) field.get(service)).addAll((Collection) val); + } + } else { + field.set(service, val); } - } else { - field.set(service, val); } + if (in.read() != '\n') logger.log(Level.SEVERE, servtype + "'s [" + resname + "] load value error"); } - if (in.read() != '\n') logger.log(Level.SEVERE, servtype + "'s [" + resname + "] load value error"); } + in.close(); } - in.close(); } } + //尚未完整实现， 先屏蔽 @SuppressWarnings("unchecked") - protected void savePersistData() throws IOException { + private void savePersistData() throws IOException { File home = application.getHome(); if (home == null || !home.isDirectory()) return; File cachedir = new File(home, "cache"); @@ -530,6 +534,10 @@ public abstract class NodeServer { } while ((clzz = clzz.getSuperclass()) != Object.class); if (fields.isEmpty()) continue; //没有数据需要缓存 +// synchronized (this.application.localServices) { +// if (this.application.localServices.contains(service)) continue; +// this.application.localServices.add(service); +// } if (!cachedir.isDirectory()) cachedir.mkdirs(); String resname = Sncp.getResourceName(service); FileOutputStream out = new FileOutputStream(new File(cachedir, prefix + Sncp.getResourceType(service).getName() + (resname.isEmpty() ? "" : ("-" + resname)) + ".bat")); @@ -542,7 +550,7 @@ public abstract class NodeServer { } catch (Exception e) { logger.log(Level.SEVERE, field + " save value error", e); } - out.write(convert.convertTo(field.getGenericType(), val)); + convert.convertTo(out, field.getGenericType(), val); out.write('\n'); } out.close(); @@ -690,7 +698,6 @@ public abstract class NodeServer { } }); if (sb != null && sb.length() > 0) logger.log(Level.INFO, sb.toString()); - this.savePersistData(); server.shutdown(); } diff --git a/src/org/redkale/net/sncp/Sncp.java b/src/org/redkale/net/sncp/Sncp.java index 646c9fd64..17852db30 100644 --- a/src/org/redkale/net/sncp/Sncp.java +++ b/src/org/redkale/net/sncp/Sncp.java @@ -266,7 +266,7 @@ public abstract class Sncp { protected static Class createLocalServiceClass(ClassLoader classLoader, final String name, final Class serviceImplClass) { if (serviceImplClass == null) return null; if (!Service.class.isAssignableFrom(serviceImplClass)) return serviceImplClass; - ResourceFactory.checkName(name); + ResourceFactory.checkResourceName(name); int mod = serviceImplClass.getModifiers(); if (!java.lang.reflect.Modifier.isPublic(mod)) return serviceImplClass; if (java.lang.reflect.Modifier.isAbstract(mod)) return serviceImplClass; @@ -891,7 +891,7 @@ public abstract class Sncp { final AnyValue conf) { if (serviceTypeOrImplClass == null) return null; if (!Service.class.isAssignableFrom(serviceTypeOrImplClass)) return null; - ResourceFactory.checkName(name); + ResourceFactory.checkResourceName(name); int mod = serviceTypeOrImplClass.getModifiers(); boolean realed = !(java.lang.reflect.Modifier.isAbstract(mod) || serviceTypeOrImplClass.isInterface()); if (!java.lang.reflect.Modifier.isPublic(mod)) return null; diff --git a/src/org/redkale/util/Creator.java b/src/org/redkale/util/Creator.java index b15fe93c9..91fa1c3ba 100644 --- a/src/org/redkale/util/Creator.java +++ b/src/org/redkale/util/Creator.java @@ -207,7 +207,7 @@ public interface Creator { clazz = (Class) HashMap.class; } else if (clazz.isAssignableFrom(HashSet.class)) { clazz = (Class) HashSet.class; - } else if (clazz == ConcurrentMap.class) { + } else if (clazz.isAssignableFrom(ConcurrentHashMap.class)) { clazz = (Class) ConcurrentHashMap.class; } if (clazz.isInterface() || Modifier.isAbstract(clazz.getModifiers())) { diff --git a/src/org/redkale/util/ResourceFactory.java b/src/org/redkale/util/ResourceFactory.java index 79fa637d8..cb77d9780 100644 --- a/src/org/redkale/util/ResourceFactory.java +++ b/src/org/redkale/util/ResourceFactory.java @@ -102,7 +102,7 @@ public final class ResourceFactory { * * @param name String */ - public static void checkName(String name) { + public static void checkResourceName(String name) { if (name == null || (!name.isEmpty() && !name.matches("^[a-zA-Z0-9_;\\-\\.\\[\\]\\(\\)]+$"))) { throw new IllegalArgumentException("name(" + name + ") contains illegal character, must be (a-z,A-Z,0-9,_,.,(,),-,[,])"); } @@ -346,7 +346,7 @@ public final class ResourceFactory { * @return 旧资源对象 */ public A register(final boolean autoSync, final String name, final A rs) { - checkName(name); + checkResourceName(name); final Class claz = rs.getClass(); ResourceType rtype = claz.getAnnotation(ResourceType.class); if (rtype == null) { @@ -399,7 +399,7 @@ public final class ResourceFactory { * @return 旧资源对象 */ public A register(final boolean autoSync, final String name, final Type clazz, final A rs) { - checkName(name); + checkResourceName(name); ConcurrentHashMap map = this.store.get(clazz); if (map == null) { synchronized (clazz) {