From 40a2238f367f613464ff4fc52946fc09590cb5ab Mon Sep 17 00:00:00 2001
From: sawshaw <843506585@qq.com>
Date: Wed, 27 Jul 2016 08:52:09 +0800
Subject: [PATCH 1/6] someJavaDemo

---
 Demo/src/list/IfTest.java      | 20 ++++++++++++++++++++
 Demo/src/list/Judge.java       | 22 ++++++++++++++++++++++
 Demo/src/list/ListNull.java    | 17 +++++++++++++++++
 Demo/src/list/ListSeq.java     | 34 ++++++++++++++++++++++++++++++++++
 Demo/src/list/ListTest.java    | 23 +++++++++++++++++++++++
 Demo/src/list/MyList.java      | 22 ++++++++++++++++++++++
 Demo/src/list/SetUserList.java | 25 +++++++++++++++++++++++++
 Demo/src/list/User.java        | 27 +++++++++++++++++++++++++++
 Demo/src/time/TimeTest.java    | 18 ++++++++++++++++++
 Demo/src/time/Weekday.java     | 31 +++++++++++++++++++++++++++++++
 10 files changed, 239 insertions(+)
 create mode 100644 Demo/src/list/IfTest.java
 create mode 100644 Demo/src/list/Judge.java
 create mode 100644 Demo/src/list/ListNull.java
 create mode 100644 Demo/src/list/ListSeq.java
 create mode 100644 Demo/src/list/ListTest.java
 create mode 100644 Demo/src/list/MyList.java
 create mode 100644 Demo/src/list/SetUserList.java
 create mode 100644 Demo/src/list/User.java
 create mode 100644 Demo/src/time/TimeTest.java
 create mode 100644 Demo/src/time/Weekday.java

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/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..f1fc8c3
--- /dev/null
+++ b/Demo/src/list/ListTest.java
@@ -0,0 +1,23 @@
+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);
+		}
+		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/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..d77a79a
--- /dev/null
+++ b/Demo/src/list/User.java
@@ -0,0 +1,27 @@
+package list;
+
+public class User {
+	private int id;
+	private Integer age;
+	private String 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;
+	}
+	
+
+}
diff --git a/Demo/src/time/TimeTest.java b/Demo/src/time/TimeTest.java
new file mode 100644
index 0000000..be649d1
--- /dev/null
+++ b/Demo/src/time/TimeTest.java
@@ -0,0 +1,18 @@
+package time;
+
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class TimeTest {
+	public static void main(String[] args) {
+		Date date = new Date();//获得系统时间.
+        String nowTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);//将时间格式转换成符合Timestamp要求的格式.
+        System.out.println(nowTime+"\n");
+        Timestamp xx = Timestamp.valueOf(nowTime);
+        System.out.println(xx+"\n");
+        String xxx="xxxxx"+1;
+        System.out.println(xxx);
+	}
+
+}
diff --git a/Demo/src/time/Weekday.java b/Demo/src/time/Weekday.java
new file mode 100644
index 0000000..cdb91fa
--- /dev/null
+++ b/Demo/src/time/Weekday.java
@@ -0,0 +1,31 @@
+package time;
+
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Date;
+
+public class Weekday {
+	public static void main(String[] args) {
+		//long time=System.currentTimeMillis();
+		Date date=new Date();
+		long time=date.getTime();
+		Timestamp ts=new Timestamp(time);
+		System.out.println(ts);
+		int hour=ts.getHours();
+		System.out.println(hour);
+		System.out.println();
+		if(hour>=8&&hour<=18){
+			System.out.println("xxxx");
+		}else{
+			System.out.println("oooo");
+		}
+		Calendar cal=Calendar.getInstance();
+		cal.setTime(date);
+		if(cal.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY||cal.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY){
+			System.out.println("oooo");
+		}else{
+			System.out.println("xxxx");
+		}
+	}
+
+}

From c24a7512d61dc5d63414e42d73f3dc7a07df3847 Mon Sep 17 00:00:00 2001
From: sawshaw <843506585@qq.com>
Date: Wed, 27 Jul 2016 09:45:19 +0800
Subject: [PATCH 2/6] =?UTF-8?q?leetCode=E7=AE=97=E6=B3=95....?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Demo/src/leetcode/TwoSum.java | 97 +++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 Demo/src/leetcode/TwoSum.java

