Sfoglia il codice sorgente

api_log 环境变量配置

zhanghaijun 2 anni fa
parent
commit
081d5e7bfa

+ 2 - 3
train-common/train-common-web/src/main/java/top/haijunit/web/interceptor/WebInvokeTimeInterceptor.java

@@ -10,7 +10,6 @@ import org.springframework.http.MediaType;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;
 import top.haijunit.common.utils.JsonUtils;
 import top.haijunit.common.utils.JsonUtils;
-import top.haijunit.common.utils.SpringUtils;
 import top.haijunit.web.filter.RepeatedlyRequestWrapper;
 import top.haijunit.web.filter.RepeatedlyRequestWrapper;
 
 
 import java.io.BufferedReader;
 import java.io.BufferedReader;
@@ -24,11 +23,11 @@ import java.util.Map;
 @Slf4j
 @Slf4j
 public class WebInvokeTimeInterceptor implements HandlerInterceptor {
 public class WebInvokeTimeInterceptor implements HandlerInterceptor {
 
 
-    private final static String PRO_FILE = "prod";
 
 
     @Override
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        if (!PRO_FILE.equals(SpringUtils.getActiveProfile())) {
+        String apiLog = System.getenv("api_log");
+        if (StrUtil.isNotBlank(apiLog)) {
             String url = request.getMethod() + " " + request.getRequestURI();
             String url = request.getMethod() + " " + request.getRequestURI();
             // 打印请求参数
             // 打印请求参数
             if (isJsonRequest(request)) {
             if (isJsonRequest(request)) {

+ 1 - 0
train-server/src/main/resources/application.yml

@@ -68,6 +68,7 @@ spring:
       connectionTestQuery: SELECT 1
       connectionTestQuery: SELECT 1
       keepaliveTime: 30000
       keepaliveTime: 30000
   jpa:
   jpa:
+    open-in-view: false
     hibernate:
     hibernate:
       ddl-auto: update
       ddl-auto: update
     show-sql: true
     show-sql: true

+ 1 - 2
train-server/src/main/resources/templates/webSocket.html

@@ -14,8 +14,7 @@
         } else {
         } else {
             console.log("您的浏览器支持WebSocket");
             console.log("您的浏览器支持WebSocket");
             //实现化WebSocket对象,指定要连接的服务器地址与端口,建立连接.
             //实现化WebSocket对象,指定要连接的服务器地址与端口,建立连接.
-            // var socketUrl = "http://localhost:8086/socket/" + $("#uid").val();
-            var socketUrl = "http://localhost:8086/websocket";
+            let socketUrl = location.origin + "/websocket";
             //将https与http协议替换为ws协议
             //将https与http协议替换为ws协议
             socketUrl = socketUrl.replace("https", "ws").replace("http", "ws");
             socketUrl = socketUrl.replace("https", "ws").replace("http", "ws");
             console.log(socketUrl);
             console.log(socketUrl);