diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f68d109
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,29 @@
+### IntelliJ IDEA ###
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
\ No newline at end of file
diff --git a/.idea/OneTest.iml b/.idea/OneTest.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/.idea/OneTest.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 639900d..0548357 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 087c77c..8b10403 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,7 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index f99659f..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# OneTest
-
diff --git a/two/src/Main.java b/src/Main.java
similarity index 100%
rename from two/src/Main.java
rename to src/Main.java
diff --git a/one1/src/oneTest1.java b/src/shift6247.java
similarity index 98%
rename from one1/src/oneTest1.java
rename to src/shift6247.java
index 8ce29db..8d7ac17 100644
--- a/one1/src/oneTest1.java
+++ b/src/shift6247.java
@@ -5,7 +5,7 @@ import javafx.scene.control.*;
import javafx.scene.layout.GridPane;
import javafx.stage.Stage;
-public class oneTest1 extends Application {
+public class shift6247 extends Application {
@Override
public void start(Stage primaryStage) {
diff --git a/two/two.iml b/test shift.iml
similarity index 84%
rename from two/two.iml
rename to test shift.iml
index 37cc804..c90834f 100644
--- a/two/two.iml
+++ b/test shift.iml
@@ -5,7 +5,7 @@
-
+
\ No newline at end of file
diff --git a/two/src/test.java b/two/src/test.java
deleted file mode 100644
index b0bd95a..0000000
--- a/two/src/test.java
+++ /dev/null
@@ -1,86 +0,0 @@
-import javafx.application.Application;
-import javafx.geometry.Insets;
-import javafx.scene.Scene;
-import javafx.scene.control.*;
-import javafx.scene.layout.GridPane;
-import javafx.stage.Stage;
-
-public class test extends Application {
-
- @Override
- public void start(Stage primaryStage) {
- primaryStage.setTitle("进制转换器");
-
- // 创建布局
- GridPane grid = new GridPane();
- grid.setPadding(new Insets(10));
- grid.setVgap(8);
- grid.setHgap(10);
-
- // 输入框
- Label inputLabel = new Label("输入数值:");
- GridPane.setConstraints(inputLabel, 0, 0);
- TextField inputField = new TextField();
- GridPane.setConstraints(inputField, 1, 0);
-
- // 源进制选择
- Label fromBaseLabel = new Label("源进制:");
- GridPane.setConstraints(fromBaseLabel, 0, 1);
- ComboBox fromBaseCombo = new ComboBox<>();
- fromBaseCombo.getItems().addAll(2, 10, 16);
- fromBaseCombo.setValue(10); // 默认选择十进制
- GridPane.setConstraints(fromBaseCombo, 1, 1);
-
- // 目标进制选择
- Label toBaseLabel = new Label("目标进制:");
- GridPane.setConstraints(toBaseLabel, 0, 2);
- ComboBox toBaseCombo = new ComboBox<>();
- toBaseCombo.getItems().addAll(2, 10, 16);
- toBaseCombo.setValue(10); // 默认选择十进制
- GridPane.setConstraints(toBaseCombo, 1, 2);
-
- // 转换按钮
- Button convertButton = new Button("转换");
- GridPane.setConstraints(convertButton, 1, 3);
-
- // 输出框
- Label resultLabel = new Label("结果:");
- GridPane.setConstraints(resultLabel, 0, 4);
- TextField resultField = new TextField();
- resultField.setEditable(false);
- GridPane.setConstraints(resultField, 1, 4);
-
- // 处理转换逻辑
- convertButton.setOnAction(e -> {
- String input = inputField.getText();
- int fromBase = fromBaseCombo.getValue();
- int toBase = toBaseCombo.getValue();
- String result = convertBase(input, fromBase, toBase);
- resultField.setText(result);
- });
-
- // 添加所有控件到布局
- grid.getChildren().addAll(inputLabel, inputField, fromBaseLabel, fromBaseCombo,
- toBaseLabel, toBaseCombo, convertButton, resultLabel, resultField);
-
- // 创建场景并显示
- Scene scene = new Scene(grid, 400, 200);
- primaryStage.setScene(scene);
- primaryStage.show();
- }
-
- private String convertBase(String value, int fromBase, int toBase) {
- try {
- // 将输入值从源进制转换为十进制
- int decimalValue = Integer.parseInt(value, fromBase);
- // 将十进制转换为目标进制
- return Integer.toString(decimalValue, toBase).toUpperCase();
- } catch (NumberFormatException e) {
- return "输入无效";
- }
- }
-
- public static void main(String[] args) {
- launch(args);
- }
-}