Home Explore Help
Register Sign In
elabFrameworkCore
/
jay-monitor-data-web
4
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

项目功能优化

liukaixiong 4 years ago
parent
eb4e9a4a9f
commit
c22f24aa3a
12 changed files with 194 additions and 252 deletions
Split View Show Diff Stats
  1. 2 0
      jay-monitor-data-server/pom.xml
  2. 5 1
      jay-monitor-data-server/src/main/java/com/jay/monitor/data/server/report/alert/notify/DingDingRealTimeAlertProcess.java
  3. 0 2
      jay-monitor-data-server/src/main/resources/application-com.yml
  4. 0 2
      jay-monitor-data-server/src/main/resources/application-test.yml
  5. 16 3
      jay-monitor-data-server/src/main/resources/application-uat.yml
  6. BIN
      jay-monitor-data-server/src/main/resources/static/fonts/iconfont.eot
  7. 154 231
      jay-monitor-data-server/src/main/resources/static/fonts/iconfont.svg
  8. BIN
      jay-monitor-data-server/src/main/resources/static/fonts/iconfont.ttf
  9. BIN
      jay-monitor-data-server/src/main/resources/static/fonts/iconfont.woff
  10. 2 2
      jay-monitor-data-server/src/main/resources/templates/index.html
  11. 14 7
      jay-monitor-data-server/src/main/resources/templates/trace/mqList.html
  12. 1 4
      jay-monitor-data-server/src/main/resources/templates/trace/urlList.html

+ 2 - 0
jay-monitor-data-server/pom.xml
View File 

@@ -167,6 +167,7 @@
 
                     <exclude>**/*.woff</exclude>
 
                     <exclude>**/*.woff2</exclude>
 
                     <exclude>**/*.ttf</exclude>
 
+<!--                    <exclude>**/*.svg</exclude>-->
 
                 </excludes>
 
             </resource>
 
             <resource>
 
@@ -176,6 +177,7 @@
 
                     <include>**/*.woff</include>
 
                     <include>**/*.woff2</include>
 
                     <include>**/*.ttf</include>
 
+<!--                    <include>**/*.svg</include>-->
 
                 </includes>
 
             </resource>
 
         </resources>

+ 5 - 1
jay-monitor-data-server/src/main/java/com/jay/monitor/data/server/report/alert/notify/DingDingRealTimeAlertProcess.java
View File 

@@ -11,6 +11,7 @@ import com.jay.monitor.data.server.models.request.dingding.ActionCardModel;
 
 import com.jay.monitor.data.server.store.ConfigStoreManager;
 
 import com.jay.monitor.data.server.utils.DingDingUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.beans.factory.annotation.Value;
 
 import org.springframework.stereotype.Component;
 
 
 import java.util.Arrays;
 
