add Psiphon3 vpn

config/application.yml

@@ -19,17 +19,6 @@ tsg:
     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
-      cyberghostvpn_serverip:
-        id: 1
-        name: cyberghostvpn_serverip
-        update:
-          cron: 0 0 0/1 * * ?
-          enable: false
-          sql:
-        delete:
-          cron: 0 0 0/1 * * ?
-          enable: false
-          offsetSecond: -600
       hotspotvpn_serverip:
         id: 2
         name: hotspotvpn_serverip
@@ -42,8 +31,23 @@ tsg:
           enable: false
           offsetSecond: -600
       ipvanishvpn_serverip:
-        id: 3
+        id: 12
         name: ipvanishvpn_serverip
+
+      psiphon3vpn_serverip:
+        id: 1310853
+        name: psiphon3vpn_serverip
+        update:
+          cron: 0 0 0/1 * * ?
+          enable: false
+          sql:
+        delete:
+          cron: 0 0 0/1 * * ?
+          enable: false
+          offsetSecond: -600
+      cyberghostvpn_serverip:
+        id: 1
+        name: cyberghostvpn_serverip
         update:
           cron: 0 0 0/1 * * ?
           enable: false

src/main/java/com/geedge/scheduler/IpScheduler.java

@@ -313,6 +313,30 @@ public class IpScheduler {
         executeDelete(expressvpnIpId, expressvpnIpDeleteEnable, expressvpnIpOffsetSecond);
     }
 
+    @Value("${tsg.object.ip.psiphon3vpn_serverip.id}")
+    private Integer psiphon3vpnServeripId;
+    @Value("${tsg.object.ip.psiphon3vpn_serverip.name}")
+    private String psiphon3vpnServeripName;
+    @Value("${tsg.object.ip.psiphon3vpn_serverip.update.enable}")
+    private Boolean psiphon3vpnServeripUpdateEnable;
+    @Value("${tsg.object.ip.psiphon3vpn_serverip.update.sql}")
+    private String psiphon3vpnServeripSql;
+    @Value("${tsg.object.ip.psiphon3vpn_serverip.delete.enable}")
+    private Boolean psiphon3vpnServeripDeleteEnable;
+    @Value("${tsg.object.ip.psiphon3vpn_serverip.delete.offsetSecond}")
+    private Integer psiphon3vpnServeripOffsetSecond;
+    public Counter psiphon3vpnServeripCounter = Counter.build("psiphon3vpn_serverip_counter", "COUNTER HELP").register(CollectorRegistry.defaultRegistry);
+
+    @Scheduled(cron = "${tsg.object.ip.psiphon3vpn_serverip.update.cron}")
+    public void updatePsiphon3vpn() {
+        executeUpdate(psiphon3vpnServeripId, psiphon3vpnServeripName, psiphon3vpnServeripUpdateEnable, psiphon3vpnServeripSql, psiphon3vpnServeripCounter);
+    }
+
+    @Scheduled(cron = "${tsg.object.ip.psiphon3vpn_serverip.delete.cron}")
+    public void deletePsiphon3vpn() {
+        executeDelete(psiphon3vpnServeripId, psiphon3vpnServeripDeleteEnable, psiphon3vpnServeripOffsetSecond);
+    }
+
 
     private static void executeUpdate(Integer id, String name, Boolean enable, String sql, Counter counter) {
         log.info("{}: started update task.", id);