优化

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;

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

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

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

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;

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;

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;

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 {

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;
 
 /**
  * 系统用户服务实现

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;

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 {
 

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;
 

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;

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.*;

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;

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;
 

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);

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;

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

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;

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 {
 

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;
 

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;

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

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;