@@ -29,6 +30,9 @@ public class DingDingRealTimeAlertProcess implements AlertRealTimeMsg {
 
     @Autowired
 
     private ConfigStoreManager configStoreManager;
 
 
+    @Value("${spring.profiles.active:}")
 
+    private String profiles;
 
+
 
     @Override
 
     public AlertMsgEnums alertType() {
 
         return AlertMsgEnums.DingDing;
 
@@ -58,7 +62,7 @@ public class DingDingRealTimeAlertProcess implements AlertRealTimeMsg {
 
 
         StringBuilder mdText = new StringBuilder();
 
         mdText.append("【[日志跳转明细](" + logUrl + ")】");
 
-        mdText.append("\r【[控制台跳转明细](" + consoleUrl + ")】");
 
+        mdText.append("\r【[" + profiles + " - 控制台跳转明细](" + consoleUrl + ")】");
 
         mdText.append(MdConstants.newLine);
 
         mdText.append(" ``` ");
 
         mdText.append(MdConstants.newLine);

+ 0 - 2
jay-monitor-data-server/src/main/resources/application-com.yml
View File 

@@ -37,7 +37,5 @@ spring:
 
         status-list: [ -1 ]
 
     log-monitor-url: http://106.14.4.198:2281/cat/r/m/
 
     console-url: http://47.103.148.74:5800/index.html
 
-  cat:
 
-    url: ${spring.alert.log-monitor-url}
 
 logging:
 
   config: logback/logback.xml

+ 0 - 2
jay-monitor-data-server/src/main/resources/application-test.yml
View File 

@@ -37,8 +37,6 @@ spring:
 
         status-list: [ -1 ]
 
     log-monitor-url: http://192.168.0.90:2281/cat/r/m/
 
     console-url: http://101.133.210.230:5800/index.html
 
-  cat:
 
-    url: ${spring.alert.log-monitor-url}
 
 #logging:
 
 #  level:
 
 #    com.jay.monitor.data.server: debug

+ 16 - 3
jay-monitor-data-server/src/main/resources/application-uat.yml
View File 

@@ -13,7 +13,7 @@ spring:
 
     test-on-return: false
 
     test-while-idle: true
 
     keep-alive: true
 
-    url: jdbc:mysql://172.19.189.118/jay_monitor?characterEncoding=UTF-8&connectTimeout=60000&socketTimeout=60000
 
+    url: jdbc:mysql://172.19.189.118/jay_monitor_uat?characterEncoding=UTF-8&connectTimeout=60000&socketTimeout=60000
 
     username: jay_monitor
 
     password: jayzhou
 
   oss:
 
@@ -23,5 +23,18 @@ spring:
 
     default-bucket-name: linux-data
 
     default-bucket-path: alert/image  # 注意不要/开头
 
   alert:
 
-    alert-type: dingding
 
-    url: https://oapi.dingtalk.com/robot/send?access_token=e60c210c07708843b8e991e47daee84bfe43af6d91d660d613104d910e1c4e1f
 
+    alert-type:
 
+      dingding:
 
+        url: https://oapi.dingtalk.com/robot/send?access_token=e60c210c07708843b8e991e47daee84bfe43af6d91d660d613104d910e1c4e1f
 
+    alert-rule-config-map:
 
+      URL:
 
+        max-time: 5000
 
+        status-list: [ 500,503,504 ]
 
+      MQ:
 
+        max-time: 1000
 
+        status-list: [ -1 ]
 
+    log-monitor-url: http://106.14.4.198:2281/cat/r/m/
 
+    console-url: http://101.132.100.169:5800/index.html
 
+
 
+logging:
 
+  config: classpath:logback/logback.xml

BIN
jay-monitor-data-server/src/main/resources/static/fonts/iconfont.eot
View File


File diff suppressed because it is too large
+ 154 - 231
jay-monitor-data-server/src/main/resources/static/fonts/iconfont.svg


BIN
jay-monitor-data-server/src/main/resources/static/fonts/iconfont.ttf
View File


BIN
jay-monitor-data-server/src/main/resources/static/fonts/iconfont.woff
View File


+ 2 - 2
jay-monitor-data-server/src/main/resources/templates/index.html
View File 

@@ -20,7 +20,7 @@
 
 <body>
 
 <!-- 顶部开始 -->
 
 <div class="container">
 
-    <div class="logo"><a href="./index.html.bak">Elab 技术出品</a></div>
 
+    <div class="logo"><a href="./index.html.bak">ELab 技术出品</a></div>
 
     <div class="left_open">
 
         <i title="展开左侧栏" class="iconfont">&#xe699;</i>
 
     </div>
 
@@ -312,7 +312,7 @@
 
 <!-- 中部结束 -->
 
 <!-- 底部开始 -->
 
 <div class="footer">
 
-    <div class="copyright">Copyright ©2019 Elab后台管理 v2.3 All Rights Reserved</div>
 
+    <div class="copyright">Copyright ©2021 Elab后台管理 v2.3 All Rights Reserved</div>
 
 </div>
 
 <!-- 底部结束 -->
 
 </body>

+ 14 - 7
jay-monitor-data-server/src/main/resources/templates/trace/mqList.html
View File 

@@ -49,6 +49,18 @@
 
                         <input code="text" class="layui-input" name="topic" id="q_topic" value="">
 
                     </div>
 
                 </div>
 
+                <div class="layui-inline">
 
+                    <label class="layui-form-label">分区</label>
 
+                    <div class="layui-input-block">
 
+                        <input code="text" class="layui-input" name="partitionName" id="q_partition_name" value="">
 
+                    </div>
 
+                </div>
 
+                <div class="layui-inline">
 
+                    <label class="layui-form-label">消息编号</label>
 
+                    <div class="layui-input-block">
 
+                        <input code="text" class="layui-input" name="msgId" id="q_msg_id" value="">
 
+                    </div>
 
+                </div>
 
             </div>
 
             <div class="layui-form-item">
 
                 <div class="layui-inline">
 
@@ -124,10 +136,8 @@
 
             let resultSet = result.pageModel.resultSet;
 
             if (resultSet) {
 
                 var jsonConfig = {collapsed: false, withQuotes: true, withLinks: true}
 
-                debugger;
 
                 var resultJson = [];
 
                 $(resultSet).each(function (index, obj) {
 
-                    debugger;
 
                     var data = {};
 
                     data["应用名称"] = obj.applicationName;
 
                     data["应用ip"] = obj.applicationIp + "";
 
@@ -250,8 +260,8 @@
 
                 }
 
             }
 
             , {
 
-                fixed: 'right', title: '操作',  width: 100, templet: function (res) {
 
-                    return '<em><a className="layui-btn layui-btn-xs" lay-event="findDetail"><i class="layui-icon" style="font-size: 30px; color: #1E9FFF;">&#xe64c;</i></a></em>'
 
+                fixed: 'right', title: '操作', width: 100, templet: function (res) {
 
+                    return '<em><a className="layui-btn layui-btn-xs" lay-event="findDetail"><i class="layui-icon" style="font-size: 30px; color: #1E9FFF;">&#xe62a;</i></a></em>'
 
                 }
 
             }
 
         ];
 
@@ -260,10 +270,8 @@
 
         elab_common.layUITableDML(layer, table, title, listUrl, method, dataColumn, updateUrl, delUrl);
 
         table.on('tool(list_table)', function (obj) {
 
             var event = obj.event;
 
-            debugger;
 
             if ("findDetail" == event) {
 
                 elab_common.getReq("/api/log/mq?id=" + obj.data.id, null, function (data) {
 
-                    debugger;
 
                     showJson(data);
 
                 })
 
             }
 
@@ -274,7 +282,6 @@
 
         });
 
 
         form.on('submit(submit_from)', function (data) {
 
-            debugger;
 
             //执行重载
 
             table.reload('tableList', {
 
                 page: {

+ 1 - 4
jay-monitor-data-server/src/main/resources/templates/trace/urlList.html
View File 

@@ -139,7 +139,7 @@
 
                 field: 'dataId', title: 'token'
 
             }, {
 
                 field: 'logId', title: '链路编号', rowspan: 2, width: 100, templet: function (res) {
 
-                    return '<em><a href="' + catUrl + res.logId + '" target="_blank">当前日志</a></em>'
 
+                    return '<em><a href="' + catUrl + res.logId + '" target="_blank"><i class="layui-icon" style="font-size: 30px; color: #1E9FFF;">&#xe64c;</i></a></em>'
 
                 }
 
             },
 
             {
 
@@ -177,10 +177,8 @@
 
         elab_common.layUITableDML(layer, table, title, listUrl, method, dataColumn, updateUrl, delUrl);
 
         table.on('tool(list_table)', function (obj) {
 
             var event = obj.event;
 
-            debugger;
 
             if ("findDetail" == event) {
 
                 elab_common.getReq("/api/log/url?id=" + obj.data.id, null, function (data) {
 
-                    debugger;
 
                     $('#json-renderer').jsonViewer(data, {collapsed: false, withQuotes: true, withLinks: false});
 
                     layer.open({
 
                         type: 1
 
@@ -216,7 +214,6 @@
 
         });
 
 
         form.on('submit(submit_from)', function (data) {
 
-            debugger;
 
             //执行重载
 
             table.reload('tableList', {
 
                 page: {