From bcc1a8b88f1a9ef341414ec64adb1cd01aafa80c Mon Sep 17 00:00:00 2001
From: HuangXin <huangxin@cmhi.chinamobile.com>
Date: Fri, 9 Oct 2020 09:15:36 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E7=A7=BB=E5=8A=A8=E4=BA=BF?=
 =?UTF-8?q?=E9=98=B3=E8=AE=BE=E5=A4=87=E5=8C=85=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ability/impl/YiYangAbilityImpl.java       |  6 +++---
 .../yiyang/dispose/common/YiYangBaseResp.java |  2 +-
 .../common/YiYangDisposeAbilityInfo.java      |  2 +-
 .../common/YiYangDisposeAbilityRsp.java       |  2 +-
 .../yiyang/dispose/common/YiYangLoginReq.java |  2 +-
 .../yiyang/dispose/common/YiYangLoginRsp.java |  2 +-
 .../dispose/common/YiYangStartTaskItem.java   |  2 +-
 .../dispose/common/YiYangStartTaskReq.java    |  2 +-
 .../dispose/common/YiYangStartTaskRsp.java    |  2 +-
 .../dispose/common/YiYangStartedItem.java     |  2 +-
 .../dispose/common/YiYangStopTaskReq.java     |  2 +-
 .../dispose/common/YiYangStopTaskRsp.java     |  2 +-
 .../dispose/common/YiYangStoppedItem.java     |  2 +-
 .../dispose/protocol/YiYangInterface.java     | 20 +++++++++----------
 14 files changed, 25 insertions(+), 25 deletions(-)
 rename src/main/java/com/{dispose => }/yiyang/dispose/common/YiYangBaseResp.java (89%)
 rename src/main/java/com/{dispose => }/yiyang/dispose/common/YiYangDisposeAbilityInfo.java (93%)
 rename src/main/java/com/{dispose => }/yiyang/dispose/common/YiYangDisposeAbilityRsp.java (93%)
 rename src/main/java/com/{dispose => }/yiyang/dispose/common/YiYangLoginReq.java (90%)
 rename src/main/java/com/{dispose => }/yiyang/dispose/common/YiYangLoginRsp.java (94%)
 rename src/main/java/com/{dispose => }/yiyang/dispose/common/YiYangStartTaskItem.java (93%)
 rename src/main/java/com/{dispose => }/yiyang/dispose/common/YiYangStartTaskReq.java (90%)
 rename src/main/java/com/{dispose => }/yiyang/dispose/common/YiYangStartTaskRsp.java (92%)
 rename src/main/java/com/{dispose => }/yiyang/dispose/common/YiYangStartedItem.java (93%)
 rename src/main/java/com/{dispose => }/yiyang/dispose/common/YiYangStopTaskReq.java (89%)
 rename src/main/java/com/{dispose => }/yiyang/dispose/common/YiYangStopTaskRsp.java (92%)
 rename src/main/java/com/{dispose => }/yiyang/dispose/common/YiYangStoppedItem.java (94%)
 rename src/main/java/com/{dispose => }/yiyang/dispose/protocol/YiYangInterface.java (90%)

diff --git a/src/main/java/com/dispose/ability/impl/YiYangAbilityImpl.java b/src/main/java/com/dispose/ability/impl/YiYangAbilityImpl.java
index b317429b..3998f01e 100644
--- a/src/main/java/com/dispose/ability/impl/YiYangAbilityImpl.java
+++ b/src/main/java/com/dispose/ability/impl/YiYangAbilityImpl.java
@@ -10,9 +10,9 @@ import com.dispose.common.NetflowDirection;
 import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
 import com.dispose.pojo.po.MulReturnType;
 import com.dispose.pojo.vo.DeviceFirewareInfo;
-import com.dispose.yiyang.dispose.common.YiYangDisposeAbilityRsp;
-import com.dispose.yiyang.dispose.common.YiYangLoginRsp;
-import com.dispose.yiyang.dispose.protocol.YiYangInterface;
+import com.yiyang.dispose.common.YiYangDisposeAbilityRsp;
+import com.yiyang.dispose.common.YiYangLoginRsp;
+import com.yiyang.dispose.protocol.YiYangInterface;
 import inet.ipaddr.IPAddress;
 import inet.ipaddr.IPAddressString;
 import lombok.Getter;
