Pixee-Bot-Java
diff --git a/‎powerjob-common/src/main/java/tech/powerjob/common/serialize/JsonUtils.java‎
Lines changed: 17 additions & 0 deletions b/‎powerjob-common/src/main/java/tech/powerjob/common/serialize/JsonUtils.java‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎powerjob-common/src/main/java/tech/powerjob/common/utils/NetUtils.java‎
Lines changed: 15 additions & 0 deletions b/‎powerjob-common/src/main/java/tech/powerjob/common/utils/NetUtils.java‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/dfs/FileLocation.java‎
Lines changed: 9 additions & 2 deletions b/‎powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/dfs/FileLocation.java‎
Lines changed: 9 additions & 2 deletions
diff --git a/‎powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/AbstractDFsService.java‎
Lines changed: 3 additions & 0 deletions b/‎powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/AbstractDFsService.java‎
Lines changed: 3 additions & 0 deletions
@@ -8,9 +8,12 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import tech.powerjob.common.exception.ImpossibleException;
 import tech.powerjob.common.exception.PowerJobException;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * JSON工具类
@@ -27,6 +30,8 @@ public class JsonUtils {
             .configure(JsonParser.Feature.IGNORE_UNDEFINED, true)
             .build();
 
+    private static final TypeReference<Map<String, Object>>  MAP_TYPE_REFERENCE  = new TypeReference<Map<String, Object>> () {};
+
     private JsonUtils(){
 
     }
@@ -67,6 +72,18 @@ public static <T> T parseObject(String json, Class<T> clz) throws JsonProcessing
         return JSON_MAPPER.readValue(json, clz);
     }
 
+    public static Map<String, Object> parseMap(String json) {
+        if (StringUtils.isEmpty(json)) {
+            return new HashMap<>();
+        }
+        try {
+            return JSON_MAPPER.readValue(json, MAP_TYPE_REFERENCE);
+        } catch (Exception e) {
+            ExceptionUtils.rethrow(e);
+        }
+        throw new ImpossibleException();
+    }
+
     public static <T> T parseObject(byte[] b, Class<T> clz) throws IOException {
         return JSON_MAPPER.readValue(b, clz);
     }
 
@@ -56,6 +56,21 @@ public static int getRandomPort() {
         return ThreadLocalRandom.current().nextInt(RND_PORT_START, RND_PORT_END);
     }
 
+    /**
+     * 检测某个 IP 端口是否可用
+     * @param ip IP
+     * @param port 端口
+     * @return 是否可用
+     */
+    public static boolean checkIpPortAvailable(String ip, int port) {
+        try (Socket socket = new Socket()) {
+            socket.connect(new InetSocketAddress(ip, port), 1000);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
     /**
      * 获取本机 IP 地址
      *
 
@@ -1,6 +1,7 @@
 package tech.powerjob.server.extension.dfs;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.Accessors;
 
 /**
@@ -9,7 +10,8 @@
  * @author tjq
  * @since 2023/7/16
  */
-@Data
+@Getter
+@Setter
 @Accessors(chain = true)
 public class FileLocation {
 
@@ -22,4 +24,9 @@ public class FileLocation {
      * 名称
      */
     private String name;
+
+    @Override
+    public String toString() {
+        return String.format("%s.%s", bucket, name);
+    }
 }
@@ -17,6 +17,8 @@
 @Slf4j
 public abstract class AbstractDFsService implements DFsService, ApplicationContextAware, DisposableBean {
 
+    protected ApplicationContext applicationContext;
+
     public AbstractDFsService() {
         log.info("[DFsService] invoke [{}]'s constructor", this.getClass().getName());
     }
@@ -32,6 +34,7 @@ protected static String fetchProperty(Environment environment, String dfsType, S
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.applicationContext = applicationContext;
         log.info("[DFsService] invoke [{}]'s setApplicationContext", this.getClass().getName());
         init(applicationContext);
     }
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`@Slf4j`
`18`	`18`	`public abstract class AbstractDFsService implements DFsService, ApplicationContextAware, DisposableBean {`
`19`	`19`
	`20`	`+ protected ApplicationContext applicationContext;`
	`21`	`+`
`20`	`22`	`public AbstractDFsService() {`
`21`	`23`	`log.info("[DFsService] invoke [{}]'s constructor", this.getClass().getName());`
`22`	`24`	`}`
`@@ -32,6 +34,7 @@ protected static String fetchProperty(Environment environment, String dfsType, S`
`32`	`34`
`33`	`35`	`@Override`
`34`	`36`	`public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {`
	`37`	`+ this.applicationContext = applicationContext;`
`35`	`38`	`log.info("[DFsService] invoke [{}]'s setApplicationContext", this.getClass().getName());`
`36`	`39`	`init(applicationContext);`
`37`	`40`	`}`