hotfix remove http-request & support Pair itself

zjn-zjn · Mar 3, 2022 · 67b0aed · 67b0aed
1 parent 35621d5
commit 67b0aed
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 46 deletions.
diff --git a/ice-client/src/main/java/com/ice/client/rmi/IceRmiClientServiceImpl.java b/ice-client/src/main/java/com/ice/client/rmi/IceRmiClientServiceImpl.java
@@ -20,7 +20,7 @@
 import com.ice.core.relation.*;
 import com.ice.core.utils.IceLinkedList;
 import com.ice.rmi.common.client.IceRmiClientService;
-import javafx.util.Pair;
+import com.ice.common.model.Pair;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

diff --git a/ice-common/src/main/java/com/ice/common/model/Pair.java b/ice-common/src/main/java/com/ice/common/model/Pair.java
@@ -0,0 +1,30 @@
+package com.ice.common.model;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Pair<K,V> implements Serializable{
+   private K key;
+
+   public K getKey() { return key; }
+
+   private V value;
+
+   @Override
+   public String toString() {
+       return key + "=" + value;
+   }
+
+   @Override
+   public int hashCode() {
+       return key.hashCode() * 13 + (value == null ? 0 : value.hashCode());
+   }
+}
+
diff --git a/ice-core/src/main/java/com/ice/core/relation/parallel/ParallelAll.java b/ice-core/src/main/java/com/ice/core/relation/parallel/ParallelAll.java
@@ -7,7 +7,7 @@
 import com.ice.core.context.IceContext;
 import com.ice.core.utils.IceExecutor;
 import com.ice.core.utils.IceLinkedList;
-import javafx.util.Pair;
+import com.ice.common.model.Pair;
 
 import java.util.LinkedList;
 import java.util.List;

diff --git a/ice-core/src/main/java/com/ice/core/relation/parallel/ParallelAnd.java b/ice-core/src/main/java/com/ice/core/relation/parallel/ParallelAnd.java
@@ -7,7 +7,7 @@
 import com.ice.core.context.IceContext;
 import com.ice.core.utils.IceExecutor;
 import com.ice.core.utils.IceLinkedList;
-import javafx.util.Pair;
+import com.ice.common.model.Pair;
 
 import java.util.ArrayList;
 import java.util.LinkedList;

diff --git a/ice-core/src/main/java/com/ice/core/relation/parallel/ParallelAny.java b/ice-core/src/main/java/com/ice/core/relation/parallel/ParallelAny.java
@@ -7,7 +7,7 @@
 import com.ice.core.context.IceContext;
 import com.ice.core.utils.IceExecutor;
 import com.ice.core.utils.IceLinkedList;
-import javafx.util.Pair;
+import com.ice.common.model.Pair;
 
 import java.util.ArrayList;
 import java.util.LinkedList;

diff --git a/ice-core/src/main/java/com/ice/core/relation/parallel/ParallelNone.java b/ice-core/src/main/java/com/ice/core/relation/parallel/ParallelNone.java
@@ -7,7 +7,7 @@
 import com.ice.core.context.IceContext;
 import com.ice.core.utils.IceExecutor;
 import com.ice.core.utils.IceLinkedList;
-import javafx.util.Pair;
+import com.ice.common.model.Pair;
 
 import java.util.LinkedList;
 import java.util.List;

diff --git a/ice-core/src/main/java/com/ice/core/relation/parallel/ParallelTrue.java b/ice-core/src/main/java/com/ice/core/relation/parallel/ParallelTrue.java
@@ -7,7 +7,7 @@
 import com.ice.core.context.IceContext;
 import com.ice.core.utils.IceExecutor;
 import com.ice.core.utils.IceLinkedList;
-import javafx.util.Pair;
+import com.ice.common.model.Pair;
 
 import java.util.LinkedList;
 import java.util.List;

diff --git a/ice-rmi-common/src/main/java/com/ice/rmi/common/client/IceRmiClientService.java b/ice-rmi-common/src/main/java/com/ice/rmi/common/client/IceRmiClientService.java
@@ -4,7 +4,7 @@
 import com.ice.common.model.IceShowConf;
 import com.ice.core.context.IceContext;
 import com.ice.core.context.IcePack;
-import javafx.util.Pair;
+import com.ice.common.model.Pair;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;

diff --git a/ice-server/pom.xml b/ice-server/pom.xml
@@ -18,11 +18,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.kevinsawicki</groupId>
-            <artifactId>http-request</artifactId>
-            <version>${kevinsawicki.http.version}</version>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

