diff --git "a/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo1.java" "b/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo1.java"
new file mode 100644
index 0000000000000000000000000000000000000000..8b29f99b2a1420a18d629460792ba88b263832a6
--- /dev/null
+++ "b/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo1.java"
@@ -0,0 +1,74 @@
+import java.util.Scanner;
+public class Demo1 {
+	public static void main(String[]args) {
+		System.out.println("*********************************");
+		System.out.println("*****		计算器            	 ****");
+		System.out.println("*****		1、求和                 ****");
+		System.out.println("*****		2、求差                 ****");
+		System.out.println("*****		3、求积                 ****");
+		System.out.println("*****		4、求商                 ****");
+		System.out.println("*****		5、求余                 ****");
+		System.out.println("*****		Q、退出                 ****");
+		System.out.println("*****	请选择您想执行的操作    ****");
+		System.out.println("*********************************");
+		Scanner abc=new Scanner(System.in);
+		int a=abc.nextInt();
+		switch (a) {
+		case 1:
+			System.out.println("请输入第一个数的值");
+			int d1=abc.nextInt();
+			System.out.println("请输入第二个数的值");
+			int d2=abc.nextInt();
+			System.out.println("得出的值为："+ jia(d1,d2));
+			break;
+		case 2:
+			System.out.println("请输入第一个数的值");
+			 d1=abc.nextInt();
+			System.out.println("请输入第二个数的值");
+			 d2=abc.nextInt();
+			System.out.println("得出的值为："+ jian(d1,d2));
+			break;
+		case 3:
+			System.out.println("请输入第一个数的值");
+			 d1=abc.nextInt();
+			System.out.println("请输入第二个数的值");
+			 d2=abc.nextInt();
+			System.out.println("得出的值为："+ cheng(d1,d2));
+			break;
+		case 4:
+			System.out.println("请输入第一个数的值");
+			 d1=abc.nextInt();
+			System.out.println("请输入第二个数的值");
+			 d2=abc.nextInt();
+			System.out.println("得出的值为："+ chu(d1,d2));
+			break;
+		case 5:
+			System.out.println("请输入第一个数的值");
+			 d1=abc.nextInt();
+			System.out.println("请输入第二个数的值");
+			 d2=abc.nextInt();
+			System.out.println("得出的值为："+ yu(d1,d2));
+			break;
+		default:
+			break;
+		}
+	}
+	public static int jia(int d1,int d2) {
+		return d1+d2;
+	}public static int jian(int d1,int d2) {
+		return d1-d2;
+	}
+	public static int cheng(int d1,int d2) {
+		return d1*d2;
+	}
+	public static int chu(int d1,int d2) {
+		return d1/d2;
+	}
+	public static int yu(int d1,int d2) {
+		return d1%d2;
+	}
+	
+	
+
+
+}
diff --git "a/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo2.java" "b/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo2.java"
new file mode 100644
index 0000000000000000000000000000000000000000..97cdd2733fb421a0891de6417dc87b258f672b53
--- /dev/null
+++ "b/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo2.java"
@@ -0,0 +1,17 @@
+import java.util.Scanner;
+public class Demo2 {
+	public static void main(String[]args) {
+		/*
+		 * 打印三角形
+		 */
+		Scanner abc=new Scanner(System.in);
+		System.out.println("请输入高"+"\t");
+		int a=abc.nextInt();
+		for(int i=1;i<=a;i++) {
+			for(int j=1;j<=2*i-1;j++) {
+				System.out.print("*");
+			}
+			System.out.println();
+		}
+	}
+}
\ No newline at end of file
diff --git "a/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo3.java" "b/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo3.java"
new file mode 100644
index 0000000000000000000000000000000000000000..600e1279f545a4f11caa633a027069120edcd06a
--- /dev/null
+++ "b/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo3.java"
@@ -0,0 +1,17 @@
+import java.util.Scanner;
+public class Demo3 {
+	public static void main(String[]args) {
+		//打印倒三角形
+		 
+		 
+		Scanner abc=new Scanner(System.in);
+		System.out.println("请输入高"+"\t");
+		int a=abc.nextInt();
+		for(int i=1;i<=a;i++) {
+			for(int j=1;j<=2*(a-i)+1;j++) {
+				System.out.print("*");
+			}
+			System.out.println();
+		}
+	}
+}
\ No newline at end of file
diff --git "a/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo4.java" "b/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo4.java"
new file mode 100644
index 0000000000000000000000000000000000000000..6f4914e92bf44a283e572a7b237a622cb41a8b56
--- /dev/null
+++ "b/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo4.java"
@@ -0,0 +1,20 @@
+import java.util.Scanner;
+public class Demo4 {
+	public static void main(String[]args) {
+		Scanner abc=new Scanner(System.in);
+		int a =abc.nextInt();
+		int b=0;
+		int c=1;
+		int d=0;
+		for (int i=1;i<=a;i++) {
+			for(int j=1;j<=i;j++) {
+				b=j;
+			}
+			c=b*c;
+			d=d+c;
+		}
+		System.out.print(d);
+		
+}
+	
+}
\ No newline at end of file
diff --git "a/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo5.java" "b/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo5.java"
new file mode 100644
index 0000000000000000000000000000000000000000..e88b00ae67899c837644c8e2a7cd792e90aa7035
--- /dev/null
+++ "b/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/Demo5.java"
@@ -0,0 +1,57 @@
+import java.util.Scanner;
+
+public class Demo5 {
+
+	public static void main(String[] args) {
+		Scanner scanner = new Scanner(System.in);
+		System.out.println("请输入计算图形");
+		System.out.println("1.正方形");
+		System.out.println("2.长方形");
+		System.out.println("3.三角形");
+		System.out.println("4.圆形");
+		int a = scanner.nextInt();
+		
+		switch (a) {
+		case 1:
+			System.out.println("请输入正方形边长");
+			int b= scanner.nextInt();
+			System.out.println("正方形面积是"+zheng(b));
+			break;
+		case 2:
+			System.out.println("请输入长方形的长");
+			int c= scanner.nextInt();
+			System.out.println("请输入长方形的宽");
+			int d= scanner.nextInt();
+			System.out.println("长方形面积是"+chang(c,d));
+			break;
+		case 3:
+			System.out.println("请输入三角形的高");
+			int e= scanner.nextInt();
+			System.out.println("请输入三角形的底边长");
+			int f= scanner.nextInt();
+			System.out.println("三角形面积是"+san(e,f));
+			break;
+		case 4:
+			System.out.println("请输入圆形的半径");
+			double g= scanner.nextDouble();
+			System.out.println("圆形的面积是"+yuan(g));
+			break;
+			
+		default:
+			break;
+		}
+
+	}
+	public static int zheng(int b) {
+		return b*b;
+	}
+	public static int chang(int c,int d) {
+		return c*d;
+	}
+	public static int san(int e,int f) {
+		return e*f/2;
+	}
+	public static double yuan(double g) {
+		return 3.14*g*g;
+	}
+}
\ No newline at end of file
diff --git "a/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/\344\275\234\344\270\232.txt" "b/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/\344\275\234\344\270\232.txt"
new file mode 100644
index 0000000000000000000000000000000000000000..1f8cf6224e9306e7cafcae69310dd73a90a56e47
--- /dev/null
+++ "b/Java\347\254\254\344\271\235\346\254\241\344\275\234\344\270\232/\345\217\266\351\242\200/\344\275\234\344\270\232.txt"
@@ -0,0 +1,22 @@
+一、计算器
+二、用户输入高，打印如下图形
+
+*
+***
+*****
+*******
+
+三、用户输入高，打印如下图形
+
+*******
+*****
+***
+*
+
+
+四、用户输入n，求结果：
+1!+2!+3!...n!
+
+五、编写四个函数，分别计算长方形、正方形、三角形、圆形的面积，合理设置参数和返回值，main方法中根据用户的选择调用。
+
+