lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
地平线
2015-05-29 10:51:38 +08:00
parent 9d8bd75db3
commit ba46323faa
2 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/com/wentch/redkale/boot/Application.java
View File

@@ -178,6 +178,39 @@ public final class Application {
System.setProperty("convert.json.pool.size", "128");
System.setProperty("convert.bson.writer.buffer.defsize", "4096");
System.setProperty("convert.json.writer.buffer.defsize", "4096");
//------------------------------------------------------------------------
final AnyValue resources = config.getAnyValue("resources");
if (resources != null) {
factory.register(RESNAME_GRES, AnyValue.class, resources);
final AnyValue properties = resources.getAnyValue("properties");
if (properties != null) {
String dfloads = properties.getValue("load");
if (dfloads != null) {
for (String dfload : dfloads.split(";")) {
if (dfload.trim().isEmpty()) continue;
dfload = dfload.trim().replace("${APP_HOME}", home.getCanonicalPath()).replace('\\', '/');
final File df = (dfload.indexOf('/') < 0) ? new File(home, "conf/" + dfload) : new File(dfload);
if (df.isFile()) {
Properties ps = new Properties();
InputStream in = new FileInputStream(df);
ps.load(in);
in.close();
ps.forEach((x, y) -> factory.register("property." + x, y));
}
}
}
for (AnyValue prop : properties.getAnyValues("property")) {
String name = prop.getValue("name");
String value = prop.getValue("value");
if (name == null || value == null) continue;
if (name.startsWith("system.property.")) {
System.setProperty(name.substring("system.property.".length()), value);
} else {
factory.register("property." + name, value);
}
}
}
}
final File root = new File(System.getProperty(RESNAME_HOME));
this.factory.register(BsonFactory.root());
this.factory.register(JsonFactory.root());
@@ -403,37 +436,6 @@ public final class Application {
//-------------------------------------------------------------------------
final AnyValue resources = config.getAnyValue("resources");
if (resources != null) {
factory.register(RESNAME_GRES, AnyValue.class, resources);
//------------------------------------------------------------------------
final AnyValue properties = resources.getAnyValue("properties");
if (properties != null) {
String dfloads = properties.getValue("load");
if (dfloads != null) {
for (String dfload : dfloads.split(";")) {
if (dfload.trim().isEmpty()) continue;
dfload = dfload.trim().replace("${APP_HOME}", home.getCanonicalPath()).replace('\\', '/');
final File df = (dfload.indexOf('/') < 0) ? new File(home, "conf/" + dfload) : new File(dfload);
if (df.isFile()) {
Properties ps = new Properties();
InputStream in = new FileInputStream(df);
ps.load(in);
in.close();
ps.forEach((x, y) -> factory.register("property." + x, y));
}
}
}
for (AnyValue prop : properties.getAnyValues("property")) {
String name = prop.getValue("name");
String value = prop.getValue("value");
if (name == null || value == null) continue;
if (name.startsWith("system.property.")) {
System.setProperty(name.substring("system.property.".length()), value);
} else {
factory.register("property." + name, value);
}
}
}
//------------------------------------------------------------------------
final String host = this.localAddress.getHostAddress();
final Map<String, Set<String>> groups = new HashMap<>();

7
src/com/wentch/redkale/convert/EnMember.java
View File

@@ -30,9 +30,10 @@ public final class EnMember<W extends Writer, T, F> implements Comparable<EnMemb
public EnMember(Attribute<T, F> attribute, Encodeable<W, F> encoder) {
this.attribute = attribute;
this.encoder = encoder;
this.istring = CharSequence.class.isAssignableFrom(attribute.type());
this.isnumber = Number.class.isAssignableFrom(attribute.type()) || attribute.type().isPrimitive();
this.isbool = attribute.type() == Boolean.class || attribute.type() == boolean.class;
Class t = attribute.type();
this.istring = CharSequence.class.isAssignableFrom(t);
this.isbool = t == Boolean.class || t == boolean.class;
this.isnumber = Number.class.isAssignableFrom(t) || (!this.isbool && t.isPrimitive());
}
public boolean write(final W out, final boolean comma, final T obj) {