diff --git a/pom.xml b/pom.xml
index 97f63f0..93403e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
com.auth0
java-jwt
- 3.16.0
+ 4.0.0-beta.0
org.springframework
diff --git a/src/main/java/cn/langpy/kotime/config/LoadConfig.java b/src/main/java/cn/langpy/kotime/config/LoadConfig.java
index 716c832..21435d4 100644
--- a/src/main/java/cn/langpy/kotime/config/LoadConfig.java
+++ b/src/main/java/cn/langpy/kotime/config/LoadConfig.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
@ComponentScan("cn.langpy.kotime")
@Configuration
public class LoadConfig {
- public static Logger log = Logger.getLogger(LoadConfig.class.toString());
+ private static Logger log = Logger.getLogger(LoadConfig.class.toString());
@Value("${koTime.enable:true}")
private Boolean kotimeEnable;
diff --git a/src/main/java/cn/langpy/kotime/controller/KoTimeController.java b/src/main/java/cn/langpy/kotime/controller/KoTimeController.java
index cae217f..3a93b36 100644
--- a/src/main/java/cn/langpy/kotime/controller/KoTimeController.java
+++ b/src/main/java/cn/langpy/kotime/controller/KoTimeController.java
@@ -34,7 +34,7 @@ public class KoTimeController {
@Value("${ko-time.password:}")
private String password;
- public static Logger log = Logger.getLogger(KoTimeController.class.toString());
+ private static Logger log = Logger.getLogger(KoTimeController.class.toString());
@PostMapping("/login")
@ResponseBody
@@ -65,41 +65,48 @@ public class KoTimeController {
@GetMapping
- public void index(String test, HttpServletResponse response, HttpServletRequest request) throws Exception {
+ public void index(String test, HttpServletResponse response, HttpServletRequest request) {
if (null != test) {
return;
}
response.setContentType("text/html;charset=utf-8");
ClassPathResource classPathResource = new ClassPathResource(KoConstant.kotimeViewer);
- BufferedReader reader = new BufferedReader(new InputStreamReader(classPathResource.getInputStream(), "utf-8"));
- PrintWriter out = response.getWriter();
- String context = request.getContextPath();
- if (StringUtils.hasText(Context.getConfig().getContextPath())) {
- context = Context.getConfig().getContextPath();
- }
- StringBuilder stringBuilder = new StringBuilder();
- String line = "";
- int n = 0;
- while ((line = reader.readLine()) != null) {
- if (n > 14) {
- if (line.indexOf(KoConstant.globalThreshold) > -1) {
- line = line.replace(KoConstant.globalThreshold, Context.getConfig().getThreshold() + "");
- } else if (line.indexOf(KoConstant.globalNeedLogin) > -1) {
- line = line.replace(KoConstant.globalNeedLogin, Context.getConfig().getAuthEnable() + "");
- } else if (line.indexOf(KoConstant.contextPath) > -1) {
- line = line.replace(KoConstant.contextPath, context);
- } else if (line.indexOf(KoConstant.exceptionTitleStyle) > -1) {
- line = line.replace(KoConstant.exceptionTitleStyle, Context.getConfig().getExceptionEnable() == true ? "" : "display:none;");
- }
- stringBuilder.append(line + "\n");
- } else {
- stringBuilder.append(line + "\n");
+ try (
+ InputStream inputStream = classPathResource.getInputStream();
+ InputStreamReader streamReader = new InputStreamReader(inputStream, "utf-8");
+ BufferedReader reader = new BufferedReader(streamReader);
+ PrintWriter out = response.getWriter()) {
+
+ String context = request.getContextPath();
+ if (StringUtils.hasText(Context.getConfig().getContextPath())) {
+ context = Context.getConfig().getContextPath();
}
- n++;
+ StringBuilder stringBuilder = new StringBuilder();
+ String line = "";
+ int n = 0;
+ while ((line = reader.readLine()) != null) {
+ if (n > 14) {
+ if (line.indexOf(KoConstant.globalThreshold) > -1) {
+ line = line.replace(KoConstant.globalThreshold, Context.getConfig().getThreshold() + "");
+ } else if (line.indexOf(KoConstant.globalNeedLogin) > -1) {
+ line = line.replace(KoConstant.globalNeedLogin, Context.getConfig().getAuthEnable() + "");
+ } else if (line.indexOf(KoConstant.contextPath) > -1) {
+ line = line.replace(KoConstant.contextPath, context);
+ } else if (line.indexOf(KoConstant.exceptionTitleStyle) > -1) {
+ line = line.replace(KoConstant.exceptionTitleStyle, Context.getConfig().getExceptionEnable() == true ? "" : "display:none;");
+ }
+ stringBuilder.append(line + "\n");
+ } else {
+ stringBuilder.append(line + "\n");
+ }
+ n++;
+ }
+ line = stringBuilder.toString();
+ out.write(line);
+ out.flush();
+ } catch (Exception e) {
+ e.printStackTrace();
}
- line = stringBuilder.toString();
- out.write(line);
- out.close();
}
diff --git a/src/main/java/cn/langpy/kotime/data/DataBase.java b/src/main/java/cn/langpy/kotime/data/DataBase.java
index 1ae70b9..e06d4d5 100644
--- a/src/main/java/cn/langpy/kotime/data/DataBase.java
+++ b/src/main/java/cn/langpy/kotime/data/DataBase.java
@@ -15,7 +15,6 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.*;
import java.util.logging.Logger;
-import java.util.stream.Collectors;
import static java.util.stream.Collectors.toList;
@@ -25,7 +24,7 @@ import static java.util.stream.Collectors.toList;
@Component("database")
@Lazy
public class DataBase implements GraphService {
- public static Logger log = Logger.getLogger(DataBase.class.toString());
+ private static Logger log = Logger.getLogger(DataBase.class.toString());
private Connection readConnection;
private Connection writeConnection;
diff --git a/src/main/java/cn/langpy/kotime/handler/AuthHandler.java b/src/main/java/cn/langpy/kotime/handler/AuthHandler.java
index b570349..21d8fd1 100644
--- a/src/main/java/cn/langpy/kotime/handler/AuthHandler.java
+++ b/src/main/java/cn/langpy/kotime/handler/AuthHandler.java
@@ -25,7 +25,7 @@ import java.util.logging.Logger;
@Aspect
@Component
public class AuthHandler {
- public static Logger log = Logger.getLogger(AuthHandler.class.toString());
+ private static Logger log = Logger.getLogger(AuthHandler.class.toString());
@Pointcut(KoConstant.authRange)
public void preProcess() {
diff --git a/src/main/java/cn/langpy/kotime/handler/ComputeTimeHandler.java b/src/main/java/cn/langpy/kotime/handler/ComputeTimeHandler.java
index fb6f97f..5114b1b 100644
--- a/src/main/java/cn/langpy/kotime/handler/ComputeTimeHandler.java
+++ b/src/main/java/cn/langpy/kotime/handler/ComputeTimeHandler.java
@@ -16,7 +16,7 @@ import java.util.logging.Logger;
@Aspect
@Component
public class ComputeTimeHandler {
- public static Logger log = Logger.getLogger(ComputeTimeHandler.class.toString());
+ private static Logger log = Logger.getLogger(ComputeTimeHandler.class.toString());
@Pointcut(KoConstant.comMethodRange)
public void preProcess() {
diff --git a/src/main/java/cn/langpy/kotime/service/InvokedQueue.java b/src/main/java/cn/langpy/kotime/service/InvokedQueue.java
index 554fecc..00566d5 100644
--- a/src/main/java/cn/langpy/kotime/service/InvokedQueue.java
+++ b/src/main/java/cn/langpy/kotime/service/InvokedQueue.java
@@ -8,7 +8,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.logging.Logger;
public class InvokedQueue {
- public static Logger log = Logger.getLogger(InvokedQueue.class.toString());
+ private static Logger log = Logger.getLogger(InvokedQueue.class.toString());
private volatile static ConcurrentLinkedQueue queue = new ConcurrentLinkedQueue();
diff --git a/src/main/java/cn/langpy/kotime/service/KoInvokedHandler.java b/src/main/java/cn/langpy/kotime/service/KoInvokedHandler.java
index 4c0d396..1b5185b 100644
--- a/src/main/java/cn/langpy/kotime/service/KoInvokedHandler.java
+++ b/src/main/java/cn/langpy/kotime/service/KoInvokedHandler.java
@@ -12,7 +12,7 @@ import java.util.logging.Logger;
@KoListener
public final class KoInvokedHandler implements InvokedHandler {
- public static Logger log = Logger.getLogger(KoInvokedHandler.class.toString());
+ private static Logger log = Logger.getLogger(KoInvokedHandler.class.toString());
@Override
diff --git a/src/main/java/cn/langpy/kotime/service/MethodNodeService.java b/src/main/java/cn/langpy/kotime/service/MethodNodeService.java
index 19f77cd..ae664ba 100644
--- a/src/main/java/cn/langpy/kotime/service/MethodNodeService.java
+++ b/src/main/java/cn/langpy/kotime/service/MethodNodeService.java
@@ -14,7 +14,7 @@ import java.util.logging.Logger;
* zhangchang
*/
public class MethodNodeService {
- public static Logger log = Logger.getLogger(MethodNodeService.class.toString());
+ private static Logger log = Logger.getLogger(MethodNodeService.class.toString());
public static MethodNode getParentMethodNode() {
Stack stack = MethodStack.get();
diff --git a/src/main/java/cn/langpy/kotime/util/Common.java b/src/main/java/cn/langpy/kotime/util/Common.java
index f7a4538..a3352ba 100644
--- a/src/main/java/cn/langpy/kotime/util/Common.java
+++ b/src/main/java/cn/langpy/kotime/util/Common.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
* zhangchang
*/
public class Common {
- public static Logger log = Logger.getLogger(Common.class.toString());
+ private static Logger log = Logger.getLogger(Common.class.toString());
final static List> baseTypes = Arrays.asList(Integer.class, Double.class, Float.class, String.class, Boolean.class, MultipartFile.class);
diff --git a/src/main/java/cn/langpy/kotime/util/Context.java b/src/main/java/cn/langpy/kotime/util/Context.java
index d933432..41f46b0 100644
--- a/src/main/java/cn/langpy/kotime/util/Context.java
+++ b/src/main/java/cn/langpy/kotime/util/Context.java
@@ -7,7 +7,6 @@ import cn.langpy.kotime.service.GraphService;
import javax.sql.DataSource;
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.ThreadPoolExecutor;
/**
* zhangchang
diff --git a/src/main/java/cn/langpy/kotime/util/DataBaseUtil.java b/src/main/java/cn/langpy/kotime/util/DataBaseUtil.java
index 67b5d22..92c9e3e 100644
--- a/src/main/java/cn/langpy/kotime/util/DataBaseUtil.java
+++ b/src/main/java/cn/langpy/kotime/util/DataBaseUtil.java
@@ -14,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger;
public class DataBaseUtil {
- public static Logger log = Logger.getLogger(DataBaseUtil.class.toString());
+ private static Logger log = Logger.getLogger(DataBaseUtil.class.toString());
static Map tableInfoMap = new ConcurrentHashMap<>();
@@ -82,13 +82,14 @@ public class DataBaseUtil {
public static List