diff --git a/src/main/java/com/dispose/ability/impl/YiYangAbilityImpl.java b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java similarity index 81% rename from src/main/java/com/dispose/ability/impl/YiYangAbilityImpl.java rename to src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java index f7b91bf5..dceb8436 100644 --- a/src/main/java/com/dispose/ability/impl/YiYangAbilityImpl.java +++ b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java @@ -10,12 +10,12 @@ 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.yiyang.dispose.common.YiYangDisposeAbilityRsp; -import com.yiyang.dispose.common.YiYangLoginRsp; -import com.yiyang.dispose.common.YiYangStartTaskItem; -import com.yiyang.dispose.common.YiYangStartTaskRsp; -import com.yiyang.dispose.common.YiYangStopTaskRsp; -import com.yiyang.dispose.protocol.YiYangInterface; +import com.pengxin.dispose.common.PengXinDisposeAbilityRsp; +import com.pengxin.dispose.common.PengXinLoginRsp; +import com.pengxin.dispose.common.PengXinStartTaskItem; +import com.pengxin.dispose.common.PengXinStartTaskRsp; +import com.pengxin.dispose.common.PengXinStopTaskRsp; +import com.pengxin.dispose.protocol.PengXinInterface; import inet.ipaddr.IPAddress; import inet.ipaddr.IPAddressString; import lombok.Getter; @@ -28,26 +28,26 @@ import java.util.ArrayList; import java.util.List; /** - * The type Yi yang ability. + * The type Peng xin ability. * * @author */ @Slf4j -public class YiYangAbilityImpl implements DisposeAbility { +public class PengXinAbilityImpl implements DisposeAbility { /** - * The Protect ip v 4. + * The Protect ipv4. */ private final List protectIpV4 = new ArrayList<>(); /** - * The Protect ip v 6. + * The Protect ipv6. */ private final List protectIpV6 = new ArrayList<>(); /** * The Restful interface. */ - private final YiYangInterface restfulInterface = new YiYangInterface(); + private final PengXinInterface restfulInterface = new PengXinInterface(); /** * The Task req id. @@ -81,27 +81,27 @@ public class YiYangAbilityImpl implements DisposeAbility { private String token; /** - * The Yi yang dispose type. + * The Peng xin dispose type. */ - private final Integer[] yiYangDisposeType = new Integer[] {0, 4, 1, 3}; + private final Integer[] pengXinDisposeType = new Integer[] {0, 4, 1, 3}; /** - * Gets yi yang task type. + * Gets peng xin task type. * * @param capType the cap type - * @return the yi yang task type + * @return the peng xin task type */ - private int getYiYangTaskType(DisposeCapacityType capType) { - return yiYangDisposeType[capType.getValue()]; + private int getPengXinTaskType(DisposeCapacityType capType) { + return pengXinDisposeType[capType.getValue()]; } /** - * Gets yi yang object type. + * Gets peng xin object type. * * @param objType the obj type - * @return the yi yang object type + * @return the peng xin object type */ - private int getYiYangObjectType(DisposeObjectType objType) { + private int getPengXinObjectType(DisposeObjectType objType) { switch (objType) { case URL: return 2; @@ -144,7 +144,7 @@ public class YiYangAbilityImpl implements DisposeAbility { @Nullable NetflowDirection nfDirection, @Nullable Integer attackType, @Nullable Long duration) { - List reqItems = new ArrayList<>(); + List reqItems = new ArrayList<>(); String url = urlRootPath + "dispose_device/task/start"; @@ -153,10 +153,10 @@ public class YiYangAbilityImpl implements DisposeAbility { } try { - log.info("++++Begging YiYang Start Cleanup Task: {}", ip); + log.info("++++Begging PengXin Start Cleanup Task: {}", ip); if (capType != DisposeCapacityType.BLACKHOOL) { - log.error("----Error YiYang don't support dispose capacity type: {}", capType); + log.error("----Error PengXin don't support dispose capacity type: {}", capType); return new MulReturnType<>(ErrorCode.ERR_UNSUPPORT, null); } @@ -165,15 +165,15 @@ public class YiYangAbilityImpl implements DisposeAbility { duration = -1L; } - reqItems.add(YiYangStartTaskItem.builder() - .type(getYiYangTaskType(capType)) + reqItems.add(PengXinStartTaskItem.builder() + .type(getPengXinTaskType(capType)) .disposeObject(ip) - .objectType(getYiYangObjectType(DisposeObjectType.IP)) + .objectType(getPengXinObjectType(DisposeObjectType.IP)) .disposeTime(duration) .taskReqId(String.valueOf(taskReqId++)) .build()); - ProtocolRespDTO rspInfo = restfulInterface.startDisposeTask(url, token, reqItems); + ProtocolRespDTO rspInfo = restfulInterface.startDisposeTask(url, token, reqItems); // 判断是否token过期 if (rspInfo != null && rspInfo.getCode() == HttpServletResponse.SC_UNAUTHORIZED) { @@ -183,14 +183,14 @@ public class YiYangAbilityImpl implements DisposeAbility { } if (rspInfo == null || rspInfo.getCode() != ErrorCode.ERR_OK.getHttpCode()) { - log.error("----Error YiYang start clean {} server return error", ip); + log.error("----Error PengXin start clean {} server return error", ip); return new MulReturnType<>(ErrorCode.ERR_HAOHAN_ERROR, null); } - log.debug("----Finish YiYang Start Cleanup Task: {}", ip); + log.debug("----Finish PengXin Start Cleanup Task: {}", ip); return new MulReturnType<>(ErrorCode.ERR_OK, rspInfo.getMsgContent().getItems().get(0).getTaskId()); } catch (Exception ex) { - log.error("----Exception YiYang Start Cleanup Task: {}, {}, {}", ip, nfDirection, duration); + log.error("----Exception PengXin Start Cleanup Task: {}, {}, {}", ip, nfDirection, duration); return new MulReturnType<>(ErrorCode.ERR_SYSTEMEXCEPTION, null); } } @@ -217,10 +217,10 @@ public class YiYangAbilityImpl implements DisposeAbility { } try { - log.debug("++++Begging YiYang Stop Cleanup Task: {}", taskId); + log.debug("++++Begging PengXin Stop Cleanup Task: {}", taskId); if (capType != DisposeCapacityType.BLACKHOOL) { - log.error("----Error YiYang don't support dispose capacity type: {}", capType); + log.error("----Error PengXin don't support dispose capacity type: {}", capType); return new MulReturnType<>(ErrorCode.ERR_UNSUPPORT, null); } @@ -228,8 +228,8 @@ public class YiYangAbilityImpl implements DisposeAbility { return new MulReturnType<>(ErrorCode.ERR_PARAMS, null); } - ProtocolRespDTO rspInfo = restfulInterface.stopDisposeTask(url, token, - new String[]{taskId}); + ProtocolRespDTO rspInfo = restfulInterface.stopDisposeTask(url, token, + new String[]{taskId}); // 判断是否token过期 if (rspInfo != null && rspInfo.getCode() == HttpServletResponse.SC_UNAUTHORIZED) { @@ -239,14 +239,14 @@ public class YiYangAbilityImpl implements DisposeAbility { } if (rspInfo == null || rspInfo.getCode() != ErrorCode.ERR_OK.getHttpCode()) { - log.error("----Error YiYang stop task{} server return error", taskId); + log.error("----Error PengXin stop task{} server return error", taskId); return new MulReturnType<>(ErrorCode.ERR_HAOHAN_ERROR, null); } - log.debug("----Finish YiYang Stop Cleanup Task: {}", taskId); + log.debug("----Finish PengXin Stop Cleanup Task: {}", taskId); return new MulReturnType<>(ErrorCode.ERR_OK, null); } catch (Exception ex) { - log.error("----Exception YiYang Stop Cleanup Task: {}, {}, {}", ip, nfDirection, taskId); + log.error("----Exception PengXin Stop Cleanup Task: {}, {}, {}", ip, nfDirection, taskId); return new MulReturnType<>(ErrorCode.ERR_SYSTEMEXCEPTION, null); } } @@ -260,7 +260,7 @@ public class YiYangAbilityImpl implements DisposeAbility { public MulReturnType getAbilityDeviceFireware() { return new MulReturnType<>(ErrorCode.ERR_OK, DeviceFirewareInfo.builder() - .vendor("YiYang") + .vendor("PengXin") .model("Unknown") .firmware("Unknown") .os("Linux Server") @@ -325,7 +325,7 @@ public class YiYangAbilityImpl implements DisposeAbility { try { String url = urlRootPath + "dispose_device/information/capacity"; - ProtocolRespDTO rspInfo = restfulInterface.getDeviceDisposeAbility(url, token); + ProtocolRespDTO rspInfo = restfulInterface.getDeviceDisposeAbility(url, token); // 判断是否token过期 if (rspInfo != null && rspInfo.getCode() == HttpServletResponse.SC_UNAUTHORIZED) { @@ -410,7 +410,7 @@ public class YiYangAbilityImpl implements DisposeAbility { private void upgradeToken() { try { String url = urlRootPath + "dispose_device/auth/login"; - ProtocolRespDTO logInfo = restfulInterface.login(url, username, password); + ProtocolRespDTO logInfo = restfulInterface.login(url, username, password); if (logInfo != null && logInfo.getMsgContent().getStatus() == ErrorCode.ERR_OK.getCode()) { this.token = logInfo.getMsgContent().getToken(); diff --git a/src/main/java/com/dispose/common/DisposeDeviceType.java b/src/main/java/com/dispose/common/DisposeDeviceType.java index 0cb8d943..5d6a14d6 100644 --- a/src/main/java/com/dispose/common/DisposeDeviceType.java +++ b/src/main/java/com/dispose/common/DisposeDeviceType.java @@ -16,9 +16,9 @@ public enum DisposeDeviceType implements BaseEnum { HAOHAN_PLATFORM(1, "浩瀚处置设备"), /** - * Yiyang platform dispose device type. + * The Pengxin platform. */ - YIYANG_PLATFORM(2, "亿阳处置设备"), + PENGXIN_PLATFORM(2, "鹏信处置设备"), /** * The Virtual dispose. diff --git a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java index 87371e5c..f77e41db 100644 --- a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java @@ -417,13 +417,13 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService { } /** - * Yi yang device task run. + * Peng xin device task run. * * @param ai the ai * @param deviceTask the device task * @param disposeTask the dispose task */ - private void yiYangDeviceTaskRun(AbilityInfo ai, DeviceTask deviceTask, DisposeTask disposeTask) { + private void pengXinDeviceTaskRun(AbilityInfo ai, DeviceTask deviceTask, DisposeTask disposeTask) { MulReturnType ret; // 重试错误次数过多 @@ -447,10 +447,10 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService { // 更改处置任务状态为处置中 deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_STARTED); - // 记录亿阳设备返回的任务ID + // 记录鹏信设备返回的任务ID deviceTaskManager.setTaskExternId(deviceTask.getId(), ret.getSecondParam()); - log.info("YIYANG_PLATFORM setup task succeed: {}, device taskId {}", deviceTask, ret.getSecondParam()); + log.info("PENGXIN_PLATFORM setup task succeed: {}, device taskId {}", deviceTask, ret.getSecondParam()); // 重置错误尝试次数 deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), 0); @@ -459,24 +459,24 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService { deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_NEW); // 记录任务出错重试次数 deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), deviceTask.getErrRetry() + 1); - log.error("YIYANG_PLATFORM setup task times {} error {}: {}", deviceTask.getErrRetry(), + log.error("PENGXIN_PLATFORM setup task times {} error {}: {}", deviceTask.getErrRetry(), ret.getSecondParam(), deviceTask); } else { // 任务出错，不在重试，当做失败任务处理 deviceTaskManager.setAttackTypeStatus(deviceTask.getId(), disposeTask.getFlowDirection(), 0L); - log.error("YIYANG_PLATFORM setup task error {}: {}", ret.getFirstParam(), deviceTask); + log.error("PENGXIN_PLATFORM setup task error {}: {}", ret.getFirstParam(), deviceTask); } } /** - * Yi yang device task stop. + * Peng xin device task stop. * * @param ai the ai * @param deviceTask the device task * @param disposeTask the dispose task */ - private void yiYangDeviceTaskStop(AbilityInfo ai, DeviceTask deviceTask, DisposeTask disposeTask) { + private void pengXinDeviceTaskStop(AbilityInfo ai, DeviceTask deviceTask, DisposeTask disposeTask) { MulReturnType ret; // 停止处置任务 @@ -484,7 +484,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService { deviceTask.getExternId()); if (ret.getFirstParam() == ErrorCode.ERR_OK) { - log.info("YIYANG_PLATFORM stop task succeed: {}, device taskId {}", deviceTask, ret.getSecondParam()); + log.info("PENGXIN_PLATFORM stop task succeed: {}, device taskId {}", deviceTask, ret.getSecondParam()); // 设置任务状态为结束 deviceTaskManager.changeDisposeDeviceTaskInfoStatus(deviceTask.getId(), DisposeTaskStatus.TASK_FINISHED); deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), 0); @@ -492,10 +492,10 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService { } else if (deviceTask.getErrRetry() < DisposeConfigValue.CALL_ERROR_RETRY_TIMES) { // 记录任务出错重试次数 deviceTaskManager.setTaskErrRetryTimes(deviceTask.getId(), deviceTask.getErrRetry() + 1); - log.error("YIYANG_PLATFORM stop task times {} error {}: {}", deviceTask.getErrRetry(), + log.error("PENGXIN_PLATFORM stop task times {} error {}: {}", deviceTask.getErrRetry(), ret.getSecondParam(), deviceTask); } else { - log.error("YIYANG_PLATFORM stop task error {}: {}", ret.getFirstParam(), deviceTask); + log.error("PENGXIN_PLATFORM stop task error {}: {}", ret.getFirstParam(), deviceTask); } } @@ -583,8 +583,8 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService { virtualDeviceTaskRun(ai, v, task); break; - case YIYANG_PLATFORM: - yiYangDeviceTaskRun(ai, v, task); + case PENGXIN_PLATFORM: + pengXinDeviceTaskRun(ai, v, task); break; default: @@ -647,8 +647,8 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService { virtualDeviceTaskStop(ai, v, task); break; - case YIYANG_PLATFORM: - yiYangDeviceTaskStop(ai, v, task); + case PENGXIN_PLATFORM: + pengXinDeviceTaskStop(ai, v, task); break; default: diff --git a/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java b/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java index 844a2147..55d62647 100644 --- a/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java @@ -3,8 +3,8 @@ package com.dispose.service.impl; import com.dispose.ability.DisposeAbility; import com.dispose.ability.impl.DpTechAbilityImpl; import com.dispose.ability.impl.HaoHanAbilityImpl; +import com.dispose.ability.impl.PengXinAbilityImpl; import com.dispose.ability.impl.VirtualAbilityImpl; -import com.dispose.ability.impl.YiYangAbilityImpl; import com.dispose.common.DisposeCapacityType; import com.dispose.common.ErrorCode; import com.dispose.common.HttpType; @@ -112,8 +112,8 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ case HAOHAN_PLATFORM: db = new HaoHanAbilityImpl(); break; - case YIYANG_PLATFORM: - db = new YiYangAbilityImpl(); + case PENGXIN_PLATFORM: + db = new PengXinAbilityImpl(); break; case VIRTUAL_DISPOSE: db = new VirtualAbilityImpl(); diff --git a/src/main/java/com/dispose/service/impl/UserAccountServiceImpl.java b/src/main/java/com/dispose/service/impl/UserAccountServiceImpl.java index d819e85d..21b8652d 100644 --- a/src/main/java/com/dispose/service/impl/UserAccountServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/UserAccountServiceImpl.java @@ -164,7 +164,6 @@ public class UserAccountServiceImpl implements UserAccountService { public MulReturnType createUserAccount(String username, String password, String token) { UserAccount user = userAccountManager.getUserByName(username); UserAccount optUser = userAccountManager.getUserByName("admin"); - //userAccountManager.getUserByToken(token); if (optUser == null) { return MulReturnType.builder() diff --git a/src/main/java/com/yiyang/dispose/common/YiYangBaseResp.java b/src/main/java/com/pengxin/dispose/common/PengXinBaseResp.java similarity index 75% rename from src/main/java/com/yiyang/dispose/common/YiYangBaseResp.java rename to src/main/java/com/pengxin/dispose/common/PengXinBaseResp.java index 40f07fe6..ed223eb9 100644 --- a/src/main/java/com/yiyang/dispose/common/YiYangBaseResp.java +++ b/src/main/java/com/pengxin/dispose/common/PengXinBaseResp.java @@ -1,18 +1,18 @@ -package com.yiyang.dispose.common; +package com.pengxin.dispose.common; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; /** - * The type Yi yang base resp status. + * The type Peng xin base resp. * * @author */ @Data @AllArgsConstructor @NoArgsConstructor -public class YiYangBaseResp { +public class PengXinBaseResp { /** * The Status. */ diff --git a/src/main/java/com/yiyang/dispose/common/YiYangDisposeAbilityInfo.java b/src/main/java/com/pengxin/dispose/common/PengXinDisposeAbilityInfo.java similarity index 78% rename from src/main/java/com/yiyang/dispose/common/YiYangDisposeAbilityInfo.java rename to src/main/java/com/pengxin/dispose/common/PengXinDisposeAbilityInfo.java index 448fe324..82ded19b 100644 --- a/src/main/java/com/yiyang/dispose/common/YiYangDisposeAbilityInfo.java +++ b/src/main/java/com/pengxin/dispose/common/PengXinDisposeAbilityInfo.java @@ -1,4 +1,4 @@ -package com.yiyang.dispose.common; +package com.pengxin.dispose.common; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * The type Yi yang dispose ability info. + * The type Peng xin dispose ability info. * * @author */ @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @JsonInclude(JsonInclude.Include.NON_NULL) -public class YiYangDisposeAbilityInfo { +public class PengXinDisposeAbilityInfo { /** * The Type. */ @@ -31,7 +31,7 @@ public class YiYangDisposeAbilityInfo { private Integer IPType; /** - * The Protect ip. + * The Dispose ip. */ private String disposeIp; } diff --git a/src/main/java/com/yiyang/dispose/common/YiYangDisposeAbilityRsp.java b/src/main/java/com/pengxin/dispose/common/PengXinDisposeAbilityRsp.java similarity index 72% rename from src/main/java/com/yiyang/dispose/common/YiYangDisposeAbilityRsp.java rename to src/main/java/com/pengxin/dispose/common/PengXinDisposeAbilityRsp.java index cf1d7223..1559e5fd 100644 --- a/src/main/java/com/yiyang/dispose/common/YiYangDisposeAbilityRsp.java +++ b/src/main/java/com/pengxin/dispose/common/PengXinDisposeAbilityRsp.java @@ -1,4 +1,4 @@ -package com.yiyang.dispose.common; +package com.pengxin.dispose.common; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * The type Yi yang dispose ability rsp. + * The type Peng xin dispose ability rsp. * * @author */ @@ -18,7 +18,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @JsonInclude(JsonInclude.Include.NON_NULL) -public class YiYangDisposeAbilityRsp extends YiYangBaseResp { +public class PengXinDisposeAbilityRsp extends PengXinBaseResp { /** * The Device name. */ @@ -27,5 +27,5 @@ public class YiYangDisposeAbilityRsp extends YiYangBaseResp { /** * The Capacity. */ - List capacity; + List capacity; } diff --git a/src/main/java/com/yiyang/dispose/common/YiYangLoginReq.java b/src/main/java/com/pengxin/dispose/common/PengXinLoginReq.java similarity index 78% rename from src/main/java/com/yiyang/dispose/common/YiYangLoginReq.java rename to src/main/java/com/pengxin/dispose/common/PengXinLoginReq.java index 7f054b31..f4c3c29b 100644 --- a/src/main/java/com/yiyang/dispose/common/YiYangLoginReq.java +++ b/src/main/java/com/pengxin/dispose/common/PengXinLoginReq.java @@ -1,4 +1,4 @@ -package com.yiyang.dispose.common; +package com.pengxin.dispose.common; import lombok.AllArgsConstructor; import lombok.Builder; @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * The type Yi yang login req. + * The type Peng xin login req. * * @author */ @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -public class YiYangLoginReq { +public class PengXinLoginReq { /** * The User name. */ diff --git a/src/main/java/com/yiyang/dispose/common/YiYangLoginRsp.java b/src/main/java/com/pengxin/dispose/common/PengXinLoginRsp.java similarity index 83% rename from src/main/java/com/yiyang/dispose/common/YiYangLoginRsp.java rename to src/main/java/com/pengxin/dispose/common/PengXinLoginRsp.java index 69ac877b..82ec1337 100644 --- a/src/main/java/com/yiyang/dispose/common/YiYangLoginRsp.java +++ b/src/main/java/com/pengxin/dispose/common/PengXinLoginRsp.java @@ -1,4 +1,4 @@ -package com.yiyang.dispose.common; +package com.pengxin.dispose.common; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; /** - * The type Yi yang login rsp. + * The type Peng xin login rsp. * * @author */ @@ -16,7 +16,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @JsonInclude(JsonInclude.Include.NON_NULL) -public class YiYangLoginRsp extends YiYangBaseResp { +public class PengXinLoginRsp extends PengXinBaseResp { /** * The User name. */ diff --git a/src/main/java/com/yiyang/dispose/common/YiYangStartTaskItem.java b/src/main/java/com/pengxin/dispose/common/PengXinStartTaskItem.java similarity index 83% rename from src/main/java/com/yiyang/dispose/common/YiYangStartTaskItem.java rename to src/main/java/com/pengxin/dispose/common/PengXinStartTaskItem.java index 33de77ad..9aa8e353 100644 --- a/src/main/java/com/yiyang/dispose/common/YiYangStartTaskItem.java +++ b/src/main/java/com/pengxin/dispose/common/PengXinStartTaskItem.java @@ -1,4 +1,4 @@ -package com.yiyang.dispose.common; +package com.pengxin.dispose.common; import lombok.AllArgsConstructor; import lombok.Builder; @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * The type Yi yang start task items. + * The type Peng xin start task item. * * @author */ @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -public class YiYangStartTaskItem { +public class PengXinStartTaskItem { /** * The Task req id. */ diff --git a/src/main/java/com/yiyang/dispose/common/YiYangStartTaskReq.java b/src/main/java/com/pengxin/dispose/common/PengXinStartTaskReq.java similarity index 65% rename from src/main/java/com/yiyang/dispose/common/YiYangStartTaskReq.java rename to src/main/java/com/pengxin/dispose/common/PengXinStartTaskReq.java index ded9d458..b309422d 100644 --- a/src/main/java/com/yiyang/dispose/common/YiYangStartTaskReq.java +++ b/src/main/java/com/pengxin/dispose/common/PengXinStartTaskReq.java @@ -1,4 +1,4 @@ -package com.yiyang.dispose.common; +package com.pengxin.dispose.common; import lombok.AllArgsConstructor; import lombok.Builder; @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * The type Yi yang start task req. + * The type Peng xin start task req. * * @author */ @@ -16,9 +16,9 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -public class YiYangStartTaskReq { +public class PengXinStartTaskReq { /** * The Items. */ - List items; + List items; } diff --git a/src/main/java/com/yiyang/dispose/common/YiYangStartTaskRsp.java b/src/main/java/com/pengxin/dispose/common/PengXinStartTaskRsp.java similarity index 74% rename from src/main/java/com/yiyang/dispose/common/YiYangStartTaskRsp.java rename to src/main/java/com/pengxin/dispose/common/PengXinStartTaskRsp.java index a44242a7..47a8a93b 100644 --- a/src/main/java/com/yiyang/dispose/common/YiYangStartTaskRsp.java +++ b/src/main/java/com/pengxin/dispose/common/PengXinStartTaskRsp.java @@ -1,4 +1,4 @@ -package com.yiyang.dispose.common; +package com.pengxin.dispose.common; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * The type Yi yang start task rsp. + * The type Peng xin start task rsp. * * @author */ @@ -16,7 +16,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @JsonInclude(JsonInclude.Include.NON_NULL) -public class YiYangStartTaskRsp { +public class PengXinStartTaskRsp { /** * The Device name. */ @@ -25,5 +25,5 @@ public class YiYangStartTaskRsp { /** * The Items. */ - List items; + List items; } diff --git a/src/main/java/com/yiyang/dispose/common/YiYangStartedItem.java b/src/main/java/com/pengxin/dispose/common/PengXinStartedItem.java similarity index 81% rename from src/main/java/com/yiyang/dispose/common/YiYangStartedItem.java rename to src/main/java/com/pengxin/dispose/common/PengXinStartedItem.java index c00e55ec..fd4adbb4 100644 --- a/src/main/java/com/yiyang/dispose/common/YiYangStartedItem.java +++ b/src/main/java/com/pengxin/dispose/common/PengXinStartedItem.java @@ -1,4 +1,4 @@ -package com.yiyang.dispose.common; +package com.pengxin.dispose.common; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; /** - * The type Yi yang started item. + * The type Peng xin started item. * * @author */ @@ -16,7 +16,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @JsonInclude(JsonInclude.Include.NON_NULL) -public class YiYangStartedItem extends YiYangBaseResp { +public class PengXinStartedItem extends PengXinBaseResp { /** * The Task req id. */ diff --git a/src/main/java/com/yiyang/dispose/common/YiYangStopTaskReq.java b/src/main/java/com/pengxin/dispose/common/PengXinStopTaskReq.java similarity index 73% rename from src/main/java/com/yiyang/dispose/common/YiYangStopTaskReq.java rename to src/main/java/com/pengxin/dispose/common/PengXinStopTaskReq.java index 4418c2fc..f1943560 100644 --- a/src/main/java/com/yiyang/dispose/common/YiYangStopTaskReq.java +++ b/src/main/java/com/pengxin/dispose/common/PengXinStopTaskReq.java @@ -1,4 +1,4 @@ -package com.yiyang.dispose.common; +package com.pengxin.dispose.common; import lombok.AllArgsConstructor; import lombok.Builder; @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * The type Yi yang stop task req. + * The type Peng xin stop task req. * * @author */ @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -public class YiYangStopTaskReq { +public class PengXinStopTaskReq { /** * The Task id. */ diff --git a/src/main/java/com/yiyang/dispose/common/YiYangStopTaskRsp.java b/src/main/java/com/pengxin/dispose/common/PengXinStopTaskRsp.java similarity index 73% rename from src/main/java/com/yiyang/dispose/common/YiYangStopTaskRsp.java rename to src/main/java/com/pengxin/dispose/common/PengXinStopTaskRsp.java index 4ce9bffa..862e85ac 100644 --- a/src/main/java/com/yiyang/dispose/common/YiYangStopTaskRsp.java +++ b/src/main/java/com/pengxin/dispose/common/PengXinStopTaskRsp.java @@ -1,4 +1,4 @@ -package com.yiyang.dispose.common; +package com.pengxin.dispose.common; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * The type Yi yang stop task rsp. + * The type Peng xin stop task rsp. * * @author */ @@ -16,7 +16,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @JsonInclude(JsonInclude.Include.NON_NULL) -public class YiYangStopTaskRsp { +public class PengXinStopTaskRsp { /** * The Device name. */ @@ -24,5 +24,5 @@ public class YiYangStopTaskRsp { /** * The Items. */ - private List items; + private List items; } diff --git a/src/main/java/com/yiyang/dispose/common/YiYangStoppedItem.java b/src/main/java/com/pengxin/dispose/common/PengXinStoppedItem.java similarity index 84% rename from src/main/java/com/yiyang/dispose/common/YiYangStoppedItem.java rename to src/main/java/com/pengxin/dispose/common/PengXinStoppedItem.java index 09ceb295..d5af814f 100644 --- a/src/main/java/com/yiyang/dispose/common/YiYangStoppedItem.java +++ b/src/main/java/com/pengxin/dispose/common/PengXinStoppedItem.java @@ -1,4 +1,4 @@ -package com.yiyang.dispose.common; +package com.pengxin.dispose.common; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; /** - * The type Yi yang stopped item. + * The type Peng xin stopped item. * * @author */ @@ -16,7 +16,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @JsonInclude(JsonInclude.Include.NON_NULL) -public class YiYangStoppedItem extends YiYangBaseResp { +public class PengXinStoppedItem extends PengXinBaseResp { /** * The Task id. */ diff --git a/src/main/java/com/yiyang/dispose/protocol/YiYangInterface.java b/src/main/java/com/pengxin/dispose/protocol/PengXinInterface.java similarity index 68% rename from src/main/java/com/yiyang/dispose/protocol/YiYangInterface.java rename to src/main/java/com/pengxin/dispose/protocol/PengXinInterface.java index 2217211a..e83de57c 100644 --- a/src/main/java/com/yiyang/dispose/protocol/YiYangInterface.java +++ b/src/main/java/com/pengxin/dispose/protocol/PengXinInterface.java @@ -1,29 +1,29 @@ -package com.yiyang.dispose.protocol; +package com.pengxin.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.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 com.pengxin.dispose.common.PengXinBaseResp; +import com.pengxin.dispose.common.PengXinDisposeAbilityRsp; +import com.pengxin.dispose.common.PengXinLoginReq; +import com.pengxin.dispose.common.PengXinLoginRsp; +import com.pengxin.dispose.common.PengXinStartTaskItem; +import com.pengxin.dispose.common.PengXinStartTaskReq; +import com.pengxin.dispose.common.PengXinStartTaskRsp; +import com.pengxin.dispose.common.PengXinStopTaskReq; +import com.pengxin.dispose.common.PengXinStopTaskRsp; import org.springframework.web.bind.annotation.RequestMethod; import javax.servlet.http.HttpServletResponse; import java.util.List; /** - * The type Yi yang interface. + * The type Peng xin interface. * * @author */ -public class YiYangInterface { +public class PengXinInterface { /** * The Ver. */ @@ -52,11 +52,11 @@ public class YiYangInterface { * @param password the password * @return the protocol resp dto */ - public ProtocolRespDTO login(String baseUrlPath, String username, String password) { + public ProtocolRespDTO login(String baseUrlPath, String username, String password) { - BaseProtocolDTO reqInfo = new BaseProtocolDTO<>(); + BaseProtocolDTO reqInfo = new BaseProtocolDTO<>(); - reqInfo.setMsgContent(YiYangLoginReq.builder() + reqInfo.setMsgContent(PengXinLoginReq.builder() .userName(username) .password(password) .build()); @@ -68,7 +68,7 @@ public class YiYangInterface { return RestfulInterface.baseProRun(baseUrlPath, null, reqInfo, - YiYangLoginRsp.class, + PengXinLoginRsp.class, RequestMethod.POST); } @@ -80,11 +80,11 @@ public class YiYangInterface { * @return the link status */ public ErrorCode getLinkStatus(String baseUrlPath, String token) { - ProtocolRespDTO rspInfo = RestfulInterface.baseProRun(baseUrlPath, - token, - null, - YiYangBaseResp.class, - RequestMethod.GET); + ProtocolRespDTO rspInfo = RestfulInterface.baseProRun(baseUrlPath, + token, + null, + PengXinBaseResp.class, + RequestMethod.GET); if (rspInfo != null && rspInfo.getMsgContent() != null) { if (rspInfo.getCode() == HttpServletResponse.SC_UNAUTHORIZED) { return ErrorCode.ERR_LOGOUT; @@ -104,10 +104,10 @@ public class YiYangInterface { * @param items the items * @return the protocol resp dto */ - public ProtocolRespDTO startDisposeTask(String baseUrlPath, String token, - List items) { - BaseProtocolDTO reqInfo = new BaseProtocolDTO<>(); - reqInfo.setMsgContent(new YiYangStartTaskReq()); + public ProtocolRespDTO startDisposeTask(String baseUrlPath, String token, + List items) { + BaseProtocolDTO reqInfo = new BaseProtocolDTO<>(); + reqInfo.setMsgContent(new PengXinStartTaskReq()); reqInfo.getMsgContent().setItems(items); reqInfo.setCryptoType(this.cryptoType); @@ -117,7 +117,7 @@ public class YiYangInterface { return RestfulInterface.baseProRun(baseUrlPath, token, reqInfo, - YiYangStartTaskRsp.class, + PengXinStartTaskRsp.class, RequestMethod.POST); } @@ -129,10 +129,10 @@ public class YiYangInterface { * @param taskId the task id * @return the protocol resp dto */ - public ProtocolRespDTO stopDisposeTask(String baseUrlPath, String token, String[] taskId) { - BaseProtocolDTO reqInfo = new BaseProtocolDTO<>(); + public ProtocolRespDTO stopDisposeTask(String baseUrlPath, String token, String[] taskId) { + BaseProtocolDTO reqInfo = new BaseProtocolDTO<>(); - reqInfo.setMsgContent(new YiYangStopTaskReq()); + reqInfo.setMsgContent(new PengXinStopTaskReq()); reqInfo.getMsgContent().setTaskId(taskId); reqInfo.setCryptoType(this.cryptoType); @@ -142,7 +142,7 @@ public class YiYangInterface { return RestfulInterface.baseProRun(baseUrlPath, token, reqInfo, - YiYangStopTaskRsp.class, + PengXinStopTaskRsp.class, RequestMethod.POST); } @@ -153,11 +153,11 @@ public class YiYangInterface { * @param token the token * @return the device dispose ability */ - public ProtocolRespDTO getDeviceDisposeAbility(String baseUrlPath, String token) { + public ProtocolRespDTO getDeviceDisposeAbility(String baseUrlPath, String token) { return RestfulInterface.baseProRun(baseUrlPath, token, null, - YiYangDisposeAbilityRsp.class, + PengXinDisposeAbilityRsp.class, RequestMethod.GET); } }