diff --git a/Demo/src/leetcode/TwoSum.java b/Demo/src/leetcode/TwoSum.java
new file mode 100644
index 0000000..144b091
--- /dev/null
+++ b/Demo/src/leetcode/TwoSum.java
@@ -0,0 +1,97 @@
+package leetcode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @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,3,4,5,6,7,9};
+		int target=12;
+		int[] arr=twoSum2(nums,target);
+		System.out.println(arr[0]+"--"+arr[1]);
+		List<Integer> list=twoSum3(nums,target);
+		for(Integer i:list){
+			System.out.println(i);
+		}
+		
+	}
+	public static int[] twoSum(int[] nums, int target) {
+        return new int[] {1,1};
+    }
+	/**
+	 * @param nums
+	 * @param target
+	 * @return
+	 * 用Map方法
+	 * @author mercy
+	 */
+	public static int[] twoSum1(int[] nums, int target) {
+        return new int[] {1,1};
+    }
+	
+	/**
+	 * @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");
+    }
+	
+	/**
+	 * @param nums
+	 * @param target
+	 * @return
+	 * 输出多个List
+	 * @author mercy
+	 */
+	public static List<Integer> twoSum3(int[] nums, int target) {
+		List<Integer> list=new ArrayList<Integer>();
+		for(int i=0;i<nums.length;i++){
+			for(int j=i+1;j<nums.length;j++){
+				if(nums[j]==target-nums[i]){
+					list.add(i);
+					list.add(j);
+				}
+			}
+		}
+		return list;
+    }
+	
+	/**
+	 * @param nums
+	 * @param target
+	 * @return
+	 * 输出多个Map
+	 * @author mercy
+	 */
+	public static List<Integer> twoSum4(int[] nums, int target) {
+		List<Integer> list=new ArrayList<Integer>();
+		for(int i=0;i<nums.length;i++){
+			for(int j=i+1;j<nums.length;j++){
+				if(nums[j]==target-nums[i]){
+					list.add(i);
+					list.add(j);
+				}
+			}
+		}
+		return list;
+    }
+
+}

From 391f11f95b30a11163af4177640d2f3aca5f89b9 Mon Sep 17 00:00:00 2001
From: sawshaw <843506585@qq.com>
Date: Wed, 27 Jul 2016 15:28:00 +0800
Subject: [PATCH 3/6] =?UTF-8?q?leetCode=E7=AE=97=E6=B3=95...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 leetCode/src/math/TwoSum.java | 97 +++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 leetCode/src/math/TwoSum.java

diff --git a/leetCode/src/math/TwoSum.java b/leetCode/src/math/TwoSum.java
new file mode 100644
index 0000000..3b8f78a
--- /dev/null
+++ b/leetCode/src/math/TwoSum.java
@@ -0,0 +1,97 @@
+package math;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @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,3,4,5,6,7,9};
+		int target=12;
+		int[] arr=twoSum2(nums,target);
+		System.out.println(arr[0]+"--"+arr[1]);
+		List<Integer> list=twoSum3(nums,target);
+		for(Integer i:list){
+			System.out.println(i);
+		}
+		
+	}
+	public static int[] twoSum(int[] nums, int target) {
+        return new int[] {1,1};
+    }
+	/**
+	 * @param nums
+	 * @param target
+	 * @return
+	 * 用Map方法
+	 * @author mercy
+	 */
+	public static int[] twoSum1(int[] nums, int target) {
+        return new int[] {1,1};
+    }
+	
+	/**
+	 * @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");
+    }
+	
+	/**
+	 * @param nums
+	 * @param target
+	 * @return
+	 * 输出多个List
+	 * @author mercy
+	 */
+	public static List<Integer> twoSum3(int[] nums, int target) {
+		List<Integer> list=new ArrayList<Integer>();
+		for(int i=0;i<nums.length;i++){
+			for(int j=i+1;j<nums.length;j++){
+				if(nums[j]==target-nums[i]){
+					list.add(i);
+					list.add(j);
+				}
+			}
+		}
+		return list;
+    }
+	
+	/**
+	 * @param nums
+	 * @param target
+	 * @return
+	 * 输出多个Map
+	 * @author mercy
+	 */
+	public static List<Integer> twoSum4(int[] nums, int target) {
+		List<Integer> list=new ArrayList<Integer>();
+		for(int i=0;i<nums.length;i++){
+			for(int j=i+1;j<nums.length;j++){
+				if(nums[j]==target-nums[i]){
+					list.add(i);
+					list.add(j);
+				}
+			}
+		}
+		return list;
+    }
+
+}

