删除IP定位库执行器

3 files changed, 1 insertions, 103 deletions

diff --git a/galaxy-job-executor/pom.xml b/galaxy-job-executor/pom.xml
index 967f8d5..e36fcfb 100644
--- a/galaxy-job-executor/pom.xml
+++ b/galaxy-job-executor/pom.xml
@@ -85,11 +85,6 @@
             <artifactId>jasypt-spring-boot-starter</artifactId>
             <version>2.1.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.jvnet.hudson</groupId>
-            <artifactId>ganymed-ssh2</artifactId>
-            <version>build210-hudson-1</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -158,7 +153,7 @@
                         <JAR_FILE>${project.build.finalName}.xjar</JAR_FILE>
                     </buildArgs>
                     <imageTags>
-                        <imageTag>v1.3.220216-dev</imageTag>
+                        <imageTag>v1.3.220303</imageTag>
                     </imageTags>
                     <resources>
                         <resource>
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/core/config/IPLocateLibraryConfig.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/core/config/IPLocateLibraryConfig.java
deleted file mode 100644
index af27871..0000000
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/core/config/IPLocateLibraryConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mesalab.executor.core.config;
-
-import com.alibaba.nacos.api.config.annotation.NacosValue;
-import lombok.Data;
-import org.springframework.context.annotation.Configuration;
-
-@Data
-@Configuration
-public class IPLocateLibraryConfig {
-    @NacosValue(value = "${ip.locate.library.server}")
-    private String server;
-    @NacosValue(value = "${ip.locate.library.username}")
-    private String username;
-    @NacosValue(value = "${ip.locate.library.password}")
-    private String password;
-}
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/IPLocateLibraryJob.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/IPLocateLibraryJob.java
deleted file mode 100644
index e55b0f3..0000000
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/IPLocateLibraryJob.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.mesalab.executor.jobhandler;
-
-import ch.ethz.ssh2.Session;
-import ch.ethz.ssh2.StreamGobbler;
-import cn.hutool.log.Log;
-import com.mesalab.executor.core.config.IPLocateLibraryConfig;
-import com.mesalab.executor.exception.BusinessException;
-import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import ch.ethz.ssh2.Connection;
-/**
- * @ Author tiangaojie
- * @ Date 2022/1/14
- * @ Description 动态ip定位库生成
- * */
-
-@Component
-public class IPLocateLibraryJob {
-    private Log logger = Log.get();
-
-    @Autowired
-    private IPLocateLibraryConfig config;
-    private Connection conn;
-    @XxlJob("IPLocateLibraryJobHandler")
-    public ReturnT<String> timingCacheJob(String param){
-        String result = exec(param);
-        conn.close();
-        return ReturnT.SUCCESS;
-    }
-
-    public String exec(String cmds) {
-        InputStream in;
-        String result = "";
-        try {
-            if (this.login()) {
-                Session session = conn.openSession(); // 打开一个会话
-                session.execCommand(cmds);
-                in = session.getStdout();
-                result = this.processStdout(in, "utf-8");
-//              读取返回的数据
-                InputStream out = new StreamGobbler(session.getStdout());
-                BufferedReader reader = new BufferedReader(new InputStreamReader(out));
-                session.close();
-            }
-        } catch (IOException e1) {
-            e1.printStackTrace();
-        }
-        return result;
-    }
-    public String processStdout(InputStream in, String charset) {
-
-        byte[] buf = new byte[1024];
-        StringBuffer sb = new StringBuffer();
-        try {
-            while (in.read(buf) != -1) {
-                sb.append(new String(buf, charset));
-            }
-        } catch (IOException e) {
-            logger.info("Parameter transfer failure");
-        }
-        return sb.toString();
-    }
-    public boolean login() throws IOException {
-        conn = new Connection(config.getServer());
-        conn.connect(); // 连接
-        boolean root = conn.authenticateWithPassword(config.getUsername(), config.getPassword());
-        if(root==false){
-            throw new BusinessException("Server connection failure");
-        }
-        return root;
-    }
-
-}