diff --git a/src/main/java/com/dispose/yiyang/dispose/common/YiYangBaseResp.java b/src/main/java/com/yiyang/dispose/common/YiYangBaseResp.java
similarity index 89%
rename from src/main/java/com/dispose/yiyang/dispose/common/YiYangBaseResp.java
rename to src/main/java/com/yiyang/dispose/common/YiYangBaseResp.java
index 8fc6d7e1..40f07fe6 100644
--- a/src/main/java/com/dispose/yiyang/dispose/common/YiYangBaseResp.java
+++ b/src/main/java/com/yiyang/dispose/common/YiYangBaseResp.java
@@ -1,4 +1,4 @@
-package com.dispose.yiyang.dispose.common;
+package com.yiyang.dispose.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/dispose/yiyang/dispose/common/YiYangDisposeAbilityInfo.java b/src/main/java/com/yiyang/dispose/common/YiYangDisposeAbilityInfo.java
similarity index 93%
rename from src/main/java/com/dispose/yiyang/dispose/common/YiYangDisposeAbilityInfo.java
rename to src/main/java/com/yiyang/dispose/common/YiYangDisposeAbilityInfo.java
index 76b9995b..448fe324 100644
--- a/src/main/java/com/dispose/yiyang/dispose/common/YiYangDisposeAbilityInfo.java
+++ b/src/main/java/com/yiyang/dispose/common/YiYangDisposeAbilityInfo.java
@@ -1,4 +1,4 @@
-package com.dispose.yiyang.dispose.common;
+package com.yiyang.dispose.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/dispose/yiyang/dispose/common/YiYangDisposeAbilityRsp.java b/src/main/java/com/yiyang/dispose/common/YiYangDisposeAbilityRsp.java
similarity index 93%
rename from src/main/java/com/dispose/yiyang/dispose/common/YiYangDisposeAbilityRsp.java
rename to src/main/java/com/yiyang/dispose/common/YiYangDisposeAbilityRsp.java
index 091820c0..cf1d7223 100644
--- a/src/main/java/com/dispose/yiyang/dispose/common/YiYangDisposeAbilityRsp.java
+++ b/src/main/java/com/yiyang/dispose/common/YiYangDisposeAbilityRsp.java
@@ -1,4 +1,4 @@
-package com.dispose.yiyang.dispose.common;
+package com.yiyang.dispose.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/dispose/yiyang/dispose/common/YiYangLoginReq.java b/src/main/java/com/yiyang/dispose/common/YiYangLoginReq.java
similarity index 90%
rename from src/main/java/com/dispose/yiyang/dispose/common/YiYangLoginReq.java
rename to src/main/java/com/yiyang/dispose/common/YiYangLoginReq.java
index c5865ae6..7f054b31 100644
--- a/src/main/java/com/dispose/yiyang/dispose/common/YiYangLoginReq.java
+++ b/src/main/java/com/yiyang/dispose/common/YiYangLoginReq.java
@@ -1,4 +1,4 @@
-package com.dispose.yiyang.dispose.common;
+package com.yiyang.dispose.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/com/dispose/yiyang/dispose/common/YiYangLoginRsp.java b/src/main/java/com/yiyang/dispose/common/YiYangLoginRsp.java
similarity index 94%
rename from src/main/java/com/dispose/yiyang/dispose/common/YiYangLoginRsp.java
rename to src/main/java/com/yiyang/dispose/common/YiYangLoginRsp.java
index 79a9fabd..69ac877b 100644
--- a/src/main/java/com/dispose/yiyang/dispose/common/YiYangLoginRsp.java
+++ b/src/main/java/com/yiyang/dispose/common/YiYangLoginRsp.java
@@ -1,4 +1,4 @@
-package com.dispose.yiyang.dispose.common;
+package com.yiyang.dispose.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStartTaskItem.java b/src/main/java/com/yiyang/dispose/common/YiYangStartTaskItem.java
similarity index 93%
rename from src/main/java/com/dispose/yiyang/dispose/common/YiYangStartTaskItem.java
rename to src/main/java/com/yiyang/dispose/common/YiYangStartTaskItem.java
index abf018e5..33de77ad 100644
--- a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStartTaskItem.java
+++ b/src/main/java/com/yiyang/dispose/common/YiYangStartTaskItem.java
@@ -1,4 +1,4 @@
-package com.dispose.yiyang.dispose.common;
+package com.yiyang.dispose.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStartTaskReq.java b/src/main/java/com/yiyang/dispose/common/YiYangStartTaskReq.java
similarity index 90%
rename from src/main/java/com/dispose/yiyang/dispose/common/YiYangStartTaskReq.java
rename to src/main/java/com/yiyang/dispose/common/YiYangStartTaskReq.java
index 9bf2c6c5..ded9d458 100644
--- a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStartTaskReq.java
+++ b/src/main/java/com/yiyang/dispose/common/YiYangStartTaskReq.java
@@ -1,4 +1,4 @@
-package com.dispose.yiyang.dispose.common;
+package com.yiyang.dispose.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStartTaskRsp.java b/src/main/java/com/yiyang/dispose/common/YiYangStartTaskRsp.java
similarity index 92%
rename from src/main/java/com/dispose/yiyang/dispose/common/YiYangStartTaskRsp.java
rename to src/main/java/com/yiyang/dispose/common/YiYangStartTaskRsp.java
index 0da0a146..a44242a7 100644
--- a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStartTaskRsp.java
+++ b/src/main/java/com/yiyang/dispose/common/YiYangStartTaskRsp.java
@@ -1,4 +1,4 @@
-package com.dispose.yiyang.dispose.common;
+package com.yiyang.dispose.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStartedItem.java b/src/main/java/com/yiyang/dispose/common/YiYangStartedItem.java
similarity index 93%
rename from src/main/java/com/dispose/yiyang/dispose/common/YiYangStartedItem.java
rename to src/main/java/com/yiyang/dispose/common/YiYangStartedItem.java
index 343debb1..c00e55ec 100644
--- a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStartedItem.java
+++ b/src/main/java/com/yiyang/dispose/common/YiYangStartedItem.java
@@ -1,4 +1,4 @@
-package com.dispose.yiyang.dispose.common;
+package com.yiyang.dispose.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStopTaskReq.java b/src/main/java/com/yiyang/dispose/common/YiYangStopTaskReq.java
similarity index 89%
rename from src/main/java/com/dispose/yiyang/dispose/common/YiYangStopTaskReq.java
rename to src/main/java/com/yiyang/dispose/common/YiYangStopTaskReq.java
index 769d835c..4418c2fc 100644
--- a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStopTaskReq.java
+++ b/src/main/java/com/yiyang/dispose/common/YiYangStopTaskReq.java
@@ -1,4 +1,4 @@
-package com.dispose.yiyang.dispose.common;
+package com.yiyang.dispose.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStopTaskRsp.java b/src/main/java/com/yiyang/dispose/common/YiYangStopTaskRsp.java
similarity index 92%
rename from src/main/java/com/dispose/yiyang/dispose/common/YiYangStopTaskRsp.java
rename to src/main/java/com/yiyang/dispose/common/YiYangStopTaskRsp.java
index f7215713..4ce9bffa 100644
--- a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStopTaskRsp.java
+++ b/src/main/java/com/yiyang/dispose/common/YiYangStopTaskRsp.java
@@ -1,4 +1,4 @@
-package com.dispose.yiyang.dispose.common;
+package com.yiyang.dispose.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStoppedItem.java b/src/main/java/com/yiyang/dispose/common/YiYangStoppedItem.java
similarity index 94%
rename from src/main/java/com/dispose/yiyang/dispose/common/YiYangStoppedItem.java
rename to src/main/java/com/yiyang/dispose/common/YiYangStoppedItem.java
index 50fbfdd4..09ceb295 100644
--- a/src/main/java/com/dispose/yiyang/dispose/common/YiYangStoppedItem.java
+++ b/src/main/java/com/yiyang/dispose/common/YiYangStoppedItem.java
@@ -1,4 +1,4 @@
-package com.dispose.yiyang.dispose.common;
+package com.yiyang.dispose.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/dispose/yiyang/dispose/protocol/YiYangInterface.java b/src/main/java/com/yiyang/dispose/protocol/YiYangInterface.java
similarity index 90%
rename from src/main/java/com/dispose/yiyang/dispose/protocol/YiYangInterface.java
rename to src/main/java/com/yiyang/dispose/protocol/YiYangInterface.java
index 2945b090..2217211a 100644
--- a/src/main/java/com/dispose/yiyang/dispose/protocol/YiYangInterface.java
+++ b/src/main/java/com/yiyang/dispose/protocol/YiYangInterface.java
@@ -1,18 +1,18 @@
-package com.dispose.yiyang.dispose.protocol;
+package com.yiyang.dispose.protocol;
 
 import com.dispose.common.ErrorCode;
 import com.dispose.pojo.dto.protocol.base.BaseProtocolDTO;
 import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
 import com.dispose.restful.RestfulInterface;
-import com.dispose.yiyang.dispose.common.YiYangBaseResp;
-import com.dispose.yiyang.dispose.common.YiYangDisposeAbilityRsp;
-import com.dispose.yiyang.dispose.common.YiYangLoginReq;
-import com.dispose.yiyang.dispose.common.YiYangLoginRsp;
-import com.dispose.yiyang.dispose.common.YiYangStartTaskItem;
-import com.dispose.yiyang.dispose.common.YiYangStartTaskReq;
-import com.dispose.yiyang.dispose.common.YiYangStartTaskRsp;
-import com.dispose.yiyang.dispose.common.YiYangStopTaskReq;
-import com.dispose.yiyang.dispose.common.YiYangStopTaskRsp;
+import com.yiyang.dispose.common.YiYangBaseResp;
+import com.yiyang.dispose.common.YiYangDisposeAbilityRsp;
+import com.yiyang.dispose.common.YiYangLoginReq;
+import com.yiyang.dispose.common.YiYangLoginRsp;
+import com.yiyang.dispose.common.YiYangStartTaskItem;
+import com.yiyang.dispose.common.YiYangStartTaskReq;
+import com.yiyang.dispose.common.YiYangStartTaskRsp;
+import com.yiyang.dispose.common.YiYangStopTaskReq;
+import com.yiyang.dispose.common.YiYangStopTaskRsp;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import javax.servlet.http.HttpServletResponse;