fix some bug

孙健 · 孙健 · commit 99781e111939 · 2017-02-16T13:24:05.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'nlpcn.org'
-version '3.0.0'
+version '3.1.0'
 
 apply plugin: 'java'
 apply plugin: 'war'
diff --git a/src/main/java/org/nlpcn/jcoder/util/Testing.java b/src/main/java/org/nlpcn/jcoder/util/Testing.java
@@ -194,5 +194,9 @@ public static void startServer(String iocPath, String[] packages) throws Excepti
 		startServer(8080, iocPath, null, packages);
 	}
 	
+	
+	public static void main(String[] args) throws Exception {
+		startServer("D:\\git\\mss-api\\src\\test\\resources\\ioc.js", new String[]{"cn"});
+	}
 
 }
diff --git a/src/main/java/org/nlpcn/jcoder/util/TestingFilter.java b/src/main/java/org/nlpcn/jcoder/util/TestingFilter.java
@@ -47,22 +47,27 @@ public static void init(String... packages) throws IOException {
 			list.forEach(cla -> {
 				Object obj = null;
 				Single single = Mirror.getAnnotationDeep(cla, Single.class);
-				if (single == null || !single.value()) {
-					try {
-						obj = cla.newInstance();
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
-				}
 
 				for (Method method : cla.getMethods()) {
 					if (!Modifier.isPublic(method.getModifiers()) || method.isBridge() || method.getDeclaringClass() != cla) {
 						continue;
 					}
+
 					if (Mirror.getAnnotationDeep(method, Execute.class) != null || Mirror.getAnnotationDeep(method, DefaultExecute.class) != null) {
-						tempMethods.put(cla.getSimpleName() + "/" + method.getName(), KeyValue.with(method, obj));
+						if (obj == null && (single == null || single.value())) { //用懒加载方式
+							try {
+								obj = cla.newInstance();
+							} catch (Exception e) {
+								e.printStackTrace();
+							}
+						}
+						String path = cla.getSimpleName() + "/" + method.getName();
+						LOG.info("find api : " + path);
+						tempMethods.put(path, KeyValue.with(method, obj));
 					}
 				}
+
+				obj = null;
 			});
 		}
 
@@ -161,5 +166,5 @@ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain
 	public void destroy() {
 		System.out.println("destroy");
 	}
-
+	
 }
diff --git a/src/main/webapp/apidoc/index.html b/src/main/webapp/apidoc/index.html
@@ -106,7 +106,7 @@ <h2 ng-show="y.attr">Attribute</h2>
 		      </table>
 		      
 		        <h2 ng-show="y.retrunContent">Return</h2>
-		        <pre class="prettyprint prettyprinted" ng-show="y.retrunContent"><code>{{y.retrunContent}}</code></pre>
+		        <pre class="prettyprint language-json" data-type="json" ng-show="y.retrunContent"><code>{{y.retrunContent}}</code></pre>
 		      
 		</article>
 	</div>
diff --git a/src/test/java/cn/com/infcn/api/test/TaskDemo.java b/src/test/java/cn/com/infcn/api/test/TaskDemo.java
@@ -2,16 +2,24 @@
 
 import org.apache.log4j.Logger;
 import org.nlpcn.jcoder.run.annotation.DefaultExecute;
-import org.nlpcn.jcoder.util.StaticValue;
+import org.nlpcn.jcoder.run.annotation.Single;
 import org.nutz.ioc.loader.annotation.Inject;
 
+@Single(true)
 public class TaskDemo {
 
 	@Inject
 	private Logger log;
+	
+	int i = 0 ;
 
+	/**
+	 * 测试
+	 * 
+	 * @return {"FBI":[{"name":"rose","age":"25"},{"name":"jack","age":"23"}],"NBA":[{"name":"tom","sex":"man"},{"name":"jack","sex":"women"}],"NBA":[{"name":"tom","sex":"man"},{"name":"jack","sex":"women"}],"NBA":[{"name":"tom","sex":"man"},{"name":"jack","sex":"women"}],"NBA":[{"name":"tom","sex":"man"},{"name":"jack","sex":"women"}],"NBA":[{"name":"tom","sex":"man"},{"name":"jack","sex":"women"}],"NBA":[{"name":"tom","sex":"man"},{"name":"jack","sex":"women"}]}
+	 */
 	@DefaultExecute
 	public Object execute() {
-		return StaticValue.getUserIoc().getNames();
+		return i++;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -194,5 +194,9 @@ public static void startServer(String iocPath, String[] packages) throws Excepti`
`194`	`194`	`startServer(8080, iocPath, null, packages);`
`195`	`195`	`}`
`196`	`196`
	`197`	`+`
	`198`	`+ public static void main(String[] args) throws Exception {`
	`199`	`+ startServer("D:\\git\\mss-api\\src\\test\\resources\\ioc.js", new String[]{"cn"});`
	`200`	`+ }`
`197`	`201`
`198`	`202`	`}`