diff --git a/config/application.yml b/config/application.yml index dda11b5..8451103 100644 --- a/config/application.yml +++ b/config/application.yml @@ -1,5 +1,5 @@ server: - port: 9999 + port: 8888 spring: application: name: cn-object-scheduler @@ -13,113 +13,111 @@ logging: tsg: system: url: http://192.168.44.29:8080 - ##token: aa2bdec5518ad131f71944b13ce5c298&1& token: 1ca0350bc499a208a0edadb74d76a0ee&1& httpTimeout: 3600000 - isLatestVersion: false + isLatestVersion: true object: ip: - #指定排除的IP. 1.如果没有可不写值,2.若有多个用英文逗号,分隔如: 127.0.0.1,127.0.0.2,3.可适用IP段匹配,如:127.* excludeValue: 0.0.0.0,255.255.255.255,127.*,8.8.8.8,1.1.1.1 hotspotvpn_serverip: - id: 2 + id: 14145 name: hotspotvpn_serverip update: cron: 0 0 0/1 * * ? - enable: false - sql: + enable: true + sql: SELECT addr_format AS addrFormat, ip1 AS ip1, ip2 AS ip2 FROM cn_vpn_learning_ip WHERE knowledge_id = 15 and plugin_id = 1 and is_valid = 1 order by op_time desc LIMIT 100000 delete: cron: 0 0 0/1 * * ? - enable: false - offsetSecond: -600 + enable: true + offsetSecond: -10800 ipvanishvpn_serverip: - id: 3 + id: 14177 name: ipvanishvpn_serverip update: cron: 0 0 0/1 * * ? - enable: false - sql: + enable: true + sql: SELECT addr_format AS addrFormat, ip1 AS ip1, ip2 AS ip2 FROM cn_vpn_learning_ip WHERE knowledge_id = 15 and plugin_id = 3 and is_valid = 1 order by op_time desc LIMIT 100000 delete: cron: 0 0 0/1 * * ? - enable: false - offsetSecond: -600 + enable: true + offsetSecond: -10800 psiphon3vpn_serverip: - id: 12 + id: 14281 name: psiphon3vpn_serverip update: cron: 0 0 0/1 * * ? - enable: false - sql: + enable: true + sql: SELECT addr_format AS addrFormat, ip1 AS ip1, ip2 AS ip2 FROM cn_vpn_learning_ip WHERE knowledge_id = 15 and plugin_id = 4 and is_valid = 1 order by op_time desc LIMIT 100000 delete: cron: 0 0 0/1 * * ? - enable: false - offsetSecond: -600 + enable: true + offsetSecond: -10800 cyberghostvpn_serverip: - id: 1 + id: 14060 name: cyberghostvpn_serverip update: cron: 0 0 0/1 * * ? - enable: false - sql: + enable: true + sql: SELECT addr_format AS addrFormat, ip1 AS ip1, ip2 AS ip2 FROM cn_vpn_learning_ip WHERE knowledge_id = 15 and plugin_id = 6 and is_valid = 1 order by op_time desc LIMIT 100000 delete: cron: 0 0 0/1 * * ? - enable: false - offsetSecond: -600 + enable: true + offsetSecond: -10800 geckovpn_serverip: - id: 4 + id: 14113 name: geckovpn_serverip update: cron: 0 0 0/1 * * ? - enable: false - sql: + enable: true + sql: SELECT addr_format AS addrFormat, ip1 AS ip1, ip2 AS ip2 FROM cn_vpn_learning_ip WHERE knowledge_id = 15 and plugin_id = 7 and is_valid = 1 order by op_time desc LIMIT 100000 delete: cron: 0 0 0/1 * * ? - enable: false - offsetSecond: -600 + enable: true + offsetSecond: -10800 ivacyvpn_serverip: - id: 5 + id: 14185 name: ivacyvpn_serverip update: cron: 0 0 0/1 * * ? - enable: false - sql: + enable: true + sql: SELECT addr_format AS addrFormat, ip1 AS ip1, ip2 AS ip2 FROM cn_vpn_learning_ip WHERE knowledge_id = 15 and plugin_id = 9 and is_valid = 1 order by op_time desc LIMIT 100000 delete: cron: 0 0 0/1 * * ? - enable: false - offsetSecond: -600 + enable: true + offsetSecond: -10800 turbovpn_serverip: - id: 6 + id: 14260 name: turbovpn_serverip update: cron: 0 0 0/1 * * ? - enable: false - sql: + enable: true + sql: SELECT addr_format AS addrFormat, ip1 AS ip1, ip2 AS ip2 FROM cn_vpn_learning_ip WHERE knowledge_id = 15 and plugin_id = 10 and is_valid = 1 order by op_time desc LIMIT 100000 delete: cron: 0 0 0/1 * * ? - enable: false - offsetSecond: -600 + enable: true + offsetSecond: -10800 vpnunlimited_serverip: - id: 7 + id: 14162 name: vpnunlimited_serverip update: cron: 0 0 0/1 * * ? - enable: false - sql: + enable: true + sql: SELECT addr_format AS addrFormat, ip1 AS ip1, ip2 AS ip2 FROM cn_vpn_learning_ip WHERE knowledge_id = 15 and plugin_id = 11 and is_valid = 1 order by op_time desc LIMIT 100000 delete: cron: 0 0 0/1 * * ? - enable: false - offsetSecond: -600 + enable: true + offsetSecond: -10800 windscribevpn_serverip: - id: 8 + id: 14290 name: windscribevpn_serverip update: cron: 0 0 0/1 * * ? - enable: false - sql: + enable: true + sql: SELECT addr_format AS addrFormat, ip1 AS ip1, ip2 AS ip2 FROM cn_vpn_learning_ip WHERE knowledge_id = 15 and plugin_id = 13 and is_valid = 1 order by op_time desc LIMIT 100000 delete: cron: 0 0 0/1 * * ? - enable: false - offsetSecond: -600 + enable: true + offsetSecond: -10800 vpn4fame_serverip: id: 9 name: vpn4fame_serverip @@ -155,38 +153,49 @@ tsg: offsetSecond: -600 fqdn: cyberghostvpn_servername: - id: 101 + id: 14128 name: cyberghostvpn_servername update: cron: 0 0 0/1 * * ? - enable: false - sql: + enable: true + sql: SELECT domain AS domain FROM cn_vpn_learning_domain WHERE knowledge_id = 14 and plugin_id = 5 and is_valid = 1 order by op_time desc LIMIT 100000 delete: cron: 0 0 0/1 * * ? - enable: false - offsetSecond: -600 + enable: true + offsetSecond: -10800 ipvanishvpn_servername: - id: 102 + id: 14174 name: ipvanishvpn_servername update: cron: 0 0 0/1 * * ? - enable: false - sql: + enable: true + sql: SELECT domain AS domain FROM cn_vpn_learning_domain WHERE knowledge_id = 14 and plugin_id = 2 and is_valid = 1 order by op_time desc LIMIT 100000 delete: cron: 0 0 0/1 * * ? - enable: false - offsetSecond: -600 + enable: true + offsetSecond: -10800 ivacyvpn_servername: - id: 103 + id: 14185 name: ivacyvpn_servername update: cron: 0 0 0/1 * * ? - enable: false - sql: + enable: true + sql: SELECT domain AS domain FROM cn_vpn_learning_domain WHERE knowledge_id = 14 and plugin_id = 8 and is_valid = 1 order by op_time desc LIMIT 100000 delete: cron: 0 0 0/1 * * ? - enable: false - offsetSecond: -600 + enable: true + offsetSecond: -10800 + windscribevpn_servername: + id: 14282 + name: windscribevpn_servername + update: + cron: 0 0 0/1 * * ? + enable: true + sql: SELECT domain AS domain FROM cn_vpn_learning_domain WHERE knowledge_id = 14 and plugin_id = 12 and is_valid = 1 order by op_time desc LIMIT 100000 + delete: + cron: 0 0 0/1 * * ? + enable: true + offsetSecond: -10800 vpnunlimited_servername: id: 104 name: vpnunlimited_servername diff --git a/src/main/java/com/geedge/scheduler/FqdnScheduler.java b/src/main/java/com/geedge/scheduler/FqdnScheduler.java index b92c6a1..9b8f120 100644 --- a/src/main/java/com/geedge/scheduler/FqdnScheduler.java +++ b/src/main/java/com/geedge/scheduler/FqdnScheduler.java @@ -155,6 +155,30 @@ public class FqdnScheduler { executeDelete(vpn4fameServernameId, vpn4fameServernameDeleteEnable, vpn4fameServernameOffsetSecond); } + @Value("${tsg.object.fqdn.windscribevpn_servername.id}") + private Integer windscribevpnServernameId; + @Value("${tsg.object.fqdn.windscribevpn_servername.name}") + private String windscribevpnServernameName; + @Value("${tsg.object.fqdn.windscribevpn_servername.update.enable}") + private Boolean windscribevpnServernameUpdateEnable; + @Value("${tsg.object.fqdn.windscribevpn_servername.update.sql}") + private String windscribevpnServernameSql; + @Value("${tsg.object.fqdn.windscribevpn_servername.delete.enable}") + private Boolean windscribevpnServernameDeleteEnable; + @Value("${tsg.object.fqdn.windscribevpn_servername.delete.offsetSecond}") + private Integer windscribevpnServernameOffsetSecond; + public Counter windscribevpnServernameCounter = Counter.build("windscribevpn_servername_counter", "COUNTER HELP").register(CollectorRegistry.defaultRegistry); + + @Scheduled(cron = "${tsg.object.fqdn.windscribevpn_servername.update.cron}") + public void updateWindscribevpn() { + executeUpdate(windscribevpnServernameId, windscribevpnServernameName, windscribevpnServernameUpdateEnable, windscribevpnServernameSql, windscribevpnServernameCounter); + } + + @Scheduled(cron = "${tsg.object.fqdn.windscribevpn_servername.delete.cron}") + public void deleteVWindscribevpn() { + executeDelete(windscribevpnServernameId, windscribevpnServernameDeleteEnable, windscribevpnServernameOffsetSecond); + } + private static void executeUpdate(Integer id, String name, Boolean enable, String sql, Counter counter) { if (TsgUtil.isLatestVersion) { executeUpdateLatest(id, name, enable, sql, counter);