重构请求方法

Author: microDreamSheep

src/main/java/com/midream/sheep/api/http/HTTPTool.java

@@ -0,0 +1,37 @@
+package com.midream.sheep.api.http;
+
+import com.midream.sheep.swcj.pojo.ExecuteValue;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class HTTPTool {
+
+    public static HttpURLConnection getHttpURLConnection(ExecuteValue executeValue) throws IOException {
+        URL url = new URL(executeValue.getUrl());
+        //得到连接对象
+        HttpURLConnection con = (HttpURLConnection) url.openConnection();
+        //设置请求类型
+        con.setRequestMethod(executeValue.getType().getValue());
+        //设置请求需要返回的数据类型和字符集类型
+        con.setRequestProperty("Content-Type", "application/json;charset=GBK");
+        con.setRequestProperty("cookie", executeValue.getCookies());
+        con.setRequestProperty("user-agent", executeValue.getUserAge());
+        //set the request cookie
+        con.setRequestProperty("cookie", executeValue.getCookies());
+        //set the request timeout
+        con.setConnectTimeout(Integer.parseInt(executeValue.getTimeout()));
+        //set the request method
+        con.setRequestProperty("method", executeValue.getType().getValue());
+        //set the values
+        con.setRequestProperty("connection", "Keep-Alive");
+        //允许写出
+        con.setDoOutput(true);
+        //允许读入
+        con.setDoInput(true);
+        //不使用缓存
+        con.setUseCaches(false);
+        return con;
+    }
+}

src/main/java/com/midream/sheep/swcj/core/executetool/execute/SRequest.java

@@ -5,7 +5,15 @@
  * @description request type description class
  */
 public enum SRequest {
-    GET("GET"),POST("POST");
+    GET("GET"),
+    POST("POST"),
+    DELETE("DELETE"),
+    HEAD("HEAD"),
+    PUT("PUT"),
+    OPTIONS("OPTIONS"),
+    TRACE("TRACE"),
+    CONNECT("CONNECT"),
+    ;
 
     private String value;
 

src/main/java/com/midream/sheep/swcj/core/executetool/execute/regularexpression/SWCJregular.java

@@ -1,21 +1,19 @@
 package com.midream.sheep.swcj.core.executetool.execute.regularexpression;
 
 import com.midream.sheep.api.clazz.ClazzBuilder;
-import com.midream.sheep.api.clazz.filed.fileds.StringHandler;
+import com.midream.sheep.api.http.HTTPTool;
 import com.midream.sheep.swcj.core.executetool.SWCJExecute;
 import com.midream.sheep.swcj.data.Constant;
 import com.midream.sheep.swcj.data.XmlSpecialStrings;
 import com.midream.sheep.swcj.pojo.ExecuteValue;
+import com.midream.sheep.swcj.util.function.StringUtil;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.*;
-import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -85,66 +83,14 @@ private void putMap(Node name,Map<String,List<String>> values,List<String> list)
             values.put(RegConstants.strName, list);
         }
     }
