diff --git a/src/NGuessNumber.java b/src/NGuessNumber.java
index eeb7678fded7fced389cda72437e01b6de202744..0d11866926193fe6d4c053aae9509ef22f73ebd8 100644
--- a/src/NGuessNumber.java
+++ b/src/NGuessNumber.java
@@ -1,69 +1,87 @@
 import java.util.ArrayList;
 import java.util.InputMismatchException;
 import java.util.Scanner;
-
+import java.util.Random;
+/**
+ * @author xiadw
+ */
 public class NGuessNumber {
+    public static Scanner scanner = new Scanner(System.in);
+    public static ArrayList<Integer> answers = new ArrayList<>();
+    public static ArrayList<Integer> guesses = new ArrayList<>();
+    private static int NUMBER_AMOUNT = 4;
+    private static Random random = new Random();
     public static void main(String[] args) {
-        Scanner scanner = new Scanner(System.in);
         System.out.println("欢迎来到新猜数字游戏！");
         while(true){
-            ArrayList<Integer> answers = new ArrayList<>();
-            while(answers.size() < 4) {
-                int answer = (int)(Math.random() * 10);
-                if(!answers.contains(answer)){
-                    answers.add(answer);
-                }
-            }
+            answers = generateAnswer();
             while(true){
-                System.out.println("请输入4个0-9之间不重复的整数:");
-                ArrayList<Integer> guesses = new ArrayList<>();
-                while(guesses.size() < 4) {
-                    int guess;
-                    try{
-                        guess = scanner.nextInt();
-                    }catch (InputMismatchException e){
-                        System.out.println("请输入数字！");
-                        scanner.next();
-                        continue;
-                    }
-                    if(guess < 0 || guess > 9){
-                        System.out.println("请输入0-9之间的整数！");
-                        continue;
-                    }
-                    if(!guesses.contains(guess)){
-                        guesses.add(guess);
-                    }else {
-                        System.out.println("数字已经存在！");
-                    }
-                }
-
-                int a = 0;
-                for(int i = 0; i < 4; i++){
-                    if(answers.get(i) == guesses.get(i)){
-                        a = a + 1;
-                    }
-                }
-
-                int b = 0;
-                for(int i = 0; i < 4; i++){
-                    if(answers.contains(guesses.get(i)) && answers.get(i) != guesses.get(i)){
-                        b = b + 1;
-                    }
-                }
-
+                System.out.println("请输⼊4个0-9之间不重复的整数:");
+                guesses.clear();
+                guesses = receiveGuesses();
+                int a = getA();
+                int b = getB();
                 System.out.println(a+"A"+b+"B");
                 if ( a == 4 && b == 0){
                     System.out.println("恭喜你！猜对啦！");
                     break;
                 }
             }
-            System.out.println("再玩儿一次吗？（y/n）");
+            System.out.println("再玩⼉⼀次吗？（y/n）");
             String again = scanner.next();
-            if(!again.equalsIgnoreCase("y")){
+            if(!"y".equalsIgnoreCase(again)){
                 break;
             }
         }
-
-
     }
-}
+    public static ArrayList<Integer> generateAnswer(){
+        while(answers.size() < NUMBER_AMOUNT) {
+            int answer = random.nextInt(10);
+            if(!answers.contains(answer)){
+                answers.add(answer);
+            }
+        }
+        return answers;
+    }
+    public static ArrayList<Integer> receiveGuesses() {
+        while(guesses.size() < NUMBER_AMOUNT) {
+            int guess;
+            try{
+                guess = scanner.nextInt();
+            }catch (InputMismatchException e){
+                System.out.println("请输⼊数字！");
+                scanner.next();
+                continue;
+            }
+            if(guess < 0 || guess > 9){
+                System.out.println("请输⼊0-9之间的整数！");
+                continue;
+            }
+            if(!guesses.contains(guess)){
+                guesses.add(guess);
+            }else {
+                System.out.println("数字已经存在！");
+            }
+        }
+        return guesses;
+    }
+    public static int getA() {
+        int a = 0;
+        for(int i = 0; i < NUMBER_AMOUNT; i++){
+            if(answers.get(i).equals(guesses.get(i))){
+                a = a + 1;
+            }
+        }
+        return a;
+    }
+    public static int getB() {
+        int b = 0;
+        for(int i = 0; i < NUMBER_AMOUNT; i++){
+            if(answers.contains(guesses.get(i)) &&
+                    !answers.get(i).equals(guesses.get(i))){
+                b = b + 1;
+            }
+        }
+        return b;
+    }
+}
\ No newline at end of file