From 5d0a682053b0c7dd7778867b35b0d42ee7caae4f Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Fri, 7 Apr 2023 09:02:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java | 0 .../algorithm/pojo/param/AppLineTopologyDiagramAddParm.java | 0 .../algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java | 0 .../java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java | 0 .../java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java | 0 .../java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java | 0 .../njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java | 0 .../njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java | 0 .../algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java | 0 .../njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java | 0 .../main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java | 0 .../njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java | 0 .../njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java | 0 .../njcn/algorithm/pojo/param/ProjectEquipmentQueryParm.java | 0 .../com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java | 0 .../main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java | 0 .../java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java | 0 .../main/java/com/njcn/algorithm/pojo/po/CsDictPO.java | 0 .../java/com/njcn/algorithm/pojo/po/CsEquipmentDeliveryPO.java | 0 .../java/com/njcn/algorithm/pojo/po/CsProjectEquipmentPO.java | 0 .../main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java | 0 .../java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java | 0 .../main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java | 0 .../java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java | 0 .../java/com/njcn/algorithm/pojo/vo/ProjectEquipmentVO.java | 0 pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java | 2 ++ 26 files changed, 2 insertions(+) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/param/ProjectEquipmentQueryParm.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/po/CsDictPO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/po/CsEquipmentDeliveryPO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/po/CsProjectEquipmentPO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java (100%) rename pqs-algorithm/algorithm-api/{ => src}/main/java/com/njcn/algorithm/pojo/vo/ProjectEquipmentVO.java (100%) diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAddParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppLineTopologyDiagramAuditParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDictAddParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/ProjectEquipmentQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/ProjectEquipmentQueryParm.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/ProjectEquipmentQueryParm.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/ProjectEquipmentQueryParm.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/CsDictPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsDictPO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/CsDictPO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsDictPO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/CsEquipmentDeliveryPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEquipmentDeliveryPO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/CsEquipmentDeliveryPO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEquipmentDeliveryPO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/CsProjectEquipmentPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsProjectEquipmentPO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/CsProjectEquipmentPO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsProjectEquipmentPO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDictVO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/ProjectEquipmentVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/ProjectEquipmentVO.java similarity index 100% rename from pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/ProjectEquipmentVO.java rename to pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/ProjectEquipmentVO.java diff --git a/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java b/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java index 5ce750bc0..f01039dbe 100644 --- a/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java +++ b/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java @@ -50,6 +50,8 @@ public class IpUtils { log.error("X-Real-IP:"+ipAddress); ipAddress = headers.getFirst("Proxy-Client-IP"); log.error("Proxy-Client-IP:"+ipAddress); + ipAddress = headers.getFirst("REMOTE-HOST"); + log.error("REMOTE-HOST:"+ipAddress); if (StrUtil.isBlankIfStr(ipAddress) || UNKNOWN.equalsIgnoreCase(ipAddress)) { ipAddress = headers.getFirst(HEADER_PROXY_CLIENT_IP); }