From 5ba0da632604bb872694faebc4aef3d6ab8c9568 Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Fri, 3 Feb 2023 17:03:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E7=94=A8=E6=88=B7=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xkrs/common/account/CustomAuthenticationProvider.java | 2 +- src/main/java/com/xkrs/controller/FirePointController.java | 4 ++-- src/main/java/com/xkrs/controller/PushController.java | 4 ++-- src/main/java/com/xkrs/controller/SysUserController.java | 4 ++-- src/main/java/com/xkrs/service/SysUserService.java | 2 +- src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java | 2 ++ src/main/java/com/xkrs/service/impl/SysUserServiceImpl.java | 2 ++ src/main/java/com/xkrs/sms/PushHelper.java | 2 +- src/main/java/com/xkrs/sms/SMSHelper.java | 2 +- src/main/java/com/xkrs/sms/WeChatMessageHelper.java | 2 +- src/main/java/com/xkrs/{ => straw}/dao/SysUserDao.java | 4 ++-- .../java/com/xkrs/{ => straw}/model/entity/SysUserEntity.java | 2 +- src/main/java/com/xkrs/utils/FirePointCodeUtils.java | 2 +- 13 files changed, 19 insertions(+), 15 deletions(-) rename src/main/java/com/xkrs/{ => straw}/dao/SysUserDao.java (98%) rename src/main/java/com/xkrs/{ => straw}/model/entity/SysUserEntity.java (99%) diff --git a/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java b/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java index 300bf22..8ec7180 100644 --- a/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java +++ b/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java @@ -1,7 +1,7 @@ package com.xkrs.common.account; import com.xkrs.model.entity.SysAuthorityEntity; -import com.xkrs.model.entity.SysUserEntity; +import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.service.SysAuthorityService; import com.xkrs.service.SysRoleService; import com.xkrs.service.SysUserService; diff --git a/src/main/java/com/xkrs/controller/FirePointController.java b/src/main/java/com/xkrs/controller/FirePointController.java index c1e31ba..e4abf37 100644 --- a/src/main/java/com/xkrs/controller/FirePointController.java +++ b/src/main/java/com/xkrs/controller/FirePointController.java @@ -3,9 +3,9 @@ package com.xkrs.controller; import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.common.tool.TokenUtil; import com.xkrs.dao.FirePointDao; -import com.xkrs.dao.SysUserDao; +import com.xkrs.straw.dao.SysUserDao; import com.xkrs.model.entity.FirePointEntity; -import com.xkrs.model.entity.SysUserEntity; +import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.model.qo.AuditFireTypeQo; import com.xkrs.model.qo.FirePointQo; import com.xkrs.service.FirePointService; diff --git a/src/main/java/com/xkrs/controller/PushController.java b/src/main/java/com/xkrs/controller/PushController.java index c032c2f..67132cb 100644 --- a/src/main/java/com/xkrs/controller/PushController.java +++ b/src/main/java/com/xkrs/controller/PushController.java @@ -1,8 +1,8 @@ package com.xkrs.controller; import com.xkrs.common.encapsulation.PromptMessageEnum; -import com.xkrs.dao.SysUserDao; -import com.xkrs.model.entity.SysUserEntity; +import com.xkrs.straw.dao.SysUserDao; +import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.model.qo.SysUserPushAccountQo; import com.xkrs.sms.PushHelper; import org.apache.hc.core5.util.TextUtils; diff --git a/src/main/java/com/xkrs/controller/SysUserController.java b/src/main/java/com/xkrs/controller/SysUserController.java index 09eae8f..6e93afe 100644 --- a/src/main/java/com/xkrs/controller/SysUserController.java +++ b/src/main/java/com/xkrs/controller/SysUserController.java @@ -3,9 +3,9 @@ package com.xkrs.controller; import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.common.tool.TokenUtil; import com.xkrs.dao.AgentOrgDao; -import com.xkrs.dao.SysUserDao; +import com.xkrs.straw.dao.SysUserDao; import com.xkrs.model.entity.AgentOrgEntity; -import com.xkrs.model.entity.SysUserEntity; +import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.model.qo.SysUserQo; import com.xkrs.model.qo.SysUserReceiveSmsQo; import com.xkrs.model.qo.SysUserRemarkQo; diff --git a/src/main/java/com/xkrs/service/SysUserService.java b/src/main/java/com/xkrs/service/SysUserService.java index 6e3b718..03dacab 100644 --- a/src/main/java/com/xkrs/service/SysUserService.java +++ b/src/main/java/com/xkrs/service/SysUserService.java @@ -1,6 +1,6 @@ package com.xkrs.service; -import com.xkrs.model.entity.SysUserEntity; +import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.model.qo.SysUserQo; import com.xkrs.model.vo.SysUserVo; diff --git a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java index f165934..f4014d2 100644 --- a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java @@ -11,6 +11,8 @@ import com.xkrs.service.GlobalConfigService; import com.xkrs.service.StreetService; import com.xkrs.sms.PushHelper; import com.xkrs.sms.SMSHelper; +import com.xkrs.straw.dao.SysUserDao; +import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.utils.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/xkrs/service/impl/SysUserServiceImpl.java b/src/main/java/com/xkrs/service/impl/SysUserServiceImpl.java index eeff041..4bca2d4 100644 --- a/src/main/java/com/xkrs/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/SysUserServiceImpl.java @@ -7,6 +7,8 @@ import com.xkrs.model.qo.SysUserQo; import com.xkrs.model.vo.SysUserVo; import com.xkrs.service.RedisService; import com.xkrs.service.SysUserService; +import com.xkrs.straw.dao.SysUserDao; +import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.utils.DateTimeUtil; import org.apache.http.util.TextUtils; import org.springframework.context.i18n.LocaleContextHolder; diff --git a/src/main/java/com/xkrs/sms/PushHelper.java b/src/main/java/com/xkrs/sms/PushHelper.java index 432430c..edcba7f 100644 --- a/src/main/java/com/xkrs/sms/PushHelper.java +++ b/src/main/java/com/xkrs/sms/PushHelper.java @@ -6,7 +6,7 @@ import com.xiaomi.xmpush.server.Message; import com.xiaomi.xmpush.server.Result; import com.xiaomi.xmpush.server.Sender; import com.xkrs.model.entity.FirePointEntity; -import com.xkrs.model.entity.SysUserEntity; +import com.xkrs.straw.model.entity.SysUserEntity; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/src/main/java/com/xkrs/sms/SMSHelper.java b/src/main/java/com/xkrs/sms/SMSHelper.java index 7eb1119..cb5f62f 100644 --- a/src/main/java/com/xkrs/sms/SMSHelper.java +++ b/src/main/java/com/xkrs/sms/SMSHelper.java @@ -3,7 +3,7 @@ package com.xkrs.sms; import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; import com.fasterxml.jackson.databind.ObjectMapper; import com.xkrs.model.entity.FirePointEntity; -import com.xkrs.model.entity.SysUserEntity; +import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.utils.AliYunSmsUtils; import com.xkrs.utils.HttpClientUtils; import com.xkrs.utils.SMSUtils; diff --git a/src/main/java/com/xkrs/sms/WeChatMessageHelper.java b/src/main/java/com/xkrs/sms/WeChatMessageHelper.java index 27f0804..c6fe4cb 100644 --- a/src/main/java/com/xkrs/sms/WeChatMessageHelper.java +++ b/src/main/java/com/xkrs/sms/WeChatMessageHelper.java @@ -3,7 +3,7 @@ package com.xkrs.sms; import com.xkrs.dao.GlobalConfigurationDao; import com.xkrs.model.entity.FirePointEntity; import com.xkrs.model.entity.GlobalConfigurationEntity; -import com.xkrs.model.entity.SysUserEntity; +import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.service.GlobalConfigurationService; import com.xkrs.straw.model.bean.KeyValueBean; import com.xkrs.utils.HttpClientUtils; diff --git a/src/main/java/com/xkrs/dao/SysUserDao.java b/src/main/java/com/xkrs/straw/dao/SysUserDao.java similarity index 98% rename from src/main/java/com/xkrs/dao/SysUserDao.java rename to src/main/java/com/xkrs/straw/dao/SysUserDao.java index 0366ad7..1bcd5ab 100644 --- a/src/main/java/com/xkrs/dao/SysUserDao.java +++ b/src/main/java/com/xkrs/straw/dao/SysUserDao.java @@ -1,6 +1,6 @@ -package com.xkrs.dao; +package com.xkrs.straw.dao; -import com.xkrs.model.entity.SysUserEntity; +import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.model.vo.SysUserVo; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/src/main/java/com/xkrs/model/entity/SysUserEntity.java b/src/main/java/com/xkrs/straw/model/entity/SysUserEntity.java similarity index 99% rename from src/main/java/com/xkrs/model/entity/SysUserEntity.java rename to src/main/java/com/xkrs/straw/model/entity/SysUserEntity.java index e7b12cf..86bea42 100644 --- a/src/main/java/com/xkrs/model/entity/SysUserEntity.java +++ b/src/main/java/com/xkrs/straw/model/entity/SysUserEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.model.entity; +package com.xkrs.straw.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/utils/FirePointCodeUtils.java b/src/main/java/com/xkrs/utils/FirePointCodeUtils.java index 3e0c291..1640647 100644 --- a/src/main/java/com/xkrs/utils/FirePointCodeUtils.java +++ b/src/main/java/com/xkrs/utils/FirePointCodeUtils.java @@ -1,7 +1,7 @@ package com.xkrs.utils; import com.xkrs.model.entity.AgentOrgEntity; -import com.xkrs.model.entity.SysUserEntity; +import com.xkrs.straw.model.entity.SysUserEntity; import org.apache.hc.core5.util.TextUtils; import java.time.LocalDateTime;