Merge remote-tracking branch 'remotes/origin/dev'

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMonitorLogDTO.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 系统监控日志
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Data
+public class SysMonitorLogDTO implements Serializable {
+    /**
+     * 访问路径
+     */
+    private String path;
+    /**
+     * 耗时
+     */
+    private Integer costTime;
+
+}

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMonitorLogController.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.controller;
+
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+
+/**
+ * 异常日志
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Slf4j
+@RestController("monitorlog")
+public class SysMonitorLogController {
+
+    /**
+     * desc: 记录监控日志
+     *
+     * @param params
+     * @return void
+     * @author LiuJanJun
+     * @date 2021/4/19 5:56 下午
+     */
+    @RequestMapping("info")
+    public void infoLevel(@RequestBody Map<String,Object> params) {
+        log.info("monitor log info:{}", JSON.toJSONString(params));
+    }
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/net/OkHttpUtil.java

@@ -24,9 +24,9 @@ public class OkHttpUtil {
 
     private static final Logger logger = LoggerFactory.getLogger(OkHttpUtil.class);
 
-    public final static int READ_TIMEOUT = 100;
-    public final static int CONNECT_TIMEOUT = 60;
-    public final static int WRITE_TIMEOUT = 60;
+    public final static int READ_TIMEOUT = 2;
+    public final static int CONNECT_TIMEOUT = 1;
+    public final static int WRITE_TIMEOUT = 5;
     public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
 
     public static final String CONTENT_TYPE = "Content-Type";