From cb860c46a17b331b1a98b943bbff809947aa7a38 Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Wed, 1 Mar 2023 20:28:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => straw}/controller/FirePointController.java | 2 +- .../{ => straw}/controller/GaoDeApiController.java | 2 +- .../xkrs/{ => straw}/controller/PushController.java | 4 ++-- .../xkrs/{ => straw}/controller/SysUserController.java | 10 +++++----- .../com/xkrs/{ => straw}/model/qo/SysUserPushIdQo.java | 2 +- .../java/com/xkrs/{ => straw}/model/qo/SysUserQo.java | 2 +- .../xkrs/{ => straw}/model/qo/SysUserReceiveSmsQo.java | 2 +- .../com/xkrs/{ => straw}/model/qo/SysUserRemarkQo.java | 2 +- .../xkrs/{ => straw}/model/qo/SysUserVipLevelQo.java | 2 +- .../java/com/xkrs/straw/service/SysUserService.java | 2 +- .../xkrs/straw/service/impl/SysUserServiceImpl.java | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) rename src/main/java/com/xkrs/{ => straw}/controller/FirePointController.java (99%) rename src/main/java/com/xkrs/{ => straw}/controller/GaoDeApiController.java (98%) rename src/main/java/com/xkrs/{ => straw}/controller/PushController.java (96%) rename src/main/java/com/xkrs/{ => straw}/controller/SysUserController.java (98%) rename src/main/java/com/xkrs/{ => straw}/model/qo/SysUserPushIdQo.java (91%) rename src/main/java/com/xkrs/{ => straw}/model/qo/SysUserQo.java (99%) rename src/main/java/com/xkrs/{ => straw}/model/qo/SysUserReceiveSmsQo.java (96%) rename src/main/java/com/xkrs/{ => straw}/model/qo/SysUserRemarkQo.java (95%) rename src/main/java/com/xkrs/{ => straw}/model/qo/SysUserVipLevelQo.java (95%) diff --git a/src/main/java/com/xkrs/controller/FirePointController.java b/src/main/java/com/xkrs/straw/controller/FirePointController.java similarity index 99% rename from src/main/java/com/xkrs/controller/FirePointController.java rename to src/main/java/com/xkrs/straw/controller/FirePointController.java index ec1bb93..3376d95 100644 --- a/src/main/java/com/xkrs/controller/FirePointController.java +++ b/src/main/java/com/xkrs/straw/controller/FirePointController.java @@ -1,4 +1,4 @@ -package com.xkrs.controller; +package com.xkrs.straw.controller; import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.utils.TokenUtil; diff --git a/src/main/java/com/xkrs/controller/GaoDeApiController.java b/src/main/java/com/xkrs/straw/controller/GaoDeApiController.java similarity index 98% rename from src/main/java/com/xkrs/controller/GaoDeApiController.java rename to src/main/java/com/xkrs/straw/controller/GaoDeApiController.java index 59e1305..4ddbacb 100644 --- a/src/main/java/com/xkrs/controller/GaoDeApiController.java +++ b/src/main/java/com/xkrs/straw/controller/GaoDeApiController.java @@ -1,4 +1,4 @@ -package com.xkrs.controller; +package com.xkrs.straw.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; diff --git a/src/main/java/com/xkrs/controller/PushController.java b/src/main/java/com/xkrs/straw/controller/PushController.java similarity index 96% rename from src/main/java/com/xkrs/controller/PushController.java rename to src/main/java/com/xkrs/straw/controller/PushController.java index 6787d71..860299f 100644 --- a/src/main/java/com/xkrs/controller/PushController.java +++ b/src/main/java/com/xkrs/straw/controller/PushController.java @@ -1,7 +1,7 @@ -package com.xkrs.controller; +package com.xkrs.straw.controller; import com.xkrs.common.encapsulation.PromptMessageEnum; -import com.xkrs.model.qo.SysUserPushIdQo; +import com.xkrs.straw.model.qo.SysUserPushIdQo; import com.xkrs.straw.dao.SysUserDao; import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.model.helper.PushHelper; diff --git a/src/main/java/com/xkrs/controller/SysUserController.java b/src/main/java/com/xkrs/straw/controller/SysUserController.java similarity index 98% rename from src/main/java/com/xkrs/controller/SysUserController.java rename to src/main/java/com/xkrs/straw/controller/SysUserController.java index 7371cd3..d401ed9 100644 --- a/src/main/java/com/xkrs/controller/SysUserController.java +++ b/src/main/java/com/xkrs/straw/controller/SysUserController.java @@ -1,11 +1,11 @@ -package com.xkrs.controller; +package com.xkrs.straw.controller; import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; import com.xkrs.common.encapsulation.PromptMessageEnum; -import com.xkrs.model.qo.SysUserQo; -import com.xkrs.model.qo.SysUserReceiveSmsQo; -import com.xkrs.model.qo.SysUserRemarkQo; -import com.xkrs.model.qo.SysUserVipLevelQo; +import com.xkrs.straw.model.qo.SysUserQo; +import com.xkrs.straw.model.qo.SysUserReceiveSmsQo; +import com.xkrs.straw.model.qo.SysUserRemarkQo; +import com.xkrs.straw.model.qo.SysUserVipLevelQo; import com.xkrs.model.validation.SysUserQoInsert; import com.xkrs.model.validation.SysUserQoUpdate; import com.xkrs.service.RedisService; diff --git a/src/main/java/com/xkrs/model/qo/SysUserPushIdQo.java b/src/main/java/com/xkrs/straw/model/qo/SysUserPushIdQo.java similarity index 91% rename from src/main/java/com/xkrs/model/qo/SysUserPushIdQo.java rename to src/main/java/com/xkrs/straw/model/qo/SysUserPushIdQo.java index feb8f92..6339dfc 100644 --- a/src/main/java/com/xkrs/model/qo/SysUserPushIdQo.java +++ b/src/main/java/com/xkrs/straw/model/qo/SysUserPushIdQo.java @@ -1,4 +1,4 @@ -package com.xkrs.model.qo; +package com.xkrs.straw.model.qo; public class SysUserPushIdQo { diff --git a/src/main/java/com/xkrs/model/qo/SysUserQo.java b/src/main/java/com/xkrs/straw/model/qo/SysUserQo.java similarity index 99% rename from src/main/java/com/xkrs/model/qo/SysUserQo.java rename to src/main/java/com/xkrs/straw/model/qo/SysUserQo.java index b4d71ba..260887c 100644 --- a/src/main/java/com/xkrs/model/qo/SysUserQo.java +++ b/src/main/java/com/xkrs/straw/model/qo/SysUserQo.java @@ -1,4 +1,4 @@ -package com.xkrs.model.qo; +package com.xkrs.straw.model.qo; import com.xkrs.model.validation.SysUserQoInsert; import com.xkrs.model.validation.SysUserQoUpdate; diff --git a/src/main/java/com/xkrs/model/qo/SysUserReceiveSmsQo.java b/src/main/java/com/xkrs/straw/model/qo/SysUserReceiveSmsQo.java similarity index 96% rename from src/main/java/com/xkrs/model/qo/SysUserReceiveSmsQo.java rename to src/main/java/com/xkrs/straw/model/qo/SysUserReceiveSmsQo.java index ca93981..baa5dee 100644 --- a/src/main/java/com/xkrs/model/qo/SysUserReceiveSmsQo.java +++ b/src/main/java/com/xkrs/straw/model/qo/SysUserReceiveSmsQo.java @@ -1,4 +1,4 @@ -package com.xkrs.model.qo; +package com.xkrs.straw.model.qo; import com.xkrs.model.validation.SysUserQoUpdate; diff --git a/src/main/java/com/xkrs/model/qo/SysUserRemarkQo.java b/src/main/java/com/xkrs/straw/model/qo/SysUserRemarkQo.java similarity index 95% rename from src/main/java/com/xkrs/model/qo/SysUserRemarkQo.java rename to src/main/java/com/xkrs/straw/model/qo/SysUserRemarkQo.java index 67d181e..b8b5a10 100644 --- a/src/main/java/com/xkrs/model/qo/SysUserRemarkQo.java +++ b/src/main/java/com/xkrs/straw/model/qo/SysUserRemarkQo.java @@ -1,4 +1,4 @@ -package com.xkrs.model.qo; +package com.xkrs.straw.model.qo; import com.xkrs.model.validation.SysUserQoUpdate; diff --git a/src/main/java/com/xkrs/model/qo/SysUserVipLevelQo.java b/src/main/java/com/xkrs/straw/model/qo/SysUserVipLevelQo.java similarity index 95% rename from src/main/java/com/xkrs/model/qo/SysUserVipLevelQo.java rename to src/main/java/com/xkrs/straw/model/qo/SysUserVipLevelQo.java index 5c3f125..0c56fa2 100644 --- a/src/main/java/com/xkrs/model/qo/SysUserVipLevelQo.java +++ b/src/main/java/com/xkrs/straw/model/qo/SysUserVipLevelQo.java @@ -1,4 +1,4 @@ -package com.xkrs.model.qo; +package com.xkrs.straw.model.qo; import com.xkrs.model.validation.SysUserQoUpdate; diff --git a/src/main/java/com/xkrs/straw/service/SysUserService.java b/src/main/java/com/xkrs/straw/service/SysUserService.java index d0ce6b4..3d68b54 100644 --- a/src/main/java/com/xkrs/straw/service/SysUserService.java +++ b/src/main/java/com/xkrs/straw/service/SysUserService.java @@ -1,6 +1,6 @@ package com.xkrs.straw.service; -import com.xkrs.model.qo.SysUserQo; +import com.xkrs.straw.model.qo.SysUserQo; import com.xkrs.straw.model.entity.SysUserEntity; import javax.servlet.http.HttpServletRequest; 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 8105f4d..0a532a3 100644 --- a/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java @@ -3,7 +3,7 @@ package com.xkrs.straw.service.impl; import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.dao.StreetDao; import com.xkrs.model.entity.StreetEntity; -import com.xkrs.model.qo.SysUserQo; +import com.xkrs.straw.model.qo.SysUserQo; import com.xkrs.service.RedisService; import com.xkrs.straw.dao.RelRoleAuthorityDao; import com.xkrs.straw.dao.RelUserRoleDao;