From cfada75badc0d1b0af55fc862bbc5e4a8b15cefe Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Wed, 8 Mar 2023 11:47:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= 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/service/impl/FirePointServiceImpl.java | 2 +- .../java/com/xkrs/straw/controller/FirePointController.java | 2 +- .../java/com/xkrs/straw/controller/SysUserController.java | 2 +- src/main/java/com/xkrs/{ => straw}/service/RedisService.java | 2 +- src/main/java/com/xkrs/{ => straw}/service/StreetService.java | 2 +- .../com/xkrs/{ => straw}/service/SysAuthorityService.java | 2 +- .../com/xkrs/{ => straw}/service/impl/StreetServiceImpl.java | 4 ++-- .../{ => straw}/service/impl/SysAuthorityServiceImpl.java | 4 ++-- .../java/com/xkrs/straw/service/impl/SysUserServiceImpl.java | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename src/main/java/com/xkrs/{ => straw}/service/RedisService.java (99%) rename src/main/java/com/xkrs/{ => straw}/service/StreetService.java (96%) rename src/main/java/com/xkrs/{ => straw}/service/SysAuthorityService.java (90%) rename src/main/java/com/xkrs/{ => straw}/service/impl/StreetServiceImpl.java (96%) rename src/main/java/com/xkrs/{ => straw}/service/impl/SysAuthorityServiceImpl.java (90%) diff --git a/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java b/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java index 4622bc7..e6cf57e 100644 --- a/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java +++ b/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java @@ -1,6 +1,6 @@ package com.xkrs.common.account; -import com.xkrs.service.SysAuthorityService; +import com.xkrs.straw.service.SysAuthorityService; import com.xkrs.straw.model.entity.SysAuthorityEntity; import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.service.SysRoleService; diff --git a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java index 8e87e55..2c5686e 100644 --- a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java @@ -4,7 +4,7 @@ import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.straw.dao.CountyCodeWeiXinDao; import com.xkrs.straw.dao.StreetDao; import com.xkrs.service.FirePointService; -import com.xkrs.service.StreetService; +import com.xkrs.straw.service.StreetService; import com.xkrs.straw.dao.FirePointOrdinaryDao; import com.xkrs.straw.dao.SysUserDao; import com.xkrs.straw.model.bean.FirePointQueryResultBean; diff --git a/src/main/java/com/xkrs/straw/controller/FirePointController.java b/src/main/java/com/xkrs/straw/controller/FirePointController.java index 03a54e8..f79dc7e 100644 --- a/src/main/java/com/xkrs/straw/controller/FirePointController.java +++ b/src/main/java/com/xkrs/straw/controller/FirePointController.java @@ -2,7 +2,7 @@ package com.xkrs.straw.controller; import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.service.FirePointService; -import com.xkrs.service.StreetService; +import com.xkrs.straw.service.StreetService; import com.xkrs.service.impl.FirePointServiceImpl; import com.xkrs.straw.dao.SysUserDao; import com.xkrs.straw.managers.FirePointQueryManager; diff --git a/src/main/java/com/xkrs/straw/controller/SysUserController.java b/src/main/java/com/xkrs/straw/controller/SysUserController.java index 6593f1f..872e053 100644 --- a/src/main/java/com/xkrs/straw/controller/SysUserController.java +++ b/src/main/java/com/xkrs/straw/controller/SysUserController.java @@ -4,7 +4,7 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.straw.model.va.SysUserQoInsert; import com.xkrs.straw.model.va.SysUserQoUpdate; -import com.xkrs.service.RedisService; +import com.xkrs.straw.service.RedisService; import com.xkrs.straw.dao.SysUserDao; import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.model.qo.SysUserQo; diff --git a/src/main/java/com/xkrs/service/RedisService.java b/src/main/java/com/xkrs/straw/service/RedisService.java similarity index 99% rename from src/main/java/com/xkrs/service/RedisService.java rename to src/main/java/com/xkrs/straw/service/RedisService.java index 1f054dc..69c486b 100644 --- a/src/main/java/com/xkrs/service/RedisService.java +++ b/src/main/java/com/xkrs/straw/service/RedisService.java @@ -1,4 +1,4 @@ -package com.xkrs.service; +package com.xkrs.straw.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/com/xkrs/service/StreetService.java b/src/main/java/com/xkrs/straw/service/StreetService.java similarity index 96% rename from src/main/java/com/xkrs/service/StreetService.java rename to src/main/java/com/xkrs/straw/service/StreetService.java index a2abbf5..392894a 100644 --- a/src/main/java/com/xkrs/service/StreetService.java +++ b/src/main/java/com/xkrs/straw/service/StreetService.java @@ -1,4 +1,4 @@ -package com.xkrs.service; +package com.xkrs.straw.service; import com.xkrs.straw.model.entity.StreetEntity; diff --git a/src/main/java/com/xkrs/service/SysAuthorityService.java b/src/main/java/com/xkrs/straw/service/SysAuthorityService.java similarity index 90% rename from src/main/java/com/xkrs/service/SysAuthorityService.java rename to src/main/java/com/xkrs/straw/service/SysAuthorityService.java index bf384fe..bdc81a7 100644 --- a/src/main/java/com/xkrs/service/SysAuthorityService.java +++ b/src/main/java/com/xkrs/straw/service/SysAuthorityService.java @@ -1,4 +1,4 @@ -package com.xkrs.service; +package com.xkrs.straw.service; import com.xkrs.straw.model.entity.SysAuthorityEntity; diff --git a/src/main/java/com/xkrs/service/impl/StreetServiceImpl.java b/src/main/java/com/xkrs/straw/service/impl/StreetServiceImpl.java similarity index 96% rename from src/main/java/com/xkrs/service/impl/StreetServiceImpl.java rename to src/main/java/com/xkrs/straw/service/impl/StreetServiceImpl.java index 0c61e1e..f54ebec 100644 --- a/src/main/java/com/xkrs/service/impl/StreetServiceImpl.java +++ b/src/main/java/com/xkrs/straw/service/impl/StreetServiceImpl.java @@ -1,8 +1,8 @@ -package com.xkrs.service.impl; +package com.xkrs.straw.service.impl; import com.xkrs.straw.dao.StreetDao; import com.xkrs.straw.model.entity.StreetEntity; -import com.xkrs.service.StreetService; +import com.xkrs.straw.service.StreetService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/xkrs/service/impl/SysAuthorityServiceImpl.java b/src/main/java/com/xkrs/straw/service/impl/SysAuthorityServiceImpl.java similarity index 90% rename from src/main/java/com/xkrs/service/impl/SysAuthorityServiceImpl.java rename to src/main/java/com/xkrs/straw/service/impl/SysAuthorityServiceImpl.java index 7dc6f32..c9e7ec8 100644 --- a/src/main/java/com/xkrs/service/impl/SysAuthorityServiceImpl.java +++ b/src/main/java/com/xkrs/straw/service/impl/SysAuthorityServiceImpl.java @@ -1,6 +1,6 @@ -package com.xkrs.service.impl; +package com.xkrs.straw.service.impl; -import com.xkrs.service.SysAuthorityService; +import com.xkrs.straw.service.SysAuthorityService; import com.xkrs.straw.dao.RelRoleAuthorityDao; import com.xkrs.straw.dao.SysAuthorityDao; import com.xkrs.straw.model.entity.SysAuthorityEntity; 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 bff2313..d1850f0 100644 --- a/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java @@ -4,7 +4,7 @@ import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.straw.dao.StreetDao; import com.xkrs.straw.model.entity.StreetEntity; import com.xkrs.straw.model.qo.SysUserQo; -import com.xkrs.service.RedisService; +import com.xkrs.straw.service.RedisService; import com.xkrs.straw.dao.RelRoleAuthorityDao; import com.xkrs.straw.dao.RelUserRoleDao; import com.xkrs.straw.dao.SysRoleDao;