From afd3641ad9bca89f2dd3dffabd6b904190d7456f Mon Sep 17 00:00:00 2001
From: sawshaw <843506585@qq.com>
Date: Wed, 4 Jan 2017 18:18:46 +0800
Subject: [PATCH 4/6] dddd

---
 Demo/.classpath                       | 28 ++++++++
 Demo/src/Number1.java                 | 12 ++++
 Demo/src/config.properties            |  3 +
 Demo/src/exception/Exceptions.java    | 26 +++++++
 Demo/src/exe/UpCase.java              | 21 ++++++
 Demo/src/exe/Yang.java                | 28 ++++++++
 Demo/src/file/Args.java               | 10 +++
 Demo/src/file/GetProperties.java      | 22 ++++++
 Demo/src/json/ObjectToJsonObject.java | 15 +++++
 Demo/src/leetcode/TwoSum.java         | 75 +++++++--------------
 Demo/src/list/ArrayString.java        | 16 +++++
 Demo/src/list/Contructor.java         | 13 ++++
 Demo/src/list/List1.java              | 23 +++++++
 Demo/src/list/List2.java              | 39 +++++++++++
 Demo/src/list/ListList.java           | 18 +++++
 Demo/src/list/ListTest.java           |  1 +
 Demo/src/list/PersonTest.java         | 14 ++++
 Demo/src/list/User.java               | 21 +++++-
 Demo/src/string/ContainString.java    | 14 ++++
 Demo/src/string/Dot.java              |  9 +++
 Demo/src/time/TimeTest.java           | 18 -----
 Demo/src/time/Weekday.java            | 31 ---------
 leetCode/src/math/TwoSum.java         | 97 ---------------------------
 23 files changed, 354 insertions(+), 200 deletions(-)
 create mode 100644 Demo/.classpath
 create mode 100644 Demo/src/Number1.java
 create mode 100644 Demo/src/config.properties
 create mode 100644 Demo/src/exception/Exceptions.java
 create mode 100644 Demo/src/exe/UpCase.java
 create mode 100644 Demo/src/exe/Yang.java
 create mode 100644 Demo/src/file/Args.java
 create mode 100644 Demo/src/file/GetProperties.java
 create mode 100644 Demo/src/json/ObjectToJsonObject.java
 create mode 100644 Demo/src/list/ArrayString.java
 create mode 100644 Demo/src/list/Contructor.java
 create mode 100644 Demo/src/list/List1.java
 create mode 100644 Demo/src/list/List2.java
 create mode 100644 Demo/src/list/ListList.java
 create mode 100644 Demo/src/list/PersonTest.java
 create mode 100644 Demo/src/string/ContainString.java
 create mode 100644 Demo/src/string/Dot.java
 delete mode 100644 Demo/src/time/TimeTest.java
 delete mode 100644 Demo/src/time/Weekday.java
 delete mode 100644 leetCode/src/math/TwoSum.java

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
index 144b091..2de7ba1 100644
--- a/Demo/src/leetcode/TwoSum.java
+++ b/Demo/src/leetcode/TwoSum.java
@@ -1,7 +1,7 @@
 package leetcode;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author mercy
@@ -12,86 +12,59 @@
  */
 public class TwoSum {
 	public static void main(String[] args) {
-		int[] nums={2,3,4,5,6,7,9};
+		int[] nums={2,0,4,9,5,7,10,9};
 		int target=12;
-		int[] arr=twoSum2(nums,target);
+		int[] arr=twoSum1(nums,target);
 		System.out.println(arr[0]+"--"+arr[1]);
-		List<Integer> list=twoSum3(nums,target);
-		for(Integer i:list){
-			System.out.println(i);
-		}
-		
 	}
 	public static int[] twoSum(int[] nums, int target) {
-        return new int[] {1,1};
-    }
-	/**
-	 * @param nums
-	 * @param target
-	 * @return
-	 * 用Map方法
-	 * @author mercy
-	 */
-	public static int[] twoSum1(int[] nums, int target) {
-        return new int[] {1,1};
-    }
-	
-	/**
-	 * @param nums
-	 * @param target
-	 * @return
-	 * 传统的方法
-	 * @author mercy
-	 */
-	public static int[] twoSum2(int[] nums, int target) {
+		Map<Integer,Integer> map=new HashMap<>();
 		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};
-				}
+			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
-	 * 输出多个List
+	 * 用Map方法
 	 * @author mercy
 	 */
