优化

src/main/java/com/xkrs/common/StaticScheduleTask.java

@@ -1,8 +1,8 @@
 package com.xkrs.common;
 
-import com.xkrs.straw.helper.FirePointSubscribeManager;
+import com.xkrs.helper.FirePointSubscribeManager;
-import com.xkrs.straw.utilsnew.DateTimeUtils;
+import com.xkrs.utilsnew.DateTimeUtils;
-import com.xkrs.straw.utilsnew.WeiXinMessageUtils;
+import com.xkrs.utilsnew.WeiXinMessageUtils;
 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

@@ -1,11 +1,11 @@
 package com.xkrs.common.account;
 
-import com.xkrs.straw.service.SysAuthorityService;
+import com.xkrs.service.SysAuthorityService;
-import com.xkrs.straw.model.entity.SysAuthorityEntity;
+import com.xkrs.model.entity.SysAuthorityEntity;
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.straw.service.SysRoleService;
+import com.xkrs.service.SysRoleService;
-import com.xkrs.straw.service.SysUserService;
+import com.xkrs.service.SysUserService;
-import com.xkrs.straw.utilsold.DateTimeUtil;
+import com.xkrs.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.straw.utilsnew.EncryptDecryptUtil.encry256;
+import static com.xkrs.utilsnew.EncryptDecryptUtil.encry256;
 
 /**
  * 自定义认证Provider

src/main/java/com/xkrs/common/account/JwtLoginFilter.java

@@ -2,8 +2,8 @@ package com.xkrs.common.account;
 
 import com.xkrs.common.encapsulation.OutputEncapsulation;
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.straw.service.SysUserService;
+import com.xkrs.service.SysUserService;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;

src/main/java/com/xkrs/common/account/TokenAuthenticationService.java

@@ -2,7 +2,7 @@ package com.xkrs.common.account;
 
 import com.xkrs.common.encapsulation.OutputEncapsulation;
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;

src/main/java/com/xkrs/controller/DispatchFirePointController.java

@@ -1,10 +1,10 @@
-package com.xkrs.straw.controller;
+package com.xkrs.controller;
 
-import com.xkrs.straw.service.impl.FirePointServiceImpl;
+import com.xkrs.service.impl.FirePointServiceImpl;
-import com.xkrs.straw.dao.SysUserDao;
+import com.xkrs.dao.SysUserDao;
-import com.xkrs.straw.helper.FirePointSubscribeManager;
+import com.xkrs.helper.FirePointSubscribeManager;
-import com.xkrs.straw.model.qo.AllFirePointQo;
+import com.xkrs.model.qo.AllFirePointQo;
-import com.xkrs.straw.service.DispatchFirePointService;
+import com.xkrs.service.DispatchFirePointService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/xkrs/controller/FirePointController.java

@@ -1,11 +1,11 @@
-package com.xkrs.straw.controller;
+package com.xkrs.controller;
 
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.straw.service.FirePointService;
+import com.xkrs.service.FirePointService;
-import com.xkrs.straw.service.impl.FirePointServiceImpl;
+import com.xkrs.service.impl.FirePointServiceImpl;
-import com.xkrs.straw.dao.SysUserDao;
+import com.xkrs.dao.SysUserDao;
-import com.xkrs.straw.helper.FirePointQueryManager;
+import com.xkrs.helper.FirePointQueryManager;
-import com.xkrs.straw.service.StreetService;
+import com.xkrs.service.StreetService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.i18n.LocaleContextHolder;

src/main/java/com/xkrs/controller/GaoDeApiController.java

@@ -1,10 +1,10 @@
-package com.xkrs.straw.controller;
+package com.xkrs.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.straw.model.vo.GaoDeIgGeocodeVo;
+import com.xkrs.model.vo.GaoDeIgGeocodeVo;
-import com.xkrs.straw.model.vo.GaoDeWeatherVo;
+import com.xkrs.model.vo.GaoDeWeatherVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -16,8 +16,8 @@ import java.util.List;
 import java.util.Locale;
 
 import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-import static com.xkrs.straw.utilsnew.CommonConstant.*;
+import static com.xkrs.utilsnew.CommonConstant.*;
-import static com.xkrs.straw.utilsold.HttpClientUtils.sendHttpsGet;
+import static com.xkrs.utilsold.HttpClientUtils.sendHttpsGet;
 
 /**
  * @author wudong

src/main/java/com/xkrs/controller/NoticeController.java

@@ -1,7 +1,7 @@
-package com.xkrs.straw.controller;
+package com.xkrs.controller;
 
-import com.xkrs.straw.model.entity.NoticeEntity;
+import com.xkrs.model.entity.NoticeEntity;
-import com.xkrs.straw.service.NoticeService;
+import com.xkrs.service.NoticeService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/com/xkrs/controller/PushController.java

@@ -1,10 +1,10 @@
-package com.xkrs.straw.controller;
+package com.xkrs.controller;
 
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.straw.model.qo.SysUserPushIdQo;
+import com.xkrs.model.qo.SysUserPushIdQo;
-import com.xkrs.straw.dao.SysUserDao;
+import com.xkrs.dao.SysUserDao;
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.straw.model.helper.PushHelper;
+import com.xkrs.model.helper.PushHelper;
 import org.apache.hc.core5.util.TextUtils;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/xkrs/controller/StreetController.java

@@ -1,7 +1,7 @@
-package com.xkrs.straw.controller;
+package com.xkrs.controller;
 
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.straw.dao.StreetDao;
+import com.xkrs.dao.StreetDao;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;

src/main/java/com/xkrs/controller/StreettController.java

@@ -1,7 +1,7 @@
-package com.xkrs.straw.controller;
+package com.xkrs.controller;
 
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.straw.dao.StreetDao;
+import com.xkrs.dao.StreetDao;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/xkrs/controller/SysUserController.java

@@ -1,21 +1,21 @@
-package com.xkrs.straw.controller;
+package com.xkrs.controller;
 
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.straw.model.va.SysUserQoInsert;
+import com.xkrs.model.va.SysUserQoInsert;
-import com.xkrs.straw.model.va.SysUserQoUpdate;
+import com.xkrs.model.va.SysUserQoUpdate;
-import com.xkrs.straw.service.RedisService;
+import com.xkrs.service.RedisService;
-import com.xkrs.straw.dao.SysUserDao;
+import com.xkrs.dao.SysUserDao;
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.straw.model.qo.SysUserQo;
+import com.xkrs.model.qo.SysUserQo;
-import com.xkrs.straw.model.qo.SysUserReceiveSmsQo;
+import com.xkrs.model.qo.SysUserReceiveSmsQo;
-import com.xkrs.straw.model.qo.SysUserRemarkQo;
+import com.xkrs.model.qo.SysUserRemarkQo;
-import com.xkrs.straw.model.qo.SysUserVipLevelQo;
+import com.xkrs.model.qo.SysUserVipLevelQo;
-import com.xkrs.straw.model.vo.SysUserVo;
+import com.xkrs.model.vo.SysUserVo;
-import com.xkrs.straw.service.SysUserService;
+import com.xkrs.service.SysUserService;
-import com.xkrs.straw.utilsnew.*;
+import com.xkrs.utilsnew.*;
-import com.xkrs.straw.utilsnew.AliYunSmsUtils;
+import com.xkrs.utilsnew.AliYunSmsUtils;
-import com.xkrs.straw.utilsnew.RandomUtil;
+import com.xkrs.utilsnew.RandomUtil;
 import org.apache.hc.core5.util.TextUtils;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.data.domain.Sort;
@@ -34,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.straw.utilsnew.EncryptDecryptUtil.encry256;
+import static com.xkrs.utilsnew.EncryptDecryptUtil.encry256;
 
 /**
  * 系统用户Controller

src/main/java/com/xkrs/dao/CountyCodeWeiXinDao.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.dao;
+package com.xkrs.dao;
 
-import com.xkrs.straw.model.entity.CountyCodeWeiXinEntity;
+import com.xkrs.model.entity.CountyCodeWeiXinEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Component;

src/main/java/com/xkrs/dao/FirePointChannelConfigDao.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.dao;
+package com.xkrs.dao;
 
-import com.xkrs.straw.model.entity.FirePointChannelConfigEntity;
+import com.xkrs.model.entity.FirePointChannelConfigEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Component;

src/main/java/com/xkrs/dao/FirePointOrdinaryDao.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.dao;
+package com.xkrs.dao;
 
-import com.xkrs.straw.model.entity.FirePointOrdinaryEntity;
+import com.xkrs.model.entity.FirePointOrdinaryEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Component;

src/main/java/com/xkrs/dao/FirePointPreciseDao.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.dao;
+package com.xkrs.dao;
 
-import com.xkrs.straw.model.entity.FirePointPreciseEntity;
+import com.xkrs.model.entity.FirePointPreciseEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Component;

src/main/java/com/xkrs/dao/NoticeDao.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.dao;
+package com.xkrs.dao;
 
-import com.xkrs.straw.model.entity.NoticeEntity;
+import com.xkrs.model.entity.NoticeEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Component;

src/main/java/com/xkrs/dao/NoticeRelaDao.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.dao;
+package com.xkrs.dao;
 
-import com.xkrs.straw.model.entity.NoticeRelaEntity;
+import com.xkrs.model.entity.NoticeRelaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Component;

src/main/java/com/xkrs/dao/RelRoleAuthorityDao.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.dao;
+package com.xkrs.dao;
 
-import com.xkrs.straw.model.entity.RelRoleAuthorityEntity;
+import com.xkrs.model.entity.RelRoleAuthorityEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/xkrs/dao/RelUserRoleDao.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.dao;
+package com.xkrs.dao;
 
-import com.xkrs.straw.model.entity.RelUserRoleEntity;
+import com.xkrs.model.entity.RelUserRoleEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Component;

src/main/java/com/xkrs/dao/StreetDao.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.dao;
+package com.xkrs.dao;
 
-import com.xkrs.straw.model.entity.StreetEntity;
+import com.xkrs.model.entity.StreetEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/xkrs/dao/SysAuthorityDao.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.dao;
+package com.xkrs.dao;
 
-import com.xkrs.straw.model.entity.SysAuthorityEntity;
+import com.xkrs.model.entity.SysAuthorityEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Component;

src/main/java/com/xkrs/dao/SysRoleDao.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.dao;
+package com.xkrs.dao;
 
-import com.xkrs.straw.model.entity.SysRoleEntity;
+import com.xkrs.model.entity.SysRoleEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

src/main/java/com/xkrs/dao/SysUserDao.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.dao;
+package com.xkrs.dao;
 
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

src/main/java/com/xkrs/helper/FirePointPushManager.java

@@ -1,17 +1,17 @@
-package com.xkrs.straw.helper;
+package com.xkrs.helper;
 
-import com.xkrs.straw.dao.CountyCodeWeiXinDao;
+import com.xkrs.dao.CountyCodeWeiXinDao;
-import com.xkrs.straw.model.entity.CountyCodeWeiXinEntity;
+import com.xkrs.model.entity.CountyCodeWeiXinEntity;
-import com.xkrs.straw.dao.SysUserDao;
+import com.xkrs.dao.SysUserDao;
-import com.xkrs.straw.model.entity.FirePointOrdinaryEntity;
+import com.xkrs.model.entity.FirePointOrdinaryEntity;
-import com.xkrs.straw.model.entity.FirePointPreciseEntity;
+import com.xkrs.model.entity.FirePointPreciseEntity;
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.straw.model.helper.PushHelper;
+import com.xkrs.model.helper.PushHelper;
-import com.xkrs.straw.model.vo.AllFirePointVo;
+import com.xkrs.model.vo.AllFirePointVo;
-import com.xkrs.straw.utilsnew.FirePointConvertUtils;
+import com.xkrs.utilsnew.FirePointConvertUtils;
-import com.xkrs.straw.utilsnew.FirePointCodeUtils;
+import com.xkrs.utilsnew.FirePointCodeUtils;
-import com.xkrs.straw.utilsnew.SMSUtils;
+import com.xkrs.utilsnew.SMSUtils;
-import com.xkrs.straw.utilsnew.WeiXinMessageUtils;
+import com.xkrs.utilsnew.WeiXinMessageUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/com/xkrs/helper/FirePointQueryManager.java

@@ -1,18 +1,18 @@
-package com.xkrs.straw.helper;
+package com.xkrs.helper;
 
-import com.xkrs.straw.dao.FirePointOrdinaryDao;
+import com.xkrs.dao.FirePointOrdinaryDao;
-import com.xkrs.straw.dao.FirePointPreciseDao;
+import com.xkrs.dao.FirePointPreciseDao;
-import com.xkrs.straw.model.bean.FirePointQueryResultBean;
+import com.xkrs.model.bean.FirePointQueryResultBean;
-import com.xkrs.straw.model.bean.VipTimeRangeBean;
+import com.xkrs.model.bean.VipTimeRangeBean;
-import com.xkrs.straw.model.entity.FirePointOrdinaryEntity;
+import com.xkrs.model.entity.FirePointOrdinaryEntity;
-import com.xkrs.straw.model.entity.FirePointPreciseEntity;
+import com.xkrs.model.entity.FirePointPreciseEntity;
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.straw.model.vo.AllFirePointVo;
+import com.xkrs.model.vo.AllFirePointVo;
-import com.xkrs.straw.utilsnew.FirePointConvertUtils;
+import com.xkrs.utilsnew.FirePointConvertUtils;
-import com.xkrs.straw.utilsnew.JsonUtils;
+import com.xkrs.utilsnew.JsonUtils;
-import com.xkrs.straw.utilsold.DateTimeUtil;
+import com.xkrs.utilsold.DateTimeUtil;
-import com.xkrs.straw.utilsnew.DateTimeUtils;
+import com.xkrs.utilsnew.DateTimeUtils;
-import com.xkrs.straw.utilsnew.FirePointCodeUtils;
+import com.xkrs.utilsnew.FirePointCodeUtils;
 import org.apache.hc.core5.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/xkrs/helper/FirePointSubscribeManager.java

@@ -1,25 +1,25 @@
-package com.xkrs.straw.helper;
+package com.xkrs.helper;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.xkrs.straw.dao.FirePointChannelConfigDao;
+import com.xkrs.dao.FirePointChannelConfigDao;
-import com.xkrs.straw.dao.SysUserDao;
+import com.xkrs.dao.SysUserDao;
-import com.xkrs.straw.model.bean.DataWrapper4;
+import com.xkrs.model.bean.DataWrapper4;
-import com.xkrs.straw.model.bean.FirePointChannelConfigBean;
+import com.xkrs.model.bean.FirePointChannelConfigBean;
-import com.xkrs.straw.model.bean.LocalDateTimeRange;
+import com.xkrs.model.bean.LocalDateTimeRange;
-import com.xkrs.straw.model.entity.FirePointChannelConfigEntity;
+import com.xkrs.model.entity.FirePointChannelConfigEntity;
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.straw.utilsnew.JsonUtils;
+import com.xkrs.utilsnew.JsonUtils;
-import com.xkrs.straw.utilsnew.VipTimeRangeUtils;
+import com.xkrs.utilsnew.VipTimeRangeUtils;
-import com.xkrs.straw.utilsnew.DateTimeUtils;
+import com.xkrs.utilsnew.DateTimeUtils;
-import com.xkrs.straw.utilsnew.FirePointCodeUtils;
+import com.xkrs.utilsnew.FirePointCodeUtils;
-import com.xkrs.straw.utilsnew.ListUtils;
+import com.xkrs.utilsnew.ListUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
 
-import static com.xkrs.straw.utilsold.HttpClientUtils.sendHttpPost;
+import static com.xkrs.utilsold.HttpClientUtils.sendHttpPost;
 
 @Component
 public class FirePointSubscribeManager {

src/main/java/com/xkrs/helper/GeoCodeHelper.java

@@ -1,8 +1,8 @@
-package com.xkrs.straw.helper;
+package com.xkrs.helper;
 
-import com.xkrs.straw.model.vo.GaoDeIgGeocodeVo;
+import com.xkrs.model.vo.GaoDeIgGeocodeVo;
-import com.xkrs.straw.service.impl.DispatchFirePointServiceImpl;
+import com.xkrs.service.impl.DispatchFirePointServiceImpl;
-import com.xkrs.straw.utilsold.GaoDeApiUtil;
+import com.xkrs.utilsold.GaoDeApiUtil;
 import org.apache.hc.core5.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/xkrs/model/bean/DataWrapper.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.bean;
+package com.xkrs.model.bean;
 
 public class DataWrapper<DataType> {
 

src/main/java/com/xkrs/model/bean/DataWrapper2.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.bean;
+package com.xkrs.model.bean;
 
 public class DataWrapper2<DataType1, DataType2> {
 

src/main/java/com/xkrs/model/bean/DataWrapper3.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.bean;
+package com.xkrs.model.bean;
 
 public class DataWrapper3<DataType1, DataType2, DataType3> {
 

src/main/java/com/xkrs/model/bean/DataWrapper4.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.bean;
+package com.xkrs.model.bean;
 
 public class DataWrapper4<DataType1, DataType2, DataType3, DataType4> {
 

src/main/java/com/xkrs/model/bean/FirePointChannelConfigBean.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.bean;
+package com.xkrs.model.bean;
 
 import java.util.List;
 

src/main/java/com/xkrs/model/bean/FirePointQueryResultBean.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.model.bean;
+package com.xkrs.model.bean;
 
-import com.xkrs.straw.model.vo.AllFirePointVo;
+import com.xkrs.model.vo.AllFirePointVo;
 
 import java.util.List;
 

src/main/java/com/xkrs/model/bean/KeyValueBean.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.bean;
+package com.xkrs.model.bean;
 
 public class KeyValueBean {
 

src/main/java/com/xkrs/model/bean/LocalDateTimeRange.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.bean;
+package com.xkrs.model.bean;
 
 import java.time.LocalDateTime;
 

src/main/java/com/xkrs/model/bean/VipLocalDateTimeRangePair.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.bean;
+package com.xkrs.model.bean;
 
 import java.time.LocalDateTime;
 

src/main/java/com/xkrs/model/bean/VipTimeRangeBean.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.bean;
+package com.xkrs.model.bean;
 
 import java.util.List;
 

src/main/java/com/xkrs/model/entity/CountyCodeWeiXinEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/xkrs/model/entity/FirePointChannelConfigEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/xkrs/model/entity/FirePointOrdinaryEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/xkrs/model/entity/FirePointPreciseEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/xkrs/model/entity/LandEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 

src/main/java/com/xkrs/model/entity/NoticeEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/xkrs/model/entity/NoticeRelaEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/xkrs/model/entity/RelRoleAuthorityEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/xkrs/model/entity/RelUserRoleEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/xkrs/model/entity/StreetEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/xkrs/model/entity/SysAuthorityEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/xkrs/model/entity/SysRoleEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/xkrs/model/entity/SysUserEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/xkrs/model/helper/PushHelper.java

@@ -1,12 +1,12 @@
-package com.xkrs.straw.model.helper;
+package com.xkrs.model.helper;
 
 import com.xiaomi.push.sdk.ErrorCode;
 import com.xiaomi.xmpush.server.Constants;
 import com.xiaomi.xmpush.server.Message;
 import com.xiaomi.xmpush.server.Result;
 import com.xiaomi.xmpush.server.Sender;
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.straw.model.vo.AllFirePointVo;
+import com.xkrs.model.vo.AllFirePointVo;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;

src/main/java/com/xkrs/model/qo/AllFirePointQo.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.qo;
+package com.xkrs.model.qo;
 
 public class AllFirePointQo {
 

src/main/java/com/xkrs/model/qo/SysUserPushIdQo.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.qo;
+package com.xkrs.model.qo;
 
 public class SysUserPushIdQo {
 

src/main/java/com/xkrs/model/qo/SysUserQo.java

@@ -1,7 +1,7 @@
-package com.xkrs.straw.model.qo;
+package com.xkrs.model.qo;
 
-import com.xkrs.straw.model.va.SysUserQoInsert;
+import com.xkrs.model.va.SysUserQoInsert;
-import com.xkrs.straw.model.va.SysUserQoUpdate;
+import com.xkrs.model.va.SysUserQoUpdate;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotBlank;

src/main/java/com/xkrs/model/qo/SysUserReceiveSmsQo.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.model.qo;
+package com.xkrs.model.qo;
 
-import com.xkrs.straw.model.va.SysUserQoUpdate;
+import com.xkrs.model.va.SysUserQoUpdate;
 
 import javax.validation.constraints.NotNull;
 

src/main/java/com/xkrs/model/qo/SysUserRemarkQo.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.model.qo;
+package com.xkrs.model.qo;
 
-import com.xkrs.straw.model.va.SysUserQoUpdate;
+import com.xkrs.model.va.SysUserQoUpdate;
 
 import javax.validation.constraints.NotNull;
 

src/main/java/com/xkrs/model/qo/SysUserVipLevelQo.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.model.qo;
+package com.xkrs.model.qo;
 
-import com.xkrs.straw.model.va.SysUserQoUpdate;
+import com.xkrs.model.va.SysUserQoUpdate;
 
 import javax.validation.constraints.NotNull;
 

src/main/java/com/xkrs/model/va/SysUserQoInsert.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.va;
+package com.xkrs.model.va;
 
 /**
  * SysUserQoInsert

src/main/java/com/xkrs/model/va/SysUserQoUpdate.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.va;
+package com.xkrs.model.va;
 
 /**
  * SysUserQoUpdate

src/main/java/com/xkrs/model/vo/AllFirePointVo.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.vo;
+package com.xkrs.model.vo;
 
 public class AllFirePointVo {
 

src/main/java/com/xkrs/model/vo/GaoDeIgGeocodeVo.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.vo;
+package com.xkrs.model.vo;
 
 import java.util.List;
 

src/main/java/com/xkrs/model/vo/GaoDeWeatherVo.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.vo;
+package com.xkrs.model.vo;
 
 import java.util.List;
 

src/main/java/com/xkrs/model/vo/SysUserVo.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.model.vo;
+package com.xkrs.model.vo;
 
 public class SysUserVo {
 

src/main/java/com/xkrs/service/DispatchFirePointService.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.service;
+package com.xkrs.service;
 
-import com.xkrs.straw.model.qo.AllFirePointQo;
+import com.xkrs.model.qo.AllFirePointQo;
 
 public interface DispatchFirePointService {
 

src/main/java/com/xkrs/service/FirePointService.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.service;
+package com.xkrs.service;
 
 public interface FirePointService {
 

src/main/java/com/xkrs/service/NoticeService.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.service;
+package com.xkrs.service;
 
-import com.xkrs.straw.model.entity.NoticeEntity;
+import com.xkrs.model.entity.NoticeEntity;
 
 /**
  * 公告栏通知接口

src/main/java/com/xkrs/service/RedisService.java

@@ -1,6 +1,5 @@
-package com.xkrs.straw.service;
+package com.xkrs.service;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 

src/main/java/com/xkrs/service/StreetService.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.service;
+package com.xkrs.service;
 
-import com.xkrs.straw.model.entity.StreetEntity;
+import com.xkrs.model.entity.StreetEntity;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/xkrs/service/SysAuthorityService.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.service;
+package com.xkrs.service;
 
-import com.xkrs.straw.model.entity.SysAuthorityEntity;
+import com.xkrs.model.entity.SysAuthorityEntity;
 
 import java.util.List;
 

src/main/java/com/xkrs/service/SysRoleService.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.service;
+package com.xkrs.service;
 
-import com.xkrs.straw.model.entity.SysRoleEntity;
+import com.xkrs.model.entity.SysRoleEntity;
 
 import java.util.List;
 

src/main/java/com/xkrs/service/SysUserService.java

@@ -1,7 +1,7 @@
-package com.xkrs.straw.service;
+package com.xkrs.service;
 
-import com.xkrs.straw.model.qo.SysUserQo;
+import com.xkrs.model.qo.SysUserQo;
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;

src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java

@@ -1,20 +1,20 @@
-package com.xkrs.straw.service.impl;
+package com.xkrs.service.impl;
 
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.straw.dao.*;
+import com.xkrs.dao.*;
-import com.xkrs.straw.helper.FirePointPushManager;
+import com.xkrs.helper.FirePointPushManager;
-import com.xkrs.straw.helper.FirePointQueryManager;
+import com.xkrs.helper.FirePointQueryManager;
-import com.xkrs.straw.helper.GeoCodeHelper;
+import com.xkrs.helper.GeoCodeHelper;
-import com.xkrs.straw.model.bean.DataWrapper2;
+import com.xkrs.model.bean.DataWrapper2;
-import com.xkrs.straw.model.entity.FirePointChannelConfigEntity;
+import com.xkrs.model.entity.FirePointChannelConfigEntity;
-import com.xkrs.straw.model.entity.FirePointOrdinaryEntity;
+import com.xkrs.model.entity.FirePointOrdinaryEntity;
-import com.xkrs.straw.model.entity.FirePointPreciseEntity;
+import com.xkrs.model.entity.FirePointPreciseEntity;
-import com.xkrs.straw.model.entity.StreetEntity;
+import com.xkrs.model.entity.StreetEntity;
-import com.xkrs.straw.model.qo.AllFirePointQo;
+import com.xkrs.model.qo.AllFirePointQo;
-import com.xkrs.straw.service.DispatchFirePointService;
+import com.xkrs.service.DispatchFirePointService;
-import com.xkrs.straw.utilsnew.DateTimeUtils;
+import com.xkrs.utilsnew.DateTimeUtils;
-import com.xkrs.straw.utilsnew.FirePointDispatchUtils;
+import com.xkrs.utilsnew.FirePointDispatchUtils;
-import com.xkrs.straw.utilsnew.FirePointFilterUtils;
+import com.xkrs.utilsnew.FirePointFilterUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.i18n.LocaleContextHolder;

src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java

@@ -1,21 +1,21 @@
-package com.xkrs.straw.service.impl;
+package com.xkrs.service.impl;
 
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.straw.service.FirePointService;
+import com.xkrs.service.FirePointService;
-import com.xkrs.straw.dao.CountyCodeWeiXinDao;
+import com.xkrs.dao.CountyCodeWeiXinDao;
-import com.xkrs.straw.dao.FirePointOrdinaryDao;
+import com.xkrs.dao.FirePointOrdinaryDao;
-import com.xkrs.straw.dao.StreetDao;
+import com.xkrs.dao.StreetDao;
-import com.xkrs.straw.dao.SysUserDao;
+import com.xkrs.dao.SysUserDao;
-import com.xkrs.straw.helper.FirePointQueryManager;
+import com.xkrs.helper.FirePointQueryManager;
-import com.xkrs.straw.model.bean.FirePointQueryResultBean;
+import com.xkrs.model.bean.FirePointQueryResultBean;
-import com.xkrs.straw.model.entity.FirePointOrdinaryEntity;
+import com.xkrs.model.entity.FirePointOrdinaryEntity;
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.straw.model.helper.PushHelper;
+import com.xkrs.model.helper.PushHelper;
-import com.xkrs.straw.model.vo.AllFirePointVo;
+import com.xkrs.model.vo.AllFirePointVo;
-import com.xkrs.straw.service.StreetService;
+import com.xkrs.service.StreetService;
-import com.xkrs.straw.utilsnew.DateTimeUtils;
+import com.xkrs.utilsnew.DateTimeUtils;
-import com.xkrs.straw.utilsnew.FirePointConvertUtils;
+import com.xkrs.utilsnew.FirePointConvertUtils;
-import com.xkrs.straw.utilsnew.TokenUtil;
+import com.xkrs.utilsnew.TokenUtil;
 import org.apache.hc.core5.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/xkrs/service/impl/NoticeServiceImpl.java

@@ -1,14 +1,14 @@
-package com.xkrs.straw.service.impl;
+package com.xkrs.service.impl;
 
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.straw.dao.NoticeDao;
+import com.xkrs.dao.NoticeDao;
-import com.xkrs.straw.dao.NoticeRelaDao;
+import com.xkrs.dao.NoticeRelaDao;
-import com.xkrs.straw.dao.SysUserDao;
+import com.xkrs.dao.SysUserDao;
-import com.xkrs.straw.model.entity.NoticeEntity;
+import com.xkrs.model.entity.NoticeEntity;
-import com.xkrs.straw.model.entity.NoticeRelaEntity;
+import com.xkrs.model.entity.NoticeRelaEntity;
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.straw.service.NoticeService;
+import com.xkrs.service.NoticeService;
-import com.xkrs.straw.utilsnew.TokenUtil;
+import com.xkrs.utilsnew.TokenUtil;
 import org.apache.hc.core5.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/xkrs/service/impl/StreetServiceImpl.java

@@ -1,8 +1,8 @@
-package com.xkrs.straw.service.impl;
+package com.xkrs.service.impl;
 
-import com.xkrs.straw.dao.StreetDao;
+import com.xkrs.dao.StreetDao;
-import com.xkrs.straw.model.entity.StreetEntity;
+import com.xkrs.model.entity.StreetEntity;
-import com.xkrs.straw.service.StreetService;
+import com.xkrs.service.StreetService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/com/xkrs/service/impl/SysAuthorityServiceImpl.java

@@ -1,9 +1,9 @@
-package com.xkrs.straw.service.impl;
+package com.xkrs.service.impl;
 
-import com.xkrs.straw.service.SysAuthorityService;
+import com.xkrs.service.SysAuthorityService;
-import com.xkrs.straw.dao.RelRoleAuthorityDao;
+import com.xkrs.dao.RelRoleAuthorityDao;
-import com.xkrs.straw.dao.SysAuthorityDao;
+import com.xkrs.dao.SysAuthorityDao;
-import com.xkrs.straw.model.entity.SysAuthorityEntity;
+import com.xkrs.model.entity.SysAuthorityEntity;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/com/xkrs/service/impl/SysRoleServiceImpl.java

@@ -1,8 +1,8 @@
-package com.xkrs.straw.service.impl;
+package com.xkrs.service.impl;
 
-import com.xkrs.straw.dao.SysRoleDao;
+import com.xkrs.dao.SysRoleDao;
-import com.xkrs.straw.model.entity.SysRoleEntity;
+import com.xkrs.model.entity.SysRoleEntity;
-import com.xkrs.straw.service.SysRoleService;
+import com.xkrs.service.SysRoleService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/com/xkrs/service/impl/SysUserServiceImpl.java

@@ -1,20 +1,20 @@
-package com.xkrs.straw.service.impl;
+package com.xkrs.service.impl;
 
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.straw.dao.StreetDao;
+import com.xkrs.dao.StreetDao;
-import com.xkrs.straw.model.entity.StreetEntity;
+import com.xkrs.model.entity.StreetEntity;
-import com.xkrs.straw.model.qo.SysUserQo;
+import com.xkrs.model.qo.SysUserQo;
-import com.xkrs.straw.service.RedisService;
+import com.xkrs.service.RedisService;
-import com.xkrs.straw.dao.RelRoleAuthorityDao;
+import com.xkrs.dao.RelRoleAuthorityDao;
-import com.xkrs.straw.dao.RelUserRoleDao;
+import com.xkrs.dao.RelUserRoleDao;
-import com.xkrs.straw.dao.SysRoleDao;
+import com.xkrs.dao.SysRoleDao;
-import com.xkrs.straw.dao.SysUserDao;
+import com.xkrs.dao.SysUserDao;
-import com.xkrs.straw.model.entity.RelRoleAuthorityEntity;
+import com.xkrs.model.entity.RelRoleAuthorityEntity;
-import com.xkrs.straw.model.entity.RelUserRoleEntity;
+import com.xkrs.model.entity.RelUserRoleEntity;
-import com.xkrs.straw.model.entity.SysRoleEntity;
+import com.xkrs.model.entity.SysRoleEntity;
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.straw.service.SysUserService;
+import com.xkrs.service.SysUserService;
-import com.xkrs.straw.utilsnew.VipTimeRangeUtils;
+import com.xkrs.utilsnew.VipTimeRangeUtils;
 import org.apache.http.util.TextUtils;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.data.domain.Sort;
@@ -32,8 +32,8 @@ import java.util.List;
 import java.util.Locale;
 
 import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-import static com.xkrs.straw.utilsold.DateTimeUtil.dateTimeToString;
+import static com.xkrs.utilsold.DateTimeUtil.dateTimeToString;
-import static com.xkrs.straw.utilsnew.EncryptDecryptUtil.encry256;
+import static com.xkrs.utilsnew.EncryptDecryptUtil.encry256;
 
 /**
  * 系统用户服务实现

src/main/java/com/xkrs/utilsnew/AliYunSmsUtils.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;

src/main/java/com/xkrs/utilsnew/CommonConstant.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
 public interface CommonConstant {
 

src/main/java/com/xkrs/utilsnew/DateTimeUtils.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;

src/main/java/com/xkrs/utilsnew/EncryptDecryptUtil.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

src/main/java/com/xkrs/utilsnew/FirePointCodeUtils.java

@@ -1,6 +1,6 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
 import org.apache.hc.core5.util.TextUtils;
 
 import java.util.ArrayList;

src/main/java/com/xkrs/utilsnew/FirePointConvertUtils.java

@@ -1,8 +1,8 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
-import com.xkrs.straw.model.entity.FirePointOrdinaryEntity;
+import com.xkrs.model.entity.FirePointOrdinaryEntity;
-import com.xkrs.straw.model.entity.FirePointPreciseEntity;
+import com.xkrs.model.entity.FirePointPreciseEntity;
-import com.xkrs.straw.model.vo.AllFirePointVo;
+import com.xkrs.model.vo.AllFirePointVo;
 
 /**
  * AllFirePointVo输出格式转化工具

src/main/java/com/xkrs/utilsnew/FirePointDispatchUtils.java

@@ -1,8 +1,8 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
-import com.xkrs.straw.model.bean.FirePointChannelConfigBean;
+import com.xkrs.model.bean.FirePointChannelConfigBean;
-import com.xkrs.straw.model.entity.FirePointChannelConfigEntity;
+import com.xkrs.model.entity.FirePointChannelConfigEntity;
-import com.xkrs.straw.service.impl.DispatchFirePointServiceImpl;
+import com.xkrs.service.impl.DispatchFirePointServiceImpl;
 import org.apache.hc.core5.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/xkrs/utilsnew/FirePointFilterUtils.java

@@ -1,10 +1,10 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
-import com.xkrs.straw.dao.FirePointOrdinaryDao;
+import com.xkrs.dao.FirePointOrdinaryDao;
-import com.xkrs.straw.dao.FirePointPreciseDao;
+import com.xkrs.dao.FirePointPreciseDao;
-import com.xkrs.straw.model.bean.DataWrapper2;
+import com.xkrs.model.bean.DataWrapper2;
-import com.xkrs.straw.model.entity.FirePointOrdinaryEntity;
+import com.xkrs.model.entity.FirePointOrdinaryEntity;
-import com.xkrs.straw.model.entity.FirePointPreciseEntity;
+import com.xkrs.model.entity.FirePointPreciseEntity;
 import org.springframework.data.jpa.domain.Specification;
 
 import javax.persistence.criteria.Predicate;

src/main/java/com/xkrs/utilsnew/JsonUtils.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;

src/main/java/com/xkrs/utilsnew/ListUtils.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
 import org.apache.hc.core5.util.TextUtils;
 

src/main/java/com/xkrs/utilsnew/RandomUtil.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
 import java.util.Random;
 

src/main/java/com/xkrs/utilsnew/SMSUtils.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;

src/main/java/com/xkrs/utilsnew/SysUserConvertUtils.java

@@ -1,7 +1,7 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
-import com.xkrs.straw.model.entity.SysUserEntity;
+import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.straw.model.vo.SysUserVo;
+import com.xkrs.model.vo.SysUserVo;
 
 public class SysUserConvertUtils {
 

src/main/java/com/xkrs/utilsnew/TokenUtil.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;

src/main/java/com/xkrs/utilsnew/VipTimeRangeUtils.java

@@ -1,7 +1,7 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
-import com.xkrs.straw.model.bean.VipLocalDateTimeRangePair;
+import com.xkrs.model.bean.VipLocalDateTimeRangePair;
-import com.xkrs.straw.model.bean.VipTimeRangeBean;
+import com.xkrs.model.bean.VipTimeRangeBean;
 import org.apache.hc.core5.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/xkrs/utilsnew/WeiXinMessageUtils.java

@@ -1,11 +1,11 @@
-package com.xkrs.straw.utilsnew;
+package com.xkrs.utilsnew;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.xkrs.straw.utilsold.WDHttpClientUtils.sendHttpPost;
+import static com.xkrs.utilsold.WDHttpClientUtils.sendHttpPost;
 
 public class WeiXinMessageUtils {
 

src/main/java/com/xkrs/utilsold/DateTimeUtil.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.utilsold;
+package com.xkrs.utilsold;
 
 import org.apache.hc.core5.util.TextUtils;
 

src/main/java/com/xkrs/utilsold/GaoDeApiUtil.java

@@ -1,7 +1,7 @@
-package com.xkrs.straw.utilsold;
+package com.xkrs.utilsold;
 
 import com.alibaba.fastjson.JSON;
-import com.xkrs.straw.model.vo.GaoDeIgGeocodeVo;
+import com.xkrs.model.vo.GaoDeIgGeocodeVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -10,9 +10,9 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.xkrs.straw.utilsnew.CommonConstant.INVERSEGEOGRAPHY_KEY;
+import static com.xkrs.utilsnew.CommonConstant.INVERSEGEOGRAPHY_KEY;
-import static com.xkrs.straw.utilsnew.CommonConstant.INVERSEGEOGRAPHY_URL;
+import static com.xkrs.utilsnew.CommonConstant.INVERSEGEOGRAPHY_URL;
-import static com.xkrs.straw.utilsold.HttpClientUtils.sendHttpsGet;
+import static com.xkrs.utilsold.HttpClientUtils.sendHttpsGet;
 
 /**
  * @author wudong

src/main/java/com/xkrs/utilsold/HttpClientUtils.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.utilsold;
+package com.xkrs.utilsold;
 
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;

src/main/java/com/xkrs/utilsold/WDHttpClientUtils.java

@@ -1,4 +1,4 @@
-package com.xkrs.straw.utilsold;
+package com.xkrs.utilsold;
 
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;