项目功能优化

README.md

@@ -148,6 +148,10 @@ max_allowed_packet = 50M # 也可以继续调大点
 show variables like '%max_allowed_pack%';
 ```
 
+##### 临时方案
+```sql
+set global max_allowed_packet = 50 * 1024 * 1024;
+```
 
 
 

jay-monitor-data-client/src/main/java/com/jay/monitor/data/client/config/ClientMonitorAutoConfiguration.java

@@ -29,7 +29,7 @@ import java.net.InetAddress;
 @Import({MonitorSendProducer.class})
 public class ClientMonitorAutoConfiguration {
 
-    @Value(value = "${spring.application.name}")
+    @Value(value = "${spring.application.name:未知服务}")
     private String applicationName;
 
     @Bean

jay-monitor-data-client/src/main/java/com/jay/monitor/data/client/config/KafkaMonitorAutoConfiguration.java

@@ -1,28 +1,31 @@
-//package com.jay.monitor.data.client.config;
-//
-//import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.kafka.core.KafkaTemplate;
-//
-///**
-// * @Module 配置类
-// * @Description 相关kafka配置
-// * @Author liukaixiong
-// * @Date 2020/11/19 14:17
-// */
-//@Configuration
-//@ConditionalOnBean(value = {KafkaTemplate.class})
-//public class KafkaMonitorAutoConfiguration {
-//
-////    @Bean
-////    public KafkaMonitorProducer kafkaMonitorProducer() {
-////        return new KafkaMonitorProducer();
-////    }
-//
-////    @Bean
-////    @ConditionalOnBean(value = {MessageListener.class})
-////    public MonitorRuleFactory monitorRuleFactory() {
-////        return new MonitorRuleFactory();
-////    }
-//
-//}
+package com.jay.monitor.data.client.config;
+
+import com.jay.monitor.data.client.ext.MonitorRuleFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.listener.MessageListener;
+
+/**
+ * @Module 配置类
+ * @Description 相关kafka配置
+ * @Author liukaixiong
+ * @Date 2020/11/19 14:17
+ */
+@Configuration
+@ConditionalOnBean(value = {KafkaTemplate.class})
+public class KafkaMonitorAutoConfiguration {
+
+//    @Bean
+//    public KafkaMonitorProducer kafkaMonitorProducer() {
+//        return new KafkaMonitorProducer();
+//    }
+
+    @Bean
+    @ConditionalOnBean(value = {MessageListener.class})
+    public MonitorRuleFactory monitorRuleFactory() {
+        return new MonitorRuleFactory();
+    }
+
+}

jay-monitor-data-server/src/main/java/com/jay/monitor/data/server/controllers/IndexController.java

@@ -1,5 +1,6 @@
 package com.jay.monitor.data.server.controllers;
 
+import com.alibaba.fastjson.JSONObject;
 import com.cat.file.message.MessageManagerProcess;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -23,6 +24,12 @@ public class IndexController {
         return page + "index";
     }
 
+    @RequestMapping(value = "/test", method = {RequestMethod.DELETE, RequestMethod.PUT}, produces = "application/json; charset=utf-8")
+    @ResponseBody
+    public JSONObject test(@RequestBody JSONObject jsonObject) throws Exception {
+        return jsonObject;
+    }
+
     @RequestMapping(value = "/getLogId", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
     @ResponseBody
     public String getLogId(@RequestParam("id") String logId) throws Exception {

jay-monitor-data-server/src/main/java/com/jay/monitor/data/server/costs/ServerConstants.java

@@ -13,5 +13,6 @@ public class ServerConstants {
     public static int ERROR_STATUS = -1;
 
     public static String ERROR_LOG_ID ="errorLogId";
+
     public static String JSON_LOG_ID ="jsonLogId";
 }

jay-monitor-data-server/src/main/java/com/jay/monitor/data/server/report/alert/notify/DingDingRealTimeAlertProcess.java

@@ -65,7 +65,7 @@ public class DingDingRealTimeAlertProcess extends AbstractAlertRule {
         Map<String, Object> extMap = realTimeAlert.getExtMap();
         if (extMap != null) {
             Object id = extMap.get(ServerConstants.ERROR_LOG_ID);
-            if (id != null) {
+            if (AlertRuleEnums.STATUS == triggerRule && id != null) {
                 String linkConsole = serverLogConsole + "?logId=" + id.toString();
                 ActionCardModel.ActionCardDTO.BtnsDTO errorBtn = new ActionCardModel.ActionCardDTO.BtnsDTO("查看异常栈", linkConsole);
                 btnList.add(errorBtn);

jay-monitor-data-server/src/main/resources/application-com.yml

@@ -27,17 +27,17 @@ spring:
   alert:
     alert-type:
       dingding:
-        url: https://oapi.dingtalk.com/robot/send?access_token=1dd1309908d8d77afe87e9d205f4bdd4751685f7fc00ee26ddf8023d4b2f3601
+        url: https://oapi.dingtalk.com/robot/send?access_token=9f140367f26795e163a269645012d11631a1dd32f4e131d66be06a88fd883cc9
     alert-rule-config-map:
       URL:
         max-time: 5000
         status-list: [ 500,503,504 ]
       MQ:
-        max-time: 1000
+        max-time: 3000
         status-list: [ -1 ]
     log-monitor-url: http://106.14.4.198:2281/cat/r/m/
-    console-url: ${spring.alert.server-domain}/index.html
     server-domain: http://47.103.148.74:5800
-      server-log-console: ${spring.alert.server-domain}/api/log/console
+    console-url: ${spring.alert.server-domain}/index.html
+    server-log-console: ${spring.alert.server-domain}/api/log/console
 logging:
-  config: logback/logback.xml
+  config: classpath:logback/logback.xml

jay-monitor-data-server/src/main/resources/application-dev.yml

@@ -13,12 +13,12 @@ spring:
     test-on-return: false
     test-while-idle: true
     keep-alive: true
-    #    url: jdbc:mysql://192.168.0.13:3306/elab_db?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior
-    #    username: root
-    #    password: elab@123
+#    url: jdbc:mysql://192.168.0.13:3306/elab_db?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior
+#    username: root
+#    password: elab@123
     url: jdbc:mysql://106.14.4.198:3306/jay_monitor?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior
-    username: root
-    password: 666666
+    username: jay_monitor
+    password: jayzhou
   oss:
     access-key-id: LTAImNZed054h0YV
     access-key-secret: 8hmhlhiQ2ikmVeLKujwMNWsktFpSzm

jay-monitor-data-server/src/main/resources/application-test.yml

@@ -36,8 +36,8 @@ spring:
         max-time: 1000
         status-list: [ -1 ]
     log-monitor-url: http://192.168.0.90:2281/cat/r/m/
-    console-url: ${spring.alert.server-domain}/index.html
     server-domain: http://101.133.210.230:5800
+    console-url: ${spring.alert.server-domain}/index.html
     server-log-console: ${spring.alert.server-domain}/api/log/console
 
 #logging:

jay-monitor-data-server/src/main/resources/templates/trace/mqList.html

@@ -34,7 +34,7 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">项目名称</label>
                     <div class="layui-input-block">
-                        <input code="text" class="layui-input" name="project" id="project" value="">
+                        <input code="text" class="layui-input" name="applicationName" id="q_application_name" value="">
                     </div>
                 </div>
                 <div class="layui-inline">