-
     /**
      * 获取字符串
      */
     private String getText(ExecuteValue executeValue) {
-        HttpURLConnection con;
-        BufferedReader buffer;
-        StringBuilder resultBuffer;
-        InputStream inputStream = null;
         try {
-            URL url = new URL(executeValue.getUrl());
-            //得到连接对象
-            con = (HttpURLConnection) url.openConnection();
-            //设置请求类型
-            con.setRequestMethod(executeValue.getType().getValue());
-            //设置请求需要返回的数据类型和字符集类型
-            con.setRequestProperty("Content-Type", "application/json;charset=GBK");
-            con.setRequestProperty("cookie", executeValue.getCookies());
-            con.setRequestProperty("user-agent", executeValue.getUserAge());
-            //set the request cookie
-            con.setRequestProperty("cookie", executeValue.getCookies());
-            //set the request timeout
-            con.setConnectTimeout(Integer.parseInt(executeValue.getTimeout()));
-            //set the request method
-            con.setRequestProperty("method", executeValue.getType().getValue());
-            //set the values
-            con.setRequestProperty("connection", "Keep-Alive");
-            //允许写出
-            con.setDoOutput(true);
-            //允许读入
-            con.setDoInput(true);
-            //不使用缓存
-            con.setUseCaches(false);
-            //得到响应码
-            int responseCode = con.getResponseCode();
-
-            if (responseCode == HttpURLConnection.HTTP_OK) {
-                //得到响应流
-                inputStream = con.getInputStream();
-                //将响应流转换成字符串
-                resultBuffer = new StringBuilder();
-                String line;
-                buffer = new BufferedReader(new InputStreamReader(inputStream, "GBK"));
-                while ((line = buffer.readLine()) != null) {
-                    resultBuffer.append(line);
-                }
-                return resultBuffer.toString();
-            }
-        } catch (Exception e) {
-            Logger.getLogger(SWCJregular.class.getName()).warning(e.getMessage());
-            e.printStackTrace();
-        } finally {
-            if (inputStream != null) {
-                try {
-                    inputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
+            return StringUtil.getStringByStream(new BufferedReader(new InputStreamReader(HTTPTool.getHttpURLConnection(executeValue).getInputStream(), "GBK")));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         }
-        return "";
     }
 }

src/main/java/com/midream/sheep/swcj/core/factory/parse/bystr/BetterXmlParseTool.java

@@ -10,19 +10,17 @@
 import com.midream.sheep.swcj.pojo.enums.ChooseStrategy;
 import com.midream.sheep.swcj.pojo.swc.ReptileUrl;
 import com.midream.sheep.swcj.pojo.swc.RootReptile;
+import com.midream.sheep.swcj.util.function.StringUtil;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
-import java.nio.file.Files;
 import java.util.*;
 import java.util.logging.Logger;
 
 public class BetterXmlParseTool implements SWCJParseI {
     @Override
     public List<RootReptile> parseXmlFile(File xmlFile, ReptileConfig rc) {
-        return parseStringXml(getStringByStream(xmlFile), rc);
+        return parseStringXml(StringUtil.getStringByStream(xmlFile), rc);
     }
 
     @Override
@@ -185,21 +183,4 @@ private String[] parseTag(String xmlString, String startTag, String endTag) {
         return swcs.toArray(new String[0]);
     }
 
-    /**
-     * 读取文件
-     * */
-    private String getStringByStream(File xmlFile) {
-        //根据File获取xml文件文本
-        StringBuilder sb = new StringBuilder();
-        try (InputStream is = Files.newInputStream(xmlFile.toPath())) {
-            byte[] bytes = new byte[1024];
-            int len;
-            while ((len = is.read(bytes)) != -1) {
-                sb.append(new String(bytes, 0, len));
-            }
-        } catch (IOException e) {
-            Logger.getLogger(BetterXmlParseTool.class.getName()).warning(e.getMessage());
-        }
-        return sb.toString();
-    }
 }

src/main/java/com/midream/sheep/swcj/pojo/buildup/SWCJMethod.java

@@ -7,7 +7,11 @@
  * @author midreamsheep
  */
 public class SWCJMethod {
+    //方法额外的配置文件
+    private String config;
+    //请求类型
     private String requestType;
+    //方法名
     private String name;
     private String methodName;
     private List<MethodHandler> vars;
@@ -34,6 +38,14 @@ public String getRequestType() {
         return requestType;
     }
 
+    public String getConfig() {
+        return config;
+    }
+
+    public void setConfig(String config) {
+        this.config = config;
+    }
+
     public void setRequestType(String requestType) {
         this.requestType = requestType;
     }

src/main/java/com/midream/sheep/swcj/util/function/StringUtil.java

@@ -1,15 +1,22 @@
 package com.midream.sheep.swcj.util.function;
 
+import com.midream.sheep.api.http.HTTPTool;
+import com.midream.sheep.swcj.core.executetool.execute.regularexpression.SWCJregular;
+import com.midream.sheep.swcj.core.factory.parse.bystr.BetterXmlParseTool;
 import com.midream.sheep.swcj.data.Constant;
 import com.midream.sheep.swcj.data.ReptileConfig;
 import com.midream.sheep.swcj.pojo.buildup.SWCJMethod;
 import com.midream.sheep.swcj.pojo.swc.ReptileUrl;
 import com.midream.sheep.swcj.pojo.swc.RootReptile;
 
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.logging.Logger;
 
 /**
  * @author midreamsheep
@@ -86,4 +93,42 @@ public static String getExecuteCharacter(ReptileUrl ru, List<String> injection,
         }
         return templet.replace("#[in]",(Constant.nullString.contentEquals(inj))?Constant.nullString:inj.substring(0, inj.length() - 1));
     }
+    /**
+     * 读取文件
+     * */
+    public static String getStringByStream(File xmlFile) {
+        try {
+            return getStringByStream(Files.newInputStream(xmlFile.toPath()));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    public static String getStringByStream(InputStream is) {
+        try (InputStream inputStream = is) {
+            //根据File获取xml文件文本
+            StringBuilder sb = new StringBuilder();
+            byte[] bytes = new byte[1024];
+            int len;
+            while ((len = inputStream.read(bytes)) != -1) {
+                sb.append(new String(bytes, 0, len));
+            }
+            return sb.toString();
+        }catch (IOException e){
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String getStringByStream(BufferedReader gbk) {
+        StringBuilder sb;
+        try (BufferedReader input = gbk) {
+            String line;
+            sb = new StringBuilder();
+            while ((line = input.readLine()) != null) {
+                sb.append(line);
+            }
+            return sb.toString();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }