修改热部署

Yanyutin753 · Dec 6, 2023 · c9b3373 · c9b3373
1 parent 4a531ac
commit c9b3373
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 18 deletions.
diff --git 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
@@ -1,5 +1 @@
-<<<<<<< HEAD
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Welcome to PandoraNext-TokensTool</title><script defer="defer" src="js/chunk-vendors.0ce29eef.js"></script><script defer="defer" src="js/app.9181fdf3.js"></script><link href="css/chunk-vendors.8a308144.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
-=======
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Welcome to PandoraNext-TokensTool</title><script defer="defer" src="js/chunk-vendors.0ce29eef.js"></script><script defer="defer" src="js/app.ac3a987d.js"></script><link href="css/chunk-vendors.8a308144.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
->>>>>>> bcd58edf7697081bd86d12c983b1afcac8db4495
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Welcome to PandoraNext-TokensTool</title><script defer="defer" src="js/chunk-vendors.0ce29eef.js"></script><script defer="defer" src="js/app.9181fdf3.js"></script><link href="css/chunk-vendors.8a308144.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
diff --git a/rearServer/target/classes/static/index.html b/rearServer/target/classes/static/index.html
@@ -1,5 +1 @@
-<<<<<<< HEAD
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Welcome to PandoraNext-TokensTool</title><script defer="defer" src="js/chunk-vendors.0ce29eef.js"></script><script defer="defer" src="js/app.9181fdf3.js"></script><link href="css/chunk-vendors.8a308144.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
-=======
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Welcome to PandoraNext-TokensTool</title><script defer="defer" src="js/chunk-vendors.0ce29eef.js"></script><script defer="defer" src="js/app.ac3a987d.js"></script><link href="css/chunk-vendors.8a308144.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
->>>>>>> bcd58edf7697081bd86d12c983b1afcac8db4495
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Welcome to PandoraNext-TokensTool</title><script defer="defer" src="js/chunk-vendors.0ce29eef.js"></script><script defer="defer" src="js/app.9181fdf3.js"></script><link href="css/chunk-vendors.8a308144.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
diff --git a/rearServer/target/pandoraNext-0.0.1-SNAPSHOT.jar.original b/rearServer/target/pandoraNext-0.0.1-SNAPSHOT.jar.original
diff --git a/...ver/target/pandoraNext-0.0.1-SNAPSHOT.jar → ...r/target/pandoraNext-0.4.7.1-SNAPSHOT.jar b/...ver/target/pandoraNext-0.0.1-SNAPSHOT.jar → ...r/target/pandoraNext-0.4.7.1-SNAPSHOT.jar