From 13a63313908c1f85594b6003fd50fc7c90e68e67 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 30 May 2019 14:06:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F=E7=9B=91=E6=8E=A7][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E7=B3=BB=E7=BB=9F=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=8C=E5=8F=AA=E7=9B=91=E6=8E=A7test?= =?UTF-8?q?=E5=8F=8Arelease=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sql => V201905301346__ADD_SYS_MONITOR.sql} | 79 ++++++++++--------- .../iformall/schedule/SysMonitorSchedule.java | 2 + .../com/iformall/domain/po/SysMonitor.java | 3 + .../iformall/enums/EnumSysMonitorStatus.java | 36 +++++++++ .../resources/mapper/SysMonitorMapper.xml | 6 +- 5 files changed, 86 insertions(+), 40 deletions(-) rename mallinkAdmin/src/main/resources/db/migration/{V201905290800__ADD_SYS_MONITOR.sql => V201905301346__ADD_SYS_MONITOR.sql} (57%) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumSysMonitorStatus.java diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905290800__ADD_SYS_MONITOR.sql b/mallinkAdmin/src/main/resources/db/migration/V201905301346__ADD_SYS_MONITOR.sql similarity index 57% rename from mallinkAdmin/src/main/resources/db/migration/V201905290800__ADD_SYS_MONITOR.sql rename to mallinkAdmin/src/main/resources/db/migration/V201905301346__ADD_SYS_MONITOR.sql index 88ce39b32..74f21608b 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201905290800__ADD_SYS_MONITOR.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201905301346__ADD_SYS_MONITOR.sql @@ -3,50 +3,51 @@ CREATE TABLE `sys_monitor` ( `id` bigint(20) NOT NULL, `name` varchar(50) NOT NULL COMMENT '网址名称', `url` varchar(255) NOT NULL COMMENT '网址url', - `type` tinyint(20) DEFAULT '1' COMMENT '1=网址监控', - `deploy` tinyint(20) DEFAULT '1' COMMENT '1=dev 2=test 3=release', + `type` tinyint(2) DEFAULT '1' COMMENT '1=网址监控', + `deploy` tinyint(2) DEFAULT '1' COMMENT '1=dev 2=test 3=release', + `enable` tinyint(2) DEFAULT '0' COMMENT '0:enable 1:disable', `err_msg` varchar(50) DEFAULT NULL COMMENT '错误信息', PRIMARY KEY (`id`), UNIQUE `id_UNIQUE` USING BTREE (`id`) comment '' ) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='网络监控' CHECKSUM=0 DELAY_KEY_WRITE=0; -INSERT INTO `sys_monitor` (`id`,`name`,`url`,`type`,`deploy`,`err_msg`) VALUES -(1, "dev-管理端","https://mall.youlane.cn/api/version", 1, 1, "{url}不响应"), -(2, "dev-C端","https://ciformall.youlane.cn/C/api/mall/version", 1, 1, "{name}: {url} 不响应"), -(3, "dev-B端","https://biformall.youlane.cn/B/api/mall/version", 1, 1, "{name}: {url}不响应"), -(4, "dev-Schedule","http://202.165.179.86:5000/S/version", 1, 1, "{name}: {url}不响应"), -(5, "dev-消息服务器","http://202.165.179.86:5001/mq/version", 1, 1, "{name}: {url}不响应"), -(6, "dev-websocket服务器","http://202.165.179.86:7100/W/version", 1, 1, "{name}: {url}不响应"), -(7, "dev-微信第三方开放平台","https://open.youlane.cn/O/version", 1, 1, "{name}: {url}不响应"), -(8, "dev-移动端数据塔台","https://mobile.youlane.cn/#/", 1, 1, "{name}: {url}不响应"), -(9, "dev-幸运卡牌","https://game.youlane.cn/luckCard/index.html", 1, 1, "{name}: {url}不响应"), -(10, "dev-幸运砸金蛋","https://game.youlane.cn/goldEgg/index.html", 1, 1, "{name}: {url}不响应"), -(11, "dev-幸运刮刮乐","https://game.youlane.cn/guaguale/index.html", 1, 1, "{name}: {url}不响应"), -(12, "dev-callback","http://202.165.179.86:9100/version", 1, 1, "{name}: {url}不响应"), +INSERT INTO `sys_monitor` (`id`,`name`,`url`,`type`,`deploy`,`enable`,`err_msg`) VALUES +(1, "dev-管理端","https://mall.youlane.cn/api/version", 1, 1, 1, "{name}: {url} 不响应"), +(2, "dev-C端","https://ciformall.youlane.cn/C/api/mall/version", 1, 1, 1, "{name}: {url} 不响应"), +(3, "dev-B端","https://biformall.youlane.cn/B/api/mall/version", 1, 1, 1, "{name}: {url} 不响应"), +(4, "dev-Schedule","http://202.165.179.86:5000/S/version", 1, 1, 1, "{name}: {url} 不响应"), +(5, "dev-消息服务器","http://202.165.179.86:5001/mq/version", 1, 1, 1, "{name}: {url} 不响应"), +(6, "dev-websocket服务器","http://202.165.179.86:7100/W/version", 1, 1, 1, "{name}: {url} 不响应"), +(7, "dev-微信第三方开放平台","https://open.youlane.cn/O/version", 1, 1, 1, "{name}: {url} 不响应"), +(8, "dev-移动端数据塔台","https://mobile.youlane.cn/#/", 1, 1, 1, "{name}: {url} 不响应"), +(9, "dev-幸运卡牌","https://game.youlane.cn/luckCard/index.html", 1, 1, 1, "{name}: {url} 不响应"), +(10, "dev-幸运砸金蛋","https://game.youlane.cn/goldEgg/index.html", 1, 1, 1, "{name}: {url} 不响应"), +(11, "dev-幸运刮刮乐","https://game.youlane.cn/guaguale/index.html", 1, 1, 1, "{name}: {url} 不响应"), +(12, "dev-callback","http://202.165.179.86:9100/version", 1, 1, 1, "{name}: {url} 不响应"), -(101, "test-管理端","https://admintest.malls.iformall.com/api/version", 1, 2, "{name}: {url}不响应"), -(102, "test-C端","https://ctest.malls.iformall.com/C/api/mall/version", 1, 2, "{name}: {url} 不响应"), -(103, "test-B端","https://btest.malls.iformall.com/B/api/mall/version", 1, 2, "{name}: {url}不响应"), -(104, "test-Schedule","https://stest.malls.iformall.com/S/version", 1, 2, "{name}: {url}不响应"), -(105, "test-消息服务器","https://stest.malls.iformall.com/mq/version", 1, 2, "{name}: {url}不响应"), -(106, "test-websocket服务器","https://stest.malls.iformall.com/W/version", 1, 2, "{name}: {url}不响应"), -(107, "test-微信第三方开放平台","https://opentest.malls.iformall.com/O/version", 1, 2, "{name}: {url}不响应"), -(108, "test-移动端数据塔台","https://mobiletest.malls.iformall.com/#/", 1, 2, "{name}: {url}不响应"), -(109, "test-幸运卡牌","https://gametest.malls.iformall.com/game/luckCard/index.html", 1, 2, "{name}: {url}不响应"), -(110, "test-幸运砸金蛋","https://gametest.malls.iformall.com/game/goldEgg/index.html", 1, 2, "{name}: {url}不响应"), -(111, "test-幸运刮刮乐","https://gametest.malls.iformall.com/game/guaguale/index.html", 1, 2, "{name}: {url}不响应"), -(112, "test-callback","https://callbacktest.malls.iformall.com/api/version", 1, 2, "{name}: {url}不响应"), +(101, "test-管理端","https://admintest.malls.iformall.com/api/version", 1, 2, 0, "{name}: {url} 不响应"), +(102, "test-C端","https://ctest.malls.iformall.com/C/api/mall/version", 1, 2, 0, "{name}: {url} 不响应"), +(103, "test-B端","https://btest.malls.iformall.com/B/api/mall/version", 1, 2, 0, "{name}: {url} 不响应"), +(104, "test-Schedule","https://stest.malls.iformall.com/S/version", 1, 2, 0, "{name}: {url} 不响应"), +(105, "test-消息服务器","https://stest.malls.iformall.com/mq/version", 1, 2, 0, "{name}: {url} 不响应"), +(106, "test-websocket服务器","https://stest.malls.iformall.com/W/version", 1, 2, 0, "{name}: {url} 不响应"), +(107, "test-微信第三方开放平台","https://opentest.malls.iformall.com/O/version", 1, 2, 0, "{name}: {url} 不响应"), +(108, "test-移动端数据塔台","https://mobiletest.malls.iformall.com/#/", 1, 2, 0, "{name}: {url} 不响应"), +(109, "test-幸运卡牌","https://gametest.malls.iformall.com/game/luckCard/index.html", 1, 2, 0, "{name}: {url} 不响应"), +(110, "test-幸运砸金蛋","https://gametest.malls.iformall.com/game/goldEgg/index.html", 1, 2, 0, "{name}: {url} 不响应"), +(111, "test-幸运刮刮乐","https://gametest.malls.iformall.com/game/guaguale/index.html", 1, 2, 0, "{name}: {url} 不响应"), +(112, "test-callback","https://callbacktest.malls.iformall.com/api/version", 1, 2, 0, "{name}: {url} 不响应"), -(201, "生产环境-管理端","https://admin.malls.iformall.com/api/version", 1, 3, "{name}: {url}不响应"), -(202, "生产环境-C端","https://c.malls.iformall.com/C/api/mall/version", 1, 3, "{name}: {url} 不响应"), -(203, "生产环境-B端","https://b.malls.iformall.com/B/api/mall/version", 1, 3, "{name}: {url}不响应"), -(204, "生产环境-Schedule","https://s.malls.iformall.com/S/version", 1, 3, "{name}: {url}不响应"), -(205, "生产环境-消息服务器","https://s.malls.iformall.com/mq/version", 1, 3, "{name}: {url}不响应"), -(206, "生产环境-websocket服务器","https://s.malls.iformall.com/W/version", 1, 3, "{name}: {url}不响应"), -(207, "生产环境-微信第三方开放平台","https://open.malls.iformall.com/O/version", 1, 3, "{name}: {url}不响应"), -(208, "生产环境-移动端数据塔台","https://mobile.malls.iformall.com/#/", 1, 3, "{name}: {url}不响应"), -(209, "生产环境-幸运卡牌","https://game.malls.iformall.com/game/luckCard/index.html", 1, 3, "{name}: {url}不响应"), -(210, "生产环境-幸运砸金蛋","https://game.malls.iformall.com/game/goldEgg/index.html", 1, 3, "{name}: {url}不响应"), -(211, "生产环境-幸运刮刮乐","https://game.malls.iformall.com/game/guaguale/index.html", 1, 3, "{name}: {url}不响应"), -(212, "生产环境-callback","https://callback.malls.iformall.com/api/version", 1, 3, "{name}: {url}不响应") +(201, "生产环境-管理端","https://admin.malls.iformall.com/api/version", 1, 3, 0, "{name}: {url}不响应"), +(202, "生产环境-C端","https://c.malls.iformall.com/C/api/mall/version", 1, 3, 0, "{name}: {url} 不响应"), +(203, "生产环境-B端","https://b.malls.iformall.com/B/api/mall/version", 1, 3, 0, "{name}: {url}不响应"), +(204, "生产环境-Schedule","https://s.malls.iformall.com/S/version", 1, 3, 0, "{name}: {url}不响应"), +(205, "生产环境-消息服务器","https://s.malls.iformall.com/mq/version", 1, 3, 0, "{name}: {url}不响应"), +(206, "生产环境-websocket服务器","https://s.malls.iformall.com/W/version", 1, 3, 0, "{name}: {url}不响应"), +(207, "生产环境-微信第三方开放平台","https://open.malls.iformall.com/O/version", 1, 3, 0, "{name}: {url}不响应"), +(208, "生产环境-移动端数据塔台","https://mobile.malls.iformall.com/#/", 1, 3, 0, "{name}: {url}不响应"), +(209, "生产环境-幸运卡牌","https://game.malls.iformall.com/game/luckCard/index.html", 1, 3, 0, "{name}: {url}不响应"), +(210, "生产环境-幸运砸金蛋","https://game.malls.iformall.com/game/goldEgg/index.html", 1, 3, 0, "{name}: {url}不响应"), +(211, "生产环境-幸运刮刮乐","https://game.malls.iformall.com/game/guaguale/index.html", 1, 3, 0, "{name}: {url}不响应"), +(212, "生产环境-callback","https://callback.malls.iformall.com/api/version", 1, 3, 0, "{name}: {url}不响应") ; \ No newline at end of file diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java index 75e6249e8..3028b3be6 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java @@ -1,6 +1,7 @@ package com.iformall.schedule; import com.iformall.domain.po.SysMonitor; +import com.iformall.enums.EnumSysMonitorStatus; import com.iformall.mapper.*; import com.iformall.service.MailService; import com.iformall.utils.HttpUtil; @@ -34,6 +35,7 @@ public class SysMonitorSchedule { public void checkUrls() { if(isFmMonitor) { SysMonitor q = new SysMonitor(); + q.setEnable(EnumSysMonitorStatus.ENABLE.getCode()); List sysMonitors = sysMonitorMapper.findList(q); for (SysMonitor sysMonitor : sysMonitors) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java b/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java index 6fd62d77a..07f0d4e5a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/SysMonitor.java @@ -28,6 +28,8 @@ public class SysMonitor implements Serializable { private Integer type; @io.swagger.annotations.ApiModelProperty(value="1=dev 2=test 3=release",name="deploy") private Integer deploy; + @io.swagger.annotations.ApiModelProperty(value="0:enable 1:disable",name="enable") + private Integer enable; @io.swagger.annotations.ApiModelProperty(value="",name="errMsg") private String errMsg; @@ -40,6 +42,7 @@ public class SysMonitor implements Serializable { ,Url_ASC("`url` ASC"),Url_DESC("`url` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ,Deploy_ASC("`deploy` ASC"),Deploy_DESC("`deploy` DESC") + ,Enable_ASC("`enable` ASC"),Enable_DESC("`enable` DESC") ,ErrMsg_ASC("`err_msg` ASC"),ErrMsg_DESC("`err_msg` DESC") ; private String value; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumSysMonitorStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumSysMonitorStatus.java new file mode 100644 index 000000000..9cd2282c4 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumSysMonitorStatus.java @@ -0,0 +1,36 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2019/13/54. + */ +public enum EnumSysMonitorStatus { + + ENABLE(0, "启用"), + DISABLE(1, "停用"), + ; + + public static EnumSysMonitorStatus getEnum(Integer code) { + for (EnumSysMonitorStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumSysMonitorStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/resources/mapper/SysMonitorMapper.xml b/mallinkService/src/main/resources/mapper/SysMonitorMapper.xml index febd96a9a..50e82ef4b 100644 --- a/mallinkService/src/main/resources/mapper/SysMonitorMapper.xml +++ b/mallinkService/src/main/resources/mapper/SysMonitorMapper.xml @@ -7,11 +7,12 @@ + - `id`,`name`,`url`,`type`,`deploy`,`err_msg` + `id`,`name`,`url`,`type`,`deploy`,`enable`,`err_msg` @@ -31,6 +32,9 @@ and `deploy` = #{deploy} + + and `enable` = #{enable} + and `err_msg` like concat('%', #{errMsg},'%')