update

Author: luyongfugx

demo/quickstart/release/2014072100004/base-2014072100004.js

@@ -0,0 +1 @@
+define("p2",[],function(){console.log("p2 ok!"),document.write("p2 ok lcs!</br>")});

demo/quickstart/release/2014072100004/page/p1-2014072100004.js

@@ -0,0 +1 @@
+define("p3",[],function(){console.log("p3 ok!"),document.write("p3 ok!</br>")});

demo/quickstart/release/2014072100004/page/p2-2014072100004.js

@@ -43,7 +43,7 @@
             serverDomain: 'http://localhost:6600',
             buildType: 'project',
             //ver:'2014052900062'
-            ver: '2014053000003'
+            ver: '2014072100004'
             //ver: '2014053000002'
             //ver: '2014051200050'
         };

demo/quickstart/release/2014072100004/page/p3-2014072100004.js

@@ -2,6 +2,8 @@
 
 import java.io.BufferedReader;
 
+
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
@@ -16,7 +18,7 @@
 /**
  * @author waynelu 计算两个文件之间的增量，并返回增量文件
  */
-public class DiffUtil {
+public class ChunkDiff {
 	class DiffItem {
 		private boolean isMatch;
 		private String data;
@@ -204,6 +206,7 @@ else if (matchTrunkIndex >= 0) {
 
 	public JSONObject makeIncDataFile(String oldFile, String newFile,
 			int chunkSize) {
+		//System.out.println("new chunkDiff");
 		JSONObject resultFile = new JSONObject();
 		resultFile.put("modify", true);
 		// resultFile.modify=true;
@@ -295,6 +298,7 @@ public String readFile(String file, String encode) {
 				while ((rLine = bfin.readLine()) != null) {
 					strBuffer.append(rLine);
 				}
+				bfin.close();
 			} catch (Exception ex) {
 
 			}
@@ -311,7 +315,7 @@ public JSONObject makeIncDataFromFile(String oldFile, String newFile,
 
 	}
 
-	public DiffUtil() {
+	public ChunkDiff() {
 		// TODO Auto-generated constructor stub
 	}
 
@@ -320,12 +324,12 @@ public DiffUtil() {
 	 */
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub
-		DiffUtil dUtil = new DiffUtil();
+		ChunkDiff dUtil = new ChunkDiff();
 		JSONObject json = dUtil
 				.makeIncDataFromFile(
-						"/Users/waynelu/storeinc/demo/static/hello/dist/1.0.6/main-1.0.6.js",
-						"/Users/waynelu/storeinc/demo/static/hello/dist/1.0.7/main-1.0.7.js",
-						12);
+						"/Users/waynelu/nginxhtmls/jetty/webapps/mtwebapp/release/2014071500017/base-2014071500017.js",
+						"/Users/waynelu/nginxhtmls/jetty/webapps/mtwebapp/release/2014071500016/base-2014071500016.js",
+						12);        
 		System.out.println(json.toJSONString());
 	}