diff --git a/Demo/.classpath b/Demo/.classpath
new file mode 100644
index 0000000..00fcd0b
--- /dev/null
+++ b/Demo/.classpath
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="time/" kind="src" path="src"/>
+	<classpathentry kind="src" path="source"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="lib" path="C:/Users/Administrator/.m2/repository/com/alibaba/fastjson/1.1.27/fastjson-1.1.27.jar">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.archivename" value="fastjson-1.1.27.jar"/>
+			<attribute name="maven.groupId" value="com.alibaba"/>
+			<attribute name="maven.artifactId" value="fastjson"/>
+			<attribute name="maven.version" value="1.1.27"/>
+			<attribute name="maven.scope" value="compile"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="C:/Users/Administrator/.m2/repository/org/springframework/spring-beans/4.1.9.RELEASE/spring-beans-4.1.9.RELEASE.jar" sourcepath="C:/Users/Administrator/.m2/repository/org/springframework/spring-beans/4.1.9.RELEASE/spring-beans-4.1.9.RELEASE-sources.jar">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.archivename" value="spring-beans-4.1.9.RELEASE.jar"/>
+			<attribute name="maven.groupId" value="org.springframework"/>
+			<attribute name="maven.artifactId" value="spring-beans"/>
+			<attribute name="maven.version" value="4.1.9.RELEASE"/>
+			<attribute name="maven.scope" value="compile"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/spring"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Demo/src/Number1.java b/Demo/src/Number1.java
new file mode 100644
index 0000000..c6a0542
--- /dev/null
+++ b/Demo/src/Number1.java
@@ -0,0 +1,12 @@
+
+public class Number1 {
+	public static void main(String[] args) {
+		String a="1";
+		String b="2";
+		System.out.println(a+b);
+		String areaCode="00";
+		int areaCodeInt =Integer.parseInt(areaCode.substring(1,areaCode.length()));
+		System.out.println(areaCodeInt);
+	}
+
+}
diff --git a/Demo/src/config.properties b/Demo/src/config.properties
new file mode 100644
index 0000000..74491d5
--- /dev/null
+++ b/Demo/src/config.properties
@@ -0,0 +1,3 @@
+user=i'm user
+pwd=i'm pwd
+fileViewPath=http://www.baidu.com
\ No newline at end of file
diff --git a/Demo/src/exception/Exceptions.java b/Demo/src/exception/Exceptions.java
new file mode 100644
index 0000000..afe75af
--- /dev/null
+++ b/Demo/src/exception/Exceptions.java
@@ -0,0 +1,26 @@
+package exception;
+
+public class Exceptions {
+	public static String result(int a,int b){
+		try{
+			a=a/b;
+		}catch(Exception e){
+			return "0";
+		}
+		System.out.println("hello");
+		return "1";
+	}
+	public static String isTrue(){
+		int a=4;
+		if(a==5){
+			return "true";
+		}
+		System.out.println("你好");
+		return "false";
+	}
+	public static void main(String[] args) {
+		//System.out.println(result(4,0));
+		System.out.println(isTrue());
+	}
+
+}
diff --git a/Demo/src/exe/UpCase.java b/Demo/src/exe/UpCase.java
new file mode 100644
index 0000000..9ec85db
--- /dev/null
+++ b/Demo/src/exe/UpCase.java
@@ -0,0 +1,21 @@
+package exe;
+
+public class UpCase {
+	public static String upcase(String s){
+		String x=s.toUpperCase();
+		return x;
+	}
+	public static String lowcase(String s){
+		String x=s.toLowerCase();
+		return x;
+	}
+	public static void main(String[] args) {
+		String s="wweddd";
+		String xx=upcase(s);
+		System.out.println(xx);
+		String s1="WWDWDE";
+		String xx1=lowcase(s1);
+		System.out.println(xx1);
+	}
+
+}
diff --git a/Demo/src/exe/Yang.java b/Demo/src/exe/Yang.java
new file mode 100644
index 0000000..f1c5598
--- /dev/null
+++ b/Demo/src/exe/Yang.java
@@ -0,0 +1,28 @@
+package exe;
+
+/**
+ * @author mercy
+ *一只羊，4年后每年生一只，求N年生多少只?
+ */
+public class Yang {
+	public static int getYang(int n){
+		int sum=0;
+		if(n<3){
+			return 0;
+		}else{
+			int m=n/3;
+			for(int i=1;i<=m;i++){
+				sum+=n-(3*i);
+			}
+		}
+		return sum;
+		
+		
+	}
+	
+	public static void main(String[] args) {
+		int n=10;
+		System.out.println(getYang(n));
+	}
+
+}
diff --git a/Demo/src/file/Args.java b/Demo/src/file/Args.java
new file mode 100644
index 0000000..232f20d
--- /dev/null
+++ b/Demo/src/file/Args.java
@@ -0,0 +1,10 @@
+package file;
+
+public class Args {
+	public static void main(String[] args) {
+		for(int i=0;i<args.length;i++){
+			System.out.println(args[i]);
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/Demo/src/file/GetProperties.java b/Demo/src/file/GetProperties.java
new file mode 100644
index 0000000..26b0c25
--- /dev/null
+++ b/Demo/src/file/GetProperties.java
@@ -0,0 +1,22 @@
+package file;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Properties;
+
+public class GetProperties {
+	public static void main(String[] args) {
+		String file="classpath:aa.properties";
+		Properties prop = new Properties();
+		String value="";
+		try{
+			InputStream is = new FileInputStream(file);
+			prop.load(is);
+			value=prop.getProperty("user");
+		}catch(Exception e){
+			System.out.println("解析错误...");
+		}
+		System.out.println(value);
+	}
+
+}
diff --git a/Demo/src/json/ObjectToJsonObject.java b/Demo/src/json/ObjectToJsonObject.java
new file mode 100644
index 0000000..af3b98c
--- /dev/null
+++ b/Demo/src/json/ObjectToJsonObject.java
@@ -0,0 +1,15 @@
+package json;
+
+import com.alibaba.fastjson.JSONObject;
+
+import object.User;
+
+public class ObjectToJsonObject {
+	public static void main(String[] args) {
+		User user=new User();
+		user.setId(12);user.setName("zhongguo");
+		JSONObject object=(JSONObject) JSONObject.toJSON(user);
+		System.out.println(object);
+	}
+
+}
diff --git a/Demo/src/leetcode/TwoSum.java b/Demo/src/leetcode/TwoSum.java
new file mode 100644
index 0000000..2de7ba1
--- /dev/null
+++ b/Demo/src/leetcode/TwoSum.java
@@ -0,0 +1,70 @@
+package leetcode;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author mercy
+ *Example:
+ *Given nums = [2, 7, 11, 15], target = 9,
+ *Because nums[0] + nums[1] = 2 + 7 = 9,
+ *return [0, 1].
+ */
+public class TwoSum {
+	public static void main(String[] args) {
+		int[] nums={2,0,4,9,5,7,10,9};
+		int target=12;
+		int[] arr=twoSum1(nums,target);
+		System.out.println(arr[0]+"--"+arr[1]);
+	}
+	public static int[] twoSum(int[] nums, int target) {
+		Map<Integer,Integer> map=new HashMap<>();
+		for(int i=0;i<nums.length;i++){
+			map.put(nums[i], i);
+		}
+		for(int i=0;i<nums.length;i++){
+			int other=target-nums[i];
+			if(map.containsKey(other)&&map.get(other)!=i){
+				 return new int[] { i, map.get(other) };
+			}
+		}
+		throw new IllegalArgumentException("No two sum solution");
+    }
+	/**
+	 * @param nums
+	 * @param target
+	 * @return
+	 * 用Map方法
+	 * @author mercy
+	 */
+	public static int[] twoSum1(int[] nums, int target) {
+		Map<Integer,Integer> map=new HashMap<>();
+		for(int i=0;i<nums.length;i++){
+			int other=target-nums[i];
+			if(map.containsKey(other)){
+				return new int[]{map.get(other),i};
+			}
+			map.put(nums[i], i);
+		}	
+		throw new IllegalArgumentException("No two sum solution");
+    }
+	
+	/**
+	 * @param nums
+	 * @param target
+	 * @return
+	 * 传统的方法
+	 * @author mercy
+	 */
+	public static int[] twoSum2(int[] nums, int target) {
+		for(int i=0;i<nums.length;i++){
+			for(int j=i+1;j<nums.length;j++){
+				if(nums[j]==target-nums[i]){
+					return new int[] {i,j};
+				}
+			}
+		}
+		throw new IllegalArgumentException("No two sum solution");
+    }
+
+}
diff --git a/Demo/src/list/ArrayString.java b/Demo/src/list/ArrayString.java
new file mode 100644
index 0000000..3045137
--- /dev/null
+++ b/Demo/src/list/ArrayString.java
@@ -0,0 +1,16 @@
+package list;
+
+public class ArrayString {
+	public static void main(String[] args) {
+		int a=5;int b=0;
+		b=b+a;
+		a=7;
+		b=b+a;
+		a=9;
+		b=b+a;
+		//b=21
+		System.out.println(b);
+		
+	}
+
+}
diff --git a/Demo/src/list/Contructor.java b/Demo/src/list/Contructor.java
new file mode 100644
index 0000000..fe1b121
--- /dev/null
+++ b/Demo/src/list/Contructor.java
@@ -0,0 +1,13 @@
+package list;
+
+/**
+ * @author mercy
+ * 、构造函数初始化
+ */
+public class Contructor {
+	public static void main(String[] args) {
+		User user=new User(1,12,"wangsong");
+		System.out.println(user.getName());
+	}
+
+}
diff --git a/Demo/src/list/IfTest.java b/Demo/src/list/IfTest.java
new file mode 100644
index 0000000..f2357c1
--- /dev/null
+++ b/Demo/src/list/IfTest.java
@@ -0,0 +1,20 @@
+package list;
+
+public class IfTest {
+	public static void main(String[] args) {
+		int a=1;int b=3;int c=4;int d=5;
+		if(a==1){
+			if(b==2){
+				System.out.println("222222222222");
+			}else if(c==3){
+				System.out.println("333333333333");
+			}else if(d==4){
+				System.out.println("44444444444444");
+				
+			}else{
+				System.out.println("5555555555555");
+			}
+		}
+	}
+
+}
diff --git a/Demo/src/list/Judge.java b/Demo/src/list/Judge.java
new file mode 100644
index 0000000..19bc739
--- /dev/null
+++ b/Demo/src/list/Judge.java
@@ -0,0 +1,22 @@
+package list;
+
+public class Judge {
+	public static void main(String[] args) {
+		int a=1;
+		if(a==1){
+			
+		}
+		if(a==2){
+			System.out.println("----");
+		}
+		System.out.println(tt(1));
+	}
+	public static int tt(int a){
+		if(a==1){
+			return 1;
+		}
+		return 2;
+		
+	}
+
+}
diff --git a/Demo/src/list/List1.java b/Demo/src/list/List1.java
new file mode 100644
index 0000000..d083336
--- /dev/null
+++ b/Demo/src/list/List1.java
@@ -0,0 +1,23 @@
+package list;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class List1 {
+	public static void main(String[] args) {
+		List<Integer> list=new ArrayList<Integer>();
+		List<Integer> lists=new ArrayList<Integer>();
+		for(int i=1;i<10;i++){
+			list.add(i);
+		}
+		lists.addAll(list);
+		List<Integer> list1=new ArrayList<Integer>();
+		//lists.addAll(list1);
+		System.out.println(lists.size());
+		for(int i=0;i<lists.size();i++){
+			System.out.println("i:"+i);
+			System.out.println(list.get(i));
+		}
+	}
+
+}
diff --git a/Demo/src/list/List2.java b/Demo/src/list/List2.java
new file mode 100644
index 0000000..6fd3387
--- /dev/null
+++ b/Demo/src/list/List2.java
@@ -0,0 +1,39 @@
+package list;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class List2 {
+	public static void main(String[] args) {
+		List<User> us=new ArrayList<User>();
+		User u=new User("A",1);
+		us.add(u);
+		u=new User("C",2);
+		us.add(u);
+		u=new User("D",5);
+		us.add(u);
+		u=new User("A",4);
+		us.add(u);
+		u=new User("D",6);
+		us.add(u);
+		Map<String,Integer> map1=new HashMap<String,Integer>();
+		for(int i=0;i<us.size();i++){
+			map1.put(us.get(i).getName(),0);
+			
+		}
+		for(int i=0;i<us.size();i++){
+			if(map1.containsKey(us.get(i).getName())){
+				map1.put(us.get(i).getName(),us.get(i).getId()+map1.get(us.get(i).getName()));
+			}
+			
+		}
+		
+		for(Map.Entry<String, Integer> entry : map1.entrySet())    
+		{    
+		    System.out.println(entry.getKey()+": "+entry.getValue());    
+		} 
+	}
+
+}
diff --git a/Demo/src/list/ListList.java b/Demo/src/list/ListList.java
new file mode 100644
index 0000000..1cd3a92
--- /dev/null
+++ b/Demo/src/list/ListList.java
@@ -0,0 +1,18 @@
+package list;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ListList {
+	public static void main(String[] args) {
+		List<String> list=new ArrayList<String>();
+		List<String> list1=new ArrayList<String>();
+		list.add("aa");list.add("cc");list.add("bb");
+		list.addAll(list1);
+		System.out.println(list.size());
+		for(String i:list){
+			System.out.println(i);
+		}
+	}
+
+}
diff --git a/Demo/src/list/ListNull.java b/Demo/src/list/ListNull.java
new file mode 100644
index 0000000..2bb1c9e
--- /dev/null
+++ b/Demo/src/list/ListNull.java
@@ -0,0 +1,17 @@
+package list;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ListNull {
+	public static void main(String[] args) {
+		List<String> list=new ArrayList<String>();
+		if(list!=null&&!list.isEmpty()){
+			System.out.println("不为空");
+			System.out.println(list.get(0));
+		}else{
+			System.out.println("空");
+		}
+	}
+
+}
diff --git a/Demo/src/list/ListSeq.java b/Demo/src/list/ListSeq.java
new file mode 100644
index 0000000..45d3d97
--- /dev/null
+++ b/Demo/src/list/ListSeq.java
@@ -0,0 +1,34 @@
+package list;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class ListSeq {
+	public static void main(String[] args) {
+		List<User> list1=new ArrayList<User>();
+		for(int i=0;i<5;i++){
+			User user=new User();
+			user.setAge(i);
+			user.setId(i);
+			user.setName("age"+i);
+			list1.add(user);
+		}
+		Collections.sort(list1, new Comparator<User>() {// 排序
+			@Override
+			public int compare(User o1, User o2) {
+				if (o1.getAge()==null) {
+					o1.setAge(1000);
+				}
+				if (o2.getAge()== null) {
+					o2.setAge(1000);
+				}
+				//return o2.getAge().compareTo(o1.getAge());//倒序
+				return o1.getAge().compareTo(o2.getAge());//顺序
+			}
+		});
+		System.out.println(list1.get(1).getAge());//顺序是1,倒序是3
+	}
+
+}
diff --git a/Demo/src/list/ListTest.java b/Demo/src/list/ListTest.java
new file mode 100644
index 0000000..50ac07b
--- /dev/null
+++ b/Demo/src/list/ListTest.java
@@ -0,0 +1,24 @@
+package list;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ListTest {
+	public static void main(String[] args) {
+		List<User> users=new ArrayList<User>();
+		User user2=new User();
+		user2.setAge(1);
+		for(int i=0;i<10;i++){
+			User user=new User();
+			user.setAge(i);
+			user.setName("name"+i);
+			users.add(user);
+		}
+		System.out.println(users.toString());
+		for(User user1:users){
+			System.out.println(user1.getAge()+"====="+user1.getName());
+		}
+		
+	}
+
+}
diff --git a/Demo/src/list/MyList.java b/Demo/src/list/MyList.java
new file mode 100644
index 0000000..4b9219e
--- /dev/null
+++ b/Demo/src/list/MyList.java
@@ -0,0 +1,22 @@
+package list;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MyList {
+	public static void main(String[] args) {
+		List<String> list1=new ArrayList<String>();
+		List<String> list2=new ArrayList<String>();
+		list1.add("a");list1.add("b");list1.add("c");
+		list2.add("1");list2.add("2");list2.add("3");list2.add("4");
+		List<List<String>> ls=new ArrayList<List<String>>();
+		ls.add(list1);
+		ls.add(list2);
+		for(int i=0;i<ls.size();i++){
+			for(int j=0;j<3;j++){
+				System.out.print(ls.get(i).get(j));
+			}
+			System.out.println("\n");
+		}
+	}
+}
\ No newline at end of file
diff --git a/Demo/src/list/PersonTest.java b/Demo/src/list/PersonTest.java
new file mode 100644
index 0000000..ea22b00
--- /dev/null
+++ b/Demo/src/list/PersonTest.java
@@ -0,0 +1,14 @@
+package list;
+
+public class PersonTest {
+	public static void main(String[] args) {
+		Person p=new Person();
+		p.setFood("food123");
+		p.setLuck("luck456");
+		User user=new User(12,22,"wangsong");
+		p.setUser(user);
+		String xx=p.toString();
+		System.out.println(xx);
+	}
+
+}
diff --git a/Demo/src/list/SetUserList.java b/Demo/src/list/SetUserList.java
new file mode 100644
index 0000000..b6ab1be
--- /dev/null
+++ b/Demo/src/list/SetUserList.java
@@ -0,0 +1,25 @@
+package list;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SetUserList {
+	public static void main(String[] args) {
+		List<User> ulist=new ArrayList<User>();
+		for(int i=0;i<10;i++){
+			User user=new User();
+			user.setAge(i);
+			user.setId(i+1);
+			ulist.add(user);
+		}
+		System.out.println(ulist.get(0).getAge()+ulist.get(0).getName()+ulist.get(0).getId());
+		for(User user1:ulist){
+			user1.setName(user1.getAge()+"name");
+		}
+		for(int i=0;i<ulist.size();i++){
+			System.out.println(ulist.get(i).getName());
+		}
+		System.out.println(ulist.get(2).getName());
+	}
+
+}
diff --git a/Demo/src/list/User.java b/Demo/src/list/User.java
new file mode 100644
index 0000000..acbae38
--- /dev/null
+++ b/Demo/src/list/User.java
@@ -0,0 +1,42 @@
+package list;
+
+public class User {
+	private int id;
+	private int age;
+	private String name;
+	public User(){
+	}
+	public User(int id,int age,String name){
+		this.id=id;
+		this.age=age;
+		this.name=name;
+	}
+	public User(String name,int id){
+		this.id=id;
+		this.name=name;
+	}
+	public int getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Integer getAge() {
+		return age;
+	}
+	public void setAge(int age) {
+		this.age = age;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("User [id=").append(id).append(", age=").append(age).append(", name=").append(name).append("]");
+		return builder.toString();
+	}
+}
diff --git a/Demo/src/object/Student.java b/Demo/src/object/Student.java
new file mode 100644
index 0000000..a09e797
--- /dev/null
+++ b/Demo/src/object/Student.java
@@ -0,0 +1,18 @@
+package object;
+
+public class Student {
+	private int id;
+	private String name;
+	public int getId() {
+		return id;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+}
diff --git a/Demo/src/object/Test.java b/Demo/src/object/Test.java
new file mode 100644
index 0000000..c3f87b2
--- /dev/null
+++ b/Demo/src/object/Test.java
@@ -0,0 +1,15 @@
+package object;
+
+import org.springframework.beans.BeanUtils;
+
+public class Test {
+	public static void main(String[] args) {
+		User user=new User();
+		user.setId(15);
+		user.setName("wangsong");
+		Student s=new Student();
+		BeanUtils.copyProperties(user,s);
+		System.out.println(s.getId()+"\n"+s.getName());
+	}
+
+}
diff --git a/Demo/src/object/User.java b/Demo/src/object/User.java
new file mode 100644
index 0000000..843a947
--- /dev/null
+++ b/Demo/src/object/User.java
@@ -0,0 +1,41 @@
+package object;
+
+public class User {
+	private int id;
+	private String name;
+	private Student student;
+	
+	public User() {
+	}
+	public User(int id, String name) {
+		this.id = id;
+		this.name = name;
+	}
+	public User(int id, String name, Student s) {
+		this.id = id;
+		this.name = name;
+		this.student=s;
+	}
+	public int getId() {
+		return id;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public Student getStudent() {
+		return student;
+	}
+	public void setStudent(Student student) {
+		this.student = student;
+	}
+	@Override
+	public String toString() {
+		return "User [id=" + id + ", name=" + name + ", student=" + student + "]";
+	}
+}
diff --git a/Demo/src/order/Test1.java b/Demo/src/order/Test1.java
new file mode 100644
index 0000000..3520fee
--- /dev/null
+++ b/Demo/src/order/Test1.java
@@ -0,0 +1,19 @@
+package order;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+public class Test1 {
+	public static void main(String[] args) {
+		String xx="[{'attrId':1,'attrValue':'圆通快递','cityId':200,'operType':'001','productSpecId':'GD9900131','servNbr':'GZYDWQ20160727151335'},{'attrId':2,'attrValue':'1','cityId':200,'operType':'001','productSpecId':'GD9900131','servNbr':'GZYDWQ20160727151335'},{'attrId':3,'attrValue':'1','cityId':200,'operType':'001','productSpecId':'GD9900131','servNbr':'GZYDWQ20160727151335'}]";
+		JSONArray array=JSONArray.parseArray(xx);
+		for(int i=0;i<array.size();i++){
+			System.out.println(array.get(i));
+			JSONObject param=(JSONObject) JSONObject.parse(array.get(i).toString());
+			System.out.println(param.get("attrId"));
+		}
+		
+	}
+	
+
+}
diff --git a/Demo/src/string/ContainString.java b/Demo/src/string/ContainString.java
new file mode 100644
index 0000000..1e7a5a5
--- /dev/null
+++ b/Demo/src/string/ContainString.java
@@ -0,0 +1,14 @@
+package string;
+
+public class ContainString {
+	public static void main(String[] args) {
+		String x="123xxt345";
+		String y="xxt";
+		if(x.contains(y)){
+			System.out.println("包含");
+		}else{
+			System.out.println("不包含");
+		}
+	}
+
+}
diff --git a/Demo/src/string/Dot.java b/Demo/src/string/Dot.java
new file mode 100644
index 0000000..dcbd93d
--- /dev/null
+++ b/Demo/src/string/Dot.java
@@ -0,0 +1,9 @@
+package string;
+
+public class Dot {
+	public static void main(String[] args) {
+		String xx="";
+		System.out.println(xx.length());
+	}
+
+}
diff --git a/NetWork/.classpath b/NetWork/.classpath
new file mode 100644
index 0000000..1dd10d1
--- /dev/null
+++ b/NetWork/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/NetWork/.gitignore b/NetWork/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/NetWork/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/networkProgramming/.project b/NetWork/.project
similarity index 87%
rename from networkProgramming/.project
rename to NetWork/.project
index 26c1cd5..ec02c8b 100644
--- a/networkProgramming/.project
+++ b/NetWork/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>networkProgramming</name>
+	<name>NetWork</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/networkProgramming/.settings/org.eclipse.jdt.core.prefs b/NetWork/.settings/org.eclipse.jdt.core.prefs
similarity index 74%
rename from networkProgramming/.settings/org.eclipse.jdt.core.prefs
rename to NetWork/.settings/org.eclipse.jdt.core.prefs
index 838bd9d..bb35fa0 100644
--- a/networkProgramming/.settings/org.eclipse.jdt.core.prefs
+++ b/NetWork/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/networkProgramming/src/start/EchoPlayer.java b/NetWork/src/demo1/EchoPlayer.java
similarity index 84%
rename from networkProgramming/src/start/EchoPlayer.java
rename to NetWork/src/demo1/EchoPlayer.java
index 67fe1bb..d8da1a5 100644
--- a/networkProgramming/src/start/EchoPlayer.java
+++ b/NetWork/src/demo1/EchoPlayer.java
@@ -1,9 +1,13 @@
-package start;
+package demo1;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
+/**
+ * @author mercy
+ * 输入字符串，并输出
+ */
 public class EchoPlayer {
 	public static String echo(String msg){
 		return "echo:"+msg;
diff --git a/README.md b/README.md
deleted file mode 100644
index 4f29390..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# java-network-programming
-《java网络编程精解》练习题
diff --git a/networkProgramming/.classpath b/networkProgramming/.classpath
deleted file mode 100644
index e1d87d8..0000000
--- a/networkProgramming/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="lib" path="/Users/sawyer/Documents/jar/grizzly-framework-2.4.3.jar"/>
-	<classpathentry kind="lib" path="/Users/sawyer/Documents/jar/cindy-2.4.4.jar"/>
-	<classpathentry kind="lib" path="/Users/sawyer/Documents/jar/commons-logging-1.2.jar"/>
-	<classpathentry kind="lib" path="/Users/sawyer/Documents/jar/netty-all-4.1.22.Final.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/networkProgramming/src/cindy/CindyServer.java b/networkProgramming/src/cindy/CindyServer.java
deleted file mode 100644
index 60e5965..0000000
--- a/networkProgramming/src/cindy/CindyServer.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cindy;
-
-import net.sf.cindy.Message;
-import net.sf.cindy.Session;
-import net.sf.cindy.SessionAdapter;
-import net.sf.cindy.impl.AutoCloseEventGenerator;
-import net.sf.cindy.impl.SimpleServerSocketSession;
-//参考 http://blog.csdn.net/kjfcpua/article/details/4890540
-public class CindyServer {
-	public static void main(String[] args) {
-	//建立一个普通的TCP服务   
-	SimpleServerSocketSession session = new  SimpleServerSocketSession();
-	//设置事件产生器，如果和上面一段程序一起运行，应该共享同一个事件产生器以提高效率   
-	session.setEventGenerator(new  AutoCloseEventGenerator());
-	//设置要监听的端口   
-	session.setListenPort(10003); 
-	//添加连接上SocketSession的事件监听器   
-	session.addSocketSessionListener(new  SessionHandler());
-	//开始服务   
-	session.start(true ) ; 
-	System.out.println("服务已经启动");
-	}
-}
diff --git a/networkProgramming/src/cindy/SessionHandler.java b/networkProgramming/src/cindy/SessionHandler.java
deleted file mode 100644
index 43b1f70..0000000
--- a/networkProgramming/src/cindy/SessionHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cindy;
-
-import java.nio.ByteBuffer;
-
-import net.sf.cindy.Message;
-import net.sf.cindy.Session;
-import net.sf.cindy.SessionAdapter;
-import net.sf.cindy.impl.ByteArrayMessage;
-
-public class SessionHandler extends SessionAdapter{
-	public void sessionClosed(Session paramSession) throws Exception {
-		 //System.out.println("session closed");
-	}
-
-	public void sessionEstablished(Session paramSession) throws Exception {
-		 //System.out.println("session established");;  
-	}
-
-	public void sessionIdle(Session paramSession) throws Exception {
-	}
-
-	public void sessionTimeout(Session paramSession) throws Exception {
-	}
-
-	public void messageReceived(Session session, Message message) throws Exception {
-		System.out.println("message received:"+message);
-		ByteArrayMessage message1 = new  ByteArrayMessage();;  
-        message1.setContent(("received message:"+message).getBytes()); 
-        session.write(message1);
-
-        //中文乱码问题
-       /* ByteBuffer bb=message.toByteBuffer()[0];
-		byte[] b = new byte[bb.remaining()];
-		bb.get(b, 0, b.length);
-	    String str=new String(b,"GBK"); 
-		System.out.println("message received:"+str);
-		ByteArrayMessage message1 = new  ByteArrayMessage();;  
-        message1.setContent(("message received:"+str).getBytes("GBK")); 
-        session.write(message1);*/
-
-       // ByteArrayMessage message2 = new  ByteArrayMessage();
-        //message2.setContent("message2" .getBytes());  
-        //session.blockWrite(message2);  
-	}
-
-	public void messageSent(Session session, Message message) throws Exception {
-		 //System.out.println("messgae send:"+message);
-	}
-
-	public void exceptionCaught(Session paramSession, Throwable paramThrowable) throws Exception {
-	}
-
-}
diff --git a/networkProgramming/src/eightUdpSocket/EchoClient.java b/networkProgramming/src/eightUdpSocket/EchoClient.java
deleted file mode 100644
index 9717cb0..0000000
--- a/networkProgramming/src/eightUdpSocket/EchoClient.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package eightUdpSocket;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.SocketException;
-
-public class EchoClient {
-	private String remotHost="localhost";
-	private int remotPort=8000;
-	private DatagramSocket socket;//发送数据报的socket
-	private EchoClient() throws SocketException{
-		socket=new DatagramSocket(); //与本地任意一个UDP端口绑定
-		System.out.println("UDP客户端已启动...");
-	}
-	public void talk(){
-		try {
-			InetAddress remotIp=InetAddress.getByName(remotHost);
-			BufferedReader br=new BufferedReader(new InputStreamReader(System.in));
-			String msg=null;
-			while((msg=br.readLine())!=null){
-				byte[] outputData=msg.getBytes();
-				DatagramPacket outputPacket=new DatagramPacket(outputData,outputData.length,remotIp,remotPort);
-				socket.send(outputPacket);//往服务端发数据报
-				DatagramPacket inputPacket=new DatagramPacket(new byte[512], 512);
-				socket.receive(inputPacket);//接收服务端的返回的数据报
-				System.out.println(new String(inputPacket.getData(),0,inputPacket.getLength()));
-				if(msg.equals("bye")){
-					break;
-				}
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		}finally{
-			socket.close();
-		}
-	}
-	public static void main(String[] args) throws IOException {
-		new EchoClient().talk();
-	}
-
-}
diff --git a/networkProgramming/src/eightUdpSocket/EchoServer.java b/networkProgramming/src/eightUdpSocket/EchoServer.java
deleted file mode 100644
index 2ddbc54..0000000
--- a/networkProgramming/src/eightUdpSocket/EchoServer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package eightUdpSocket;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.SocketException;
-
-public class EchoServer {
-	private int port=8000;
-	private DatagramSocket socket;//发送数据报的socket
-	private EchoServer() throws SocketException{
-		socket=new DatagramSocket(port); //与本地的固UDP定端口绑定
-		System.out.println("UDP服务端已启动...");
-	}
-	private String echo(String msg){
-		return "echo:"+msg;
-	}
-	public void service(){
-		while(true){
-			try{
-				DatagramPacket packet=new DatagramPacket(new byte[512], 512);//构造接收包的长度
-				socket.receive(packet);//接收来自任意client的数据报
-				String msg=new String(packet.getData(),0,packet.getLength());//解码并组合成msg
-				System.out.println(packet.getAddress()+":"+packet.getPort()+">"+msg);//服务端输出数据
-				packet.setData(echo(msg).getBytes());//字节数组类型
-				socket.send(packet);//给客户端返回数据
-			}catch(IOException e){
-				e.printStackTrace();
-			}
-		}
-	}
-	public static void main(String[] args) throws SocketException {
-		new EchoServer().service();
-	}
-
-}
diff --git a/networkProgramming/src/eightUdpSocket/SpsServer.java b/networkProgramming/src/eightUdpSocket/SpsServer.java
deleted file mode 100644
index 31041f8..0000000
--- a/networkProgramming/src/eightUdpSocket/SpsServer.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package eightUdpSocket;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.UnknownHostException;
- 
-//此线程类 用于处理接收到连接状态的 客户端的收发处理
-//若多个客户端连接则会创建多个实例 
-class ServerThread extends Thread {
- 
-    private Socket m_Client = null;
-    private InputStream in = null;
-    private OutputStream out = null;
-    private BizCommonService bizCommonService;
-    private String ENCODING = "GBK";
- 
-    public ServerThread(Socket _client,BizCommonService bizCommonService) throws Exception {
-        this.m_Client = _client;
-        this.in = m_Client.getInputStream(); // 获取出入流
-        this.out = m_Client.getOutputStream();// 获取输出流
-        this.bizCommonService=bizCommonService;
-    }
- 
-    public void run() {
-        byte[] recvBuf = new byte[2048];
-        byte[] sendBuf = new byte[2048];
-        int len = 0;
- 
-        while (true) {
-            // 先判断客户端连接状态
-            try {
-                m_Client.sendUrgentData(0);
-            } catch (IOException e) {
-                break;// 失去连接
-            }
- 
-            // 输入流从网络上读取数据
-            try {
-                len = in.read(recvBuf);
-                System.out.println("len:"+len);
-                if(len==-1){
-                	//没收到数据断开连接
-                	break;
-                }else{
-                	System.out.println("recv:" + new String(recvBuf, 0, len,ENCODING));
-                }
-            } catch (IOException e) {
-                break;// 接收异常
-            }
-            //收到的数据
-            String recv="";
-			try {
-				recv = new String(recvBuf, 0, len,ENCODING);
-			} catch (UnsupportedEncodingException e1) {
-				e1.printStackTrace();
-			}
-            boolean result = bizCommonService.sendOperToCacheAysn(recv);
-        	/**
-        	 * step 3 : 创建响应报文
-        	 */
-    		String res = bizCommonService.createResponseStr(recv,result);
-            sendBuf = res.getBytes();
-            try {
-                out.write(sendBuf);
-                System.out.println("send:" + res);
-            } catch (IOException e) {
-                break;// 发送异常
-            }
-        }
- 
-        System.out.println("客户端失去连接");
-        try {
-            in.close();
-            out.close();
-            m_Client.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}
- 
-// 此线程类用于接收服务端socket监听到的客户端连接 并创建线程对于此客户端的处理
-class ClientRequestProc extends Thread {
- 
-    private ServerSocket m_Server = null;
-    private BizCommonService bizCommonService;
- 
-    public ClientRequestProc(ServerSocket _server,BizCommonService bizCommonService) {
-        m_Server = _server;
-       this. bizCommonService=bizCommonService;
-    }
- 
-    public void run() {
-        while (true) {
-            try {
-                Socket client = m_Server.accept();
-                System.out.println("有客户端连接");
-                try {
-                    ServerThread proc = new ServerThread(client,bizCommonService);
-                    proc.start();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                System.out.println("启动客户端处理线程");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}
-
-public class SpsServer {
-	public static void main(String[] args) {
-		final Logger log = LoggerFactory.getLogger(SpsServer.class);  
-		try{
-			ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
-					new String[] { "applicationContext.xml" });
-			context.start();
-			BizCommonService bizCommonService = (BizCommonService) context.getBean("bizCommonService");
-			SpsServer.serverStart(bizCommonService);  
-		}catch(Exception e){
-			log.error("start sps interface server error:",e);
-			System.exit(-1);
-		}
-	}
-	public static void serverStart(BizCommonService bizCommonService){
-		ServerSocket server = null;
-		int PORT=10002;
-		//int PORT=30087;//prod
-		//String PORTs=(String)CustomizedPropertyConfigurer.getContextProperty("toSpsServerPort");
-    	//PORT=Integer.parseInt(PORTs);
-	    try {
-	        server = new ServerSocket(PORT);
-	    } catch (IOException e) {
-	        e.printStackTrace();
-	    }
-	    String ip=server.getInetAddress().getHostAddress();
-	    System.out.println(ip+":"+PORT+"服务器开始监听...\n");
-	    ClientRequestProc clientRp = new ClientRequestProc(server,bizCommonService);
-	    clientRp.start();
-	    try {
-	        clientRp.join();// 等待子线程退出(阻塞函数 防止主线程先结束)
-	    } catch (InterruptedException e) {
-	        e.printStackTrace();
-	    }
-	}
-	
-}
\ No newline at end of file
diff --git a/networkProgramming/src/eightUdpSocket/package-info.java b/networkProgramming/src/eightUdpSocket/package-info.java
deleted file mode 100644
index 8b58bb0..0000000
--- a/networkProgramming/src/eightUdpSocket/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * 
- */
-/**
- * @author mercy
- *基于UDP的数据报和套接字
- */
-package eightUdpSocket;
\ No newline at end of file
diff --git a/networkProgramming/src/fourNoBlocking/Handler.java b/networkProgramming/src/fourNoBlocking/Handler.java
deleted file mode 100644
index 46c0077..0000000
--- a/networkProgramming/src/fourNoBlocking/Handler.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package fourNoBlocking;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.Socket;
-import java.nio.channels.SocketChannel;
-
-public class Handler implements Runnable{
-	private SocketChannel socketChannel;
-	public Handler(SocketChannel socketChannel){
-		this.socketChannel=socketChannel;
-	}
-	public String echo(String msg){
-		return "echo:"+msg;
-	}
-	private PrintWriter getWriter(Socket socket) throws IOException{
-		OutputStream socketOut=socket.getOutputStream();
-		return new PrintWriter(socketOut,true);
-	}
-	private BufferedReader getReader(Socket socket)throws IOException{
-		InputStream socketIn=socket.getInputStream();
-		return new BufferedReader(new InputStreamReader(socketIn));
-	}
-	@Override
-	public void run() {
-		handle(socketChannel);
-	}
-	public void handle(SocketChannel socketChannel){
-		Socket socket=socketChannel.socket();//获取socket对象
-		System.out.println("服务端执行线程..绑定的客户端port:"+socket.getPort());
-		try{
-			BufferedReader br=getReader(socket);
-			PrintWriter pw=getWriter(socket);
-			String msg=null;
-			while((msg=br.readLine())!=null){
-				System.out.println(msg);
-				pw.println(echo(msg));
-			}
-		}catch(IOException e){
-			e.printStackTrace();
-		}finally{
-			if(socket!=null){
-				try {
-					socket.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
-}
diff --git a/networkProgramming/src/fourNoBlocking/NIOBlockEchoClient.java b/networkProgramming/src/fourNoBlocking/NIOBlockEchoClient.java
deleted file mode 100644
index 5c29ba3..0000000
--- a/networkProgramming/src/fourNoBlocking/NIOBlockEchoClient.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package fourNoBlocking;
-
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.channels.SocketChannel;
-
-
-/**
- * @author mercy
- * 阻塞式NIO客户端
- */
-public class NIOBlockEchoClient {
-	private SocketChannel socketChannel=null;
-	private int port=10002;
-	public NIOBlockEchoClient()throws IOException{
-		socketChannel=SocketChannel.open();
-		InetAddress ad=InetAddress.getLocalHost();
-		InetSocketAddress isa=new InetSocketAddress(ad,port);
-		socketChannel.connect(isa);//连接服务
-		//获取绑定后的端口号和绑定前的端口号
-	}
-	
-	private PrintWriter getWriter(Socket socket) throws IOException{
-		OutputStream socketOut=socket.getOutputStream();
-		return new PrintWriter(socketOut,true);
-	}
-	private BufferedReader getReader(Socket socket)throws IOException{
-		InputStream socketIn=socket.getInputStream();
-		return new BufferedReader(new InputStreamReader(socketIn));
-	}
-	
-	public void talk() throws IOException{
-		try{
-			BufferedReader br=getReader(socketChannel.socket());
-			PrintWriter pw=getWriter(socketChannel.socket());
-			BufferedReader reader=new BufferedReader(new InputStreamReader(System.in));
-			String msg=null;
-			while((msg=reader.readLine())!=null){
-				pw.println(msg);
-				System.out.println(br.readLine());
-				if(msg.equals("bye")){
-					break;
-				}
-			}
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-		try{
-			socketChannel.close();
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-	}
-	public static void main(String[] args) throws IOException{
-		new NIOBlockEchoClient().talk();
-	}
-
-
-}
diff --git a/networkProgramming/src/fourNoBlocking/NIOBlockEchoServer.java b/networkProgramming/src/fourNoBlocking/NIOBlockEchoServer.java
deleted file mode 100644
index 19f186f..0000000
--- a/networkProgramming/src/fourNoBlocking/NIOBlockEchoServer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package fourNoBlocking;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-
-/**
- * @author mercy
- * 用nio创建阻塞式IO服务端(当ServerSocketChannel和SocketChannel采用阻塞式IO时为了处理多个连接必须使用多线程)
- */
-public class NIOBlockEchoServer {
-	private int port=8000;
-	private ServerSocketChannel serverSocketChannel;
-	private ExecutorService servicePool;//线程池
-	private final int poolSize=5;
-	public NIOBlockEchoServer() throws IOException{
-		//返回当前电脑系统的CPU数目,CPU越多,线程池工作的数目也越多
-		servicePool=Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()*poolSize);
-		//创建对象
-		serverSocketChannel=ServerSocketChannel.open();
-		//设置在同一主机上关闭服务器端程序再启动该程序时候可以顺利绑定相同端口
-		serverSocketChannel.socket().setReuseAddress(true);
-		//使得服务器进程与本地端口绑定
-		serverSocketChannel.socket().bind(new InetSocketAddress(port));
-		System.out.println("服务已启动...");
-	}
-	public void service(){
-		while(true){
-			SocketChannel socketChannel=null;
-			try{
-				socketChannel=serverSocketChannel.accept();
-				servicePool.execute(new Handler(socketChannel));//创建一个工作线程
-			}catch(IOException e){
-				e.printStackTrace();
-			}
-			
-		}
-	}
-	public static void main(String[] args) throws IOException {
-		new NIOBlockEchoServer().service();
-	}
-
-}
diff --git a/networkProgramming/src/fourNoBlocking/NoBlockAndBlockServer.java b/networkProgramming/src/fourNoBlocking/NoBlockAndBlockServer.java
deleted file mode 100644
index 0e1e205..0000000
--- a/networkProgramming/src/fourNoBlocking/NoBlockAndBlockServer.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package fourNoBlocking;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.charset.Charset;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * @author mercy
- * 接收客户连接按照阻塞模式，有就注册读就绪和写就绪事件,否则进入阻塞模式,直到接收到了客户连接负责接收数据和发送数据的线程采用非阻塞模式
- * 单独出一个accept方法
- * 
- */
-public class NoBlockAndBlockServer {
-	private Selector selector=null;
-	private ServerSocketChannel serverSocketChannel=null;
-	private int port=8000;
-	private Charset charset=Charset.forName("GBK");//返回一个字符类型对象
-	
-	public NoBlockAndBlockServer() throws IOException{
-		selector=Selector.open();//创建Selector对象
-		serverSocketChannel=ServerSocketChannel.open();
-		serverSocketChannel.socket().setReuseAddress(true);
-		serverSocketChannel.socket().bind(new InetSocketAddress(port));
-		System.out.println("服务已启动...");
-	}
-	private Object gate=new Object();
-	public void accept(){
-		for(;;){
-			try{
-				SocketChannel socketChannel=serverSocketChannel.accept();
-				socketChannel.configureBlocking(false);//设置无阻塞模式
-				ByteBuffer buffer=ByteBuffer.allocate(6555);//创建一个ByteBuffer对象用于存放数据
-				synchronized (gate) {
-					selector.wakeup();//唤醒阻塞在select方法上的线程
-					socketChannel.register(selector,SelectionKey.OP_READ|SelectionKey.OP_WRITE,buffer);
-				}
-			}catch(IOException e){
-				e.printStackTrace();
-			}
-		}
-		
-	}
-	public void service() throws IOException{
-		for(;;){
-			synchronized (gate) {}
-			int n=selector.select();//已经可以进行IO的通道数
-			if(n==0){
-				continue;
-			}
-			Set readyKeys=selector.selectedKeys();
-			Iterator it=readyKeys.iterator();
-			while(it.hasNext()){
-				SelectionKey key=null;
-				key=(SelectionKey)it.next();
-				it.remove();//删除集合中的key
-				try{
-					if(key.isReadable()){//key的channel是否可读
-						receive(key);
-					}
-					if(key.isWritable()){//key的channel是否可写
-						send(key);
-					}
-				}catch(IOException e){
-					e.printStackTrace();
-					try{
-						if(key!=null){
-							key.cancel();
-							key.channel().close();
-						}
-					}catch(Exception ex){
-						ex.printStackTrace();
-					}
-				}
-			}
-		}
-	}
-	/**
-	 * @param key
-	 * @throws IOException
-	 * @author mercy
-	 * 根据读取的数据处理完返回给客户端
-	 */
-	public void send(SelectionKey key) throws IOException{
-		ByteBuffer buffer=(ByteBuffer) key.attachment();//检索当前的文件
-		SocketChannel socketChannel=(SocketChannel) key.channel();
-		buffer.flip();//把极限(limit)设为位置(position)，把位置设为0
-		String data=decode(buffer);//解码客户端发过来的数据
-		if(data.indexOf("\r\n")==-1){//不包含\r\n直接return
-			return ;
-		}
-		String outputData=data.substring(0, data.indexOf("\n")+1);
-		System.out.println("客户端发送的数据:"+outputData); 
-		ByteBuffer outputBuffer=encode("echo:"+outputData);//返回给客户端的数据
-		while(outputBuffer.hasRemaining()){//buffer里面有数据
-			socketChannel.write(outputBuffer);
-		}
-		ByteBuffer temp=encode(outputData);
-		buffer.position(temp.limit());//设置buffer的位置为temp的极限
-		buffer.compact();//删除已经处理的字符串
-		if(outputData.equals("bye\r\n")){
-			key.cancel();
-			socketChannel.close();
-			System.out.println("关闭与某客户端的连接");
-		}
-	}
-	/**
-	 * @param key
-	 * @throws IOException
-	 * @author mercy
-	 * 读取客户端发来的数据
-	 */
-	public void receive(SelectionKey key) throws IOException{
-		ByteBuffer buffer=(ByteBuffer) key.attachment();
-		SocketChannel socketChannel=(SocketChannel) key.channel();
-		ByteBuffer readBuffer=ByteBuffer.allocate(6555);//创建自定义内存的buffer
-		socketChannel.read(readBuffer);
-		readBuffer.flip();
-		buffer.limit(buffer.capacity());//设置buffer的极限为buffer的容量
-		buffer.put(readBuffer);
-	}
-	public String decode(ByteBuffer buffer){//解码
-		CharBuffer charBuffer=charset.decode(buffer);
-		return charBuffer.toString();
-		
-	}
-	public ByteBuffer encode(String str){//编码
-		return charset.encode(str);
-	}
-	public static void main(String[] args) throws IOException {
-		final NoBlockAndBlockServer server=new NoBlockAndBlockServer();
-		Thread accept= new Thread(){
-			public void run(){
-				server.accept();
-			}
-		};
-		accept.start();
-		server.service();
-	}
-}
diff --git a/networkProgramming/src/fourNoBlocking/NoBlockClient.java b/networkProgramming/src/fourNoBlocking/NoBlockClient.java
deleted file mode 100644
index 4b0e5a4..0000000
--- a/networkProgramming/src/fourNoBlocking/NoBlockClient.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package fourNoBlocking;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.SocketChannel;
-import java.nio.charset.Charset;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * @author mercy
- * 非阻塞式IO客户端
- */
-public class NoBlockClient {
-	private SocketChannel socketChannel=null;
-	private ByteBuffer sendBuffer=ByteBuffer.allocate(1024);
-	private ByteBuffer receiveBuffer=ByteBuffer.allocate(1024);
-	private Charset charset=Charset.forName("GBK");
-	private Selector selector;
-	private int port=8000;
-	public NoBlockClient() throws IOException{
-		socketChannel=SocketChannel.open();
-		InetAddress add=InetAddress.getLocalHost();
-		InetSocketAddress isa=new InetSocketAddress(add, port);
-		socketChannel.connect(isa);//采用阻塞模式连接服务器
-		socketChannel.configureBlocking(false);//采用非阻塞模式
-		System.out.println("连接服务器成功....");
-		selector=Selector.open();
-	}
-	/**
-	 * 
-	 * @author mercy
-	 * 接收用户从控制台输入的数据
-	 */
-	public void receiveFromUser(){
-		try{
-			//用户输入的数据放入buffer中
-			BufferedReader br=new BufferedReader(new InputStreamReader(System.in));
-			String msg=null;
-			while((msg=br.readLine())!=null){
-				synchronized (sendBuffer) {
-					sendBuffer.put(encode(msg+"\r\n"));
-				}
-				if(msg.equals("bye")){
-					break;
-				}
-			}
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-	}
-	
-	/**
-	 * @param key
-	 * @author mercy
-	 * 发送sendBuffer中的数据
-	 * @throws IOException 
-	 */
-	public void send(SelectionKey key) throws IOException{
-		SocketChannel socketChannel=(SocketChannel) key.channel();
-		synchronized (sendBuffer) {
-			sendBuffer.flip();//将极限(limit)设为位置(position)，将位置设为0
-			socketChannel.write(sendBuffer);
-			sendBuffer.compact();//删除已经发送的数据
-		}
-	}
-	/**
-	 * @param key
-	 * @throws IOException
-	 * @author mercy
-	 * 接收服务端发送的数据,如果buffer中有数据则打印,然后从buffer中删除
-	 */
-	public void receive(SelectionKey key) throws IOException{
-		SocketChannel socketChannel=(SocketChannel) key.channel();
-		socketChannel.read(receiveBuffer);
-		receiveBuffer.flip();
-		String receiveData=decode(receiveBuffer);
-		if(receiveData.indexOf("\n")==-1){
-			return;
-		}
-		String outputData=receiveData.substring(0, receiveData.indexOf("\n")+1);
-		System.out.println(outputData);
-		if(outputData.equals("echo:bye\r\n")){
-			key.cancel();
-			socketChannel.close();
-			System.out.println("连接服务器关闭...");
-			selector.close();
-			System.exit(0);
-		}
-		ByteBuffer temp=encode(outputData);
-		receiveBuffer.position(temp.limit());
-		receiveBuffer.compact();//删除已经打印的数据
-	}
-	
-	public String decode(ByteBuffer buffer){//解码
-		CharBuffer charBuffer=charset.decode(buffer);
-		return charBuffer.toString();
-		
-	}
-	public ByteBuffer encode(String str){//编码
-		return charset.encode(str);
-	}
-	public void talk()throws IOException{
-		socketChannel.register(selector,SelectionKey.OP_READ|SelectionKey.OP_WRITE);
-		while(selector.select()>0){
-			Set readyKeys=selector.selectedKeys();
-			Iterator it=readyKeys.iterator();
-			while(it.hasNext()){
-				SelectionKey key=null;
-				try{
-					key=(SelectionKey) it.next();
-					it.remove();
-					if(key.isReadable()){
-						receive(key);
-					}
-					if(key.isWritable()){
-						send(key);
-					}
-				}catch(IOException e){
-					e.printStackTrace();
-					try{
-						if(key!=null){
-							key.cancel();
-							key.channel().close();
-						}
-					}catch(Exception ex){
-						e.printStackTrace();
-					}
-				}
-			}
-		}
-	}
-	public static void main(String[] args) throws IOException {
-		final NoBlockClient client=new NoBlockClient();
-		Thread receiver=new Thread(){
-			public void run(){
-				client.receiveFromUser();//接收用户输入的数据
-			}
-		};
-		receiver.start();
-		client.talk();
-	}
-
-}
diff --git a/networkProgramming/src/fourNoBlocking/NoBlockServer.java b/networkProgramming/src/fourNoBlocking/NoBlockServer.java
deleted file mode 100644
index 02f7fba..0000000
--- a/networkProgramming/src/fourNoBlocking/NoBlockServer.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package fourNoBlocking;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.charset.Charset;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * @author mercy
- * NIO创建非阻塞式服务端
- * 一个主线程能接收客户的连接，接收客户的请求，向客户发回响应数据
- * ByteBuffer是字节缓存区,存放的是字节，要转换成字符串需要编解码
- */
-public class NoBlockServer {
-	private Selector selector=null;
-	private ServerSocketChannel serverSocketChannel=null;
-	private int port=8000;
-	private Charset charset=Charset.forName("GBK");//返回一个字符类型对象
-	
-	public NoBlockServer() throws IOException{
-		selector=Selector.open();//创建Selector对象
-		serverSocketChannel=ServerSocketChannel.open();
-		serverSocketChannel.socket().setReuseAddress(true);
-		serverSocketChannel.configureBlocking(false);//设置无阻塞模式
-		serverSocketChannel.socket().bind(new InetSocketAddress(port));
-		System.out.println("服务已启动...");
-	}
-	
-	public void service() throws IOException{
-		serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT);//用给定的选择器注册channel，并返回一个key
-		while(selector.select()>0){
-			Set readyKeys=selector.selectedKeys();
-			Iterator it=readyKeys.iterator();
-			while(it.hasNext()){
-				SelectionKey key=null;
-				try{
-					key=(SelectionKey)it.next();
-					it.remove();//删除集合中的key
-					if(key.isAcceptable()){//是否可以接收客户端的socket连接
-						ServerSocketChannel ssc=(ServerSocketChannel)key.channel();
-						SocketChannel socketChannel=ssc.accept();
-						System.out.println("接收到的客户端连接,来自："+socketChannel.socket().getInetAddress()+":"+socketChannel.socket().getPort());
-						socketChannel.configureBlocking(false);//设置无阻塞模式
-						ByteBuffer buffer=ByteBuffer.allocate(2048);//创建一个ByteBuffer对象用于存放数据(数据存放缓冲区)
-						socketChannel.register(selector,SelectionKey.OP_READ|SelectionKey.OP_WRITE,buffer);//注册事件,Selector会监控事件是否发生
-					}
-					if(key.isReadable()){//key的channel是否可读
-						receive(key);
-					}
-					if(key.isWritable()){//key的channel是否可写
-						send(key);
-					}
-				}catch(IOException e){
-					System.out.println("exception....");
-					e.printStackTrace();
-					try{
-						if(key!=null){
-							key.cancel();
-							key.channel().close();
-						}
-					}catch(Exception ex){
-						ex.printStackTrace();
-					}
-				}
-			}
-		}
-
-	}
-	/**
-	 * @param key
-	 * @throws IOException
-	 * @author mercy
-	 * 根据读取的数据处理完返回给客户端
-	 */
-	public void send(SelectionKey key) throws IOException{
-		ByteBuffer buffer=(ByteBuffer) key.attachment();//检索当前的文件
-		SocketChannel socketChannel=(SocketChannel) key.channel();
-		buffer.flip();//把极限(limit)设为位置(position)，把位置设为0
-		String data=decode(buffer);//解码客户端发过来的数据
-		if(data.length()==0){
-			return ;
-		}
-//		if(data.indexOf("\r\n")==-1){//不包含\r\n直接return
-//			return ;
-//		}
-		String outputData=data;//.substring(0, data.indexOf("\n")+1);
-		System.out.println("客户端发送的数据:"+outputData); 
-		ByteBuffer outputBuffer=encode("echo:"+outputData);//返回给客户端的数据
-		while(outputBuffer.hasRemaining()){//buffer里面有数据
-			socketChannel.write(outputBuffer);
-		}
-		ByteBuffer temp=encode(outputData);
-		buffer.position(temp.limit());//设置buffer的位置：temp的极限
-		buffer.compact();//删除已经处理的字符串(删除缓冲区内从0到当前位置position的内容)
-		if(outputData.equals("bye\r\n")){
-			key.cancel();
-			socketChannel.close();
-			System.out.println("关闭与某客户端的连接");
-		}
-	}
-	/**
-	 * @param key
-	 * @throws IOException
-	 * @author mercy
-	 * 读取客户端发来的数据
-	 */
-	public void receive(SelectionKey key) throws IOException{
-		ByteBuffer buffer=(ByteBuffer) key.attachment();
-//		if(!buffer.hasRemaining()){
-//			return ;
-//		}
-		SocketChannel socketChannel=(SocketChannel) key.channel();
-		ByteBuffer readBuffer=ByteBuffer.allocate(2048);//创建自定义内存的buffer(存放读到的数据)
-		socketChannel.read(readBuffer);
-		readBuffer.flip();
-		buffer.limit(buffer.capacity());//设置buffer的极限为buffer的容量
-		buffer.put(readBuffer);//复制到缓存区
-	}
-	public String decode(ByteBuffer buffer){//解码
-		CharBuffer charBuffer=charset.decode(buffer);
-		return charBuffer.toString();
-		
-	}
-	public ByteBuffer encode(String str){//编码
-		return charset.encode(str);
-	}
-	public static void main(String[] args) throws IOException {
-		new NoBlockServer().service();
-	}
-}
diff --git a/networkProgramming/src/fourNoBlocking/SendClient.java b/networkProgramming/src/fourNoBlocking/SendClient.java
deleted file mode 100644
index e6dee81..0000000
--- a/networkProgramming/src/fourNoBlocking/SendClient.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package fourNoBlocking;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.ByteBuffer;
-
-
-/**
- * 
- * 发送报文给客户端
- * 
- * 
- * @author zhouzhixiang
- * @date 2016年12月14日 上午11:56:27
- * @since 1.0
- */
-public class SendClient {
-
-    private static final String ENCODING = "GBK";
-
-    public static String send(String ip, int port, String sendStr, int timeout) {
-        long start = System.currentTimeMillis();
-        System.out.println(sendStr.length());
-        if (sendStr == null || "".equals(sendStr)) {
-            return "str is null";
-        }
-        Socket client = null;
-        OutputStream stream = null;
-        InputStream is = null;
-
-        try {
-            client = new Socket();
-            InetSocketAddress address = new InetSocketAddress(ip, port);
-            client.connect(address);
-
-            timeout = timeout >= 0 ? timeout : 3500;
-            client.setSoTimeout(timeout);
-            stream = client.getOutputStream();
-            is = client.getInputStream();
-
-            int len = 0;
-
-            len = sendStr.getBytes(ENCODING).length;
-            ByteBuffer buf = ByteBuffer.allocate(len);
-            byte[] bytes = sendStr.getBytes(ENCODING);
-            buf.put(bytes);
-            stream.write(buf.array(), 0, len);
-            stream.flush();
-            String res = "";
-            int i = 0;
-            byte[] b = new byte[6555];
-            while ((i = is.read(b)) != -1) {
-                res = new String(b, 0, i);
-                System.out.println(res);
-                break;
-            }
-            long end = System.currentTimeMillis();
-
-
-            return res;
-        } catch (Exception e) {
-            StringBuilder strBuilder = new StringBuilder();
-            strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-            .append(System.currentTimeMillis());
-            return strBuilder.toString();
-        } finally {
-            if (client != null) {
-                try {
-                    client.close();
-                } catch (IOException e) {
-                    StringBuilder strBuilder = new StringBuilder();
-                    strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-                    .append(System.currentTimeMillis());
-                }
-            }
-
-            if (stream != null) {
-                try {
-                    stream.close();
-                } catch (IOException e) {
-                    StringBuilder strBuilder = new StringBuilder();
-                    strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-                    .append(System.currentTimeMillis());
-                }
-            }
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    StringBuilder strBuilder = new StringBuilder();
-                    strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-                    .append(System.currentTimeMillis());
-                }
-            }
-        }
-    }
-    
-    public static void main(String[] args) {
-    	String msg="";
-        msg="FFFF76623634010100102700170103IBSS017555      000000021800100023402287248808*766236340100200001178400003001785000030217860000302110000004075510100020SZ2000000054121442461020001241324186148310300593PM_DJDHHM||83456517||001#$PM_HYLX||0||001#$BA_MSMAN||海豚||001#$PM_DJQYYB||518000||001#$PM_DJQYMC||深圳市福田区人力资源服务中心||001#$PM_BHHM||83456517||001#$PM_DJQYDZ||福田区福强路深圳文化创意园世纪工艺品文化广场309栋B座1-3层||001#$PM_SFZDXY||XY02||001#$PM_DJKHXX||||001#$BA_MSDEPTNAME||12||001#$PM_DLS||DSL6||001#$PM_YWSLLB||SLLB01||001#$PM_SLDYSLSH||0||001#$PM_JFQ||01||001#$PM_DJHMGS||1||001#$PM_SRFJ||2||001#$PM_JFJG||1||001#$PM_YZ||30||001#$PM_DXFSSL||100||001#$PB_BILLINGTYPE||000000||005#$PB_USERTYPE||100002||005#$PB_USERCHAR||JFSX01||005#$BEGIN_DATE||20170607||005#$END_DATE||||005#$10400014DXMP214688722910700016号百信息服务中心10800010122810070411400006徐冬生115000088291816511600110114+企业名片行业版包月套餐,114+短信名片包月套餐_定价计划,114+企业名片行业版包月套餐赠送3个月套餐外等额话费优惠11700017755KH000293285120";
-    	//String x=SendClient.send("weway.wicp.net", 10101, msg, 3500);
-    	String x=SendClient.send("127.0.0.1", 8000, msg, 3500);
-    	System.out.println("return string:"+x);
-	}
-
-}
diff --git a/networkProgramming/src/fourNoBlocking/package-info.java b/networkProgramming/src/fourNoBlocking/package-info.java
deleted file mode 100644
index 9b0029f..0000000
--- a/networkProgramming/src/fourNoBlocking/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * 
- */
-/**
- * @author mercy
- * 使用非阻塞式IO创建服务端程序和客户端程序
- */
-package fourNoBlocking;
-
diff --git a/networkProgramming/src/framework/grizzly/EchoClient.java b/networkProgramming/src/framework/grizzly/EchoClient.java
deleted file mode 100644
index 13f84b3..0000000
--- a/networkProgramming/src/framework/grizzly/EchoClient.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package framework.grizzly;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.Socket;
-
-public class EchoClient {
-	private String 	host="localhost";
-	private int port=10003;
-	private Socket socket;
-	public EchoClient()throws IOException{
-		socket=new Socket(host,port);
-		//获取绑定后的端口号和绑定前的端口号
-		System.out.println("new Connecttion accept" +socket.getInetAddress()+":"+socket.getPort()+",localPort:"+socket.getLocalPort());
-	}
-	private PrintWriter getWriter(Socket socket) throws IOException{
-		OutputStream socketOut=socket.getOutputStream();
-		return new PrintWriter(socketOut,true);
-	}
-	private BufferedReader getReader(Socket socket)throws IOException{
-		InputStream socketIn=socket.getInputStream();
-		return new BufferedReader(new InputStreamReader(socketIn));
-	}
-	public void talk() throws IOException{
-		try{
-			BufferedReader br=getReader(socket);
-			PrintWriter pw=getWriter(socket);
-			BufferedReader reader=new BufferedReader(new InputStreamReader(System.in));
-			String msg=null;
-			while((msg=reader.readLine())!=null){
-				pw.println(msg);
-				System.out.println(br.readLine());
-				if(msg.equals("bye")){
-					break;
-				}
-			}
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-		try{
-			socket.close();
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-	}
-	public static void main(String[] args) throws IOException{
-		new EchoClient().talk();
-	}
-
-}
diff --git a/networkProgramming/src/framework/grizzly/GrizzlyEchoClient.java b/networkProgramming/src/framework/grizzly/GrizzlyEchoClient.java
deleted file mode 100644
index 5e4b9ce..0000000
--- a/networkProgramming/src/framework/grizzly/GrizzlyEchoClient.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package framework.grizzly;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.Charset;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.glassfish.grizzly.Connection;
-import org.glassfish.grizzly.filterchain.FilterChainBuilder;
-import org.glassfish.grizzly.filterchain.TransportFilter;
-import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
-import org.glassfish.grizzly.nio.transport.TCPNIOTransportBuilder;
-import org.glassfish.grizzly.utils.Charsets;
-import org.glassfish.grizzly.utils.StringFilter;
-
-public class GrizzlyEchoClient {
-
-    @SuppressWarnings("unchecked")
-    public static void main(String[] args) throws IOException,
-            ExecutionException, InterruptedException, TimeoutException {
-
-        Connection connection = null;
-
-        // Create a FilterChain using FilterChainBuilder
-        FilterChainBuilder filterChainBuilder = FilterChainBuilder.stateless();
-        // Add TransportFilter, which is responsible
-        // for reading and writing data to the connection
-        filterChainBuilder.add(new TransportFilter());
-        // StringFilter is responsible for Buffer <-> String conversion
-        filterChainBuilder.add(new StringFilter(Charset.forName("GBK")));
-        // ClientFilter is responsible for redirecting server responses to the standard output
-        filterChainBuilder.add(new GrizzlyEchoClientFilter());
-
-        // Create TCP transport
-        final TCPNIOTransport transport =
-                TCPNIOTransportBuilder.newInstance().build();
-        transport.setProcessor(filterChainBuilder.build());
-
-        try {
-            // start the transport
-            transport.start();
-
-            // perform async. connect to the server
-            Future<Connection> future = transport.connect("127.0.0.1",
-                    GrizzlyEchoServer.PORT);
-            // wait for connect operation to complete
-            connection = future.get(10, TimeUnit.SECONDS);
-
-            assert connection != null;
-
-            System.out.println("Ready... (\"q\" to exit)");
-            final BufferedReader inReader = new BufferedReader(
-                    new InputStreamReader(System.in, Charsets.ASCII_CHARSET));
-            do {
-                final String userInput = inReader.readLine();
-                if (userInput == null || "q".equals(userInput)) {
-                    break;
-                }
-
-                connection.write(userInput);
-            } while (true);
-        } finally {
-            // close the client connection
-            if (connection != null) {
-                connection.closeSilently();
-            }
-            // stop the transport
-            transport.shutdownNow();
-        }
-    }
-}
diff --git a/networkProgramming/src/framework/grizzly/GrizzlyEchoClientFilter.java b/networkProgramming/src/framework/grizzly/GrizzlyEchoClientFilter.java
deleted file mode 100644
index 944d0b1..0000000
--- a/networkProgramming/src/framework/grizzly/GrizzlyEchoClientFilter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package framework.grizzly;
-
-import java.io.IOException;
-
-import org.glassfish.grizzly.filterchain.BaseFilter;
-import org.glassfish.grizzly.filterchain.FilterChainContext;
-import org.glassfish.grizzly.filterchain.NextAction;
-
-public class GrizzlyEchoClientFilter extends BaseFilter {
-    /**
-     * Handle just read operation, when some message has come and ready to be
-     * processed.
-     *
-     * @param ctx Context of {@link FilterChainContext} processing
-     * @return the next action
-     * @throws java.io.IOException
-     */
-    @Override
-    public NextAction handleRead(final FilterChainContext ctx) throws IOException {
-        // We get String message from the context, because we rely prev. Filter in chain is StringFilter
-        final String serverResponse = ctx.getMessage();
-        System.out.println("Server echo: " + serverResponse);
-
-        return ctx.getStopAction();
-    }
-}
diff --git a/networkProgramming/src/framework/grizzly/GrizzlyEchoFilter.java b/networkProgramming/src/framework/grizzly/GrizzlyEchoFilter.java
deleted file mode 100644
index 2e951f5..0000000
--- a/networkProgramming/src/framework/grizzly/GrizzlyEchoFilter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package framework.grizzly;
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.glassfish.grizzly.Buffer;
-import org.glassfish.grizzly.Connection;
-import org.glassfish.grizzly.Grizzly;
-import org.glassfish.grizzly.filterchain.BaseFilter;
-import org.glassfish.grizzly.filterchain.FilterChainContext;
-import org.glassfish.grizzly.filterchain.NextAction;
-
-public class GrizzlyEchoFilter extends BaseFilter{
-	 private static final Logger logger = Grizzly.logger(GrizzlyEchoFilter.class);
-	 public NextAction handleRead(FilterChainContext ctx) throws IOException{
-	    Object message = ctx.getMessage();
-		Connection connection = ctx.getConnection();
-		Object address = ctx.getAddress();
-		if (logger.isLoggable(Level.FINEST)) {
-			 logger.log(Level.FINEST, "EchoFilter. connection={0} dstAddress={1} message={2}",
-					new Object[] { connection, address, message });
-		}
-		if (message instanceof Buffer) {
-			 ((Buffer) message).allowBufferDispose(true);
-		 }
-		System.out.println("message:"+message);
-		ctx.write(address, message, null);
-		 return ctx.getStopAction();
-	 }
-}
\ No newline at end of file
diff --git a/networkProgramming/src/framework/grizzly/GrizzlyEchoServer.java b/networkProgramming/src/framework/grizzly/GrizzlyEchoServer.java
deleted file mode 100644
index 1d8675d..0000000
--- a/networkProgramming/src/framework/grizzly/GrizzlyEchoServer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package framework.grizzly;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.logging.Logger;
-import org.glassfish.grizzly.filterchain.FilterChainBuilder;
-import org.glassfish.grizzly.filterchain.TransportFilter;
-import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
-import org.glassfish.grizzly.nio.transport.TCPNIOTransportBuilder;
-import org.glassfish.grizzly.utils.StringFilter;
-
-/**
- * Class initializes and starts the echo server, based on Grizzly 2.0
- *
- * @author Alexey Stashok
- */
-public class GrizzlyEchoServer {
-    private static final Logger logger = Logger.getLogger(GrizzlyEchoServer.class.getName());
-    public static final String ADDR="127.0.0.1";
-    public static final int PORT = 10003;
-
-    public static void main(String[] args) throws IOException {
-        // Create a FilterChain using FilterChainBuilder
-        FilterChainBuilder filterChainBuilder = FilterChainBuilder.stateless();
-
-        // Add TransportFilter, which is responsible
-        // for reading and writing data to the connection
-        filterChainBuilder.add(new TransportFilter());
-
-        // StringFilter is responsible for Buffer <-> String conversion
-        filterChainBuilder.add(new StringFilter(Charset.forName("GBK")));
-
-        // EchoFilter is responsible for echoing received messages
-        filterChainBuilder.add(new GrizzlyEchoFilter());
-        
-        // Create TCP transport
-        final TCPNIOTransport transport =
-                TCPNIOTransportBuilder.newInstance().build();
-        
-        transport.setProcessor(filterChainBuilder.build());
-        
-        try {
-            // binding transport to start listen on certain host and port
-        	logger.info("binding transport to start listen on certain host and port");
-            transport.bind(ADDR,PORT);
-
-            // start the transport
-            transport.start();
-
-            //logger.info("Press any key to stop the server...");
-            System.in.read();
-       } finally {
-            //logger.info("Stopping transport...");
-            // stop the transport
-            transport.shutdownNow();
-
-            logger.info("Stopped transport...");
-        }
-    }
-}
\ No newline at end of file
diff --git a/networkProgramming/src/framework/grizzly/GrizzlyEchoServer1.java b/networkProgramming/src/framework/grizzly/GrizzlyEchoServer1.java
deleted file mode 100644
index 7c7a9d9..0000000
--- a/networkProgramming/src/framework/grizzly/GrizzlyEchoServer1.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package framework.grizzly;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.logging.Logger;
-import org.glassfish.grizzly.filterchain.FilterChainBuilder;
-import org.glassfish.grizzly.filterchain.TransportFilter;
-import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
-import org.glassfish.grizzly.nio.transport.TCPNIOTransportBuilder;
-import org.glassfish.grizzly.utils.StringFilter;
-
-/**
- * Class initializes and starts the echo server, based on Grizzly 2.0
- *
- * @author Alexey Stashok
- */
-/**
- * @author mercy
- *通过换行去区分一个中断符
- */
-public class GrizzlyEchoServer1 {
-    private static final Logger logger = Logger.getLogger(GrizzlyEchoServer1.class.getName());
-    public static final String ADDR="127.0.0.1";
-    public static final int PORT = 10003;
-
-    public static void main(String[] args) throws IOException {
-        // Create a FilterChain using FilterChainBuilder
-        FilterChainBuilder filterChainBuilder = FilterChainBuilder.stateless();
-
-        // Add TransportFilter, which is responsible
-        // for reading and writing data to the connection
-        filterChainBuilder.add(new TransportFilter());
-
-        // StringFilter is responsible for Buffer <-> String conversion
-       // filterChainBuilder.add(new StringFilter(Charset.forName("GBK")));
-        filterChainBuilder.add(new StringFilter(Charset.forName("GBK"), "\r\n"));
-        // EchoFilter is responsible for echoing received messages
-        filterChainBuilder.add(new GrizzlyEchoFilter());
-        
-        // Create TCP transport
-        final TCPNIOTransport transport =
-                TCPNIOTransportBuilder.newInstance().build();
-        
-        transport.setProcessor(filterChainBuilder.build());
-        
-        try {
-            // binding transport to start listen on certain host and port
-        	logger.info("binding transport to start listen on certain host and port");
-            transport.bind(ADDR,PORT);
-
-            // start the transport
-            transport.start();
-
-            //logger.info("Press any key to stop the server...");
-            System.in.read();
-       } finally {
-            //logger.info("Stopping transport...");
-            // stop the transport
-            transport.shutdownNow();
-
-            logger.info("Stopped transport...");
-        }
-    }
-}
\ No newline at end of file
diff --git a/networkProgramming/src/framework/grizzly/ThreadTest.java b/networkProgramming/src/framework/grizzly/ThreadTest.java
deleted file mode 100644
index 97accb5..0000000
--- a/networkProgramming/src/framework/grizzly/ThreadTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package framework.grizzly;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.ByteBuffer;
-
-public class ThreadTest{
-	class SendThread implements Runnable {
-		public SendThread() {
-		}
-
-		public void run() {
-			String f="00000000111111100000000";
-			long start=System.currentTimeMillis();
-			System.out.println("length:"+f.length());
-			String d=new ThreadTest().send("127.0.0.1", 10003, f, 3500);
-		    System.out.println("result:"+d);
-			long end=System.currentTimeMillis();
-			System.out.println("COST:"+(end-start));
-		}
-	}
-	 public String send(String ip, int port, String sendStr, int timeout) {
-		    String ENCODING = "GBK";
-	        if (sendStr == null || "".equals(sendStr)) {
-	            return "str is null";
-	        }
-	        Socket client = null;
-	        OutputStream stream = null;
-	        InputStream is = null;
-
-	        try {
-	            client = new Socket();
-	            InetSocketAddress address = new InetSocketAddress(ip, port);
-	            client.connect(address);
-
-	            timeout = timeout >= 0 ? timeout : 3500;
-	            client.setSoTimeout(timeout);
-	            stream = client.getOutputStream();
-	            is = client.getInputStream();
-
-	            int len = 0;
-
-	            len = sendStr.getBytes(ENCODING).length;
-	            ByteBuffer buf = ByteBuffer.allocate(len);
-	            byte[] bytes = sendStr.getBytes(ENCODING);
-	            buf.put(bytes);
-	            stream.write(buf.array(), 0, len);
-	            stream.flush();
-	            String res = "";
-	            int i = 0;
-	            byte[] b = new byte[6555];
-	            while ((i = is.read(b)) != -1) {
-	                res = new String(b, 0, i,"GBK");
-	                break;
-	            }
-	            return res;
-	        } catch (Exception e) {
-	            StringBuilder strBuilder = new StringBuilder();
-	            strBuilder.append("error send message1").append(e.getMessage()).append("&errorID=")
-	            .append(System.currentTimeMillis());
-	            return strBuilder.toString();
-	        } finally {
-	            if (client != null) {
-	                try {
-	                    client.close();
-	                } catch (IOException e) {
-	                    StringBuilder strBuilder = new StringBuilder();
-	                    strBuilder.append("error send message2").append(e.getMessage()).append("&errorID=")
-	                    .append(System.currentTimeMillis());
-	                }
-	            }
-
-	            if (stream != null) {
-	                try {
-	                    stream.close();
-	                } catch (IOException e) {
-	                    StringBuilder strBuilder = new StringBuilder();
-	                    strBuilder.append("error send message3").append(e.getMessage()).append("&errorID=")
-	                    .append(System.currentTimeMillis());
-	                }
-	            }
-	            if (is != null) {
-	                try {
-	                    is.close();
-	                } catch (IOException e) {
-	                    StringBuilder strBuilder = new StringBuilder();
-	                    strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-	                    .append(System.currentTimeMillis());
-	                }
-	            }
-	        }
-	    }
-	 public void start(){
-		 new Thread(new SendThread()).start();
-	 }
-	 public static void main(String[] args) {
-		new ThreadTest().start();
-	}
-
-}
diff --git a/networkProgramming/src/framework/mina/EchoClient.java b/networkProgramming/src/framework/mina/EchoClient.java
deleted file mode 100644
index 0a80166..0000000
--- a/networkProgramming/src/framework/mina/EchoClient.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package framework.mina;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.Socket;
-
-public class EchoClient {
-	private String 	host="localhost";
-	private int port=10003;
-	private Socket socket;
-	public EchoClient()throws IOException{
-		socket=new Socket(host,port);
-		//获取绑定后的端口号和绑定前的端口号
-		System.out.println("new Connecttion accept" +socket.getInetAddress()+":"+socket.getPort()+",localPort:"+socket.getLocalPort());
-	}
-	private PrintWriter getWriter(Socket socket) throws IOException{
-		OutputStream socketOut=socket.getOutputStream();
-		return new PrintWriter(socketOut,true);
-	}
-	private BufferedReader getReader(Socket socket)throws IOException{
-		InputStream socketIn=socket.getInputStream();
-		return new BufferedReader(new InputStreamReader(socketIn));
-	}
-	public void talk() throws IOException{
-		try{
-			BufferedReader br=getReader(socket);
-			PrintWriter pw=getWriter(socket);
-			BufferedReader reader=new BufferedReader(new InputStreamReader(System.in));
-			String msg=null;
-			while((msg=reader.readLine())!=null){
-				pw.println(msg);
-				System.out.println(br.readLine());
-				if(msg.equals("bye")){
-					break;
-				}
-			}
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-		try{
-			socket.close();
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-	}
-	public static void main(String[] args) throws IOException{
-		new EchoClient().talk();
-	}
-
-}
diff --git a/networkProgramming/src/framework/mina/MinaClient.java b/networkProgramming/src/framework/mina/MinaClient.java
deleted file mode 100644
index c787a0c..0000000
--- a/networkProgramming/src/framework/mina/MinaClient.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package framework.mina;
-
-import java.net.InetSocketAddress;
-import java.nio.charset.Charset;
-
-import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
-import org.apache.mina.core.future.CloseFuture;
-import org.apache.mina.core.future.ConnectFuture;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolCodecFilter;
-import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
-import org.apache.mina.filter.logging.LoggingFilter;
-import org.apache.mina.transport.socket.SocketConnector;
-import org.apache.mina.transport.socket.nio.NioSocketConnector;
-
-public class MinaClient {
-
-    private SocketConnector connector;
-    private ConnectFuture future;
-    private IoSession session;
-
-    public boolean connect() {
-        /*
-         * 1.创建一个socket连接,连接到服务器
-         */
-        connector = new NioSocketConnector();
-
-        /*
-         * 获取过滤器链,用于添加过滤器
-         */
-        DefaultIoFilterChainBuilder chain = connector.getFilterChain();
-
-        // b.添加日志过滤器
-        chain.addLast("logger", new LoggingFilter());
-
-        // c.添加字符的编码过滤器
-        chain.addLast("codec", new ProtocolCodecFilter(new TextLineCodecFactory(Charset.forName("GBK"))));
-
-        /*
-         * 3.设置消息处理器，用于处理接收到的消息
-         */
-        connector.setHandler(new MinaClientHandler());
-
-        /*
-         * 4.根据IP和端口号连接到服务器
-         */
-        future = connector.connect(new InetSocketAddress("127.0.0.1", 10003));
-        // 等待连接创建完成
-        future.awaitUninterruptibly();
-
-        /*
-         * 5.获取session对象,通过session可以向服务器发送消息；
-         */
-        session = future.getSession();
-        session.getConfig().setUseReadOperation(true);
-        return future.isConnected();
-    }
-
-    /**
-     * 往服务器发送消息
-     * 
-     * @param message
-     */
-    public void sendMsg2Server(String message) {
-        session.write(message);
-    }
-
-    /**
-     * 关闭与服务器的连接
-     * 
-     * @return
-     */
-    public boolean close() {
-        CloseFuture future = session.getCloseFuture();
-        future.awaitUninterruptibly(1000);
-        connector.dispose();
-        return true;
-    }
-}
diff --git a/networkProgramming/src/framework/mina/MinaClientHandler.java b/networkProgramming/src/framework/mina/MinaClientHandler.java
deleted file mode 100644
index e12796c..0000000
--- a/networkProgramming/src/framework/mina/MinaClientHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package framework.mina;
-
-import org.apache.mina.core.service.IoHandlerAdapter;
-import org.apache.mina.core.session.IoSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MinaClientHandler extends IoHandlerAdapter {
-    private static final Logger log = LoggerFactory.getLogger(MinaClientHandler.class);
-
-    @Override
-    public void exceptionCaught(IoSession session, Throwable cause)
-            throws Exception {
-        // 出现异常
-        log.error("--------exception--------");
-        super.exceptionCaught(session, cause);
-    }
-
-    @Override
-    public void messageReceived(IoSession session, Object message)
-            throws Exception {
-        // 从服务器中接收到消息后的处理
-        log.info("--------msg receive--------");
-        log.info("Message:{}" + message.toString());
-        super.messageReceived(session, message);
-    }
-
-    @Override
-    public void messageSent(IoSession session, Object message) throws Exception {
-        // 往服务器中发送消息
-        log.info("--------msg sent--------");
-        super.messageSent(session, message);
-    }
-
-    @Override
-    public void sessionCreated(IoSession session) throws Exception {
-        // 当session被创建的时候调用
-        log.info("--------session create--------");
-        super.sessionCreated(session);
-    }
-}
diff --git a/networkProgramming/src/framework/mina/MinaServer.java b/networkProgramming/src/framework/mina/MinaServer.java
deleted file mode 100644
index 2151bcf..0000000
--- a/networkProgramming/src/framework/mina/MinaServer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package framework.mina;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.charset.Charset;
-
-import org.apache.mina.core.service.IoAcceptor;
-import org.apache.mina.core.session.IdleStatus;
-import org.apache.mina.filter.codec.ProtocolCodecFilter;
-import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
-import org.apache.mina.filter.logging.LoggingFilter;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
-
-public class MinaServer {
-    // 定义监听端口
-    private static final int PORT = 10003;
-
-    public static void main(String[] args) throws IOException {
-    	IoAcceptor acceptor = new NioSocketAcceptor();
-
-    	   acceptor.getFilterChain().addLast("logger", new LoggingFilter());
-    	   /*acceptor.getFilterChain().addLast(
-    	     "codec",
-    	     new ProtocolCodecFilter(new TextLineCodecFactory(Charset
-    	       .forName("GBK"))));*/
-    	   acceptor.getFilterChain().addLast("codec",new ProtocolCodecFilter(new TextLineCodecFactory(Charset
-        	       .forName("GBK"),"\r\n","\r\n")));
-
-    	   acceptor.setHandler(new MinaServerHandler());
-    	   acceptor.getSessionConfig().setReadBufferSize(2048);
-    	   acceptor.getSessionConfig().setIdleTime(IdleStatus.BOTH_IDLE, 10);
-    	   acceptor.bind(new InetSocketAddress(PORT));
-    	}
-    	}
\ No newline at end of file
diff --git a/networkProgramming/src/framework/mina/MinaServer1.java b/networkProgramming/src/framework/mina/MinaServer1.java
deleted file mode 100644
index d23216b..0000000
--- a/networkProgramming/src/framework/mina/MinaServer1.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package framework.mina;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.charset.Charset;
-
-import org.apache.mina.core.service.IoAcceptor;
-import org.apache.mina.core.session.IdleStatus;
-import org.apache.mina.filter.codec.ProtocolCodecFilter;
-import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
-import org.apache.mina.filter.logging.LoggingFilter;
-import org.apache.mina.filter.stream.StreamWriteFilter;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
-
-public class MinaServer1 {
-	  // 定义监听端口
-    private static final int PORT = 10003;
-
-    public static void main(String[] args) throws IOException {
-    	IoAcceptor acceptor = new NioSocketAcceptor();
-
-    	   acceptor.getFilterChain().addLast("logger", new LoggingFilter());
-    	   acceptor.getFilterChain().addLast("ddd", new StreamWriteFilter()); 
-    	   //acceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(new TextLineCodecFactory(Charset.forName("GBK")))); 
-    	   acceptor.setHandler(new MinaServerHandler1());
-    	   acceptor.getSessionConfig().setReadBufferSize(2048);
-    	   acceptor.getSessionConfig().setIdleTime(IdleStatus.BOTH_IDLE, 10);
-    	   acceptor.bind(new InetSocketAddress(PORT));
-    	   System.out.println("PORT IS START......");
-    	}
-    	}
\ No newline at end of file
diff --git a/networkProgramming/src/framework/mina/MinaServerHandler.java b/networkProgramming/src/framework/mina/MinaServerHandler.java
deleted file mode 100644
index f96431c..0000000
--- a/networkProgramming/src/framework/mina/MinaServerHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package framework.mina;
-
-import java.util.Date;
-
-import org.apache.mina.core.service.IoHandlerAdapter;
-import org.apache.mina.core.session.IdleStatus;
-import org.apache.mina.core.session.IoSession;
-
-public class MinaServerHandler extends IoHandlerAdapter {
-	@Override
-	public void exceptionCaught(IoSession session, Throwable cause)
-	    throws Exception {
-	   cause.printStackTrace();
-	}
-
-	@Override
-	public void messageReceived(IoSession session, Object message)
-	    throws Exception {
-		String string=message.toString();
-        if (string.trim().equalsIgnoreCase("quit")) {
-            session.close(true);
-            return;
-        }
-        System.out.println("recevied message:"+string);
-        String reply=" hi, i am server";
-        session.write(reply);
-        System.out.println("message have been written");
-	}
-
-	@Override
-	public void sessionIdle(IoSession session, IdleStatus status)
-	    throws Exception {
-	   System.out.println("IDLE " + session.getIdleCount(status));
-	}
-	}
\ No newline at end of file
diff --git a/networkProgramming/src/framework/mina/MinaServerHandler1.java b/networkProgramming/src/framework/mina/MinaServerHandler1.java
deleted file mode 100644
index 996e927..0000000
--- a/networkProgramming/src/framework/mina/MinaServerHandler1.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package framework.mina;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.nio.ByteBuffer;
-import java.util.Date;
-
-import org.apache.mina.core.buffer.IoBuffer;
-import org.apache.mina.core.service.IoHandlerAdapter;
-import org.apache.mina.core.session.IdleStatus;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-
-public class MinaServerHandler1 extends IoHandlerAdapter {
-	@Override
-	public void exceptionCaught(IoSession session, Throwable cause)
-	    throws Exception {
-	   cause.printStackTrace();
-	}
-
-	@Override
-	public void messageReceived(IoSession session, Object message)
-	    throws Exception {
-		IoBuffer buffer=(IoBuffer)message;  
-        ByteBuffer bf= buffer.buf();  
-        byte[] tempBuffer=new byte[bf.limit()];  
-        bf.get(tempBuffer);  
-        //GBK字符转换
-        String str=new String(tempBuffer,"GBK");  
-        System.out.println("receive:"+str+"\nreceive's length:"+str.length());  
-        String reply="hi, i am server你好";
-        //session.write(reply);
-        ByteArrayOutputStream outputPacket = new ByteArrayOutputStream();
-        DataOutputStream dos = new DataOutputStream(outputPacket);
-        byte[] bytes = reply.getBytes("GBK");
-        int len= reply.getBytes("GBK").length;
-        System.out.println("reply's length:"+len);
-        dos.write(bytes,0,len);
-        //dos.writeUTF(reply);
-        dos.flush();
-        System.out.println(outputPacket.toByteArray().length);
-        IoBuffer b = IoBuffer.allocate(6000);
-        System.out.println("length:"+outputPacket.toByteArray().length);
-        System.out.println(b.limit());
-        b.put(outputPacket.toByteArray());
-        b.flip();
-        System.out.println(b.limit());
-        session.write(b); 
-	}
-	public  ByteBuffer getByteBuffer(String str) {
-
-		return ByteBuffer.wrap(str.getBytes());
-
-		}
-
-	@Override
-	public void sessionIdle(IoSession session, IdleStatus status)
-	    throws Exception {
-	   System.out.println("IDLE " + session.getIdleCount(status));
-	}
-	}
\ No newline at end of file
diff --git a/networkProgramming/src/framework/mina/MinaTest.java b/networkProgramming/src/framework/mina/MinaTest.java
deleted file mode 100644
index a1b8220..0000000
--- a/networkProgramming/src/framework/mina/MinaTest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package framework.mina;
-
-public class MinaTest {
-	public static void main(String[] args) {
-		MinaClient c=new MinaClient();
-		c.connect();
-		c.sendMsg2Server("-----00009999-----");
-	}
-
-}
diff --git a/networkProgramming/src/framework/mina/ThreadTest.java b/networkProgramming/src/framework/mina/ThreadTest.java
deleted file mode 100644
index 449a35d..0000000
--- a/networkProgramming/src/framework/mina/ThreadTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package framework.mina;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.ByteBuffer;
-
-/**
- * @author mercy
- * mina要加上换行才能收到数据\n或者\r\n
- */
-public class ThreadTest{
-	class SendThread implements Runnable {
-		public SendThread() {
-		}
-
-		public void run() {
-			String f="00000000111111100000000\n";
-			long start=System.currentTimeMillis();
-			System.out.println("length:"+f.length());
-			String d=new ThreadTest().send("127.0.0.1", 10003, f, 3500);
-		    System.out.println("result:"+d);
-			long end=System.currentTimeMillis();
-			System.out.println("COST:"+(end-start));
-		}
-	}
-	 public String send(String ip, int port, String sendStr, int timeout) {
-		    String ENCODING = "GBK";
-	        if (sendStr == null || "".equals(sendStr)) {
-	            return "str is null";
-	        }
-	        Socket client = null;
-	        OutputStream stream = null;
-	        InputStream is = null;
-
-	        try {
-	            client = new Socket();
-	            InetSocketAddress address = new InetSocketAddress(ip, port);
-	            client.connect(address);
-
-	            timeout = timeout >= 0 ? timeout : 3500;
-	            client.setSoTimeout(timeout);
-	            stream = client.getOutputStream();
-	            is = client.getInputStream();
-
-	            int len = 0;
-
-	            len = sendStr.getBytes(ENCODING).length;
-	            ByteBuffer buf = ByteBuffer.allocate(len);
-	            byte[] bytes = sendStr.getBytes(ENCODING);
-	            buf.put(bytes);
-	            stream.write(buf.array(), 0, len);
-	            stream.flush();
-	            String res = "";
-	            int i = 0;
-	            byte[] b = new byte[6555];
-	            while ((i = is.read(b)) != -1) {
-	                res = new String(b, 0, i,"GBK");
-	                break;
-	            }
-	            return res;
-	        } catch (Exception e) {
-	            StringBuilder strBuilder = new StringBuilder();
-	            strBuilder.append("error send message1").append(e.getMessage()).append("&errorID=")
-	            .append(System.currentTimeMillis());
-	            return strBuilder.toString();
-	        } finally {
-	            if (client != null) {
-	                try {
-	                    client.close();
-	                } catch (IOException e) {
-	                    StringBuilder strBuilder = new StringBuilder();
-	                    strBuilder.append("error send message2").append(e.getMessage()).append("&errorID=")
-	                    .append(System.currentTimeMillis());
-	                }
-	            }
-
-	            if (stream != null) {
-	                try {
-	                    stream.close();
-	                } catch (IOException e) {
-	                    StringBuilder strBuilder = new StringBuilder();
-	                    strBuilder.append("error send message3").append(e.getMessage()).append("&errorID=")
-	                    .append(System.currentTimeMillis());
-	                }
-	            }
-	            if (is != null) {
-	                try {
-	                    is.close();
-	                } catch (IOException e) {
-	                    StringBuilder strBuilder = new StringBuilder();
-	                    strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-	                    .append(System.currentTimeMillis());
-	                }
-	            }
-	        }
-	    }
-	 public void start(){
-		 new Thread(new SendThread()).start();
-	 }
-	 public static void main(String[] args) {
-		new ThreadTest().start();
-	}
-
-}
diff --git a/networkProgramming/src/framework/netty/EchoClient.java b/networkProgramming/src/framework/netty/EchoClient.java
deleted file mode 100644
index 46bdfae..0000000
--- a/networkProgramming/src/framework/netty/EchoClient.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package framework.netty;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.Socket;
-
-public class EchoClient {
-	private String 	host="localhost";
-	private int port=10003;
-	private Socket socket;
-	public EchoClient()throws IOException{
-		socket=new Socket(host,port);
-		//获取绑定后的端口号和绑定前的端口号
-		System.out.println("new Connecttion accept" +socket.getInetAddress()+":"+socket.getPort()+",localPort:"+socket.getLocalPort());
-	}
-	private PrintWriter getWriter(Socket socket) throws IOException{
-		OutputStream socketOut=socket.getOutputStream();
-		return new PrintWriter(socketOut,true);
-	}
-	private BufferedReader getReader(Socket socket)throws IOException{
-		InputStream socketIn=socket.getInputStream();
-		return new BufferedReader(new InputStreamReader(socketIn));
-	}
-	public void talk() throws IOException{
-		try{
-			BufferedReader br=getReader(socket);
-			PrintWriter pw=getWriter(socket);
-			BufferedReader reader=new BufferedReader(new InputStreamReader(System.in));
-			String msg=null;
-			while((msg=reader.readLine())!=null){
-				pw.println(msg);
-				System.out.println(br.readLine());
-				if(msg.equals("bye")){
-					break;
-				}
-			}
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-		try{
-			socket.close();
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-	}
-	public static void main(String[] args) throws IOException{
-		new EchoClient().talk();
-	}
-
-}
diff --git a/networkProgramming/src/framework/netty/NettyServer.java b/networkProgramming/src/framework/netty/NettyServer.java
deleted file mode 100644
index 7321f53..0000000
--- a/networkProgramming/src/framework/netty/NettyServer.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package framework.netty;
-
-import java.nio.charset.Charset;
-
-import org.apache.log4j.Logger;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import com.eshore.ismp.hbinterface.service.BizCommonService;
-
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.handler.codec.string.StringDecoder;
-import io.netty.handler.codec.string.StringEncoder;
-
-public class NettyServer {
-	 private static final Logger logger = Logger.getLogger(NettyServer.class);  
-	    private static  int PORT = 10003;  
-	    /**用于分配处理业务线程的线程组个数 */  
-	    protected static final int BIZGROUPSIZE = Runtime.getRuntime().availableProcessors()*2; //默认  
-	    /** 业务出现线程大小*/  
-	    protected static final int BIZTHREADSIZE = 4;  
-	        /* 
-	     * NioEventLoopGroup实际上就是个线程池, 
-	     * NioEventLoopGroup在后台启动了n个NioEventLoop来处理Channel事件, 
-	     * 每一个NioEventLoop负责处理m个Channel, 
-	     * NioEventLoopGroup从NioEventLoop数组里挨个取出NioEventLoop来处理Channel 
-	     */  
-	    private static final EventLoopGroup bossGroup = new NioEventLoopGroup(BIZGROUPSIZE);  
-	    private static final EventLoopGroup workerGroup = new NioEventLoopGroup(BIZTHREADSIZE);  
-	      
-	    protected static void run(final BizCommonService bizCommonService) throws Exception { 
-	    	//String PORTs=ConfigLoadUtil.getValue("toCrmServerPort");
-	    	//PORT=Integer.parseInt(PORTs);
-	    	logger.info("PORT IS:"+PORT);
-	    	//System.out.println("start main 7......PORT="+PORT);
-	        ServerBootstrap b = new ServerBootstrap();  
-	        b.group(bossGroup, workerGroup);  
-	        b.channel(NioServerSocketChannel.class);  
-	        b.childHandler(new ChannelInitializer<SocketChannel>() {  
-	            @Override  
-	            public void initChannel(SocketChannel ch) throws Exception {  
-	                ChannelPipeline pipeline = ch.pipeline();  
-	              /*  pipeline.addLast("decoder", new StringDecoder(CharsetUtil.UTF_8));  
-	                pipeline.addLast("encoder", new StringEncoder(CharsetUtil.UTF_8));  */
-	                pipeline.addLast("decoder", new StringDecoder(Charset.forName("GBK")));  
-	                pipeline.addLast("encoder", new StringEncoder(Charset.forName("GBK")));
-	                pipeline.addLast(new NettyServerHandler(bizCommonService));  
-	            }  
-	        });  
-	        b.bind(PORT).sync();  
-	        logger.info("TCP服务器已启动");  
-	    }  
-	      
-	    protected static void shutdown() {  
-	        workerGroup.shutdownGracefully();  
-	        bossGroup.shutdownGracefully();  
-	    }  
-	  
-	    public static void main(String[] args) throws Exception {  
-	    	try{
-	    		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
-	    				new String[] { "applicationContext.xml" });
-	    		BizCommonService bizCommonService = (BizCommonService) context.getBean("bizCommonService");
-	    		context.start();
-	    		NettyServer.run(bizCommonService);   
-	    	}catch(Exception e){
-	    		logger.error("start crm interface error:",e);
-	    		System.exit(-1);
-	    	}
-	    }  
-}
diff --git a/networkProgramming/src/framework/netty/NettyServerHandler.java b/networkProgramming/src/framework/netty/NettyServerHandler.java
deleted file mode 100644
index 5bfe16b..0000000
--- a/networkProgramming/src/framework/netty/NettyServerHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package framework.netty;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class NettyServerHandler extends SimpleChannelInboundHandler<Object> {
-
-    private static final Logger logger = LoggerFactory.getLogger(NettyServerHandler.class);  
-    public NettyServerHandler(){}
-    @Override  
-    protected void channelRead0(ChannelHandlerContext ctx, Object msg)  
-            throws Exception {  
-        logger.info("SERVER接收到消息msg:{}",msg);  
-        long start = System.currentTimeMillis();
-		 
-		long end = System.currentTimeMillis();
-        String res="hi,i'am server";
-        ctx.channel().writeAndFlush(res);  
-      //  ctx.close();
-    }  
-      
-    @Override  
-    public void exceptionCaught(ChannelHandlerContext ctx,  
-            Throwable cause) throws Exception {  
-        logger.warn("Unexpected exception from downstream.", cause);  
-        ctx.close();  
-    }
-
-	@Override
-	public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-		logger.info("client closed:"+ctx.channel().hashCode());
-		super.channelInactive(ctx);
-	}  
-    
-    
-}	
diff --git a/networkProgramming/src/framework/netty/ThreadTest.java b/networkProgramming/src/framework/netty/ThreadTest.java
deleted file mode 100644
index f3fe73c..0000000
--- a/networkProgramming/src/framework/netty/ThreadTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package framework.netty;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.ByteBuffer;
-
-public class ThreadTest{
-	class SendThread implements Runnable {
-		public SendThread() {
-		}
-
-		public void run() {
-			String f="002222222222222ffffffffff00000011111110000000000000000000000000000000";
-			f="1111111111111111111275111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111A1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111B1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111C11111111111111111111111111111111111111111111111111111111111111111111111111111D";
-			long start=System.currentTimeMillis();
-			System.out.println("length:"+f.length());
-			String d=new ThreadTest().send("127.0.0.1", 1111, f, 3500);
-		    System.out.println("result:"+d+"\n length:"+d.length());
-			long end=System.currentTimeMillis();
-			System.out.println("COST:"+(end-start));
-		}
-	}
-	 public String send(String ip, int port, String sendStr, int timeout) {
-		    String ENCODING = "GBK";
-	        if (sendStr == null || "".equals(sendStr)) {
-	            return "str is null";
-	        }
-	        Socket client = null;
-	        OutputStream stream = null;
-	        InputStream is = null;
-
-	        try {
-	            client = new Socket();
-	            InetSocketAddress address = new InetSocketAddress(ip, port);
-	            client.connect(address);
-
-	            timeout = timeout >= 0 ? timeout : 3500;
-	            client.setSoTimeout(timeout);
-	            stream = client.getOutputStream();
-	            is = client.getInputStream();
-
-	            int len = 0;
-
-	            len = sendStr.getBytes(ENCODING).length;
-	            ByteBuffer buf = ByteBuffer.allocate(len);
-	            byte[] bytes = sendStr.getBytes(ENCODING);
-	            buf.put(bytes);
-	            stream.write(buf.array(), 0, len);
-	            stream.flush();
-	            String res = "";
-	            int i = 0;
-	            byte[] b = new byte[6555];
-	            while ((i = is.read(b)) != -1) {
-	                res = new String(b, 0, i,"GBK");
-	                break;
-	            }
-	            return res;
-	        } catch (Exception e) {
-	            StringBuilder strBuilder = new StringBuilder();
-	            strBuilder.append("error send message1").append(e.getMessage()).append("&errorID=")
-	            .append(System.currentTimeMillis());
-	            return strBuilder.toString();
-	        } finally {
-	            if (client != null) {
-	                try {
-	                    client.close();
-	                } catch (IOException e) {
-	                    StringBuilder strBuilder = new StringBuilder();
-	                    strBuilder.append("error send message2").append(e.getMessage()).append("&errorID=")
-	                    .append(System.currentTimeMillis());
-	                }
-	            }
-
-	            if (stream != null) {
-	                try {
-	                    stream.close();
-	                } catch (IOException e) {
-	                    StringBuilder strBuilder = new StringBuilder();
-	                    strBuilder.append("error send message3").append(e.getMessage()).append("&errorID=")
-	                    .append(System.currentTimeMillis());
-	                }
-	            }
-	            if (is != null) {
-	                try {
-	                    is.close();
-	                } catch (IOException e) {
-	                    StringBuilder strBuilder = new StringBuilder();
-	                    strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-	                    .append(System.currentTimeMillis());
-	                }
-	            }
-	        }
-	    }
-	 public void start(){
-		 new Thread(new SendThread()).start();
-	 }
-	 public static void main(String[] args) {
-		new ThreadTest().start();
-	}
-
-}
diff --git a/networkProgramming/src/gfrizzly/Server.java b/networkProgramming/src/gfrizzly/Server.java
deleted file mode 100644
index d758738..0000000
--- a/networkProgramming/src/gfrizzly/Server.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package gfrizzly;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.logging.Logger;
-
-import org.glassfish.grizzly.filterchain.FilterChainBuilder;
-import org.glassfish.grizzly.filterchain.TransportFilter;
-import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
-import org.glassfish.grizzly.nio.transport.TCPNIOTransportBuilder;
-import org.glassfish.grizzly.utils.EchoFilter;
-import org.glassfish.grizzly.utils.StringFilter;
-
-public class Server {
-	private static final Logger logger = Logger.getLogger(Server.class.getName());
-
-    public static final String HOST = "localhost";
-    public static final int PORT = 7777;
-
-    public static void main(String[] args) throws IOException {
-        // Create a FilterChain using FilterChainBuilder
-        FilterChainBuilder filterChainBuilder = FilterChainBuilder.stateless();
-
-        // Add TransportFilter, which is responsible
-        // for reading and writing data to the connection
-        filterChainBuilder.add(new TransportFilter());
-
-        // StringFilter is responsible for Buffer <-> String conversion
-        filterChainBuilder.add(new StringFilter(Charset.forName("UTF-8")));
-
-        // EchoFilter is responsible for echoing received messages
-        filterChainBuilder.add(new EchoFilter());
-        
-        // Create TCP transport
-        final TCPNIOTransport transport =
-                TCPNIOTransportBuilder.newInstance().build();
-        
-        transport.setProcessor(filterChainBuilder.build());
-        
-        try {
-            // binding transport to start listen on certain host and port
-            transport.bind(HOST, PORT);
-
-            // start the transport
-            transport.start();
-
-            logger.info("Press any key to stop the server...");
-            System.in.read();
-        } finally {
-            logger.info("Stopping transport...");
-            // stop the transport
-            transport.shutdownNow();
-
-            logger.info("Stopped transport...");
-        }
-    }
-}
diff --git a/networkProgramming/src/io/SendClient.java b/networkProgramming/src/io/SendClient.java
deleted file mode 100644
index 8af3702..0000000
--- a/networkProgramming/src/io/SendClient.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package io;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.ByteBuffer;
-
-public class SendClient {
-
-    private static final String ENCODING = "GBK";
-
-    public static String send(String ip, int port, String sendStr, int timeout) {
-        long start = System.currentTimeMillis();
-        System.out.println(sendStr.length());
-        if (sendStr == null || "".equals(sendStr)) {
-            return "str is null";
-        }
-        Socket client = null;
-        OutputStream stream = null;
-        InputStream is = null;
-
-        try {
-            client = new Socket();
-            InetSocketAddress address = new InetSocketAddress(ip, port);
-            client.connect(address);
-
-            timeout = timeout >= 0 ? timeout : 3500;
-            client.setSoTimeout(timeout);
-            stream = client.getOutputStream();
-            is = client.getInputStream();
-
-            int len = 0;
-
-            len = sendStr.getBytes(ENCODING).length;
-            ByteBuffer buf = ByteBuffer.allocate(len);
-            byte[] bytes = sendStr.getBytes(ENCODING);
-            buf.put(bytes);
-            stream.write(buf.array(), 0, len);
-            stream.flush();
-            String res = "";
-            int i = 0;
-            byte[] b = new byte[6555];
-            while ((i = is.read(b)) != -1) {
-                res = new String(b, 0, i);
-                System.out.println(res);
-                break;
-            }
-            long end = System.currentTimeMillis();
-
-
-            return res;
-        } catch (Exception e) {
-            StringBuilder strBuilder = new StringBuilder();
-            strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-            .append(System.currentTimeMillis());
-            return strBuilder.toString();
-        } finally {
-            if (client != null) {
-                try {
-                    client.close();
-                } catch (IOException e) {
-                    StringBuilder strBuilder = new StringBuilder();
-                    strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-                    .append(System.currentTimeMillis());
-                }
-            }
-
-            if (stream != null) {
-                try {
-                    stream.close();
-                } catch (IOException e) {
-                    StringBuilder strBuilder = new StringBuilder();
-                    strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-                    .append(System.currentTimeMillis());
-                }
-            }
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    StringBuilder strBuilder = new StringBuilder();
-                    strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-                    .append(System.currentTimeMillis());
-                }
-            }
-        }
-    }
-    
-    public static void main(String[] args) {
-    	String msg="";
-        msg="FFFF76623634010100102700170103IBSS017555\n";
-		String x=SendClient.send("127.0.0.1", 10003, msg, 3500);
-    	System.out.println("return string:"+x);
-	}
-
-}
\ No newline at end of file
diff --git a/networkProgramming/src/nioThread/AgentServer.java b/networkProgramming/src/nioThread/AgentServer.java
deleted file mode 100644
index 4e35b5b..0000000
--- a/networkProgramming/src/nioThread/AgentServer.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package nioThread;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.charset.Charset;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import com.eshore.ismp.common.util.EcrmOrderSplitUtil;
-import com.eshore.ismp.common.util.MbossReceipt;
-import com.eshore.ismp.common.util.ReceiptResult;
-import com.eshore.ismp.hbinterface.service.BizCommonService;
-//读取线程是多线程
-public class AgentServer{
-	private static final Logger logger = LoggerFactory.getLogger(AgentServer2.class);  
-	private Selector selector=null;
-	private ServerSocketChannel serverSocketChannel=null;
-	public  SelectorLoop connectEvent;
-	public  SelectorLoop readEvent;
-	public boolean isReadBellRunning=false;
-	private int port=10001;
-	//private Charset charset=Charset.forName("GBK");//返回一个字符类型对象
-	public AgentServer() throws IOException{
-		//selector=Selector.open();//创建Selector对象
-		serverSocketChannel=ServerSocketChannel.open();
-		serverSocketChannel.socket().setReuseAddress(true);
-		serverSocketChannel.configureBlocking(false);//设置无阻塞模式
-		serverSocketChannel.socket().bind(new InetSocketAddress(port));
-		logger.info("服务已启动...");
-	}
-	public void service(BizCommonService bizCommonService) throws IOException{
-		 //连接线程
-		 connectEvent = new SelectorLoop(bizCommonService);
-		 //读取线程
-		 readEvent= new SelectorLoop(bizCommonService);
-		try {
-			//用给定的选择器注册channel，并返回一个key,只监听连接事件
-			serverSocketChannel.register(connectEvent.getSelector(), SelectionKey.OP_ACCEPT);
-		} catch (ClosedChannelException e) {
-			e.printStackTrace();
-		}
-		new Thread(connectEvent).start();
-	}
-	public class SelectorLoop implements Runnable{
-		private Selector selector;
-		private BizCommonService bizCommonService;
-		public SelectorLoop() throws IOException {
-			this.selector = Selector.open();
-		}
-		public SelectorLoop(BizCommonService bizCommonService) throws IOException {
-			this.selector = Selector.open();
-			this.bizCommonService=bizCommonService;
-		}
-		public Selector getSelector() {
-			return this.selector;
-		 }
-		public BizCommonService getBizCommonService() {
-			return this.bizCommonService;
-		 }
-		
-		@Override
-		public void run() {
-			try {
-				while(selector.select()>0){
-					Set readyKeys=selector.selectedKeys();
-					Iterator it=readyKeys.iterator();
-					while(it.hasNext()){
-						SelectionKey key=null;
-						key=(SelectionKey)it.next();
-						it.remove();//删除集合中的key
-						this.manage(key,bizCommonService);
-				  }
-				
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-
-		}
-		public void manage(SelectionKey key,BizCommonService bizCommonService){
-			try{
-				if(key.isAcceptable()){//是否可以接收客户端的socket连接
-					ServerSocketChannel ssc=(ServerSocketChannel)key.channel();
-					SocketChannel socketChannel=ssc.accept();
-					//logger.info("client from："+socketChannel.socket().getInetAddress()+":"+socketChannel.socket().getPort());
-					socketChannel.configureBlocking(false);//设置无阻塞模式
-					ByteBuffer buffer=ByteBuffer.allocate(6000);//创建一个ByteBuffer对象用于存放数据(数据存放缓冲区)
-					//监听读写事件
-					socketChannel.register(readEvent.getSelector(),SelectionKey.OP_READ|SelectionKey.OP_WRITE,buffer);//注册事件,Selector会监控事件是否发生
-					synchronized(AgentServer.this) {
-						if (!AgentServer.this.isReadBellRunning) {
-							AgentServer.this.isReadBellRunning = true;
-							new Thread(readEvent).start();
-						}
-					}
-				}
-				if(key.isReadable()){//key的channel是否可读
-					receive(key);
-				}
-				if(key.isWritable()){//key的channel是否可写
-					send(key,bizCommonService);
-				}
-			}catch(IOException e){  
-				logger.info("agent test exception....");
-				e.printStackTrace();
-				try{
-					if(key!=null){
-						key.cancel();
-						key.channel().close();
-					}
-				}catch(Exception ex){
-					ex.printStackTrace();
-				}
-			}
-		}
-	}
-	/**
-	 * @param key
-	 * @throws IOException
-	 * @author mercy
-	 * 根据读取的数据处理完返回给客户端
-	 */
-	public void send(SelectionKey key,BizCommonService bizCommonService) throws IOException{
-		ByteBuffer buffer=(ByteBuffer) key.attachment();
-		SocketChannel socketChannel=(SocketChannel) key.channel();
-		buffer.flip();
-		String data=decode(buffer);//解码客户端发过来的数据
-		if(data.length()==0){
-			return ;
-		}
-		String outputData=data;//.substring(0, data.indexOf("\n")+1);
-		logger.info("receive data:"+outputData);
-		//String reply="FFFF02141433570200012400050301IBSS01662       001023CS0214143357*0189086510002001100301420170214143500004003099005007success";
-		//ByteBuffer outputBuffer=encode("echo:"+reply);//返回给客户端的数据
-		String res =null;
-		res = createResponseStr(String.valueOf(outputData));
-		logger.info("res:{}",res);
-		ByteBuffer outputBuffer=encode(res);//返回给客户端的数据
-		while(outputBuffer.hasRemaining()){
-			//System.out.println("=="+decode(outputBuffer));
-			socketChannel.write(outputBuffer);
-		}
-		ByteBuffer temp=encode(outputData);
-		buffer.position(temp.limit());
-		buffer.compact();
-		if(outputData.length()==0){
-			key.cancel();
-			socketChannel.close();
-			logger.info("关闭与某客户端的连接");
-		}
-	}
-	public static final String MBOSS_PLAN_TYPE = "000";
-	public static final String HB_SYSTEM_ID ="03";
-	public static final String ICRM_SYSTEM_ID ="04";
-	public static final String CRM_SYSTEM_ID ="01";
-	public static final String SIZE_VALUE="5";
-	public  String createResponseStr(String msg){
-		ReceiptResult re = null;
-    	try{
-			EcrmOrderSplitUtil crmOrder= new EcrmOrderSplitUtil();
-			crmOrder.setSrcString(msg.replaceAll("\n", ""));
-			//crmOrder.splitOrderString();
-			
-			String orderType = crmOrder.getValue(MBOSS_PLAN_TYPE);
-			
-			if(orderType!=null && "30".equals(orderType)){
-				re = MbossReceipt.getReturnByteBuffer(msg,MbossReceipt.PLAN_RECEIVED,HB_SYSTEM_ID,ICRM_SYSTEM_ID,
-						 MbossReceipt.RECEIVED_OK, "success");
-			}else{
-				re = MbossReceipt.getReturnByteBuffer(msg,MbossReceipt.PLAN_RECEIVED, HB_SYSTEM_ID,CRM_SYSTEM_ID,
-						MbossReceipt.RECEIVED_OK, "success");
-			}
-    	}catch(Exception e){
-    		logger.error("解析报文出错！",e);
-    		re = MbossReceipt.getReturnByteBuffer(msg,MbossReceipt.PLAN_RECEIVED, HB_SYSTEM_ID,CRM_SYSTEM_ID,
-					"101", "fail");
-    	}
-		return re.getResult();
-	}
-	/**
-	 * @param key
-	 * @throws IOException
-	 * @author mercy
-	 * 读取客户端发来的数据
-	 */
-	public void receive(SelectionKey key) throws IOException{
-		ByteBuffer buffer=(ByteBuffer) key.attachment();
-		SocketChannel socketChannel=(SocketChannel) key.channel();
-		ByteBuffer readBuffer=ByteBuffer.allocate(6000);//创建自定义内存的buffer(存放读到的数据)
-		socketChannel.read(readBuffer);
-		readBuffer.flip();
-		buffer.limit(buffer.capacity());//设置buffer的极限为buffer的容量
-		buffer.put(readBuffer);//复制到缓存区
-	}
-	public String decode(ByteBuffer buffer){//解码
-		CharBuffer charBuffer=Charset.forName("GBK").decode(buffer);
-		return charBuffer.toString();
-		
-	}
-	public ByteBuffer encode(String str){//编码
-		return Charset.forName("GBK").encode(str);
-	}
-	public static void main(String[] args) throws IOException {
-		final Logger log = LoggerFactory.getLogger(AgentServer2.class);  
-		try{
-			ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
-					new String[] { "applicationContext.xml" });
-			context.start();
-			BizCommonService bizCommonService = (BizCommonService) context.getBean("bizCommonService");
-			new AgentServer().service(bizCommonService);  
-		}catch(Exception e){
-			log.error("start agent interface server error:",e);
-			System.exit(-1);
-		}
-	}
-}
\ No newline at end of file
diff --git a/networkProgramming/src/nioThread/AgentServer2.java b/networkProgramming/src/nioThread/AgentServer2.java
deleted file mode 100644
index d9c9e9e..0000000
--- a/networkProgramming/src/nioThread/AgentServer2.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package nioThread;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.charset.Charset;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import com.eshore.ismp.common.util.EcrmOrderSplitUtil;
-import com.eshore.ismp.common.util.MbossReceipt;
-import com.eshore.ismp.common.util.ReceiptResult;
-import com.eshore.ismp.hbinterface.service.BizCommonService;
-
-/**
- * @author mercy
- *接收ICRM工单和接收业务平台数据回单
- */
-public class AgentServer2{
-	private static final Logger logger = LoggerFactory.getLogger(AgentServer2.class);  
-	private Selector selector=null;
-	private ServerSocketChannel serverSocketChannel=null;
-	private int port=10001;
-	//private Charset charset=Charset.forName("GBK");//返回一个字符类型对象
-	public AgentServer2() throws IOException{
-		selector=Selector.open();//创建Selector对象
-		serverSocketChannel=ServerSocketChannel.open();
-		serverSocketChannel.socket().setReuseAddress(true);
-		serverSocketChannel.configureBlocking(false);//设置无阻塞模式
-		serverSocketChannel.socket().bind(new InetSocketAddress(port));
-		logger.info("服务已启动...");
-	}
-	
-	public void service(BizCommonService bizCommonService) throws IOException{
-		serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT);//用给定的选择器注册channel，并返回一个key
-		while(selector.select()>0){
-			Set readyKeys=selector.selectedKeys();
-			Iterator it=readyKeys.iterator();
-			while(it.hasNext()){
-				SelectionKey key=null;
-				try{
-					key=(SelectionKey)it.next();
-					it.remove();//删除集合中的key
-					if(key.isAcceptable()){//是否可以接收客户端的socket连接
-						ServerSocketChannel ssc=(ServerSocketChannel)key.channel();
-						SocketChannel socketChannel=ssc.accept();
-						//logger.info("client from："+socketChannel.socket().getInetAddress()+":"+socketChannel.socket().getPort());
-						socketChannel.configureBlocking(false);//设置无阻塞模式
-						ByteBuffer buffer=ByteBuffer.allocate(6000);//创建一个ByteBuffer对象用于存放数据(数据存放缓冲区)
-						socketChannel.register(selector,SelectionKey.OP_READ|SelectionKey.OP_WRITE,buffer);//注册事件,Selector会监控事件是否发生
-					}
-					if(key.isReadable()){//key的channel是否可读
-						receive(key);
-					}
-					if(key.isWritable()){//key的channel是否可写
-						send(key,bizCommonService);
-					}
-				}catch(IOException e){  
-					logger.info("agent test exception....");
-					e.printStackTrace();
-					try{
-						if(key!=null){
-							key.cancel();
-							key.channel().close();
-						}
-					}catch(Exception ex){
-						ex.printStackTrace();
-					}
-				}
-			}
-		}
-
-	}
-	/**
-	 * @param key
-	 * @throws IOException
-	 * @author mercy
-	 * 根据读取的数据处理完返回给客户端
-	 */
-	public void send(SelectionKey key,BizCommonService bizCommonService) throws IOException{
-		ByteBuffer buffer=(ByteBuffer) key.attachment();
-		SocketChannel socketChannel=(SocketChannel) key.channel();
-		buffer.flip();
-		String data=decode(buffer);//解码客户端发过来的数据
-		if(data.length()==0){
-			return ;
-		}
-		String outputData=data;//.substring(0, data.indexOf("\n")+1);
-		logger.info("receive data:"+outputData);
-		//String reply="FFFF02141433570200012400050301IBSS01662       001023CS0214143357*0189086510002001100301420170214143500004003099005007success";
-		//ByteBuffer outputBuffer=encode("echo:"+reply);//返回给客户端的数据
-		String res =null;
-		res = createResponseStr(String.valueOf(outputData));
-		logger.info("res:{}",res);
-		ByteBuffer outputBuffer=encode(res);//返回给客户端的数据
-		while(outputBuffer.hasRemaining()){
-			//System.out.println("=="+decode(outputBuffer));
-			socketChannel.write(outputBuffer);
-		}
-		ByteBuffer temp=encode(outputData);
-		buffer.position(temp.limit());
-		buffer.compact();
-		if(outputData.length()==0){
-			key.cancel();
-			socketChannel.close();
-			logger.info("关闭与某客户端的连接");
-		}
-	}
-	public static final String MBOSS_PLAN_TYPE = "000";
-	public static final String HB_SYSTEM_ID ="03";
-	public static final String ICRM_SYSTEM_ID ="04";
-	public static final String CRM_SYSTEM_ID ="01";
-	public static final String SIZE_VALUE="5";
-	public  String createResponseStr(String msg){
-		ReceiptResult re = null;
-    	try{
-			EcrmOrderSplitUtil crmOrder= new EcrmOrderSplitUtil();
-			crmOrder.setSrcString(msg.replaceAll("\n", ""));
-			//crmOrder.splitOrderString();
-			
-			String orderType = crmOrder.getValue(MBOSS_PLAN_TYPE);
-			
-			if(orderType!=null && "30".equals(orderType)){
-				re = MbossReceipt.getReturnByteBuffer(msg,MbossReceipt.PLAN_RECEIVED,HB_SYSTEM_ID,ICRM_SYSTEM_ID,
-						 MbossReceipt.RECEIVED_OK, "success");
-			}else{
-				re = MbossReceipt.getReturnByteBuffer(msg,MbossReceipt.PLAN_RECEIVED, HB_SYSTEM_ID,CRM_SYSTEM_ID,
-						MbossReceipt.RECEIVED_OK, "success");
-			}
-    	}catch(Exception e){
-    		logger.error("解析报文出错！",e);
-    		re = MbossReceipt.getReturnByteBuffer(msg,MbossReceipt.PLAN_RECEIVED, HB_SYSTEM_ID,CRM_SYSTEM_ID,
-					"101", "fail");
-    	}
-		return re.getResult();
-	}
-	/**
-	 * @param key
-	 * @throws IOException
-	 * @author mercy
-	 * 读取客户端发来的数据
-	 */
-	public void receive(SelectionKey key) throws IOException{
-		ByteBuffer buffer=(ByteBuffer) key.attachment();
-		SocketChannel socketChannel=(SocketChannel) key.channel();
-		ByteBuffer readBuffer=ByteBuffer.allocate(6000);//创建自定义内存的buffer(存放读到的数据)
-		socketChannel.read(readBuffer);
-		readBuffer.flip();
-		buffer.limit(buffer.capacity());//设置buffer的极限为buffer的容量
-		buffer.put(readBuffer);//复制到缓存区
-	}
-	public String decode(ByteBuffer buffer){//解码
-		CharBuffer charBuffer=Charset.forName("GBK").decode(buffer);
-		return charBuffer.toString();
-		
-	}
-	public ByteBuffer encode(String str){//编码
-		return Charset.forName("GBK").encode(str);
-	}
-	public static void main(String[] args) throws IOException {
-		final Logger log = LoggerFactory.getLogger(AgentServer2.class);  
-		try{
-			ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
-					new String[] { "applicationContext.xml" });
-			context.start();
-			BizCommonService bizCommonService = (BizCommonService) context.getBean("bizCommonService");
-			new AgentServer2().service(bizCommonService);  
-		}catch(Exception e){
-			log.error("start agent interface server error:",e);
-			System.exit(-1);
-		}
-	}
-}
-
diff --git a/networkProgramming/src/remoteReflect/HelloService.java b/networkProgramming/src/remoteReflect/HelloService.java
deleted file mode 100644
index 2a5564c..0000000
--- a/networkProgramming/src/remoteReflect/HelloService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package remoteReflect;
-
-import java.util.Date;
-
-public interface HelloService {
-	public String echo(String msg);
-	public Date getTime();
-
-}
diff --git a/networkProgramming/src/remoteReflect/HelloServiceImpl.java b/networkProgramming/src/remoteReflect/HelloServiceImpl.java
deleted file mode 100644
index 8d609c2..0000000
--- a/networkProgramming/src/remoteReflect/HelloServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package remoteReflect;
-
-import java.util.Date;
-
-/**
- * @author mercy
- * 
- */
-public class HelloServiceImpl implements HelloService{
-
-	@Override
-	public String echo(String msg) {
-		return "echo:"+msg;
-	}
-
-	@Override
-	public Date getTime() {
-		return new Date();
-	}
-
-}
diff --git a/networkProgramming/src/remoteReflect/SimpleServer.java b/networkProgramming/src/remoteReflect/SimpleServer.java
deleted file mode 100644
index 76b9190..0000000
--- a/networkProgramming/src/remoteReflect/SimpleServer.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package remoteReflect;
-
-public class SimpleServer {
-
-}
diff --git a/networkProgramming/src/remoteReflect/package-info.java b/networkProgramming/src/remoteReflect/package-info.java
deleted file mode 100644
index 46c9622..0000000
--- a/networkProgramming/src/remoteReflect/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * 
- */
-/**
- * @author mercy
- *远程调用中使用反射机制
- */
-package remoteReflect;
\ No newline at end of file
diff --git a/networkProgramming/src/server/SpsServer1.java b/networkProgramming/src/server/SpsServer1.java
deleted file mode 100644
index 0fb8100..0000000
--- a/networkProgramming/src/server/SpsServer1.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package server;
-
-import java.nio.channels.SocketChannel;
-import java.nio.charset.Charset;
-
-public class SpsServer1 {
-	 private static final Logger logger = Logger.getLogger(SpsServer1.class);  
-	    private static int PORT = 20002;  
-	    /**用于分配处理业务线程的线程组个数 */  
-	    protected static final int BIZGROUPSIZE = Runtime.getRuntime().availableProcessors()*2; //默认  
-	    /** 业务出现线程大小*/  
-	    protected static final int BIZTHREADSIZE = 4;  
-	        /* 
-	     * NioEventLoopGroup实际上就是个线程池, 
-	     * NioEventLoopGroup在后台启动了n个NioEventLoop来处理Channel事件, 
-	     * 每一个NioEventLoop负责处理m个Channel, 
-	     * NioEventLoopGroup从NioEventLoop数组里挨个取出NioEventLoop来处理Channel 
-	     */  
-	    private static final EventLoopGroup bossGroup = new NioEventLoopGroup(BIZGROUPSIZE);  
-	    private static final EventLoopGroup workerGroup = new NioEventLoopGroup(BIZTHREADSIZE);  
-	      
-	    protected static void run(final BizCommonService bizCommonService) throws Exception {  
-	    	//String PORTs=ConfigLoadUtil.getValue("toSpsServerPort");
-	    	//PORT=Integer.parseInt(PORTs);
-	    	//logger.info("PORT IS:"+PORT);
-	        ServerBootstrap b = new ServerBootstrap();  
-	        b.group(bossGroup, workerGroup);  
-	        b.channel(NioServerSocketChannel.class);  
-	        b.childHandler(new ChannelInitializer<SocketChannel>() {  
-	            @Override  
-	            public void initChannel(SocketChannel ch) throws Exception {  
-	                ChannelPipeline pipeline = ch.pipeline();  
-	               /* pipeline.addLast("decoder", new StringDecoder(CharsetUtil.UTF_8));  
-	                pipeline.addLast("encoder", new StringEncoder(CharsetUtil.UTF_8));  */
-	                pipeline.addLast("decoder", new StringDecoder(Charset.forName("GBK")));  
-	                pipeline.addLast("encoder", new StringEncoder(Charset.forName("GBK")));
-	                pipeline.addLast(new SpsServerHandler(bizCommonService));  
-	            }  
-	        });  
-	  
-	        b.bind(PORT).sync();  
-	        logger.info("TCP服务器已启动");  
-	    }  
-	      
-	    protected static void shutdown() {  
-	        workerGroup.shutdownGracefully();  
-	        bossGroup.shutdownGracefully();  
-	    }  
-	  
-	    public static void main(String[] args) throws Exception {  
-	    	try{
-	    		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
-	    				new String[] { "applicationContext.xml" });
-	    		context.start();
-	    		BizCommonService bizCommonService = (BizCommonService) context.getBean("bizCommonService");
-	    		SpsServer1.run(bizCommonService);  
-	    	}catch(Exception e){
-	    		logger.error("start sps interface server error:",e);
-	    		System.exit(-1);
-	    	}
-	    }  
-}
diff --git a/networkProgramming/src/server/SpsServer2.java b/networkProgramming/src/server/SpsServer2.java
deleted file mode 100644
index 55b36f0..0000000
--- a/networkProgramming/src/server/SpsServer2.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package server;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import com.eshore.ismp.hbinterface.service.BizCommonService;
- 
-//此线程类 用于处理接收到连接状态的 客户端的收发处理
-//若多个客户端连接则会创建多个实例 
-class ServerThread extends Thread {
- 
-    private Socket m_Client = null;
-    private InputStream in = null;
-    private OutputStream out = null;
-    private BizCommonService bizCommonService;
-    private String ENCODING = "GBK";
- 
-    public ServerThread(Socket _client,BizCommonService bizCommonService) throws Exception {
-        this.m_Client = _client;
-        this.in = m_Client.getInputStream(); // 获取出入流
-        this.out = m_Client.getOutputStream();// 获取输出流
-        this.bizCommonService=bizCommonService;
-    }
- 
-    public void run() {
-        byte[] recvBuf = new byte[2048];
-        byte[] sendBuf = new byte[2048];
-        int len = 0;
- 
-        while (true) {
-            // 先判断客户端连接状态
-            try {
-                m_Client.sendUrgentData(0);
-            } catch (IOException e) {
-                break;// 失去连接
-            }
- 
-            // 输入流从网络上读取数据
-            try {
-                len = in.read(recvBuf);
-                System.out.println("len:"+len);
-                if(len==-1){
-                	//没收到数据断开连接
-                	break;
-                }else{
-                	System.out.println("recv:" + new String(recvBuf, 0, len,ENCODING));
-                }
-            } catch (IOException e) {
-                break;// 接收异常
-            }
-            //收到的数据
-            String recv="";
-			try {
-				recv = new String(recvBuf, 0, len,ENCODING);
-			} catch (UnsupportedEncodingException e1) {
-				e1.printStackTrace();
-			}
-            boolean result = bizCommonService.sendOperToCacheAysn(recv);
-        	/**
-        	 * step 3 : 创建响应报文
-        	 */
-    		String res = bizCommonService.createResponseStr(recv,result);
-            sendBuf = res.getBytes();
-            try {
-                out.write(sendBuf);
-                System.out.println("send:" + res);
-            } catch (IOException e) {
-                break;// 发送异常
-            }
-        }
- 
-        System.out.println("客户端失去连接");
-        try {
-            in.close();
-            out.close();
-            m_Client.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}
- 
-// 此线程类用于接收服务端socket监听到的客户端连接 并创建线程对于此客户端的处理
-class ClientRequestProc extends Thread {
- 
-    private ServerSocket m_Server = null;
-    private BizCommonService bizCommonService;
- 
-    public ClientRequestProc(ServerSocket _server,BizCommonService bizCommonService) {
-        m_Server = _server;
-       this. bizCommonService=bizCommonService;
-    }
- 
-    public void run() {
-        while (true) {
-            try {
-                Socket client = m_Server.accept();
-                System.out.println("有客户端连接");
-                try {
-                    ServerThread proc = new ServerThread(client,bizCommonService);
-                    proc.start();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                System.out.println("启动客户端处理线程");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}
-
-public class SpsServer2 {
-	public static void main(String[] args) {
-		final Logger log = LoggerFactory.getLogger(SpsServer.class);  
-		try{
-			ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
-					new String[] { "applicationContext.xml" });
-			context.start();
-			BizCommonService bizCommonService = (BizCommonService) context.getBean("bizCommonService");
-			SpsServer2.serverStart(bizCommonService);  
-		}catch(Exception e){
-			log.error("start sps interface server error:",e);
-			System.exit(-1);
-		}
-	}
-	public static void serverStart(BizCommonService bizCommonService){
-		ServerSocket server = null;
-		int PORT=10002;
-		//int PORT=30087;//prod
-		//String PORTs=(String)CustomizedPropertyConfigurer.getContextProperty("toSpsServerPort");
-    	//PORT=Integer.parseInt(PORTs);
-	    try {
-	        server = new ServerSocket(PORT);
-	    } catch (IOException e) {
-	        e.printStackTrace();
-	    }
-	    String ip=server.getInetAddress().getHostAddress();
-	    System.out.println(ip+":"+PORT+"服务器开始监听...\n");
-	    ClientRequestProc clientRp = new ClientRequestProc(server,bizCommonService);
-	    clientRp.start();
-	    try {
-	        clientRp.join();// 等待子线程退出(阻塞函数 防止主线程先结束)
-	    } catch (InterruptedException e) {
-	        e.printStackTrace();
-	    }
-	}
-	
-}
\ No newline at end of file
diff --git a/networkProgramming/src/server/SpsServerHandler.java b/networkProgramming/src/server/SpsServerHandler.java
deleted file mode 100644
index cbe0923..0000000
--- a/networkProgramming/src/server/SpsServerHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package server;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.eshore.ismp.hbinterface.service.BizCommonService;
-
-public class SpsServerHandler extends SimpleChannelInboundHandler<Object> {
-
-    private static final Logger logger = LoggerFactory.getLogger(SpsServerHandler.class);  
-    private BizCommonService bizCommonService;
-    public SpsServerHandler(){}
-   
-    public SpsServerHandler(BizCommonService bizCommonService){
-    	this.bizCommonService=bizCommonService;
-    }
-    @Override  
-    protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {  
-        logger.info("SERVER接收到消息 msg:{}",msg);  
-        long start = System.currentTimeMillis();
-        /**
-         * step 1 : 转换接收信息为对象
-         * 改用异步，不需要转换对象
-         */
-        //EcrmOrder order=bizCommonService.convertRequest(String.valueOf(msg));
-        /**
-         * step 2 : 将请求对象发送到工单模块
-         */
-        //boolean result =bizCommonService.sendToOrderBySPS(order);
-       // boolean result = bizCommonService.sendOperToOrderAysn(String.valueOf(msg));
-        boolean result = bizCommonService.sendOperToCacheAysn(String.valueOf(msg));
-    	
-    	/**
-    	 * step 3 : 创建响应报文
-    	 */
-		String res = bizCommonService.createResponseStr(String.valueOf(msg),result);
-		long end = System.currentTimeMillis();
-        logger.debug("SpsServer request:{} res:{} time cost:{}ms",String.valueOf(msg),res,(end-start));
-        ctx.channel().writeAndFlush(res);  
-    }  
-      
-    @Override  
-    public void exceptionCaught(ChannelHandlerContext ctx,  
-            Throwable cause) throws Exception {  
-        logger.warn("Unexpected exception from downstream.", cause);  
-        ctx.close();  
-    }
-
-	@Override
-	public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-		logger.info("client closed:"+ctx.channel().hashCode());
-		super.channelInactive(ctx);
-	}  
-    
-    
-}	
diff --git a/networkProgramming/src/serverClient/EchoClient.java b/networkProgramming/src/serverClient/EchoClient.java
deleted file mode 100644
index 303dd1e..0000000
--- a/networkProgramming/src/serverClient/EchoClient.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package serverClient;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.Socket;
-
-public class EchoClient {
-	private String 	host="localhost";
-	private int port=10003;
-	private Socket socket;
-	public EchoClient()throws IOException{
-		socket=new Socket(host,port);
-		//获取绑定后的端口号和绑定前的端口号
-		System.out.println("new Connecttion accept" +socket.getInetAddress()+":"+socket.getPort()+",localPort:"+socket.getLocalPort());
-	}
-	private PrintWriter getWriter(Socket socket) throws IOException{
-		OutputStream socketOut=socket.getOutputStream();
-		return new PrintWriter(socketOut,true);
-	}
-	private BufferedReader getReader(Socket socket)throws IOException{
-		InputStream socketIn=socket.getInputStream();
-		return new BufferedReader(new InputStreamReader(socketIn));
-	}
-	public void talk() throws IOException{
-		try{
-			BufferedReader br=getReader(socket);
-			PrintWriter pw=getWriter(socket);
-			BufferedReader reader=new BufferedReader(new InputStreamReader(System.in));
-			String msg=null;
-			while((msg=reader.readLine())!=null){
-				pw.println(msg);
-				System.out.println(br.readLine());
-				if(msg.equals("bye")){
-					break;
-				}
-			}
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-		try{
-			socket.close();
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-	}
-	public static void main(String[] args) throws IOException{
-		new EchoClient().talk();
-	}
-
-}
diff --git a/networkProgramming/src/serverClient/EchoServer.java b/networkProgramming/src/serverClient/EchoServer.java
deleted file mode 100644
index 50c488e..0000000
--- a/networkProgramming/src/serverClient/EchoServer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package serverClient;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-public class EchoServer {
-	private int port=8000;
-	private ServerSocket serverSocket;
-	public EchoServer() throws IOException{
-		serverSocket=new ServerSocket(port);
-		System.out.println("服务已启动...");
-	}
-	public String echo(String msg){
-		return "echo:"+msg;
-	}
-	private PrintWriter getWriter(Socket socket) throws IOException{
-		OutputStream socketOut=socket.getOutputStream();
-		return new PrintWriter(socketOut,true);
-	}
-	private BufferedReader getReader(Socket socket)throws IOException{
-		InputStream socketIn=socket.getInputStream();
-		return new BufferedReader(new InputStreamReader(socketIn));
-	}
-	public void service(){
-		Socket socket=null;
-		try{
-			while(true){
-				socket=serverSocket.accept();
-				System.out.println("客户端已连接上....");
-				System.out.println("new Connecttion accept" +socket.getInetAddress()+":"+socket.getPort()+",localPort:"+socket.getLocalPort());
-				BufferedReader br=getReader(socket);
-				PrintWriter pw=getWriter(socket);
-				String msg=null;
-				while((msg=br.readLine())!=null){
-					System.out.println(msg);
-					pw.println(echo(msg));
-				}
-			}
-		}catch(IOException e){
-			e.printStackTrace();
-		}finally{
-			try{
-				if(socket!=null){
-					socket.close();
-				}
-			}catch(IOException e){
-				e.printStackTrace();
-			}
-		}
-	}
-	public static void main(String[] args)throws IOException{
-		new EchoServer().service();
-	}
-
-}
diff --git a/networkProgramming/src/tenReflectAPI/Customer.java b/networkProgramming/src/tenReflectAPI/Customer.java
deleted file mode 100644
index cdbbf2e..0000000
--- a/networkProgramming/src/tenReflectAPI/Customer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package tenReflectAPI;
-
-public class Customer {
-	private long id;
-	private String name;
-	private int age;
-	public Customer() {
-	}
-	
-	public Customer(long id, String name, int age) {
-		super();
-		this.id = id;
-		this.name = name;
-		this.age = age;
-	}
-	public long getId() {
-		return id;
-	}
-	public void setId(long id) {
-		this.id = id;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public int getAge() {
-		return age;
-	}
-	public void setAge(int age) {
-		this.age = age;
-	}
-	@Override
-	public String toString() {
-		return "Customer [id=" + id + ", name=" + name + ", age=" + age + "]";
-	}
-	
-
-}
diff --git a/networkProgramming/src/tenReflectAPI/ReflectTest.java b/networkProgramming/src/tenReflectAPI/ReflectTest.java
deleted file mode 100644
index 3b7fdb0..0000000
--- a/networkProgramming/src/tenReflectAPI/ReflectTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package tenReflectAPI;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-public class ReflectTest {
-	public Object copy(Object obj) throws Exception{
-		//获得对象的类型
-		Class classType=obj.getClass();
-		System.out.println("Class:"+classType.getName());
-		//通过默认的构造方法创建一个新对象
-		Object objectCopy=classType.getConstructor(new Class[]{}).newInstance(new Object[]{});
-		//获得对象的所有属性
-		Field fileds[]=classType.getDeclaredFields();
-		for(Field f:fileds){
-			String fieldName=f.getName();
-			System.out.println("fieldName==="+fieldName);
-			String firstLetter=fieldName.substring(0, 1).toUpperCase();
-			System.out.println("firstLetter:"+firstLetter);
-			//获得属性的getxxx方法名字
-			String getMethodName="get"+firstLetter+fieldName.substring(1);
-			System.out.println("getMethodName:"+getMethodName);
-			//获得属性的setxxx方法名字
-			String setMethodName="set"+firstLetter+fieldName.substring(1);
-			System.out.println("setMethodName:"+getMethodName);
-			//获得和属性对应的getxxxsetxxx方法
-			Method getMethod=classType.getMethod(getMethodName,new Class[]{});
-			System.out.println("getMethod:"+getMethod);
-			Method setMethod=classType.getMethod(setMethodName,new Class[]{f.getType()});
-			System.out.println("setMethod:"+setMethod);
-			//调用原对象的getxx方法
-			Object value=getMethod.invoke(obj, new Object[]{});
-			System.out.println("value:"+value);
-			//调用复制对象的setxx方法
-			setMethod.invoke(objectCopy,new Object[]{value});
-		}
-		return objectCopy;
-	}
-	public static void main(String[] args) throws Exception {
-		Customer c=new Customer(1, "Tom", 23);
-		Customer cp=(Customer) new ReflectTest().copy(c);
-		System.out.println("CopyInformation:"+cp.getName()+"--"+cp.getAge());
-	}
-
-}
diff --git a/networkProgramming/src/tenReflectAPI/package-info.java b/networkProgramming/src/tenReflectAPI/package-info.java
deleted file mode 100644
index 67855c9..0000000
--- a/networkProgramming/src/tenReflectAPI/package-info.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * 
- */
-/**
- * @author mercy
- *java反射的一些基础介绍
- *Class类代表一个类
- *Filed类代表类的成员变量即属性
- *Method类代表类的方法
- *Constructor类代表类的方法 	
- *Array类提供了动态创建数组以及访问数组元素的静态方法
- */
-package tenReflectAPI;
\ No newline at end of file
diff --git a/networkProgramming/src/test/GitHubTest.java b/networkProgramming/src/test/GitHubTest.java
deleted file mode 100644
index 24b44c1..0000000
--- a/networkProgramming/src/test/GitHubTest.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package test;
-
-public class GitHubTest {
-
-}
diff --git a/networkProgramming/src/test/NoBlockServer.java b/networkProgramming/src/test/NoBlockServer.java
deleted file mode 100644
index 6b143a9..0000000
--- a/networkProgramming/src/test/NoBlockServer.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package test;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.charset.Charset;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * @author mercy
- * NIO创建非阻塞式服务端
- * 一个主线程能接收客户的连接，接收客户的请求，向客户发回响应数据
- * ByteBuffer是字节缓存区,存放的是字节，要转换成字符串需要编解码
- */
-public class NoBlockServer {
-	private Selector selector=null;
-	private ServerSocketChannel serverSocketChannel=null;
-	private int port=10002;
-	//private Charset charset=Charset.forName("GBK");//返回一个字符类型对象
-	
-	public NoBlockServer() throws IOException{
-		selector=Selector.open();//创建Selector对象
-		serverSocketChannel=ServerSocketChannel.open();
-		serverSocketChannel.socket().setReuseAddress(true);
-		serverSocketChannel.configureBlocking(false);//设置无阻塞模式
-		serverSocketChannel.socket().bind(new InetSocketAddress(port));
-		System.out.println("服务已启动...");
-	}
-	
-	public void service() throws IOException{
-		serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT);//用给定的选择器注册channel(接收就绪channel)，并返回一个key
-		while(selector.select()>0){//轮循检查可用的channel个数
-			//每个request会封装一个channel，将所有的channel注册在一个Selector上，然后selector开始不断的轮询每个request的可读状态，如果可读，则直接返回可读状态的channel。
-			Set readyKeys=selector.selectedKeys();//循环遍历已经注册好的通道
-			Iterator it=readyKeys.iterator();
-			while(it.hasNext()){
-				SelectionKey key=null;
-				try{
-					key=(SelectionKey)it.next();
-					it.remove();//删除集合中的key
-					if(key.isAcceptable()){//是否可以接收客户端的socket连接
-						ServerSocketChannel ssc=(ServerSocketChannel)key.channel();//返回key注册的通道
-						SocketChannel socketChannel=ssc.accept();
-						System.out.println("接收到的客户端连接,来自："+socketChannel.socket().getInetAddress()+":"+socketChannel.socket().getPort());
-						socketChannel.configureBlocking(false);//设置无阻塞模式
-						ByteBuffer buffer=ByteBuffer.allocate(6000);//创建一个ByteBuffer对象用于存放数据(数据存放缓冲区)
-						socketChannel.register(selector,SelectionKey.OP_READ|SelectionKey.OP_WRITE,buffer);//注册事件,Selector会监控事件是否发生
-					}
-					if(key.isReadable()){//key的channel是否可读
-						receive(key);
-					}
-					if(key.isWritable()){//key的channel是否可写
-						send(key);
-					}
-				}catch(IOException e){
-					System.out.println("exception....");
-					e.printStackTrace();
-					try{
-						if(key!=null){
-							key.cancel();
-							key.channel().close();
-						}
-					}catch(Exception ex){
-						ex.printStackTrace();
-					}
-				}
-			}
-		}
-
-	}
-	/**
-	 * @param key
-	 * @throws IOException
-	 * @author mercy
-	 * 根据读取的数据处理完返回给客户端
-	 */
-	public void send(SelectionKey key) throws IOException{
-		ByteBuffer buffer=(ByteBuffer) key.attachment();//获取与当前通道一起使用的buffer
-		SocketChannel socketChannel=(SocketChannel) key.channel();//获取key创建的通道
-		buffer.flip();//把极限(limit)设为位置(position)，把位置设为0,将写模式切换到读模式
-		String data=decode(buffer);//解码客户端发过来的数据
-		if(data.length()==0){//不包含\r\n直接return
-			return ;
-		}
-		String outputData=data;//.substring(0, data.indexOf("\n")+1);
-		System.out.println("客户端发送的数据:"+outputData);
-		//String reply="FFFF02141433570200012400050301IBSS01662       001023CS0214143357*0189086510002001100301420170214143500004003099005007success";
-		ByteBuffer outputBuffer=encode("echo:"+outputData);//返回给客户端的数据
-		//ByteBuffer outputBuffer=encode("echo:"+reply);//返回给客户端的数据
-		while(outputBuffer.hasRemaining()){//buffer里面有数据
-			//System.out.println("=="+decode(outputBuffer));
-			socketChannel.write(outputBuffer);
-		}
-		ByteBuffer temp=encode(outputData);
-		buffer.position(temp.limit());//设置buffer的位置：temp的极限
-		buffer.compact();//删除已经处理的字符串(删除缓冲区内从0到当前位置position的内容)
-		//一旦读完了所有的数据，就需要清空缓冲区，让它可以再次被写入。
-		//clear()方法会清空整个缓冲区。
-		//compact()方法只会清除已经读过的数据，任何未读的数据都被移到缓冲区的起始处，新写入的数据将放到缓冲区未读数据的后面。
-		if(outputData.length()==0){
-			key.cancel();
-			socketChannel.close();
-			System.out.println("关闭与某客户端的连接");
-		}
-	}
-	/**
-	 * @param key
-	 * @throws IOException
-	 * @author mercy
-	 * 读取客户端发来的数据
-	 */
-	public void receive(SelectionKey key) throws IOException{
-		ByteBuffer buffer=(ByteBuffer) key.attachment();//获取与当前通道一起使用的buffer
-		SocketChannel socketChannel=(SocketChannel) key.channel();//获取key创建的通道
-		ByteBuffer readBuffer=ByteBuffer.allocate(6000);//创建自定义内存的buffer(存放读到的数据)
-		socketChannel.read(readBuffer);//将channel数据放入到readBuffer
-		readBuffer.flip();//limit=position,position=0 将Buffer从写模式切换到读模式。在读模式下，可以读取之前写入到buffer的所有数据，从position开始读，读到limit。
-		buffer.limit(buffer.capacity());//设置buffer的极限为buffer的容量
-		buffer.put(readBuffer);//复制到缓存区
-	}
-	public String decode(ByteBuffer buffer){//解码
-		CharBuffer charBuffer=Charset.forName("GBK").decode(buffer);
-		return charBuffer.toString();
-		
-	}
-	public ByteBuffer encode(String str){//编码
-		return Charset.forName("GBK").encode(str);
-	}
-	public static void main(String[] args) throws IOException {
-		new NoBlockServer().service();
-	}
-}
diff --git a/networkProgramming/src/test/ThreadTest.java b/networkProgramming/src/test/ThreadTest.java
deleted file mode 100644
index 51454a7..0000000
--- a/networkProgramming/src/test/ThreadTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package test;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.ByteBuffer;
-
-public class ThreadTest{
-	class SendThread implements Runnable {
-		public SendThread() {
-		}
-
-		public void run() {
-			int i=10;
-			while (i<1200000) {
-				StringBuilder b=new StringBuilder("");
-				b.append(i+"FFFF76623634010100102700170103IBSS017555      0000000218001000234022872488");
-				i++;
-				System.out.println("i:"+i);
-				b.append(i);
-			b.append("*766236340100200001178400003001785000030217860000302110000004075510100020SZ2000000054121442461020001241324186148310300593PM_DJDHHM||83456517||001#$PM_HYLX||0||001#$BA_MSMAN||海豚||001#$PM_DJQYYB||518000||001#$PM_DJQYMC||深圳市福田区人力资源服务中心||001#$PM_BHHM||83456517||001#$PM_DJQYDZ||福田区福强路深圳文化创意园世纪工艺品文化广场309栋B座1-3层||001#$PM_SFZDXY||XY02||001#$PM_DJKHXX||||001#$BA_MSDEPTNAME||12||001#$PM_DLS||DSL6||001#$PM_YWSLLB||SLLB01||001#$PM_SLDYSLSH||0||001#$PM_JFQ||01||001#$PM_DJHMGS||1||001#$PM_SRFJ||2||001#$PM_JFJG||1||001#$PM_YZ||30||001#$PM_DXFSSL||100||001#$PB_BILLINGTYPE||000000||005#$PB_USERTYPE||100002||005#$PB_USERCHAR||JFSX01||005#$BEGIN_DATE||20170607||005#$END_DATE||||005#$10400014DXMP214688722910700016号百信息服务中心10800010122810070411400006徐冬生115000088291816511600110114+企业名片行业版包月套餐,114+短信名片包月套餐_定价计划,114+企业名片行业版包月套餐赠送3个月套餐外等额话费优惠11700017755KH000293285120\r\n");
-			System.out.println("Send:"+b.toString());
-			String x=new ThreadTest().send("127.0.0.1", 10003, b.toString(), 3500);
-			System.out.println("result:"+x);
-			}
-		}
-	}
-	 public String send(String ip, int port, String sendStr, int timeout) {
-		    String ENCODING = "GBK";
-	        long start = System.currentTimeMillis();
-	        System.out.println("character's length:"+sendStr.length());
-	        if (sendStr == null || "".equals(sendStr)) {
-	            return "str is null";
-	        }
-	        Socket client = null;
-	        OutputStream stream = null;
-	        InputStream is = null;
-
-	        try {
-	            client = new Socket();
-	            InetSocketAddress address = new InetSocketAddress(ip, port);
-	            client.connect(address);
-
-	            timeout = timeout >= 0 ? timeout : 3500;
-	            client.setSoTimeout(timeout);
-	            stream = client.getOutputStream();
-	            is = client.getInputStream();
-
-	            int len = 0;
-
-	            len = sendStr.getBytes(ENCODING).length;
-	            ByteBuffer buf = ByteBuffer.allocate(len);
-	            byte[] bytes = sendStr.getBytes(ENCODING);
-	            buf.put(bytes);
-	            stream.write(buf.array(), 0, len);
-	            stream.flush();
-	            String res = "";
-	            int i = 0;
-	            byte[] b = new byte[6555];
-	            while ((i = is.read(b)) != -1) {
-	                res = new String(b, 0, i,"GBK");
-	                break;
-	            }
-	            long end = System.currentTimeMillis();
-
-	            return res;
-	        } catch (Exception e) {
-	            StringBuilder strBuilder = new StringBuilder();
-	            strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-	            .append(System.currentTimeMillis());
-	            return strBuilder.toString();
-	        } finally {
-	            if (client != null) {
-	                try {
-	                    client.close();
-	                } catch (IOException e) {
-	                    StringBuilder strBuilder = new StringBuilder();
-	                    strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-	                    .append(System.currentTimeMillis());
-	                }
-	            }
-
-	            if (stream != null) {
-	                try {
-	                    stream.close();
-	                } catch (IOException e) {
-	                    StringBuilder strBuilder = new StringBuilder();
-	                    strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-	                    .append(System.currentTimeMillis());
-	                }
-	            }
-	            if (is != null) {
-	                try {
-	                    is.close();
-	                } catch (IOException e) {
-	                    StringBuilder strBuilder = new StringBuilder();
-	                    strBuilder.append("error send message").append(e.getMessage()).append("&errorID=")
-	                    .append(System.currentTimeMillis());
-	                }
-	            }
-	        }
-	    }
-	 public void start(){
-		 new Thread(new SendThread()).start();
-	 }
-	 public static void main(String[] args) {
-		new ThreadTest().start();
-	}
-
-}
diff --git a/networkProgramming/src/threeServerSocket/EchoClient0.java b/networkProgramming/src/threeServerSocket/EchoClient0.java
deleted file mode 100644
index 63df169..0000000
--- a/networkProgramming/src/threeServerSocket/EchoClient0.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package threeServerSocket;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.Socket;
-
-public class EchoClient0 {
-	private String 	host="localhost";
-	private int port=8000;
-	private Socket socket;
-	public EchoClient0()throws IOException{
-		socket=new Socket(host,port);
-		//获取绑定后的端口号和绑定前的端口号
-		System.out.println("new Connecttion accept" +socket.getInetAddress()+":"+socket.getPort()+",localPort:"+socket.getLocalPort());
-	}
-	private PrintWriter getWriter(Socket socket) throws IOException{
-		OutputStream socketOut=socket.getOutputStream();
-		return new PrintWriter(socketOut,true);
-	}
-	private BufferedReader getReader(Socket socket)throws IOException{
-		InputStream socketIn=socket.getInputStream();
-		return new BufferedReader(new InputStreamReader(socketIn));
-	}
-	public void talk() throws IOException{
-		try{
-			BufferedReader br=getReader(socket);
-			PrintWriter pw=getWriter(socket);
-			BufferedReader reader=new BufferedReader(new InputStreamReader(System.in));
-			String msg=null;
-			while((msg=reader.readLine())!=null){
-				pw.println(msg);
-				System.out.println(br.readLine());
-				if(msg.equals("bye")){
-					break;
-				}
-			}
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-		try{
-			socket.close();
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-	}
-	public static void main(String[] args) throws IOException{
-		new EchoClient0().talk();
-	}
-
-}
diff --git a/networkProgramming/src/threeServerSocket/EchoClient1.java b/networkProgramming/src/threeServerSocket/EchoClient1.java
deleted file mode 100644
index c0aa242..0000000
--- a/networkProgramming/src/threeServerSocket/EchoClient1.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package threeServerSocket;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.Socket;
-
-public class EchoClient1 {
-	private String 	host="localhost";
-	private int port=8000;
-	private Socket socket;
-	public EchoClient1()throws IOException{
-		socket=new Socket(host,port);
-		//获取绑定后的端口号和绑定前的端口号
-		System.out.println("new Connecttion accept" +socket.getInetAddress()+":"+socket.getPort()+",localPort:"+socket.getLocalPort());
-	}
-	private PrintWriter getWriter(Socket socket) throws IOException{
-		OutputStream socketOut=socket.getOutputStream();
-		return new PrintWriter(socketOut,true);
-	}
-	private BufferedReader getReader(Socket socket)throws IOException{
-		InputStream socketIn=socket.getInputStream();
-		return new BufferedReader(new InputStreamReader(socketIn));
-	}
-	public void talk() throws IOException{
-		try{
-			BufferedReader br=getReader(socket);
-			PrintWriter pw=getWriter(socket);
-			BufferedReader reader=new BufferedReader(new InputStreamReader(System.in));
-			String msg=null;
-			while((msg=reader.readLine())!=null){
-				pw.println(msg);
-				System.out.println(br.readLine());
-				if(msg.equals("bye")){
-					break;
-				}
-			}
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-		try{
-			socket.close();
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-	}
-	public static void main(String[] args) throws IOException{
-		new EchoClient1().talk();
-	}
-
-}
diff --git a/networkProgramming/src/threeServerSocket/Handler.java b/networkProgramming/src/threeServerSocket/Handler.java
deleted file mode 100644
index db6eba8..0000000
--- a/networkProgramming/src/threeServerSocket/Handler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package threeServerSocket;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.Socket;
-
-public class Handler implements Runnable{
-	private Socket socket;
-	public Handler(Socket socket){
-		this.socket=socket;
-	}
-	public String echo(String msg){
-		return "echo:"+msg;
-	}
-	private PrintWriter getWriter(Socket socket) throws IOException{
-		OutputStream socketOut=socket.getOutputStream();
-		return new PrintWriter(socketOut,true);
-	}
-	private BufferedReader getReader(Socket socket)throws IOException{
-		InputStream socketIn=socket.getInputStream();
-		return new BufferedReader(new InputStreamReader(socketIn));
-	}
-	@Override
-	public void run() {
-		System.out.println("服务端执行线程..绑定的客户端port:"+socket.getPort());
-		try{
-			BufferedReader br=getReader(socket);
-			PrintWriter pw=getWriter(socket);
-			String msg=null;
-			while((msg=br.readLine())!=null){
-				System.out.println(msg);
-				pw.println(echo(msg));
-				if(msg.equals("bye")){
-					break;
-				}
-			}
-		}catch(IOException e){
-			e.printStackTrace();
-		}finally{
-			if(socket!=null){
-				try {
-					socket.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
-}
diff --git a/networkProgramming/src/threeServerSocket/ThreadClient.java b/networkProgramming/src/threeServerSocket/ThreadClient.java
deleted file mode 100644
index f131bf4..0000000
--- a/networkProgramming/src/threeServerSocket/ThreadClient.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package threeServerSocket;
-
-/**
- * @author mercy
- * 模拟创建多个客户端访问服务端
- */
-public class ThreadClient {
-
-}
diff --git a/networkProgramming/src/threeServerSocket/ThreadServer.java b/networkProgramming/src/threeServerSocket/ThreadServer.java
deleted file mode 100644
index 10d1dd7..0000000
--- a/networkProgramming/src/threeServerSocket/ThreadServer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package threeServerSocket;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-/**
- * @author mercy
- *多线程服务器
- */
-public class ThreadServer {
-	private int port=8000;
-	private ServerSocket serverSocket;
-	public ThreadServer() throws IOException{
-		serverSocket=new ServerSocket(port);
-		System.out.println("服务已启动...");
-	}
-	public void service(){
-		while(true){
-			Socket socket=null;
-			try{
-				socket=serverSocket.accept();
-				Thread workThread=new Thread(new Handler(socket));//创建一个工线程
-				workThread.start();//启动工作线程
-			}catch(IOException e){
-				e.printStackTrace();
-			}
-			
-		}
-	}
-	public static void main(String[] args) throws IOException {
-		new ThreadServer().service();
-	}
-}
diff --git a/networkProgramming/src/threeServerSocket/threadPool/EchoServer.java b/networkProgramming/src/threeServerSocket/threadPool/EchoServer.java
deleted file mode 100644
index cbd845c..0000000
--- a/networkProgramming/src/threeServerSocket/threadPool/EchoServer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package threeServerSocket.threadPool;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-import threeServerSocket.Handler;
-import threeServerSocket.ThreadServer;
-
-/**
- * @author mercy
- * 利用线程池处理客户端请求
- */
-public class EchoServer {
-	private int port=8000;
-	private ServerSocket serverSocket;
-	private ThreadPool threadPool;
-	private final int poolSize=5;
-	public EchoServer() throws IOException{
-		serverSocket=new ServerSocket(port);
-		threadPool=new ThreadPool(Runtime.getRuntime().availableProcessors()*poolSize);
-		System.out.println("服务已启动...");
-	}
-	public void service(){
-		while(true){
-			Socket socket=null;
-			try{
-				socket=serverSocket.accept();
-				threadPool.execute(new Handler(socket));//创建一个工线程
-			}catch(IOException e){
-				e.printStackTrace();
-			}
-			
-		}
-	}
-	public static void main(String[] args) throws IOException {
-		new ThreadServer().service();
-	}
-
-}
diff --git a/networkProgramming/src/threeServerSocket/threadPool/EchoServer1.java b/networkProgramming/src/threeServerSocket/threadPool/EchoServer1.java
deleted file mode 100644
index 19879a9..0000000
--- a/networkProgramming/src/threeServerSocket/threadPool/EchoServer1.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package threeServerSocket.threadPool;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import threeServerSocket.Handler;
-import threeServerSocket.ThreadServer;
-
-/**
- * @author mercy
- * 利用jdk自带线程池处理客户端请求
- */
-public class EchoServer1 {
-	private int port=8000;
-	private ServerSocket serverSocket;
-	private ExecutorService servicePool;//线程池
-	private final int poolSize=5;
-	public EchoServer1() throws IOException{
-		serverSocket=new ServerSocket(port);
-		//返回当前电脑系统的CPU数目,CPU越多,线程池工作的数目也越多
-		servicePool=Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()*poolSize);
-		System.out.println("服务已启动...");
-	}
-	public void service(){
-		while(true){
-			Socket socket=null;
-			try{
-				socket=serverSocket.accept();
-				servicePool.execute(new Handler(socket));//创建一个工线程
-			}catch(IOException e){
-				e.printStackTrace();
-			}
-			
-		}
-	}
-	public static void main(String[] args) throws IOException {
-		new ThreadServer().service();
-	}
-
-}
\ No newline at end of file
diff --git a/networkProgramming/src/threeServerSocket/threadPool/ThreadPool.java b/networkProgramming/src/threeServerSocket/threadPool/ThreadPool.java
deleted file mode 100644
index 432ebae..0000000
--- a/networkProgramming/src/threeServerSocket/threadPool/ThreadPool.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package threeServerSocket.threadPool;
-
-import java.util.LinkedList;
-
-/**
- * @author mercy
- * 服务端线程池
- */
-public class ThreadPool extends ThreadGroup{
-	private boolean isClosed=false;//线程池是否关闭
-	private LinkedList<Runnable> workQuene;//工作队列
-	private static int threadPoolID;//线程池ID
-	private int threadID;//工作线程ID
-
-	public ThreadPool(int poolSize) {//指定线程池工作线程的数据
-		super("ThreadPool-"+threadPoolID++);
-		setDaemon(true);//创建守护线程(守护线程用于服务用户)
-		workQuene=new LinkedList<Runnable>();//创建工作队列
-		for(int i=0;i<poolSize;i++){
-			new WorkThread().start();
-		}
-	}
-	
-	/**
-	 * @author mercy
-	 * 内部类工作线程
-	 */
-	private class WorkThread extends Thread{
-		public WorkThread(){
-			super(ThreadPool.this,"workThread-"+threadID++);
-		}
-
-		@Override
-		public void run() {
-			while(!isInterrupted()){//判断线程是否中断
-				Runnable task=null;
-				try{
-					task=getTask();//取出任务	
-				}catch(InterruptedException e){
-				}
-				//如果getTask返回null或线程执行getTask方法被中断，则结束此线程
-				if(task==null){
-					return;
-				}
-				try{
-					task.run();
-				}catch(Throwable t){
-					t.printStackTrace();
-				}
-			}
-		}
-
-	}
-	
-	/**
-	 * 
-	 * @author mercy
-	 * 关闭线程池
-	 */
-	protected synchronized void close(){
-		if(!isClosed){
-			isClosed=true;
-			workQuene.clear();//清空队列
-			interrupt();//中断线程
-		}
-	}
-	
-	/**
-	 * 
-	 * @author mercy
-	 * 确保在关闭线程池之前，等待工作线程把所有任务执行完(作用也是关闭线程池)
-	 */
-	public void join(){
-		synchronized (this) {
-			isClosed=true;
-			notifyAll();//唤醒还在getTask()方法中等待任务的工作线程
-		}
-		Thread[] threads=new Thread[activeCount()];//获取工作线程中活的线程
-		int count=enumerate(threads);
-		for(int i=0;i<count;i++){
-			try {
-				threads[i].join();//等待线程死去
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	/**
-	 * @param task
-	 * @author mercy
-	 * 往队列加任务
-	 */
-	public synchronized void execute(Runnable task){
-		if(isClosed){
-			throw new IllegalStateException();//线程池
-		}
-		if(task!=null){
-			workQuene.add(task);
-			notify();//唤醒等待任务的工作线程
-		}
-	}
-	/**
-	 * @return
-	 * @throws InterruptedException
-	 * @author mercy
-	 * 从工作队列中取出任务
-	 */
-	protected synchronized Runnable  getTask() throws InterruptedException{
-		while(workQuene.size()==0){
-			if(isClosed){
-				return null;
-			}
-			wait();
-		}
-		return workQuene.removeFirst();
-	}
-	
-
-}
diff --git a/networkProgramming/src/threeServerSocket/threadPool/ThreadPoolTest.java b/networkProgramming/src/threeServerSocket/threadPool/ThreadPoolTest.java
deleted file mode 100644
index 5e2bf51..0000000
--- a/networkProgramming/src/threeServerSocket/threadPool/ThreadPoolTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package threeServerSocket.threadPool;
-
-public class ThreadPoolTest {
-	private static Runnable createTask(final int taskID){
-		return new Runnable(){
-			@Override
-			public void run() {
-				System.out.println("Task"+taskID+"start");
-				try {
-					Thread.sleep(5000);
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-				}
-				System.out.println("Task"+taskID+"end");
-			}
-		};
-		
-	}
-	public static void main(String[] args) {
-		int tasks=50;
-		ThreadPool threadPool=new ThreadPool(30);
-		//运行任务
-		for(int i=0;i<tasks;i++){
-			threadPool.execute(createTask(i));
-		}
-		threadPool.join();//等待工作线程完成所有任务关闭线程池
-	}
-
-}
diff --git a/networkProgramming/src/twoSocketUsage/Client.java b/networkProgramming/src/twoSocketUsage/Client.java
deleted file mode 100644
index 9a571ee..0000000
--- a/networkProgramming/src/twoSocketUsage/Client.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package twoSocketUsage;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-
-/**
- * @author mercy
- *超时测试客户端
- */
-public class Client {
-	private String 	host="localhost";
-	private int port=8000;
-	private Socket socket;
-	public Client()throws IOException{
-		socket=new Socket();
-		SocketAddress remotAddr=new InetSocketAddress(host, port);
-		socket.connect(remotAddr, 1000);//设置等待时间为一秒钟
-		//获取绑定后的端口号和绑定前的端口号
-		System.out.println("new Connecttion accept" +socket.getInetAddress()+":"+socket.getPort()+",localPort:"+socket.getLocalPort());
-	}
-	public void test(){
-		System.out.println("连接服务端测试...");
-	}
-	public static void main(String[] args) throws IOException{
-		new Client().test();
-	}
-
-}
diff --git a/networkProgramming/src/twoSocketUsage/MailSender.java b/networkProgramming/src/twoSocketUsage/MailSender.java
deleted file mode 100644
index b528201..0000000
--- a/networkProgramming/src/twoSocketUsage/MailSender.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package twoSocketUsage;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.InetAddress;
-import java.net.Socket;
-
-/**
- * @author mercy
- * 用socket发邮件
- */
-public class MailSender {
-	private String smtpServer="smtp.189.cn";
-	private int port=25;
-	public static void main(String[] args) {
-		Message msg=new Message("18026276684@189.cn","18925121155@189.cn","hello","hi,i miss u");
-		new MailSender().sendMail(msg);
-		
-	}
-	private PrintWriter getWriter(Socket socket) throws IOException{
-		OutputStream socketOut=socket.getOutputStream();
-		return new PrintWriter(socketOut,true);
-	}
-	private BufferedReader getReader(Socket socket)throws IOException{
-		InputStream socketIn=socket.getInputStream();
-		return new BufferedReader(new InputStreamReader(socketIn));
-	}
-	public void sendMail(Message msg){
-		Socket socket=null;
-		try{
-			socket=new Socket(smtpServer,port);
-			BufferedReader br=getReader(socket);
-			PrintWriter pw= getWriter(socket);
-			String localhost=InetAddress.getLocalHost().getHostName();//获取主机名
-			sendAndReceive(null, br, pw);//仅仅是为了接收服务器的响应数据
-			sendAndReceive("HELLO"+localhost,br,pw);
-			sendAndReceive("MAIL FROM:<"+msg.from+">",br,pw);
-			sendAndReceive("ACPT TO:<"+msg.to+">",br,pw);
-			sendAndReceive("DATA",br,pw);
-			pw.println(msg.data);//发送邮件内容
-			System.out.println("Clent>"+msg.data);
-			sendAndReceive(".",br,pw);//邮件发送完毕
-			sendAndReceive("QUIT",br,pw);//通信结束
-		}catch (IOException e) {
-			e.printStackTrace();
-		}finally{
-			if(socket!=null){
-				try {
-					socket.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-	private void sendAndReceive(String str,BufferedReader br,PrintWriter pw)throws IOException{
-		if(str!=null){
-			System.out.println("Client>"+str);
-			pw.println(str);
-		}
-		String response;
-		if((response=br.readLine())!=null){
-			System.out.println("Server>"+response);
-		}
-	}
-	static class Message{
-		String from;
-		String to;
-		String subject;
-		String content;
-		String data;//邮件内容包括标题和正文
-		public Message(String from,String to,String subject,String content){
-			this.from=from;
-			this.to=to;
-			this.subject=subject;
-			this.content=content;
-			this.data="Subject:"+subject+"\r\nContent:"+content;
-		}
-		
-		
-	}
-
-}
diff --git a/networkProgramming/src/twoSocketUsage/PortScan.java b/networkProgramming/src/twoSocketUsage/PortScan.java
deleted file mode 100644
index 230cabe..0000000
--- a/networkProgramming/src/twoSocketUsage/PortScan.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package twoSocketUsage;
-
-import java.io.IOException;
-import java.net.Socket;
-
-/**
- * @author mercy
- *判断端口是否被服务器监听，若socket对象创建成功，表明端口已被服务端程序监听占用
- */
-public class PortScan {
-	public void scan(String host){
-		Socket socket=null;
-		for(int port=0;port<1024;port++){
-			try{
-				socket=new Socket(host,port);
-				System.out.println("There is a server on port "+port);
-			}catch(IOException e){
-				System.out.println("can't connect to port "+port);
-			}finally{
-				try{
-					if(socket!=null){
-						socket.close();
-					}
-				}catch(IOException e){
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-	public static void main(String[] args) {
-		String host="localhost";
-		if(args.length>0){    //可以在控制台自定义输入host地址
-			host=args[0];
-		}
-		new PortScan().scan(host);
-	}
-}
diff --git a/networkProgramming/src/twoSocketUsage/Server.java b/networkProgramming/src/twoSocketUsage/Server.java
deleted file mode 100644
index 15bf4dd..0000000
--- a/networkProgramming/src/twoSocketUsage/Server.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package twoSocketUsage;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-/**
- * @author mercy
- *超时测试服务端
- */
-public class Server {
-	private int port=8000;
-	private ServerSocket serverSocket;
-	public Server() throws IOException{
-		serverSocket=new ServerSocket(port);
-		System.out.println("服务已启动...");
-	}
-	public void service(){
-		Socket socket=null;
-		try {
-			socket=serverSocket.accept();
-			System.out.println("客户端已连接上....");
-			System.out.println("new Connecttion accept" +socket.getInetAddress()+":"+socket.getPort()+",localPort:"+socket.getLocalPort());
-		}catch (IOException e) {
-			e.printStackTrace();
-		}finally{
-			if(socket!=null){
-				try {
-					socket.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-	public static void main(String[] args) throws IOException{
-		new Server().service();
-	}
-
-}
diff --git a/networkProgramming/src/twoSocketUsage/SocketSetting.java b/networkProgramming/src/twoSocketUsage/SocketSetting.java
deleted file mode 100644
index 73ced81..0000000
--- a/networkProgramming/src/twoSocketUsage/SocketSetting.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package twoSocketUsage;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-
-/**
- * @author mercy
- * socket 常用的用法
- */
-public class SocketSetting {
-	Socket socket=null;
-	public void setSocket() throws IOException{
-		socket=new Socket();
-		SocketAddress remotAddr=new InetSocketAddress("localhost", 8000);
-		//计算超时时间
-		long begain =System.currentTimeMillis();
-		socket.connect(remotAddr, 60000);//设置等待时间为一分钟(等待时间过短会超时)
-		long end=System.currentTimeMillis();
-		System.out.println("连接所花时间:"+(end-begain));
-		InetAddress addr=InetAddress.getLocalHost();//获得本机IP地址
-		System.out.println(addr);
-		//设置客户端地址
-		InetAddress remotAdr=InetAddress.getByName("127.0.0.1");//服务器地址
-		InetAddress localAdr=InetAddress.getByName("192.168.22.2");
-		Socket socket1=new Socket(remotAdr,8000,localAdr,64116);//连接指定的服务器地址
-		
-	}
-	public static void main(String[] args) throws IOException {
-		new SocketSetting().setSocket();
-	}
-
-}