diff --git a/src/main/java/com/xkrs/common/StaticScheduleTask.java b/src/main/java/com/xkrs/common/StaticScheduleTask.java index 82a485c..20ba7c0 100644 --- a/src/main/java/com/xkrs/common/StaticScheduleTask.java +++ b/src/main/java/com/xkrs/common/StaticScheduleTask.java @@ -2,7 +2,7 @@ package com.xkrs.common; import com.xkrs.straw.managers.FirePointSubscribeManager; import com.xkrs.straw.utilsnew.DateTimeUtils; -import com.xkrs.utils.WDWxSendMsgUtil; +import com.xkrs.straw.utilsold.WDWxSendMsgUtil; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java b/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java index 3cb6512..4622bc7 100644 --- a/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java +++ b/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java @@ -5,7 +5,7 @@ import com.xkrs.straw.model.entity.SysAuthorityEntity; import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.service.SysRoleService; import com.xkrs.straw.service.SysUserService; -import com.xkrs.utils.DateTimeUtil; +import com.xkrs.straw.utilsold.DateTimeUtil; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.DisabledException; @@ -21,7 +21,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; -import static com.xkrs.utils.EncryptDecryptUtil.encry256; +import static com.xkrs.straw.utilsold.EncryptDecryptUtil.encry256; /** * 自定义认证Provider diff --git a/src/main/java/com/xkrs/straw/controller/GaoDeApiController.java b/src/main/java/com/xkrs/straw/controller/GaoDeApiController.java index 2712bf8..5614dc6 100644 --- a/src/main/java/com/xkrs/straw/controller/GaoDeApiController.java +++ b/src/main/java/com/xkrs/straw/controller/GaoDeApiController.java @@ -16,8 +16,8 @@ import java.util.List; import java.util.Locale; import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject; -import static com.xkrs.utils.CommonConstant.*; -import static com.xkrs.utils.HttpClientUtils.sendHttpsGet; +import static com.xkrs.straw.utilsold.CommonConstant.*; +import static com.xkrs.straw.utilsold.HttpClientUtils.sendHttpsGet; /** * @author wudong diff --git a/src/main/java/com/xkrs/straw/controller/SysUserController.java b/src/main/java/com/xkrs/straw/controller/SysUserController.java index b5b8b99..6593f1f 100644 --- a/src/main/java/com/xkrs/straw/controller/SysUserController.java +++ b/src/main/java/com/xkrs/straw/controller/SysUserController.java @@ -14,7 +14,8 @@ import com.xkrs.straw.model.qo.SysUserVipLevelQo; import com.xkrs.straw.model.vo.SysUserVo; import com.xkrs.straw.service.SysUserService; import com.xkrs.straw.utilsnew.*; -import com.xkrs.utils.*; +import com.xkrs.straw.utilsold.AliYunSmsUtils; +import com.xkrs.straw.utilsold.RandomUtil; import org.apache.hc.core5.util.TextUtils; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.data.domain.Sort; @@ -33,7 +34,7 @@ import java.util.concurrent.TimeUnit; import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationErrorList; import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject; -import static com.xkrs.utils.EncryptDecryptUtil.encry256; +import static com.xkrs.straw.utilsold.EncryptDecryptUtil.encry256; /** * 系统用户Controller diff --git a/src/main/java/com/xkrs/straw/helper/GeoCodeHelper.java b/src/main/java/com/xkrs/straw/helper/GeoCodeHelper.java index 5f3a2e2..18ecdff 100644 --- a/src/main/java/com/xkrs/straw/helper/GeoCodeHelper.java +++ b/src/main/java/com/xkrs/straw/helper/GeoCodeHelper.java @@ -2,7 +2,7 @@ package com.xkrs.straw.helper; import com.xkrs.straw.model.vo.GaoDeIgGeocodeVo; import com.xkrs.straw.service.impl.DispatchFirePointServiceImpl; -import com.xkrs.utils.GaoDeApiUtil; +import com.xkrs.straw.utilsold.GaoDeApiUtil; import org.apache.hc.core5.util.TextUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/xkrs/straw/managers/FirePointPushManager.java b/src/main/java/com/xkrs/straw/managers/FirePointPushManager.java index 2155398..bc1d4d3 100644 --- a/src/main/java/com/xkrs/straw/managers/FirePointPushManager.java +++ b/src/main/java/com/xkrs/straw/managers/FirePointPushManager.java @@ -9,9 +9,9 @@ import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.model.helper.PushHelper; import com.xkrs.straw.model.vo.AllFirePointVo; import com.xkrs.straw.utilsnew.FirePointConvertUtils; -import com.xkrs.utils.FirePointCodeUtils; +import com.xkrs.straw.utilsold.FirePointCodeUtils; import com.xkrs.straw.utilsnew.SMSUtils; -import com.xkrs.utils.WDWxSendMsgUtil; +import com.xkrs.straw.utilsold.WDWxSendMsgUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/xkrs/straw/managers/FirePointQueryManager.java b/src/main/java/com/xkrs/straw/managers/FirePointQueryManager.java index 63101f6..20f670b 100644 --- a/src/main/java/com/xkrs/straw/managers/FirePointQueryManager.java +++ b/src/main/java/com/xkrs/straw/managers/FirePointQueryManager.java @@ -10,9 +10,9 @@ import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.model.vo.AllFirePointVo; import com.xkrs.straw.utilsnew.FirePointConvertUtils; import com.xkrs.straw.utilsnew.JsonUtils; -import com.xkrs.utils.DateTimeUtil; +import com.xkrs.straw.utilsold.DateTimeUtil; import com.xkrs.straw.utilsnew.DateTimeUtils; -import com.xkrs.utils.FirePointCodeUtils; +import com.xkrs.straw.utilsold.FirePointCodeUtils; import org.apache.hc.core5.util.TextUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/xkrs/straw/managers/FirePointSubscribeManager.java b/src/main/java/com/xkrs/straw/managers/FirePointSubscribeManager.java index 96106f6..59e4a94 100644 --- a/src/main/java/com/xkrs/straw/managers/FirePointSubscribeManager.java +++ b/src/main/java/com/xkrs/straw/managers/FirePointSubscribeManager.java @@ -11,7 +11,7 @@ import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.utilsnew.JsonUtils; import com.xkrs.straw.utilsnew.VipTimeRangeUtils; import com.xkrs.straw.utilsnew.DateTimeUtils; -import com.xkrs.utils.FirePointCodeUtils; +import com.xkrs.straw.utilsold.FirePointCodeUtils; import com.xkrs.straw.utilsnew.ListUtils; import org.springframework.stereotype.Component; @@ -19,7 +19,7 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.*; -import static com.xkrs.utils.HttpClientUtils.sendHttpPost; +import static com.xkrs.straw.utilsold.HttpClientUtils.sendHttpPost; @Component public class FirePointSubscribeManager { diff --git a/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java b/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java index 8b18d7b..bff2313 100644 --- a/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java @@ -32,8 +32,8 @@ import java.util.List; import java.util.Locale; import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject; -import static com.xkrs.utils.DateTimeUtil.dateTimeToString; -import static com.xkrs.utils.EncryptDecryptUtil.encry256; +import static com.xkrs.straw.utilsold.DateTimeUtil.dateTimeToString; +import static com.xkrs.straw.utilsold.EncryptDecryptUtil.encry256; /** * 系统用户服务实现 diff --git a/src/main/java/com/xkrs/utils/AliYunSmsUtils.java b/src/main/java/com/xkrs/straw/utilsold/AliYunSmsUtils.java similarity index 98% rename from src/main/java/com/xkrs/utils/AliYunSmsUtils.java rename to src/main/java/com/xkrs/straw/utilsold/AliYunSmsUtils.java index 18412b4..d7bbfbd 100644 --- a/src/main/java/com/xkrs/utils/AliYunSmsUtils.java +++ b/src/main/java/com/xkrs/straw/utilsold/AliYunSmsUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import com.aliyuncs.DefaultAcsClient; import com.aliyuncs.IAcsClient; diff --git a/src/main/java/com/xkrs/utils/CommonConstant.java b/src/main/java/com/xkrs/straw/utilsold/CommonConstant.java similarity index 92% rename from src/main/java/com/xkrs/utils/CommonConstant.java rename to src/main/java/com/xkrs/straw/utilsold/CommonConstant.java index f73a62a..3d711f2 100644 --- a/src/main/java/com/xkrs/utils/CommonConstant.java +++ b/src/main/java/com/xkrs/straw/utilsold/CommonConstant.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; public interface CommonConstant { diff --git a/src/main/java/com/xkrs/utils/DateTimeUtil.java b/src/main/java/com/xkrs/straw/utilsold/DateTimeUtil.java similarity index 98% rename from src/main/java/com/xkrs/utils/DateTimeUtil.java rename to src/main/java/com/xkrs/straw/utilsold/DateTimeUtil.java index 136e4e3..0600d01 100644 --- a/src/main/java/com/xkrs/utils/DateTimeUtil.java +++ b/src/main/java/com/xkrs/straw/utilsold/DateTimeUtil.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import org.apache.hc.core5.util.TextUtils; diff --git a/src/main/java/com/xkrs/utils/EncryptDecryptUtil.java b/src/main/java/com/xkrs/straw/utilsold/EncryptDecryptUtil.java similarity index 98% rename from src/main/java/com/xkrs/utils/EncryptDecryptUtil.java rename to src/main/java/com/xkrs/straw/utilsold/EncryptDecryptUtil.java index a459df9..3fcba69 100644 --- a/src/main/java/com/xkrs/utils/EncryptDecryptUtil.java +++ b/src/main/java/com/xkrs/straw/utilsold/EncryptDecryptUtil.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/src/main/java/com/xkrs/utils/ExcelImportUtil.java b/src/main/java/com/xkrs/straw/utilsold/ExcelImportUtil.java similarity index 99% rename from src/main/java/com/xkrs/utils/ExcelImportUtil.java rename to src/main/java/com/xkrs/straw/utilsold/ExcelImportUtil.java index 57d86a6..feb20f6 100644 --- a/src/main/java/com/xkrs/utils/ExcelImportUtil.java +++ b/src/main/java/com/xkrs/straw/utilsold/ExcelImportUtil.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; diff --git a/src/main/java/com/xkrs/utils/FileFastDfs.java b/src/main/java/com/xkrs/straw/utilsold/FileFastDfs.java similarity index 99% rename from src/main/java/com/xkrs/utils/FileFastDfs.java rename to src/main/java/com/xkrs/straw/utilsold/FileFastDfs.java index c39dc24..9a22437 100644 --- a/src/main/java/com/xkrs/utils/FileFastDfs.java +++ b/src/main/java/com/xkrs/straw/utilsold/FileFastDfs.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import cn.hutool.core.io.resource.InputStreamResource; import cn.hutool.core.thread.ThreadUtil; diff --git a/src/main/java/com/xkrs/utils/FileUploadUtils.java b/src/main/java/com/xkrs/straw/utilsold/FileUploadUtils.java similarity index 97% rename from src/main/java/com/xkrs/utils/FileUploadUtils.java rename to src/main/java/com/xkrs/straw/utilsold/FileUploadUtils.java index 38f83d5..a9a6630 100644 --- a/src/main/java/com/xkrs/utils/FileUploadUtils.java +++ b/src/main/java/com/xkrs/straw/utilsold/FileUploadUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/xkrs/utils/FileUtil.java b/src/main/java/com/xkrs/straw/utilsold/FileUtil.java similarity index 98% rename from src/main/java/com/xkrs/utils/FileUtil.java rename to src/main/java/com/xkrs/straw/utilsold/FileUtil.java index abaae00..d576088 100644 --- a/src/main/java/com/xkrs/utils/FileUtil.java +++ b/src/main/java/com/xkrs/straw/utilsold/FileUtil.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.xkrs.utils.DateTimeUtil.getNowTimeStr; +import static com.xkrs.straw.utilsold.DateTimeUtil.getNowTimeStr; public class FileUtil { private static final Logger log = LoggerFactory.getLogger(FileUtil.class); diff --git a/src/main/java/com/xkrs/utils/FirePointCodeUtils.java b/src/main/java/com/xkrs/straw/utilsold/FirePointCodeUtils.java similarity index 98% rename from src/main/java/com/xkrs/utils/FirePointCodeUtils.java rename to src/main/java/com/xkrs/straw/utilsold/FirePointCodeUtils.java index 2302b90..7fb829a 100644 --- a/src/main/java/com/xkrs/utils/FirePointCodeUtils.java +++ b/src/main/java/com/xkrs/straw/utilsold/FirePointCodeUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.utilsnew.VipTimeRangeUtils; diff --git a/src/main/java/com/xkrs/utils/GaoDeApiUtil.java b/src/main/java/com/xkrs/straw/utilsold/GaoDeApiUtil.java similarity index 87% rename from src/main/java/com/xkrs/utils/GaoDeApiUtil.java rename to src/main/java/com/xkrs/straw/utilsold/GaoDeApiUtil.java index 49e0cf6..f64eba5 100644 --- a/src/main/java/com/xkrs/utils/GaoDeApiUtil.java +++ b/src/main/java/com/xkrs/straw/utilsold/GaoDeApiUtil.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import com.alibaba.fastjson.JSON; import com.xkrs.straw.model.vo.GaoDeIgGeocodeVo; @@ -10,9 +10,9 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; -import static com.xkrs.utils.CommonConstant.INVERSEGEOGRAPHY_KEY; -import static com.xkrs.utils.CommonConstant.INVERSEGEOGRAPHY_URL; -import static com.xkrs.utils.HttpClientUtils.sendHttpsGet; +import static com.xkrs.straw.utilsold.CommonConstant.INVERSEGEOGRAPHY_KEY; +import static com.xkrs.straw.utilsold.CommonConstant.INVERSEGEOGRAPHY_URL; +import static com.xkrs.straw.utilsold.HttpClientUtils.sendHttpsGet; /** * @author wudong diff --git a/src/main/java/com/xkrs/utils/HttpClientUtils.java b/src/main/java/com/xkrs/straw/utilsold/HttpClientUtils.java similarity index 99% rename from src/main/java/com/xkrs/utils/HttpClientUtils.java rename to src/main/java/com/xkrs/straw/utilsold/HttpClientUtils.java index 6d6891c..f36addc 100644 --- a/src/main/java/com/xkrs/utils/HttpClientUtils.java +++ b/src/main/java/com/xkrs/straw/utilsold/HttpClientUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; diff --git a/src/main/java/com/xkrs/utils/LocalNullUtils.java b/src/main/java/com/xkrs/straw/utilsold/LocalNullUtils.java similarity index 90% rename from src/main/java/com/xkrs/utils/LocalNullUtils.java rename to src/main/java/com/xkrs/straw/utilsold/LocalNullUtils.java index 47bddb8..7db1044 100644 --- a/src/main/java/com/xkrs/utils/LocalNullUtils.java +++ b/src/main/java/com/xkrs/straw/utilsold/LocalNullUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; public class LocalNullUtils { diff --git a/src/main/java/com/xkrs/utils/RandomUtil.java b/src/main/java/com/xkrs/straw/utilsold/RandomUtil.java similarity index 88% rename from src/main/java/com/xkrs/utils/RandomUtil.java rename to src/main/java/com/xkrs/straw/utilsold/RandomUtil.java index 3cfd163..f0f504c 100644 --- a/src/main/java/com/xkrs/utils/RandomUtil.java +++ b/src/main/java/com/xkrs/straw/utilsold/RandomUtil.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import java.util.Random; diff --git a/src/main/java/com/xkrs/utils/WDHttpClientUtils.java b/src/main/java/com/xkrs/straw/utilsold/WDHttpClientUtils.java similarity index 99% rename from src/main/java/com/xkrs/utils/WDHttpClientUtils.java rename to src/main/java/com/xkrs/straw/utilsold/WDHttpClientUtils.java index ea6cb9c..504eb82 100644 --- a/src/main/java/com/xkrs/utils/WDHttpClientUtils.java +++ b/src/main/java/com/xkrs/straw/utilsold/WDHttpClientUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; diff --git a/src/main/java/com/xkrs/utils/WDWxSendMsgUtil.java b/src/main/java/com/xkrs/straw/utilsold/WDWxSendMsgUtil.java similarity index 90% rename from src/main/java/com/xkrs/utils/WDWxSendMsgUtil.java rename to src/main/java/com/xkrs/straw/utilsold/WDWxSendMsgUtil.java index ab0bbbd..fed4d60 100644 --- a/src/main/java/com/xkrs/utils/WDWxSendMsgUtil.java +++ b/src/main/java/com/xkrs/straw/utilsold/WDWxSendMsgUtil.java @@ -1,11 +1,11 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.HashMap; import java.util.Map; -import static com.xkrs.utils.WDHttpClientUtils.sendHttpPost; +import static com.xkrs.straw.utilsold.WDHttpClientUtils.sendHttpPost; /** * @author wudong diff --git a/src/main/java/com/xkrs/utils/XlsxUtil.java b/src/main/java/com/xkrs/straw/utilsold/XlsxUtil.java similarity index 99% rename from src/main/java/com/xkrs/utils/XlsxUtil.java rename to src/main/java/com/xkrs/straw/utilsold/XlsxUtil.java index a6836c0..8d0ea39 100644 --- a/src/main/java/com/xkrs/utils/XlsxUtil.java +++ b/src/main/java/com/xkrs/straw/utilsold/XlsxUtil.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsold; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook;