diff --git a/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java index e85857937..ccf2c88af 100644 --- a/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java @@ -8,9 +8,10 @@ import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.dto.*; -import com.jsowell.thirdparty.domain.StationStatsInfo; -import com.jsowell.thirdparty.service.LianLianService; -import com.jsowell.thirdparty.vo.*; +import com.jsowell.thirdparty.lianlian.common.CommonResult; +import com.jsowell.thirdparty.lianlian.domain.StationStatsInfo; +import com.jsowell.thirdparty.lianlian.service.LianLianService; +import com.jsowell.thirdparty.lianlian.vo.*; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -313,8 +314,10 @@ public class LianLianController extends BaseController { /** * 获取token接口 + * http://localhost:8080/LianLian/v1/query_token */ - public String queryToken() { + @PostMapping("/v1/query_token") + public CommonResult queryToken() { return null; } } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java index b4c138787..8a3f58ea2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java @@ -20,7 +20,7 @@ import com.jsowell.pile.service.IPileStationInfoService; import com.jsowell.pile.service.IThirdPartySettingInfoService; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.service.PileService; -import com.jsowell.thirdparty.service.LianLianService; +import com.jsowell.thirdparty.lianlian.service.LianLianService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 60250b61d..1ddcfa708 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -43,7 +43,7 @@ import com.jsowell.service.MemberService; import com.jsowell.service.OrderService; import com.jsowell.service.PileRemoteService; import com.jsowell.service.PileService; -import com.jsowell.thirdparty.service.LianLianService; +import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.wxpay.common.WeChatPayParameter; import com.jsowell.wxpay.dto.AppletTemplateMessageSendDTO; import com.jsowell.wxpay.dto.WeChatRefundDTO; diff --git a/jsowell-common/src/main/java/com/jsowell/common/lianlian/common/CommonResult.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/CommonResult.java similarity index 96% rename from jsowell-common/src/main/java/com/jsowell/common/lianlian/common/CommonResult.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/CommonResult.java index 5a4256aee..a14096ff9 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/lianlian/common/CommonResult.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/CommonResult.java @@ -1,7 +1,7 @@ -package com.jsowell.common.lianlian.common; +package com.jsowell.thirdparty.lianlian.common; -import com.jsowell.common.lianlian.common.enums.ResultCode; +import com.jsowell.thirdparty.lianlian.common.enums.ResultCode; /** * 接口返回类 diff --git a/jsowell-common/src/main/java/com/jsowell/common/lianlian/common/enums/ResultCode.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/enums/ResultCode.java similarity index 88% rename from jsowell-common/src/main/java/com/jsowell/common/lianlian/common/enums/ResultCode.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/enums/ResultCode.java index e0fb80202..281ac82c5 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/lianlian/common/enums/ResultCode.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/enums/ResultCode.java @@ -1,4 +1,4 @@ -package com.jsowell.common.lianlian.common.enums; +package com.jsowell.thirdparty.lianlian.common.enums; /** * 返回结果枚举 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ChargeDetail.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ChargeDetail.java similarity index 96% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ChargeDetail.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ChargeDetail.java index c699c2831..c6e946921 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ChargeDetail.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ChargeDetail.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.domain; +package com.jsowell.thirdparty.lianlian.domain; import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ChargeOrder.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ChargeOrder.java similarity index 93% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ChargeOrder.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ChargeOrder.java index 4698395d4..f84102c11 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ChargeOrder.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ChargeOrder.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.domain; +package com.jsowell.thirdparty.lianlian.domain; import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorChargeStatusInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorChargeStatusInfo.java similarity index 98% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorChargeStatusInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorChargeStatusInfo.java index 6c204b6b9..b554a6afa 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorChargeStatusInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorChargeStatusInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.domain; +package com.jsowell.thirdparty.lianlian.domain; import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorInfo.java similarity index 96% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorInfo.java index 132947aee..0dade0d92 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.domain; +package com.jsowell.thirdparty.lianlian.domain; import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorStatsInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorStatsInfo.java similarity index 92% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorStatsInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorStatsInfo.java index 3038b567a..ef075fa17 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorStatsInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorStatsInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.domain; +package com.jsowell.thirdparty.lianlian.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorStatusInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorStatusInfo.java similarity index 94% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorStatusInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorStatusInfo.java index 553c93b1b..3b412b4cd 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/ConnectorStatusInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorStatusInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.domain; +package com.jsowell.thirdparty.lianlian.domain; import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/EquipmentInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentInfo.java similarity index 97% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/EquipmentInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentInfo.java index 45b394f2d..d2ed499ac 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/EquipmentInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.domain; +package com.jsowell.thirdparty.lianlian.domain; import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/EquipmentStatsInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentStatsInfo.java similarity index 94% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/EquipmentStatsInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentStatsInfo.java index 775179682..fc9089802 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/EquipmentStatsInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentStatsInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.domain; +package com.jsowell.thirdparty.lianlian.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/OperatorInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/OperatorInfo.java similarity index 94% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/OperatorInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/OperatorInfo.java index 8a7c2ca89..f738b2ca4 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/OperatorInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/OperatorInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.domain; +package com.jsowell.thirdparty.lianlian.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/OrderInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/OrderInfo.java similarity index 98% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/OrderInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/OrderInfo.java index 752089f4c..4a8c94d3a 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/OrderInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/OrderInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.domain; +package com.jsowell.thirdparty.lianlian.domain; import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationInfo.java similarity index 98% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationInfo.java index 31ad97155..fccfc4665 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.domain; +package com.jsowell.thirdparty.lianlian.domain; import com.alibaba.fastjson2.annotation.JSONField; @@ -6,7 +6,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; import java.math.BigDecimal; import java.util.List; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationStatsInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationStatsInfo.java similarity index 93% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationStatsInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationStatsInfo.java index e189c2652..19e77d470 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationStatsInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationStatsInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.domain; +package com.jsowell.thirdparty.lianlian.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationStatusInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationStatusInfo.java similarity index 91% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationStatusInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationStatusInfo.java index f9bb0a6df..527cdc8f9 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/domain/StationStatusInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationStatusInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.domain; +package com.jsowell.thirdparty.lianlian.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/LianLianService.java similarity index 94% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/LianLianService.java index e36a7331f..9eb489cef 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/LianLianService.java @@ -1,8 +1,8 @@ -package com.jsowell.thirdparty.service; +package com.jsowell.thirdparty.lianlian.service; import com.jsowell.pile.dto.*; -import com.jsowell.thirdparty.domain.StationStatsInfo; -import com.jsowell.thirdparty.vo.*; +import com.jsowell.thirdparty.lianlian.domain.StationStatsInfo; +import com.jsowell.thirdparty.lianlian.vo.*; import java.util.List; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java similarity index 99% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index b13493071..e639c2ed3 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.service.impl; +package com.jsowell.thirdparty.lianlian.service.impl; import cn.hutool.core.util.PageUtil; import cn.hutool.http.HttpUtil; @@ -17,10 +17,6 @@ import com.jsowell.common.enums.ykc.OrderStatusEnum; import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum; import com.jsowell.common.enums.ykc.PileStatusEnum; import com.jsowell.common.exception.BusinessException; -import com.jsowell.common.lianlian.Cryptos; -import com.jsowell.common.lianlian.Encodes; -import com.jsowell.common.lianlian.GBSignUtils; -import com.jsowell.common.lianlian.HttpRequestUtil; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.StringUtils; @@ -37,9 +33,13 @@ import com.jsowell.pile.vo.uniapp.BillingPriceVO; import com.jsowell.pile.vo.web.PileConnectorInfoVO; import com.jsowell.pile.vo.web.PileModelInfoVO; import com.jsowell.pile.vo.web.PileStationVO; -import com.jsowell.thirdparty.domain.*; -import com.jsowell.thirdparty.service.LianLianService; -import com.jsowell.thirdparty.vo.*; +import com.jsowell.thirdparty.lianlian.domain.*; +import com.jsowell.thirdparty.lianlian.service.LianLianService; +import com.jsowell.thirdparty.lianlian.util.Cryptos; +import com.jsowell.thirdparty.lianlian.util.Encodes; +import com.jsowell.thirdparty.lianlian.util.GBSignUtils; +import com.jsowell.thirdparty.lianlian.util.HttpRequestUtil; +import com.jsowell.thirdparty.lianlian.vo.*; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/jsowell-common/src/main/java/com/jsowell/common/lianlian/Cryptos.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Cryptos.java similarity index 99% rename from jsowell-common/src/main/java/com/jsowell/common/lianlian/Cryptos.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Cryptos.java index 68e6da379..6dabce5e3 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/lianlian/Cryptos.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Cryptos.java @@ -1,6 +1,6 @@ /** */ -package com.jsowell.common.lianlian; +package com.jsowell.thirdparty.lianlian.util; import javax.crypto.Cipher; import javax.crypto.KeyGenerator; diff --git a/jsowell-common/src/main/java/com/jsowell/common/lianlian/Digests.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Digests.java similarity index 98% rename from jsowell-common/src/main/java/com/jsowell/common/lianlian/Digests.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Digests.java index 775545aba..d4bfaadc5 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/lianlian/Digests.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Digests.java @@ -1,6 +1,6 @@ /** */ -package com.jsowell.common.lianlian; +package com.jsowell.thirdparty.lianlian.util; import org.apache.commons.lang3.Validate; diff --git a/jsowell-common/src/main/java/com/jsowell/common/lianlian/Encodes.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Encodes.java similarity index 98% rename from jsowell-common/src/main/java/com/jsowell/common/lianlian/Encodes.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Encodes.java index 539fd0055..93f4b604f 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/lianlian/Encodes.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Encodes.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2005-2012 springside.org.cn */ -package com.jsowell.common.lianlian; +package com.jsowell.thirdparty.lianlian.util; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Base64; diff --git a/jsowell-common/src/main/java/com/jsowell/common/lianlian/Exceptions.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Exceptions.java similarity index 97% rename from jsowell-common/src/main/java/com/jsowell/common/lianlian/Exceptions.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Exceptions.java index 0b22d89e5..5c0ecba15 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/lianlian/Exceptions.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Exceptions.java @@ -1,4 +1,4 @@ -package com.jsowell.common.lianlian; +package com.jsowell.thirdparty.lianlian.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jsowell-common/src/main/java/com/jsowell/common/lianlian/GBSignUtils.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/GBSignUtils.java similarity index 97% rename from jsowell-common/src/main/java/com/jsowell/common/lianlian/GBSignUtils.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/GBSignUtils.java index e9b472db3..100bfa86d 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/lianlian/GBSignUtils.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/GBSignUtils.java @@ -1,4 +1,4 @@ -package com.jsowell.common.lianlian; +package com.jsowell.thirdparty.lianlian.util; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/jsowell-common/src/main/java/com/jsowell/common/lianlian/HttpRequestUtil.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/HttpRequestUtil.java similarity index 99% rename from jsowell-common/src/main/java/com/jsowell/common/lianlian/HttpRequestUtil.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/HttpRequestUtil.java index 044cc7be1..b64466445 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/lianlian/HttpRequestUtil.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/HttpRequestUtil.java @@ -1,4 +1,4 @@ -package com.jsowell.common.lianlian; +package com.jsowell.thirdparty.lianlian.util; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson2.JSON; diff --git a/jsowell-common/src/main/java/com/jsowell/common/lianlian/LianLianUtils.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/LianLianUtils.java similarity index 96% rename from jsowell-common/src/main/java/com/jsowell/common/lianlian/LianLianUtils.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/LianLianUtils.java index 6b98347ef..cb48f539c 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/lianlian/LianLianUtils.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/LianLianUtils.java @@ -1,4 +1,4 @@ -package com.jsowell.common.lianlian; +package com.jsowell.thirdparty.lianlian.util; import com.jsowell.common.constant.Constants; import com.jsowell.common.util.BytesUtil; diff --git a/jsowell-common/src/main/java/com/jsowell/common/lianlian/SignUtils.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/SignUtils.java similarity index 98% rename from jsowell-common/src/main/java/com/jsowell/common/lianlian/SignUtils.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/SignUtils.java index b2f882dd1..d7a325bb9 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/lianlian/SignUtils.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/SignUtils.java @@ -1,4 +1,4 @@ -package com.jsowell.common.lianlian; +package com.jsowell.thirdparty.lianlian.util; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/EquipmentAuthVO.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/EquipmentAuthVO.java similarity index 95% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/EquipmentAuthVO.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/EquipmentAuthVO.java index 3ccb1e022..5c9a0024d 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/EquipmentAuthVO.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/EquipmentAuthVO.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.vo; +package com.jsowell.thirdparty.lianlian.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/LianLianPageResponse.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/LianLianPageResponse.java similarity index 93% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/LianLianPageResponse.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/LianLianPageResponse.java index 4ffee1980..ffc963a3e 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/LianLianPageResponse.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/LianLianPageResponse.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.vo; +package com.jsowell.thirdparty.lianlian.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/LianLianResultVO.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/LianLianResultVO.java similarity index 93% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/LianLianResultVO.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/LianLianResultVO.java index e861791af..ecb9546c8 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/LianLianResultVO.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/LianLianResultVO.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.vo; +package com.jsowell.thirdparty.lianlian.vo; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryChargingStatusVO.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryChargingStatusVO.java similarity index 98% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryChargingStatusVO.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryChargingStatusVO.java index 3a1aef286..73494fa41 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryChargingStatusVO.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryChargingStatusVO.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.vo; +package com.jsowell.thirdparty.lianlian.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryStartChargeVO.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryStartChargeVO.java similarity index 93% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryStartChargeVO.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryStartChargeVO.java index 531087f8b..a99135793 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryStartChargeVO.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryStartChargeVO.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.vo; +package com.jsowell.thirdparty.lianlian.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryStopChargeVO.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryStopChargeVO.java similarity index 93% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryStopChargeVO.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryStopChargeVO.java index f403f10c8..4f50b10b2 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryStopChargeVO.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryStopChargeVO.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.vo; +package com.jsowell.thirdparty.lianlian.vo; import lombok.Data;