diff --git a/rearServer/src/main/java/com/yyandywt99/pandoraNext/util/JwtUtils.java b/rearServer/src/main/java/com/yyandywt99/pandoraNext/util/JwtUtils.java
index 2d12454..53e33a9 100644
--- a/rearServer/src/main/java/com/yyandywt99/pandoraNext/util/JwtUtils.java
+++ b/rearServer/src/main/java/com/yyandywt99/pandoraNext/util/JwtUtils.java
@@ -36,14 +36,6 @@ public static String getSignKey(){
}
/**
-=======
-public class JwtUtils {
-
- private static String signKey = "fakeApiTool";
- private static Long expire = 43200000L;
-
- /**
->>>>>>> bcd58edf7697081bd86d12c983b1afcac8db4495
* 生成JWT令牌
* @param claims JWT第二部分负载 payload 中存储的内容
* @return
diff --git a/rearServer/src/main/resources/static/index.html b/rearServer/src/main/resources/static/index.html
index 84fa47b..7293615 100644
--- a/rearServer/src/main/resources/static/index.html
+++ b/rearServer/src/main/resources/static/index.html
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Welcome to PandoraNext-TokensTool
-=======
-Welcome to PandoraNext-TokensTool
->>>>>>> bcd58edf7697081bd86d12c983b1afcac8db4495
+Welcome to PandoraNext-TokensTool
\ No newline at end of file
diff --git a/rearServer/target/classes/static/index.html b/rearServer/target/classes/static/index.html
index 84fa47b..7293615 100644
--- a/rearServer/target/classes/static/index.html
+++ b/rearServer/target/classes/static/index.html
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Welcome to PandoraNext-TokensTool
-=======
-Welcome to PandoraNext-TokensTool
->>>>>>> bcd58edf7697081bd86d12c983b1afcac8db4495
+Welcome to PandoraNext-TokensTool
\ No newline at end of file
diff --git a/rearServer/target/pandoraNext-0.0.1-SNAPSHOT.jar.original b/rearServer/target/pandoraNext-0.0.1-SNAPSHOT.jar.original
deleted file mode 100644
index 68d0f63..0000000
Binary files a/rearServer/target/pandoraNext-0.0.1-SNAPSHOT.jar.original and /dev/null differ
diff --git a/rearServer/target/pandoraNext-0.0.1-SNAPSHOT.jar b/rearServer/target/pandoraNext-0.4.7.1-SNAPSHOT.jar
similarity index 99%
rename from rearServer/target/pandoraNext-0.0.1-SNAPSHOT.jar
rename to rearServer/target/pandoraNext-0.4.7.1-SNAPSHOT.jar
index 25f7a25..6100e3e 100644
Binary files a/rearServer/target/pandoraNext-0.0.1-SNAPSHOT.jar and b/rearServer/target/pandoraNext-0.4.7.1-SNAPSHOT.jar differ