diff --git a/ice-server/src/main/java/com/ice/server/controller/IceBaseController.java b/ice-server/src/main/java/com/ice/server/controller/IceBaseController.java
@@ -1,6 +1,5 @@
 package com.ice.server.controller;
 
-import com.github.kevinsawicki.http.HttpRequest;
 import com.ice.server.dao.model.IceBase;
 import com.ice.server.dao.model.IcePushHistory;
 import com.ice.server.exception.ErrorCode;
@@ -56,18 +55,18 @@ public Long basePush(@RequestParam Integer app, @RequestParam Long iceId, @Reque
         return iceBaseService.push(app, iceId, reason);
     }
 
-    @RequestMapping(value = "/ice-server/base/pro", method = RequestMethod.POST)
-    public int pro(@RequestBody String json) {
-        if (!"product".equals(environment)) {
-            return HttpRequest.post(productImportUrl)
-                    .connectTimeout(5000)
-                    .readTimeout(5000)
-                    .header("Content-Type", "application/json; charset=utf-8")
-                    .send(json)
-                    .code();
-        }
-        return 0;
-    }
+//    @RequestMapping(value = "/ice-server/base/pro", method = RequestMethod.POST)
+//    public int pro(@RequestBody String json) {
+//        if (!"product".equals(environment)) {
+//            return HttpRequest.post(productImportUrl)
+//                    .connectTimeout(5000)
+//                    .readTimeout(5000)
+//                    .header("Content-Type", "application/json; charset=utf-8")
+//                    .send(json)
+//                    .code();
+//        }
+//        return 0;
+//    }
 
     @RequestMapping(value = "/ice-server/base/push/history", method = RequestMethod.GET)
     public PageResult<IcePushHistory> history(@RequestParam Integer app,

diff --git a/ice-server/src/main/java/com/ice/server/controller/IceEditController.java b/ice-server/src/main/java/com/ice/server/controller/IceEditController.java
@@ -2,7 +2,6 @@
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
-import com.github.kevinsawicki.http.HttpRequest;
 import com.ice.server.model.*;
 import com.ice.server.service.IceBaseService;
 import com.ice.server.service.IceEditService;
@@ -90,24 +89,24 @@ public WebResult push(@RequestBody Map map) {
         return WebResult.success(iceBaseService.push((Integer) map.get("app"), Long.parseLong(map.get("iceId").toString()), (String) map.get("reason")));
     }
 
-    /*
-     * 发布到线上
-     */
-    @Deprecated
-    @RequestMapping(value = "/ice/topro", method = RequestMethod.POST)
-    public WebResult toPro(@RequestBody Map map) {
-        WebResult result = new WebResult();
-        if (!"product".equals(environment)) {
-            int code = HttpRequest.post(productImportUrl)
-                    .connectTimeout(5000)
-                    .readTimeout(5000)
-                    .header("Content-Type", "application/json; charset=utf-8")
-                    .send(JSON.toJSONString(map))
-                    .code();
-            result.setMsg(String.valueOf(code));
-        }
-        return result;
-    }
+//    /*
+//     * 发布到线上
+//     */
+//    @Deprecated
+//    @RequestMapping(value = "/ice/topro", method = RequestMethod.POST)
+//    public WebResult toPro(@RequestBody Map map) {
+//        WebResult result = new WebResult();
+//        if (!"product".equals(environment)) {
+//            int code = HttpRequest.post(productImportUrl)
+//                    .connectTimeout(5000)
+//                    .readTimeout(5000)
+//                    .header("Content-Type", "application/json; charset=utf-8")
+//                    .send(JSON.toJSONString(map))
+//                    .code();
+//            result.setMsg(String.valueOf(code));
+//        }
+//        return result;
+//    }
 
     /*
      * 发布历史

diff --git a/ice-server/src/main/java/com/ice/server/rmi/IceRmiClientManager.java b/ice-server/src/main/java/com/ice/server/rmi/IceRmiClientManager.java
@@ -12,7 +12,7 @@
 import com.ice.server.dao.model.IceRmiExample;
 import com.ice.server.exception.ErrorCode;
 import com.ice.server.exception.ErrorCodeException;
-import javafx.util.Pair;
+import com.ice.common.model.Pair;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

diff --git a/ice-server/src/main/java/com/ice/server/service/impl/IceConfServiceImpl.java b/ice-server/src/main/java/com/ice/server/service/impl/IceConfServiceImpl.java
@@ -15,7 +15,7 @@
 import com.ice.server.rmi.IceRmiClientManager;
 import com.ice.server.service.IceConfService;
 import com.ice.server.service.IceServerService;
-import javafx.util.Pair;
+import com.ice.common.model.Pair;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;