From d3f65edccffad28c390514eb0f7ad06027bc3bb4 Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Wed, 27 Dec 2017 10:59:05 +0800 Subject: [PATCH] fix commons --- .../payment/manage/PaymentManageApplication.java | 2 +- .../impls/OneDollarDayActivitySupportImpl.java | 4 ++-- .../manage/analysis/beans/AnalysisBean.java | 2 +- .../manage/analysis/beans/ClientRateQueryBean.java | 2 +- .../manage/analysis/beans/RefundReviewBean.java | 4 ++-- .../manage/analysis/beans/SettleDelayQuery.java | 2 +- .../core/impls/ClientRatesAnalysisServiceImpl.java | 4 ++-- .../core/impls/CustomersAnalysisServiceImp.java | 4 ++-- .../manage/analysis/core/impls/DailyReportImp.java | 4 ++-- .../analysis/core/impls/DashboardServiceImpl.java | 4 ++-- .../core/impls/EstimateAnalysisServiceImpl.java | 2 +- .../core/impls/OrderSuccessRateAnalysis.java | 4 ++-- .../core/impls/PartnerCardDashboardServiceImp.java | 2 +- .../impls/PlatformClearAnalysisServiceImpl.java | 4 ++-- .../analysis/core/impls/WeekReporterImpl.java | 4 ++-- .../ClientRateReviewEventLoader.java | 2 +- .../manage/analysis/web/ClientRatesController.java | 2 +- .../analysis/web/OrderSuccessRateController.java | 2 +- .../web/PartnerCardDashboardController.java | 2 +- .../analysis/web/PlatformRevenueController.java | 2 +- .../manage/appclient/beans/AppQueryBean.java | 2 +- .../appclient/core/impls/RetailAppServiceImp.java | 6 +++--- .../appclient/web/RetailValidationController.java | 2 +- .../core/impls/SimpleClientServiceImp.java | 4 ++-- .../apps/core/impls/AppPermissionSupportImpl.java | 2 +- .../manage/apps/core/impls/SSOSupportImpl.java | 2 +- .../bdprize/core/impls/BDPrizeServiceImpl.java | 4 ++-- .../manage/cashback/bean/CashbackQuery.java | 2 +- .../manage/cashiers/beans/CashierQueryBean.java | 2 +- .../cashiers/core/impls/CashierServiceImp.java | 2 +- .../core/impls/CityPartnerPrizeServiceImpl.java | 4 ++-- .../core/impls/CityPartnerRegisterServiceImpl.java | 2 +- .../manage/customers/beans/GatewayParams.java | 2 +- .../customers/beans/ReceiveLogQueryBean.java | 4 ++-- .../core/impls/CouponValidateServiceImpl.java | 2 +- .../core/impls/CustomerPointsServiceImp.java | 4 ++-- .../core/impls/EncourageUseProcessor.java | 14 +++++++------- .../dev/core/impl/WechatMessageServiceImpl.java | 4 ++-- .../dev/listeners/CloseOrderWarningSender.java | 6 +++--- .../manage/dev/listeners/WarningSenderHelper.java | 2 +- .../recognizers/PaymentAmountCheatMonitor.java | 4 ++-- .../payment/manage/dev/web/MailTestController.java | 2 +- .../payment/manage/dev/web/TestController.java | 2 +- .../manage/dev/web/WxSettleLogController.java | 2 +- .../manage/fund/beans/ClientQueryParams.java | 2 +- .../fund/core/impls/XPlanFundProcessorImpl.java | 8 ++++---- .../payment/manage/goods/bean/GoodOrderQuery.java | 2 +- .../payment/manage/goods/bean/GoodQuery.java | 2 +- .../payment/manage/logview/beans/LogQueryBean.java | 4 ++-- .../manage/logview/beans/LogRiskQueryBean.java | 2 +- .../manage/logview/beans/NotifyQueryBean.java | 4 ++-- .../manage/logview/beans/WechatMsgQueryBean.java | 4 ++-- .../clearing/beans/SettleDelayConfig.java | 2 +- .../clearing/core/impl/CleanServiceImpl.java | 8 ++++---- .../core/impl/SettleDelayConfigurerImpl.java | 4 ++-- .../clearing/web/CleanLogClientController.java | 2 +- .../clearing/web/FinancialController.java | 4 ++-- .../management/sysconfig/beans/FuncInfo.java | 2 +- .../manage/merchants/beans/ClientRateConfig.java | 2 +- .../manage/merchants/beans/PartnerApplyQuery.java | 2 +- .../manage/merchants/beans/PartnerQuery.java | 4 ++-- .../merchants/core/impls/ClientApplyImpl.java | 2 +- .../merchants/core/impls/ClientManagerImpl.java | 8 ++++---- .../ClientComplySubMerchantIDValidator.java | 2 +- .../events/listeners/NotyfyBDEventListener.java | 2 +- .../SendingApplyToWechatMessageListener.java | 2 +- .../merchants/web/PartnerApplyController.java | 2 +- .../payment/manage/notice/beans/NoticeQuery.java | 2 +- .../manage/notice/core/impls/MailServiceImp.java | 2 +- .../manage/organizations/beans/OrgInfo.java | 2 +- .../permission/manager/ManagerUserInterceptor.java | 4 ++-- .../manage/permission/manager/UserAdvise.java | 2 +- .../permission/manager/scanner/PermissionNode.java | 2 +- .../payment/manage/product/beans/ProductBean.java | 2 +- .../product/core/impls/ClientProductImpl.java | 2 +- .../promotion/web/PromotionRootController.java | 2 +- .../payment/manage/redpack/beans/RedpackQuery.java | 2 +- .../redpack/core/impls/ActRedPackServiceImpl.java | 14 +++++++------- .../redpack/core/impls/PartnerLMServiceImp.java | 4 ++-- .../redpack/core/impls/RedpackServiceImpl.java | 14 +++++++------- .../payment/manage/signin/beans/ManagerInfo.java | 2 +- .../core/impls/ManagerWechatBindServiceImpl.java | 4 ++-- .../core/impls/SignInAccountServiceImpl.java | 4 ++-- .../signin/core/impls/SignInStatusManagerImpl.java | 2 +- .../payment/manage/support/abafile/ABAFile.java | 4 ++-- .../manage/task/DailyReportGenerationTask.java | 4 ++-- .../payment/manage/task/DashboardTaskManager.java | 2 +- .../PartnerTransactionsDailyMsgTaskManager.java | 2 +- .../manage/tradelog/beans/ClearingLogQuery.java | 2 +- .../manage/tradelog/beans/PreRefundQueryBean.java | 2 +- .../manage/tradelog/beans/TradeLogQuery.java | 4 ++-- .../tradelog/core/impls/TradeLogServiceImpl.java | 10 +++++----- .../listeners/NoticeRefuseRefundListener.java | 2 +- .../listeners/RefundSendTemplateMessageSender.java | 2 +- 94 files changed, 158 insertions(+), 158 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/PaymentManageApplication.java b/src/main/java/au/com/royalpay/payment/manage/PaymentManageApplication.java index 4c9663614..caaed476a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/PaymentManageApplication.java +++ b/src/main/java/au/com/royalpay/payment/manage/PaymentManageApplication.java @@ -4,7 +4,7 @@ import com.google.code.kaptcha.Producer; import com.google.code.kaptcha.impl.DefaultKaptcha; import com.google.code.kaptcha.util.Config; import com.maxmind.geoip.LookupService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/diet/core/impls/OneDollarDayActivitySupportImpl.java b/src/main/java/au/com/royalpay/payment/manage/activities/diet/core/impls/OneDollarDayActivitySupportImpl.java index 356b2299b..455897b09 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/diet/core/impls/OneDollarDayActivitySupportImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/diet/core/impls/OneDollarDayActivitySupportImpl.java @@ -26,8 +26,8 @@ import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import org.joda.time.DateTime; import org.springframework.stereotype.Service; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java index 1c90ca15d..5b92ba4af 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.analysis.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.hibernate.validator.constraints.NotEmpty; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/ClientRateQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/ClientRateQueryBean.java index 49223cf66..fd841be40 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/ClientRateQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/ClientRateQueryBean.java @@ -4,7 +4,7 @@ import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.hibernate.validator.constraints.NotEmpty; import java.text.ParseException; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/RefundReviewBean.java b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/RefundReviewBean.java index b47c34a90..e372ad334 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/RefundReviewBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/RefundReviewBean.java @@ -2,8 +2,8 @@ package au.com.royalpay.payment.manage.analysis.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.DateFormat; import java.text.ParseException; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/SettleDelayQuery.java b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/SettleDelayQuery.java index 33062dfc6..07dc0e1d8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/SettleDelayQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/SettleDelayQuery.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.analysis.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.ParseException; import java.util.Date; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ClientRatesAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ClientRatesAnalysisServiceImpl.java index 1b93df44b..cb87bae94 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ClientRatesAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ClientRatesAnalysisServiceImpl.java @@ -11,8 +11,8 @@ import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java index 42665282d..1f208d280 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java @@ -18,8 +18,8 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DailyReportImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DailyReportImp.java index 70b662b7d..d48b72cbc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DailyReportImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DailyReportImp.java @@ -16,8 +16,8 @@ import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import au.com.royalpay.payment.tools.exceptions.NotFoundException; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java index fab7ab6b4..6b65c4dc0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java @@ -13,8 +13,8 @@ import au.com.royalpay.payment.tools.defines.TradeType; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; -import org.apache.commons.lang.time.DateUtils; -import org.apache.commons.lang.time.DurationFormatUtils; +import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.lang3.time.DurationFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java index 35ed61060..5e2120145 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java @@ -13,7 +13,7 @@ import au.com.royalpay.payment.manage.mappers.system.ClientMapper; import au.com.royalpay.payment.tools.exceptions.NotFoundException; import au.com.royalpay.payment.tools.utils.TimeZoneUtils; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrderSuccessRateAnalysis.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrderSuccessRateAnalysis.java index b3a20ecfc..628c77897 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrderSuccessRateAnalysis.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrderSuccessRateAnalysis.java @@ -4,8 +4,8 @@ import au.com.royalpay.payment.manage.analysis.core.OrderSuccessRateAnalysisServ import au.com.royalpay.payment.manage.analysis.mappers.OrderAnalysisMapper; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PartnerCardDashboardServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PartnerCardDashboardServiceImp.java index baea08efb..bf8f511a1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PartnerCardDashboardServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PartnerCardDashboardServiceImp.java @@ -17,7 +17,7 @@ import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java index 922414901..667f6632e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java @@ -15,8 +15,8 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/WeekReporterImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/WeekReporterImpl.java index 84ffd22c7..1708cb9db 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/WeekReporterImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/WeekReporterImpl.java @@ -18,8 +18,8 @@ import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import au.com.royalpay.payment.tools.exceptions.NotFoundException; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/clientRateSupport/ClientRateReviewEventLoader.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/clientRateSupport/ClientRateReviewEventLoader.java index d9bdecbb2..214575d6c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/clientRateSupport/ClientRateReviewEventLoader.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/clientRateSupport/ClientRateReviewEventLoader.java @@ -4,7 +4,7 @@ import au.com.royalpay.payment.manage.analysis.beans.ClientRateQueryBean; import au.com.royalpay.payment.manage.analysis.core.impls.ClientRatesAnalysisServiceImpl; import au.com.royalpay.payment.manage.mappers.log.ClientReviewLogMapper; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/ClientRatesController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/ClientRatesController.java index 124efed05..12c15b9d2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/ClientRatesController.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/ClientRatesController.java @@ -10,7 +10,7 @@ import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import au.com.royalpay.payment.tools.http.HttpUtils; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.validation.Errors; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/OrderSuccessRateController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/OrderSuccessRateController.java index 1b7904e8e..19989ae5f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/OrderSuccessRateController.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/OrderSuccessRateController.java @@ -5,7 +5,7 @@ import au.com.royalpay.payment.manage.analysis.core.OrderSuccessRateAnalysisServ import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerCardDashboardController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerCardDashboardController.java index d85a89b93..bcb8a8f7a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerCardDashboardController.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerCardDashboardController.java @@ -10,7 +10,7 @@ import au.com.royalpay.payment.manage.tradelog.beans.TradeLogQuery; import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/PlatformRevenueController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/PlatformRevenueController.java index 0855c80ad..6383e0500 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/PlatformRevenueController.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/PlatformRevenueController.java @@ -4,7 +4,7 @@ import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import au.com.royalpay.payment.manage.analysis.core.PlatformRevenueService; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.joda.time.DateTime; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java index 4606940d4..2514700bb 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java @@ -5,7 +5,7 @@ import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import au.com.royalpay.payment.core.beans.PayChannel; import au.com.royalpay.payment.tools.defines.TradeType; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.DateFormat; import java.text.ParseException; diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 0d9434462..73585a729 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -43,9 +43,9 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; import com.notnoop.apns.APNS; import com.notnoop.apns.ApnsService; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.slf4j.LoggerFactory; diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java index 41814ec30..d00114502 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java @@ -9,7 +9,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.code.kaptcha.Producer; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.springframework.validation.Errors; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientServiceImp.java index e5002702a..fc57b451c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientServiceImp.java @@ -9,8 +9,8 @@ import au.com.royalpay.payment.tools.env.PlatformEnvironment; import au.com.royalpay.payment.tools.env.SysConfigManager; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/AppPermissionSupportImpl.java b/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/AppPermissionSupportImpl.java index 81380b200..679441084 100644 --- a/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/AppPermissionSupportImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/AppPermissionSupportImpl.java @@ -5,7 +5,7 @@ import au.com.royalpay.payment.manage.mappers.system.SysAppsMapper; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import com.alibaba.fastjson.JSONObject; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/SSOSupportImpl.java b/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/SSOSupportImpl.java index 64cc0bc83..d713a2140 100644 --- a/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/SSOSupportImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/SSOSupportImpl.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.apps.core.impls; import au.com.royalpay.payment.manage.apps.core.SSOSupport; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java index 98c989149..c750d7e00 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java @@ -11,8 +11,8 @@ import java.util.List; import javax.annotation.Resource; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/src/main/java/au/com/royalpay/payment/manage/cashback/bean/CashbackQuery.java b/src/main/java/au/com/royalpay/payment/manage/cashback/bean/CashbackQuery.java index 41f226e84..421aef836 100644 --- a/src/main/java/au/com/royalpay/payment/manage/cashback/bean/CashbackQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/cashback/bean/CashbackQuery.java @@ -4,7 +4,7 @@ import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.hibernate.validator.constraints.NotEmpty; import java.text.DateFormat; diff --git a/src/main/java/au/com/royalpay/payment/manage/cashiers/beans/CashierQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/cashiers/beans/CashierQueryBean.java index ceca64644..b7f663330 100644 --- a/src/main/java/au/com/royalpay/payment/manage/cashiers/beans/CashierQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/cashiers/beans/CashierQueryBean.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.cashiers.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.DateFormat; import java.text.ParseException; diff --git a/src/main/java/au/com/royalpay/payment/manage/cashiers/core/impls/CashierServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/cashiers/core/impls/CashierServiceImp.java index dd6d62569..e80356190 100644 --- a/src/main/java/au/com/royalpay/payment/manage/cashiers/core/impls/CashierServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/cashiers/core/impls/CashierServiceImp.java @@ -17,7 +17,7 @@ import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java index fe5ba4acd..08d9a8bc8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java @@ -14,8 +14,8 @@ import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.ServerErrorException; import com.alibaba.fastjson.JSONObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerRegisterServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerRegisterServiceImpl.java index fb6512785..bb2e2a5c4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerRegisterServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerRegisterServiceImpl.java @@ -11,7 +11,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage import au.com.royalpay.payment.tools.env.PlatformEnvironment; import au.com.royalpay.payment.tools.env.RequestEnvironment; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/beans/GatewayParams.java b/src/main/java/au/com/royalpay/payment/manage/customers/beans/GatewayParams.java index e9e611d6c..187d96986 100644 --- a/src/main/java/au/com/royalpay/payment/manage/customers/beans/GatewayParams.java +++ b/src/main/java/au/com/royalpay/payment/manage/customers/beans/GatewayParams.java @@ -1,7 +1,7 @@ package au.com.royalpay.payment.manage.customers.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Pattern; diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/beans/ReceiveLogQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/customers/beans/ReceiveLogQueryBean.java index e885d1497..4051113d3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/customers/beans/ReceiveLogQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/customers/beans/ReceiveLogQueryBean.java @@ -2,8 +2,8 @@ package au.com.royalpay.payment.manage.customers.beans; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.ParseException; import java.util.Date; diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java index dcb9eef89..0c771bc18 100644 --- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java @@ -6,7 +6,7 @@ import cn.yixblog.platform.http.HttpRequestGenerator; import cn.yixblog.platform.http.HttpRequestResult; import com.alibaba.fastjson.JSONObject; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java index 4a1c6862f..a4408b2b1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java @@ -12,8 +12,8 @@ import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.NotFoundException; import com.alibaba.fastjson.JSONObject; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java index 5f0afa959..c6aa8a30b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java +++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java @@ -7,10 +7,10 @@ import java.util.List; import javax.annotation.Resource; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.RandomUtils; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.RandomUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.annotation.Cacheable; @@ -125,7 +125,7 @@ public class EncourageUseProcessor implements Ordered, EncourageService { return new JSONObject(); } int rand = RandomUtils - .nextInt(config.getBigDecimal("max_amount").subtract(config.getBigDecimal("min_amount")).multiply(CommonConsts.HUNDRED).intValue()); + .nextInt(0,config.getBigDecimal("max_amount").subtract(config.getBigDecimal("min_amount")).multiply(CommonConsts.HUNDRED).intValue()); BigDecimal amount = config.getBigDecimal("min_amount").add(BigDecimal.valueOf(rand).divide(CommonConsts.HUNDRED, 2, BigDecimal.ROUND_DOWN)); customerMembershipMapper.addEncourage(memberId, amount); JSONObject customer = customerMembershipMapper.findByMemberId(memberId); @@ -165,8 +165,8 @@ public class EncourageUseProcessor implements Ordered, EncourageService { } if (log.getBigDecimal("factor").compareTo(BigDecimal.ONE) == 0) { int critRate = config.getIntValue("crit_rate"); - if (RandomUtils.nextInt(100) < critRate) { - int factorInt = RandomUtils.nextInt(config.getBigDecimal("max_crit").multiply(CommonConsts.HUNDRED).intValue() - 100); + if (RandomUtils.nextInt(0,100) < critRate) { + int factorInt = RandomUtils.nextInt(0,config.getBigDecimal("max_crit").multiply(CommonConsts.HUNDRED).intValue() - 100); BigDecimal factor = BigDecimal.valueOf(factorInt + 100).divide(CommonConsts.HUNDRED, 2, BigDecimal.ROUND_DOWN); BigDecimal actural = log.getBigDecimal("access_amount").multiply(factor).setScale(2, BigDecimal.ROUND_DOWN); BigDecimal sub = actural.subtract(log.getBigDecimal("actural_amount")); diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/WechatMessageServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/WechatMessageServiceImpl.java index 45670fa3a..e49e5769f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/WechatMessageServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/WechatMessageServiceImpl.java @@ -13,8 +13,8 @@ import au.com.royalpay.payment.tools.connections.mpsupport.exceptions.WechatExce import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.ServerErrorException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java index 91fc3da35..1715614b0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java @@ -11,9 +11,9 @@ import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider; import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage; import au.com.royalpay.payment.tools.env.SysConfigManager; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationListener; diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/WarningSenderHelper.java b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/WarningSenderHelper.java index 24844650b..5160204dc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/WarningSenderHelper.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/WarningSenderHelper.java @@ -1,7 +1,7 @@ package au.com.royalpay.payment.manage.dev.listeners; import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import java.util.Date; diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/recognizers/PaymentAmountCheatMonitor.java b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/recognizers/PaymentAmountCheatMonitor.java index 42e535017..cf10e8bc8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/recognizers/PaymentAmountCheatMonitor.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/recognizers/PaymentAmountCheatMonitor.java @@ -15,8 +15,8 @@ import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/MailTestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/MailTestController.java index 150208f19..085c9fc8f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/MailTestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/MailTestController.java @@ -3,7 +3,7 @@ package au.com.royalpay.payment.manage.dev.web; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.manage.support.email.MailSendingEvent; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index f978731b7..f735826e8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -33,7 +33,7 @@ import au.com.royalpay.payment.tools.utils.XmlFormatUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.dom4j.Element; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/WxSettleLogController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/WxSettleLogController.java index fb63bd0aa..ae8f95583 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/WxSettleLogController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/WxSettleLogController.java @@ -4,7 +4,7 @@ import au.com.royalpay.payment.channels.wechat.runtime.MpPaymentApi; import au.com.royalpay.payment.channels.wechat.runtime.beans.SettlementLog; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; diff --git a/src/main/java/au/com/royalpay/payment/manage/fund/beans/ClientQueryParams.java b/src/main/java/au/com/royalpay/payment/manage/fund/beans/ClientQueryParams.java index 4ee58e72e..eda216c6a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/fund/beans/ClientQueryParams.java +++ b/src/main/java/au/com/royalpay/payment/manage/fund/beans/ClientQueryParams.java @@ -1,7 +1,7 @@ package au.com.royalpay.payment.manage.fund.beans; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Create by yixian at 2017-09-18 21:47 diff --git a/src/main/java/au/com/royalpay/payment/manage/fund/core/impls/XPlanFundProcessorImpl.java b/src/main/java/au/com/royalpay/payment/manage/fund/core/impls/XPlanFundProcessorImpl.java index df9ddd27d..0ae302465 100644 --- a/src/main/java/au/com/royalpay/payment/manage/fund/core/impls/XPlanFundProcessorImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/fund/core/impls/XPlanFundProcessorImpl.java @@ -21,10 +21,10 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/au/com/royalpay/payment/manage/goods/bean/GoodOrderQuery.java b/src/main/java/au/com/royalpay/payment/manage/goods/bean/GoodOrderQuery.java index d66416678..7bf2a5be2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/goods/bean/GoodOrderQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/goods/bean/GoodOrderQuery.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.goods.bean; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.ParseException; diff --git a/src/main/java/au/com/royalpay/payment/manage/goods/bean/GoodQuery.java b/src/main/java/au/com/royalpay/payment/manage/goods/bean/GoodQuery.java index ccabed7b6..1a2c6c773 100644 --- a/src/main/java/au/com/royalpay/payment/manage/goods/bean/GoodQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/goods/bean/GoodQuery.java @@ -1,7 +1,7 @@ package au.com.royalpay.payment.manage.goods.bean; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Created by yishuqian on 8/30/16. diff --git a/src/main/java/au/com/royalpay/payment/manage/logview/beans/LogQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/logview/beans/LogQueryBean.java index edeb67be0..720f92a59 100644 --- a/src/main/java/au/com/royalpay/payment/manage/logview/beans/LogQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/logview/beans/LogQueryBean.java @@ -2,8 +2,8 @@ package au.com.royalpay.payment.manage.logview.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.ParseException; diff --git a/src/main/java/au/com/royalpay/payment/manage/logview/beans/LogRiskQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/logview/beans/LogRiskQueryBean.java index f7475d6d1..5d572025e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/logview/beans/LogRiskQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/logview/beans/LogRiskQueryBean.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.logview.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.hibernate.validator.constraints.NotEmpty; import java.text.DateFormat; diff --git a/src/main/java/au/com/royalpay/payment/manage/logview/beans/NotifyQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/logview/beans/NotifyQueryBean.java index 46dfacae8..725f63337 100644 --- a/src/main/java/au/com/royalpay/payment/manage/logview/beans/NotifyQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/logview/beans/NotifyQueryBean.java @@ -2,8 +2,8 @@ package au.com.royalpay.payment.manage.logview.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.ParseException; import java.util.Date; diff --git a/src/main/java/au/com/royalpay/payment/manage/logview/beans/WechatMsgQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/logview/beans/WechatMsgQueryBean.java index 62890c929..6a01c06a0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/logview/beans/WechatMsgQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/logview/beans/WechatMsgQueryBean.java @@ -2,8 +2,8 @@ package au.com.royalpay.payment.manage.logview.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.ParseException; import java.util.Date; diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/beans/SettleDelayConfig.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/beans/SettleDelayConfig.java index f35d2da56..c61c96274 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/beans/SettleDelayConfig.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/beans/SettleDelayConfig.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.management.clearing.beans; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import com.alibaba.fastjson.annotation.JSONField; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import java.math.BigDecimal; import java.text.ParseException; diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index 104ea449a..73469d505 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java @@ -34,10 +34,10 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.apache.poi.hssf.usermodel.HSSFFont; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/SettleDelayConfigurerImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/SettleDelayConfigurerImpl.java index 9d744ad74..34926db28 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/SettleDelayConfigurerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/SettleDelayConfigurerImpl.java @@ -13,8 +13,8 @@ import java.util.Map; import javax.annotation.Resource; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/CleanLogClientController.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/CleanLogClientController.java index 312570c38..9845b880d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/CleanLogClientController.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/CleanLogClientController.java @@ -6,7 +6,7 @@ import au.com.royalpay.payment.tools.permission.enums.PartnerRole; import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/FinancialController.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/FinancialController.java index 810ff0fa2..90db91391 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/FinancialController.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/FinancialController.java @@ -6,8 +6,8 @@ import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.tools.CommonConsts; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.joda.time.DateTime; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/beans/FuncInfo.java b/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/beans/FuncInfo.java index ebd4ad6c9..29c221991 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/beans/FuncInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/beans/FuncInfo.java @@ -1,6 +1,6 @@ package au.com.royalpay.payment.manage.management.sysconfig.beans; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Created by yixian on 2017-03-01. diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRateConfig.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRateConfig.java index f50073907..351a8794d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRateConfig.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRateConfig.java @@ -3,7 +3,7 @@ package au.com.royalpay.payment.manage.merchants.beans; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.annotation.JSONField; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotNull; diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerApplyQuery.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerApplyQuery.java index 9a5305d54..352752706 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerApplyQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerApplyQuery.java @@ -1,7 +1,7 @@ package au.com.royalpay.payment.manage.merchants.beans; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Created by yixian on 2016-07-01. diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java index cca94f603..d89677a80 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java @@ -2,8 +2,8 @@ package au.com.royalpay.payment.manage.merchants.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.DateFormat; import java.text.ParseException; diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientApplyImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientApplyImpl.java index f90a94300..5c0821db1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientApplyImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientApplyImpl.java @@ -16,7 +16,7 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 52c5b03a0..9b50937bd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -72,10 +72,10 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/complyValidators/ClientComplySubMerchantIDValidator.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/complyValidators/ClientComplySubMerchantIDValidator.java index 4fba51a78..2ffaa5da7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/complyValidators/ClientComplySubMerchantIDValidator.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/complyValidators/ClientComplySubMerchantIDValidator.java @@ -3,7 +3,7 @@ package au.com.royalpay.payment.manage.merchants.core.impls.complyValidators; import au.com.royalpay.payment.manage.merchants.core.ClientComplyValidator; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/events/listeners/NotyfyBDEventListener.java b/src/main/java/au/com/royalpay/payment/manage/merchants/events/listeners/NotyfyBDEventListener.java index 1a0f23577..19b9feaf3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/events/listeners/NotyfyBDEventListener.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/events/listeners/NotyfyBDEventListener.java @@ -7,7 +7,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider; import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage; import au.com.royalpay.payment.tools.env.PlatformEnvironment; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/events/listeners/SendingApplyToWechatMessageListener.java b/src/main/java/au/com/royalpay/payment/manage/merchants/events/listeners/SendingApplyToWechatMessageListener.java index 335c5205d..f39a72ace 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/events/listeners/SendingApplyToWechatMessageListener.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/events/listeners/SendingApplyToWechatMessageListener.java @@ -6,7 +6,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi; import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider; import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage; import au.com.royalpay.payment.tools.env.PlatformEnvironment; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerApplyController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerApplyController.java index 33b5da45f..fc61892b9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerApplyController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerApplyController.java @@ -13,7 +13,7 @@ import au.com.royalpay.payment.tools.http.HttpUtils; import au.com.royalpay.payment.tools.permission.wechat.WechatMapping; import com.alibaba.fastjson.JSONObject; import com.google.code.kaptcha.Producer; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.springframework.validation.Errors; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/beans/NoticeQuery.java b/src/main/java/au/com/royalpay/payment/manage/notice/beans/NoticeQuery.java index 16d48a3fa..222c04e84 100644 --- a/src/main/java/au/com/royalpay/payment/manage/notice/beans/NoticeQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/notice/beans/NoticeQuery.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.notice.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.DateFormat; import java.text.ParseException; diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/MailServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/MailServiceImp.java index 7c0a97ad5..7605dcf26 100644 --- a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/MailServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/MailServiceImp.java @@ -10,7 +10,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; diff --git a/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java b/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java index 682335eed..86be29bc4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java @@ -1,7 +1,7 @@ package au.com.royalpay.payment.manage.organizations.beans; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.validator.constraints.NotEmpty; /** diff --git a/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java b/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java index a473ab8fc..e4c73c98e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java +++ b/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java @@ -10,8 +10,8 @@ import au.com.royalpay.payment.tools.permission.enums.PartnerRole; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.core.Ordered; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.stereotype.Component; diff --git a/src/main/java/au/com/royalpay/payment/manage/permission/manager/UserAdvise.java b/src/main/java/au/com/royalpay/payment/manage/permission/manager/UserAdvise.java index e5f553a8a..31003f508 100644 --- a/src/main/java/au/com/royalpay/payment/manage/permission/manager/UserAdvise.java +++ b/src/main/java/au/com/royalpay/payment/manage/permission/manager/UserAdvise.java @@ -4,7 +4,7 @@ import au.com.royalpay.payment.manage.signin.core.SignInStatusManager; import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.CookieValue; import org.springframework.web.bind.annotation.ModelAttribute; diff --git a/src/main/java/au/com/royalpay/payment/manage/permission/manager/scanner/PermissionNode.java b/src/main/java/au/com/royalpay/payment/manage/permission/manager/scanner/PermissionNode.java index 5ed4ecf6b..ffccc2985 100644 --- a/src/main/java/au/com/royalpay/payment/manage/permission/manager/scanner/PermissionNode.java +++ b/src/main/java/au/com/royalpay/payment/manage/permission/manager/scanner/PermissionNode.java @@ -3,7 +3,7 @@ package au.com.royalpay.payment.manage.permission.manager.scanner; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.manage.permission.manager.RequireManager; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.RequestMethod; /** diff --git a/src/main/java/au/com/royalpay/payment/manage/product/beans/ProductBean.java b/src/main/java/au/com/royalpay/payment/manage/product/beans/ProductBean.java index 85aba151a..d31a51a51 100644 --- a/src/main/java/au/com/royalpay/payment/manage/product/beans/ProductBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/product/beans/ProductBean.java @@ -1,7 +1,7 @@ package au.com.royalpay.payment.manage.product.beans; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Created by yuan on 2017/11/24. diff --git a/src/main/java/au/com/royalpay/payment/manage/product/core/impls/ClientProductImpl.java b/src/main/java/au/com/royalpay/payment/manage/product/core/impls/ClientProductImpl.java index 51586ed47..e92dc0ca4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/product/core/impls/ClientProductImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/product/core/impls/ClientProductImpl.java @@ -10,7 +10,7 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; diff --git a/src/main/java/au/com/royalpay/payment/manage/promotion/web/PromotionRootController.java b/src/main/java/au/com/royalpay/payment/manage/promotion/web/PromotionRootController.java index 7226f672c..826c30ffd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/promotion/web/PromotionRootController.java +++ b/src/main/java/au/com/royalpay/payment/manage/promotion/web/PromotionRootController.java @@ -12,7 +12,7 @@ import au.com.royalpay.payment.tools.permission.wechat.WechatMapping; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; diff --git a/src/main/java/au/com/royalpay/payment/manage/redpack/beans/RedpackQuery.java b/src/main/java/au/com/royalpay/payment/manage/redpack/beans/RedpackQuery.java index 2bfbf3e10..2a54140c7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/redpack/beans/RedpackQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/redpack/beans/RedpackQuery.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.redpack.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.ParseException; import java.util.Date; diff --git a/src/main/java/au/com/royalpay/payment/manage/redpack/core/impls/ActRedPackServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/redpack/core/impls/ActRedPackServiceImpl.java index bd62b227d..963cdcd66 100644 --- a/src/main/java/au/com/royalpay/payment/manage/redpack/core/impls/ActRedPackServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/redpack/core/impls/ActRedPackServiceImpl.java @@ -19,11 +19,11 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.RandomUtils; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.RandomUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -147,7 +147,7 @@ public class ActRedPackServiceImpl implements ActRedPackService { for (JSONObject prizeType : prizeTypes) { totalWeight += prizeType.getIntValue("weight"); } - int ran = RandomUtils.nextInt(totalWeight); + int ran = RandomUtils.nextInt(0,totalWeight); for (JSONObject prizeType : prizeTypes) { ran -= prizeType.getIntValue("weight"); @@ -211,7 +211,7 @@ public class ActRedPackServiceImpl implements ActRedPackService { if (redpack_counts > 0) { for (int i = 0; i < redpack_counts; i++) { BigDecimal amount = amountFrom.equals(amountTo) ? amountFrom - : amountFrom.add(BigDecimal.valueOf(RandomUtils.nextInt(amountTo.subtract(amountFrom).multiply(CommonConsts.HUNDRED).intValue())) + : amountFrom.add(BigDecimal.valueOf(RandomUtils.nextInt(0,amountTo.subtract(amountFrom).multiply(CommonConsts.HUNDRED).intValue())) .divide(CommonConsts.HUNDRED, 2, BigDecimal.ROUND_DOWN)); JSONObject prize = new JSONObject(); String prefix = DateFormatUtils.format(new Date(), "yyyyMMddHHmmssSSS"); diff --git a/src/main/java/au/com/royalpay/payment/manage/redpack/core/impls/PartnerLMServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/redpack/core/impls/PartnerLMServiceImp.java index 74bb7000e..79aa60964 100644 --- a/src/main/java/au/com/royalpay/payment/manage/redpack/core/impls/PartnerLMServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/redpack/core/impls/PartnerLMServiceImp.java @@ -21,8 +21,8 @@ import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.util.HSSFColor; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/au/com/royalpay/payment/manage/redpack/core/impls/RedpackServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/redpack/core/impls/RedpackServiceImpl.java index c8338c05c..0d8c28481 100644 --- a/src/main/java/au/com/royalpay/payment/manage/redpack/core/impls/RedpackServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/redpack/core/impls/RedpackServiceImpl.java @@ -20,9 +20,9 @@ import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.math.RandomUtils; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.RandomUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -152,7 +152,7 @@ public class RedpackServiceImpl implements RedpackService { int min = CurrencyAmountUtils.toCent(config.getBigDecimal("min_amount"), "CNY"); int max = CurrencyAmountUtils.toCent(config.getBigDecimal("max_amount"), "CNY"); - int amount = min == max ? min : RandomUtils.nextInt(max - min) + min; + int amount = min == max ? min : RandomUtils.nextInt(0,max - min) + min; WechatRedpack wechatRedpack = new WechatRedpack(); JSONObject customerRelation = customerMapper.findCustomerByOpenId(openId); MpWechatApi redpackApi = mpWechatApiProvider.getApi("Redpack"); @@ -185,7 +185,7 @@ public class RedpackServiceImpl implements RedpackService { if (redpack_counts > 0) { for (int i = 0; i < redpack_counts; i++) { BigDecimal amount = amountFrom.equals(amountTo) ? amountFrom - : amountFrom.add(BigDecimal.valueOf(RandomUtils.nextInt(amountTo.subtract(amountFrom).multiply(hundred).intValue())).divide(hundred, + : amountFrom.add(BigDecimal.valueOf(RandomUtils.nextInt(0,amountTo.subtract(amountFrom).multiply(hundred).intValue())).divide(hundred, 2, BigDecimal.ROUND_DOWN)); JSONObject prize = new JSONObject(); String prefix = DateFormatUtils.format(new Date(), "yyyyMMddHHmmssSSS"); @@ -263,7 +263,7 @@ public class RedpackServiceImpl implements RedpackService { for (JSONObject prizeType : prizeTypes) { totalWeight += prizeType.getIntValue("weight"); } - int ran = RandomUtils.nextInt(totalWeight); + int ran = RandomUtils.nextInt(0,totalWeight); for (JSONObject prizeType : prizeTypes) { ran -= prizeType.getIntValue("weight"); @@ -383,7 +383,7 @@ public class RedpackServiceImpl implements RedpackService { for (JSONObject prizeType : prizeTypes) { totalWeight += prizeType.getIntValue("weight"); } - int ran = RandomUtils.nextInt(totalWeight); + int ran = RandomUtils.nextInt(0,totalWeight); for (JSONObject prizeType : prizeTypes) { ran -= prizeType.getIntValue("weight"); diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/beans/ManagerInfo.java b/src/main/java/au/com/royalpay/payment/manage/signin/beans/ManagerInfo.java index 4df815ccd..3d62ee532 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/beans/ManagerInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/beans/ManagerInfo.java @@ -4,7 +4,7 @@ import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.tools.utils.PasswordUtils; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.annotation.JSONField; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.NotEmpty; diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerWechatBindServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerWechatBindServiceImpl.java index d4175f468..9d14988de 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerWechatBindServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerWechatBindServiceImpl.java @@ -7,8 +7,8 @@ import au.com.royalpay.payment.tools.env.PlatformEnvironment; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.websocket.notify.CommonPageEvent; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheEvict; import org.springframework.context.ApplicationEventPublisher; diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java index 7becc042a..042a1149d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java @@ -20,8 +20,8 @@ import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import au.com.royalpay.payment.tools.utils.PasswordUtils; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.context.ApplicationEventPublisher; diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java index 8ce8150ec..625e5034f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java @@ -11,7 +11,7 @@ import au.com.royalpay.payment.tools.utils.QRCodeUtils; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.BoundValueOperations; import org.springframework.data.redis.core.StringRedisTemplate; diff --git a/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java b/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java index 3e1337de5..0028fa65e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java +++ b/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java @@ -2,8 +2,8 @@ package au.com.royalpay.payment.manage.support.abafile; import au.com.royalpay.payment.tools.env.PlatformEnvironment; import au.com.royalpay.payment.tools.utils.CurrencyAmountUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.util.Assert; import java.io.PrintWriter; diff --git a/src/main/java/au/com/royalpay/payment/manage/task/DailyReportGenerationTask.java b/src/main/java/au/com/royalpay/payment/manage/task/DailyReportGenerationTask.java index 310e266b4..08f43b0a5 100644 --- a/src/main/java/au/com/royalpay/payment/manage/task/DailyReportGenerationTask.java +++ b/src/main/java/au/com/royalpay/payment/manage/task/DailyReportGenerationTask.java @@ -2,8 +2,8 @@ package au.com.royalpay.payment.manage.task; import au.com.royalpay.payment.manage.analysis.core.DailyReport; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/src/main/java/au/com/royalpay/payment/manage/task/DashboardTaskManager.java b/src/main/java/au/com/royalpay/payment/manage/task/DashboardTaskManager.java index 572a5a142..8b580a49e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/task/DashboardTaskManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/task/DashboardTaskManager.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.task; import au.com.royalpay.payment.manage.analysis.core.DashboardService; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/src/main/java/au/com/royalpay/payment/manage/task/PartnerTransactionsDailyMsgTaskManager.java b/src/main/java/au/com/royalpay/payment/manage/task/PartnerTransactionsDailyMsgTaskManager.java index b41cd6e6a..e89b10039 100644 --- a/src/main/java/au/com/royalpay/payment/manage/task/PartnerTransactionsDailyMsgTaskManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/task/PartnerTransactionsDailyMsgTaskManager.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.task; import au.com.royalpay.payment.manage.analysis.core.CustomersAnalysisService; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/ClearingLogQuery.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/ClearingLogQuery.java index 995aa341e..042e9b9d8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/ClearingLogQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/ClearingLogQuery.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.tradelog.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.DateFormat; import java.text.ParseException; diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/PreRefundQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/PreRefundQueryBean.java index 1a5875ad3..8da3790ac 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/PreRefundQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/PreRefundQueryBean.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.tradelog.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.DateFormat; import java.text.ParseException; diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java index a1bb31753..6773cbb08 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java @@ -6,8 +6,8 @@ import au.com.royalpay.payment.core.exceptions.ParamInvalidException; import au.com.royalpay.payment.tools.defines.TradeType; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import java.text.DateFormat; import java.text.ParseException; diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index f248f93bd..7de883812 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -34,10 +34,10 @@ import net.sf.jasperreports.engine.export.JRXlsExporter; import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter; import net.sf.jasperreports.export.*; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.util.HSSFColor; import org.slf4j.Logger; @@ -191,7 +191,7 @@ public class TradeLogServiceImpl implements TradeLogService { formatOrderTime(order, timezone, "create_time"); formatOrderTime(order, timezone, "confirm_time"); formatOrderTime(order, timezone, "transaction_time"); - order.put("order_detail", StringEscapeUtils.escapeHtml(order.getString("order_detail"))); + order.put("order_detail", StringEscapeUtils.escapeHtml4(order.getString("order_detail"))); model.addAttribute("order", order); JSONObject customer = paymentApi.getCustomerInfo(order.getString("channel"), order.getString("customer_id")); diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefuseRefundListener.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefuseRefundListener.java index 54a7d4d23..89e55b9ad 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefuseRefundListener.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefuseRefundListener.java @@ -7,7 +7,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider; import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage; import au.com.royalpay.payment.tools.env.PlatformEnvironment; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/listeners/RefundSendTemplateMessageSender.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/listeners/RefundSendTemplateMessageSender.java index 5d1a34ecc..3826034d7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/listeners/RefundSendTemplateMessageSender.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/listeners/RefundSendTemplateMessageSender.java @@ -11,7 +11,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage import au.com.royalpay.payment.tools.env.PlatformEnvironment; import au.com.royalpay.payment.tools.merchants.core.MerchantInfoProvider; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationListener;