review code.

lijiahangmax · Sep 5, 2022 · d9000d0 · d9000d0
1 parent 93063a3
commit d9000d0
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 334 deletions.
diff --git a/README.md b/README.md
@@ -262,8 +262,6 @@ MD5签名   | Signatures.md5
 │
 ├─mail                     邮件工具类
 │
-├─nginx                    nginx 解析工具类
-│
 ├─process                  进程工具类
 │
 ├─tail                     文件 tail 工具类

diff --git a/orion-ext/pom.xml b/orion-ext/pom.xml
@@ -42,19 +42,6 @@
             <version>${dom4j.version}</version>
         </dependency>
 
-        <!-- nginx-parser -->
-        <dependency>
-            <groupId>com.github.odiszapc</groupId>
-            <artifactId>nginxparser</artifactId>
-            <version>${nginxparser.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.antlr</groupId>
-                    <artifactId>antlr4-runtime</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!-- git -->
         <dependency>
             <groupId>org.eclipse.jgit</groupId>

diff --git a/orion-ext/src/main/java/com/orion/ext/nginx/NginxEntry.java b/orion-ext/src/main/java/com/orion/ext/nginx/NginxEntry.java
diff --git a/orion-ext/src/main/java/com/orion/ext/nginx/NginxExt.java b/orion-ext/src/main/java/com/orion/ext/nginx/NginxExt.java
diff --git a/orion-http/src/main/java/com/orion/http/BaseHttpRequest.java b/orion-http/src/main/java/com/orion/http/BaseHttpRequest.java
@@ -34,7 +34,7 @@ public abstract class BaseHttpRequest {
     /**
      * 请求参数
      */
-    protected Map<String, String> queryParams;
+    protected Map<String, Object> queryParams;
 
     /**
      * 请求参数
@@ -137,20 +137,19 @@ public BaseHttpRequest method(HttpMethod method) {
         return this;
     }
 
-    public BaseHttpRequest queryParam(String key, String value) {
+    public BaseHttpRequest queryParam(String key, Object value) {
         if (this.queryParams == null) {
             this.queryParams = new LinkedHashMap<>();
         }
         this.queryParams.put(key, value);
         return this;
     }
 
-    public BaseHttpRequest queryParams(Map<String, String> queryParams) {
+    public BaseHttpRequest queryParams(Map<String, ?> queryParams) {
         if (this.queryParams == null) {
-            this.queryParams = queryParams;
-        } else {
-            this.queryParams.putAll(queryParams);
+            this.queryParams = new LinkedHashMap<>();
         }
+        this.queryParams.putAll(queryParams);
         return this;
     }
 
@@ -333,7 +332,7 @@ public String getMethod() {
         return method;
     }
 
-    public Map<String, String> getQueryParams() {
+    public Map<String, Object> getQueryParams() {
         return queryParams;
     }
 

diff --git a/orion-http/src/main/java/com/orion/http/apache/ApacheRequests.java b/orion-http/src/main/java/com/orion/http/apache/ApacheRequests.java
@@ -48,7 +48,7 @@ public static ApacheResponse get(String url) {
      * @param params params
      * @return response
      */
-    public static ApacheResponse get(String url, Map<String, String> params) {
+    public static ApacheResponse get(String url, Map<String, ?> params) {
         ApacheRequest request = new ApacheRequest(url);
         request.queryParams(params);
         return request.await();

diff --git a/orion-http/src/main/java/com/orion/http/ok/OkRequests.java b/orion-http/src/main/java/com/orion/http/ok/OkRequests.java
@@ -53,7 +53,7 @@ public static OkResponse get(String url) {
      * @param params params
      * @return response
      */
-    public static OkResponse get(String url, Map<String, String> params) {
+    public static OkResponse get(String url, Map<String, ?> params) {
         OkRequest request = new OkRequest(url);
         request.queryParams(params);
         return request.await();