-	public static List<Integer> twoSum3(int[] nums, int target) {
-		List<Integer> list=new ArrayList<Integer>();
+	public static int[] twoSum1(int[] nums, int target) {
+		Map<Integer,Integer> map=new HashMap<>();
 		for(int i=0;i<nums.length;i++){
-			for(int j=i+1;j<nums.length;j++){
-				if(nums[j]==target-nums[i]){
-					list.add(i);
-					list.add(j);
-				}
+			int other=target-nums[i];
+			if(map.containsKey(other)){
+				return new int[]{map.get(other),i};
 			}
-		}
-		return list;
+			map.put(nums[i], i);
+		}	
+		throw new IllegalArgumentException("No two sum solution");
     }
 	
 	/**
 	 * @param nums
 	 * @param target
 	 * @return
-	 * 输出多个Map
+	 * 传统的方法
 	 * @author mercy
 	 */
-	public static List<Integer> twoSum4(int[] nums, int target) {
-		List<Integer> list=new ArrayList<Integer>();
+	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]){
-					list.add(i);
-					list.add(j);
+					return new int[] {i,j};
 				}
 			}
 		}
-		return list;
+		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/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/ListTest.java b/Demo/src/list/ListTest.java
index f1fc8c3..50ac07b 100644
--- a/Demo/src/list/ListTest.java
+++ b/Demo/src/list/ListTest.java
@@ -14,6 +14,7 @@ public static void main(String[] args) {
 			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/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/User.java b/Demo/src/list/User.java
index d77a79a..acbae38 100644
--- a/Demo/src/list/User.java
+++ b/Demo/src/list/User.java
@@ -2,8 +2,19 @@
 
 public class User {
 	private int id;
-	private Integer age;
+	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;
 	}
@@ -22,6 +33,10 @@ public String getName() {
 	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/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/Demo/src/time/TimeTest.java b/Demo/src/time/TimeTest.java
deleted file mode 100644
index be649d1..0000000
--- a/Demo/src/time/TimeTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package time;
-
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class TimeTest {
-	public static void main(String[] args) {
-		Date date = new Date();//获得系统时间.
-        String nowTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);//将时间格式转换成符合Timestamp要求的格式.
-        System.out.println(nowTime+"\n");
-        Timestamp xx = Timestamp.valueOf(nowTime);
-        System.out.println(xx+"\n");
-        String xxx="xxxxx"+1;
-        System.out.println(xxx);
-	}
-
-}
diff --git a/Demo/src/time/Weekday.java b/Demo/src/time/Weekday.java
deleted file mode 100644
index cdb91fa..0000000
--- a/Demo/src/time/Weekday.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package time;
-
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.Date;
-
-public class Weekday {
-	public static void main(String[] args) {
-		//long time=System.currentTimeMillis();
-		Date date=new Date();
-		long time=date.getTime();
-		Timestamp ts=new Timestamp(time);
-		System.out.println(ts);
-		int hour=ts.getHours();
-		System.out.println(hour);
-		System.out.println();
-		if(hour>=8&&hour<=18){
-			System.out.println("xxxx");
-		}else{
-			System.out.println("oooo");
-		}
-		Calendar cal=Calendar.getInstance();
-		cal.setTime(date);
-		if(cal.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY||cal.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY){
-			System.out.println("oooo");
-		}else{
-			System.out.println("xxxx");
-		}
-	}
-
-}
diff --git a/leetCode/src/math/TwoSum.java b/leetCode/src/math/TwoSum.java
deleted file mode 100644
index 3b8f78a..0000000
--- a/leetCode/src/math/TwoSum.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package math;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @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,3,4,5,6,7,9};
-		int target=12;
-		int[] arr=twoSum2(nums,target);
-		System.out.println(arr[0]+"--"+arr[1]);
-		List<Integer> list=twoSum3(nums,target);
-		for(Integer i:list){
-			System.out.println(i);
-		}
-		
-	}
-	public static int[] twoSum(int[] nums, int target) {
-        return new int[] {1,1};
-    }
-	/**
-	 * @param nums
-	 * @param target
-	 * @return
-	 * 用Map方法
-	 * @author mercy
-	 */
-	public static int[] twoSum1(int[] nums, int target) {
-        return new int[] {1,1};
-    }
-	
-	/**
-	 * @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");
-    }
-	
-	/**
-	 * @param nums
-	 * @param target
-	 * @return
-	 * 输出多个List
-	 * @author mercy
-	 */
-	public static List<Integer> twoSum3(int[] nums, int target) {
-		List<Integer> list=new ArrayList<Integer>();
-		for(int i=0;i<nums.length;i++){
-			for(int j=i+1;j<nums.length;j++){
-				if(nums[j]==target-nums[i]){
-					list.add(i);
-					list.add(j);
-				}
-			}
-		}
-		return list;
-    }
-	
-	/**
-	 * @param nums
-	 * @param target
-	 * @return
-	 * 输出多个Map
-	 * @author mercy
-	 */
-	public static List<Integer> twoSum4(int[] nums, int target) {
-		List<Integer> list=new ArrayList<Integer>();
-		for(int i=0;i<nums.length;i++){
-			for(int j=i+1;j<nums.length;j++){
-				if(nums[j]==target-nums[i]){
-					list.add(i);
-					list.add(j);
-				}
-			}
-		}
-		return list;
-    }
-
-}

From 3d2e4ca1bcd5e2fc57ee6cd5224180475e9d8b4f Mon Sep 17 00:00:00 2001
From: sawshaw <843506585@qq.com>
Date: Wed, 4 Jan 2017 18:23:54 +0800
Subject: [PATCH 5/6] dddd

---
 Demo/src/object/Student.java | 18 ++++++++++++++++
 Demo/src/object/Test.java    | 15 +++++++++++++
 Demo/src/object/User.java    | 41 ++++++++++++++++++++++++++++++++++++
 Demo/src/order/Test1.java    | 19 +++++++++++++++++
 4 files changed, 93 insertions(+)
 create mode 100644 Demo/src/object/Student.java
 create mode 100644 Demo/src/object/Test.java
 create mode 100644 Demo/src/object/User.java
 create mode 100644 Demo/src/order/Test1.java

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"));
+		}
+		
+	}
+	
+
+}

From 675540edeffe14c56ab32a1fc6f12d2ccb59501e Mon Sep 17 00:00:00 2001
From: sawshaw <843506585@qq.com>
Date: Wed, 4 Jan 2017 18:39:52 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2=E5=B9=B6=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 NetWork/.classpath                           |  6 ++++
 NetWork/.gitignore                           |  1 +
 NetWork/.project                             | 17 ++++++++++++
 NetWork/.settings/org.eclipse.jdt.core.prefs | 11 ++++++++
 NetWork/src/demo1/EchoPlayer.java            | 29 ++++++++++++++++++++
 5 files changed, 64 insertions(+)
 create mode 100644 NetWork/.classpath
 create mode 100644 NetWork/.gitignore
 create mode 100644 NetWork/.project
 create mode 100644 NetWork/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 NetWork/src/demo1/EchoPlayer.java

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/NetWork/.project b/NetWork/.project
new file mode 100644
index 0000000..ec02c8b
--- /dev/null
+++ b/NetWork/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>NetWork</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/NetWork/.settings/org.eclipse.jdt.core.prefs b/NetWork/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..bb35fa0
--- /dev/null
+++ b/NetWork/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+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.8
diff --git a/NetWork/src/demo1/EchoPlayer.java b/NetWork/src/demo1/EchoPlayer.java
new file mode 100644
index 0000000..d8da1a5
--- /dev/null
+++ b/NetWork/src/demo1/EchoPlayer.java
@@ -0,0 +1,29 @@
+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;
+	}
+	public void talk() throws IOException{
+		BufferedReader br=new BufferedReader(new InputStreamReader(System.in));
+		String msg=null;
+		while((msg=br.readLine())!=null){
+			System.out.println(echo(msg));
+			if(msg.equals("bye")){
+				break;
+			}
+		}
+	}
+	public static void main(String[] args) throws IOException {
+		new EchoPlayer().talk();
+	}
+
+}