From b5ca430125b8f158396068e0ab210cc7a7d57a90 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Fri, 13 Nov 2020 21:31:32 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/oms/{entity => pojo}/OmsOrder.java | 2 +- .../java/com/youlai/mall/pms/bo/PmsSpuBO.java | 8 ++++---- .../mall/pms/{entity => pojo}/PmsBrand.java | 2 +- .../mall/pms/{entity => pojo}/PmsCategory.java | 4 +--- .../youlai/mall/pms/{entity => pojo}/PmsSku.java | 4 +--- .../youlai/mall/pms/{entity => pojo}/PmsSpu.java | 2 +- .../pms/{entity => pojo}/PmsSpuAttribute.java | 2 +- .../pms/{entity => pojo}/PmsSpuSpecification.java | 5 +---- mall-pms/pms-search/pom.xml | 15 +++++++++++++++ mall-pms/pom.xml | 1 + .../mall/sms/{entity => pojo}/SmsAdvert.java | 2 +- .../UmsMemberFeignClient.java} | 6 +++--- .../mall/ums/{entity => pojo}/UmsMember.java | 5 +---- .../AdminUserFeignClient.java} | 4 ++-- .../{entity => pojo}/OauthClientDetails.java | 2 +- .../youlai/admin/{entity => pojo}/SysDept.java | 2 +- .../youlai/admin/{entity => pojo}/SysDict.java | 2 +- .../admin/{entity => pojo}/SysDictType.java | 2 +- .../youlai/admin/{entity => pojo}/SysMenu.java | 2 +- .../admin/{entity => pojo}/SysResource.java | 2 +- .../youlai/admin/{entity => pojo}/SysRole.java | 2 +- .../admin/{entity => pojo}/SysRoleMenu.java | 2 +- .../admin/{entity => pojo}/SysRoleResource.java | 2 +- .../youlai/admin/{entity => pojo}/SysUser.java | 2 +- .../admin/{entity => pojo}/SysUserRole.java | 2 +- .../youlai/auth/controller/AuthController.java | 10 +++++----- .../auth/service/UserDetailsServiceImpl.java | 12 ++++++------ 27 files changed, 56 insertions(+), 50 deletions(-) rename mall-oms/oms-api/src/main/java/com/youlai/mall/oms/{entity => pojo}/OmsOrder.java (96%) rename mall-pms/pms-api/src/main/java/com/youlai/mall/pms/{entity => pojo}/PmsBrand.java (92%) rename mall-pms/pms-api/src/main/java/com/youlai/mall/pms/{entity => pojo}/PmsCategory.java (88%) rename mall-pms/pms-api/src/main/java/com/youlai/mall/pms/{entity => pojo}/PmsSku.java (87%) rename mall-pms/pms-api/src/main/java/com/youlai/mall/pms/{entity => pojo}/PmsSpu.java (96%) rename mall-pms/pms-api/src/main/java/com/youlai/mall/pms/{entity => pojo}/PmsSpuAttribute.java (91%) rename mall-pms/pms-api/src/main/java/com/youlai/mall/pms/{entity => pojo}/PmsSpuSpecification.java (78%) create mode 100644 mall-pms/pms-search/pom.xml rename mall-sms/sms-api/src/main/java/com/youlai/mall/sms/{entity => pojo}/SmsAdvert.java (93%) rename mall-ums/ums-api/src/main/java/com/youlai/mall/ums/{feign/RemoteUmsMemberService.java => api/UmsMemberFeignClient.java} (83%) rename mall-ums/ums-api/src/main/java/com/youlai/mall/ums/{entity => pojo}/UmsMember.java (73%) rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{feign/RemoteAdminService.java => api/AdminUserFeignClient.java} (85%) rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{entity => pojo}/OauthClientDetails.java (97%) rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{entity => pojo}/SysDept.java (94%) rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{entity => pojo}/SysDict.java (93%) rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{entity => pojo}/SysDictType.java (92%) rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{entity => pojo}/SysMenu.java (96%) rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{entity => pojo}/SysResource.java (94%) rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{entity => pojo}/SysRole.java (95%) rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{entity => pojo}/SysRoleMenu.java (84%) rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{entity => pojo}/SysRoleResource.java (84%) rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{entity => pojo}/SysUser.java (94%) rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{entity => pojo}/SysUserRole.java (77%) diff --git a/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/entity/OmsOrder.java b/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/pojo/OmsOrder.java similarity index 96% rename from mall-oms/oms-api/src/main/java/com/youlai/mall/oms/entity/OmsOrder.java rename to mall-oms/oms-api/src/main/java/com/youlai/mall/oms/pojo/OmsOrder.java index c9843916d..d0987cbcc 100644 --- a/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/entity/OmsOrder.java +++ b/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/pojo/OmsOrder.java @@ -1,4 +1,4 @@ -package com.youlai.mall.oms.entity; +package com.youlai.mall.oms.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/bo/PmsSpuBO.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/bo/PmsSpuBO.java index 2436b3991..8572ceb79 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/bo/PmsSpuBO.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/bo/PmsSpuBO.java @@ -1,9 +1,9 @@ package com.youlai.mall.pms.bo; -import com.youlai.mall.pms.entity.PmsSku; -import com.youlai.mall.pms.entity.PmsSpu; -import com.youlai.mall.pms.entity.PmsSpuAttribute; -import com.youlai.mall.pms.entity.PmsSpuSpecification; +import com.youlai.mall.pms.pojo.PmsSku; +import com.youlai.mall.pms.pojo.PmsSpu; +import com.youlai.mall.pms.pojo.PmsSpuAttribute; +import com.youlai.mall.pms.pojo.PmsSpuSpecification; import lombok.Data; import java.util.List; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsBrand.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsBrand.java similarity index 92% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsBrand.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsBrand.java index c599e8fe2..2116d690c 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsBrand.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsBrand.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.entity; +package com.youlai.mall.pms.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsCategory.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsCategory.java similarity index 88% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsCategory.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsCategory.java index abaeaf706..5e2c09093 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsCategory.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsCategory.java @@ -1,12 +1,10 @@ -package com.youlai.mall.pms.entity; +package com.youlai.mall.pms.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.youlai.common.core.base.BaseEntity; import lombok.Data; -import java.util.Date; - @Data public class PmsCategory extends BaseEntity { diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSku.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSku.java similarity index 87% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSku.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSku.java index fac5af205..20c291766 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSku.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSku.java @@ -1,12 +1,10 @@ -package com.youlai.mall.pms.entity; +package com.youlai.mall.pms.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.youlai.common.core.base.BaseEntity; import lombok.Data; -import java.math.BigDecimal; - @Data public class PmsSku extends BaseEntity { @TableId(type = IdType.AUTO) diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSpu.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpu.java similarity index 96% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSpu.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpu.java index 438e44973..9d6c4c091 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSpu.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpu.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.entity; +package com.youlai.mall.pms.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSpuAttribute.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuAttribute.java similarity index 91% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSpuAttribute.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuAttribute.java index 0db4fb147..f21a4ae50 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSpuAttribute.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuAttribute.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.entity; +package com.youlai.mall.pms.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSpuSpecification.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuSpecification.java similarity index 78% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSpuSpecification.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuSpecification.java index 2930422f4..e53d8245f 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSpuSpecification.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuSpecification.java @@ -1,13 +1,10 @@ -package com.youlai.mall.pms.entity; +package com.youlai.mall.pms.pojo; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.youlai.common.core.base.BaseEntity; import lombok.Data; -import java.util.List; - /** * @author haoxr * @date 2020-11-06 diff --git a/mall-pms/pms-search/pom.xml b/mall-pms/pms-search/pom.xml new file mode 100644 index 000000000..3dff5922e --- /dev/null +++ b/mall-pms/pms-search/pom.xml @@ -0,0 +1,15 @@ + + + + mall-pms + com.youlai + 1.0.0-SNAPSHOT + + 4.0.0 + + pms-search + + + diff --git a/mall-pms/pom.xml b/mall-pms/pom.xml index a6506f5b8..5bed0d956 100644 --- a/mall-pms/pom.xml +++ b/mall-pms/pom.xml @@ -15,6 +15,7 @@ pms-api pms-biz + pms-search diff --git a/mall-sms/sms-api/src/main/java/com/youlai/mall/sms/entity/SmsAdvert.java b/mall-sms/sms-api/src/main/java/com/youlai/mall/sms/pojo/SmsAdvert.java similarity index 93% rename from mall-sms/sms-api/src/main/java/com/youlai/mall/sms/entity/SmsAdvert.java rename to mall-sms/sms-api/src/main/java/com/youlai/mall/sms/pojo/SmsAdvert.java index da267c632..1d6b92d3d 100644 --- a/mall-sms/sms-api/src/main/java/com/youlai/mall/sms/entity/SmsAdvert.java +++ b/mall-sms/sms-api/src/main/java/com/youlai/mall/sms/pojo/SmsAdvert.java @@ -1,4 +1,4 @@ -package com.youlai.mall.sms.entity; +package com.youlai.mall.sms.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/feign/RemoteUmsMemberService.java b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/UmsMemberFeignClient.java similarity index 83% rename from mall-ums/ums-api/src/main/java/com/youlai/mall/ums/feign/RemoteUmsMemberService.java rename to mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/UmsMemberFeignClient.java index 456da5e00..69e3dae79 100644 --- a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/feign/RemoteUmsMemberService.java +++ b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/UmsMemberFeignClient.java @@ -1,8 +1,8 @@ -package com.youlai.mall.ums.feign; +package com.youlai.mall.ums.api; import com.youlai.common.core.result.Result; import com.youlai.mall.ums.dto.MemberDTO; -import com.youlai.mall.ums.entity.UmsMember; +import com.youlai.mall.ums.pojo.UmsMember; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @FeignClient("youlai-mall-ums") -public interface RemoteUmsMemberService { +public interface UmsMemberFeignClient { @GetMapping("/members/member/{openid}") Result loadMemberByOpenid(@PathVariable String openid); diff --git a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/entity/UmsMember.java b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/UmsMember.java similarity index 73% rename from mall-ums/ums-api/src/main/java/com/youlai/mall/ums/entity/UmsMember.java rename to mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/UmsMember.java index 84a66cfc7..9a1d576a9 100644 --- a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/entity/UmsMember.java +++ b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/UmsMember.java @@ -1,13 +1,10 @@ -package com.youlai.mall.ums.entity; +package com.youlai.mall.ums.pojo; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import lombok.experimental.Accessors; import java.time.LocalDate; -import java.util.Date; @Data @Accessors(chain = true) diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/feign/RemoteAdminService.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/AdminUserFeignClient.java similarity index 85% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/feign/RemoteAdminService.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/api/AdminUserFeignClient.java index b8d810fdb..b6d1b285b 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/feign/RemoteAdminService.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/AdminUserFeignClient.java @@ -1,4 +1,4 @@ -package com.youlai.admin.feign; +package com.youlai.admin.api; import com.youlai.admin.dto.UserDTO; import com.youlai.common.core.result.Result; @@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @FeignClient("youlai-admin") -public interface RemoteAdminService { +public interface AdminUserFeignClient { @GetMapping("/users/user/{username}") Result loadUserByUsername(@PathVariable String username); diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/OauthClientDetails.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/OauthClientDetails.java similarity index 97% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/OauthClientDetails.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/OauthClientDetails.java index f1f756890..cd31b2ca2 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/OauthClientDetails.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/OauthClientDetails.java @@ -1,4 +1,4 @@ -package com.youlai.admin.entity; +package com.youlai.admin.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysDept.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDept.java similarity index 94% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysDept.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDept.java index 4bc93593e..318a6b923 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysDept.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDept.java @@ -1,4 +1,4 @@ -package com.youlai.admin.entity; +package com.youlai.admin.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysDict.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDict.java similarity index 93% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysDict.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDict.java index 35b485d61..688f56d66 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysDict.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDict.java @@ -1,4 +1,4 @@ -package com.youlai.admin.entity; +package com.youlai.admin.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysDictType.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDictType.java similarity index 92% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysDictType.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDictType.java index dca00d805..91bf94745 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysDictType.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDictType.java @@ -1,4 +1,4 @@ -package com.youlai.admin.entity; +package com.youlai.admin.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysMenu.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysMenu.java similarity index 96% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysMenu.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysMenu.java index a755798ff..0cee58003 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysMenu.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysMenu.java @@ -1,4 +1,4 @@ -package com.youlai.admin.entity; +package com.youlai.admin.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysResource.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysResource.java similarity index 94% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysResource.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysResource.java index 7aa2a0132..45b9ae687 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysResource.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysResource.java @@ -1,4 +1,4 @@ -package com.youlai.admin.entity; +package com.youlai.admin.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysRole.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRole.java similarity index 95% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysRole.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRole.java index 50a36ede7..5e59e38f2 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysRole.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRole.java @@ -1,4 +1,4 @@ -package com.youlai.admin.entity; +package com.youlai.admin.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysRoleMenu.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRoleMenu.java similarity index 84% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysRoleMenu.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRoleMenu.java index 0357d24e0..c634783f5 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysRoleMenu.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.youlai.admin.entity; +package com.youlai.admin.pojo; import lombok.Data; import lombok.experimental.Accessors; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysRoleResource.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRoleResource.java similarity index 84% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysRoleResource.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRoleResource.java index fe06125e8..faebe6413 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysRoleResource.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRoleResource.java @@ -1,4 +1,4 @@ -package com.youlai.admin.entity; +package com.youlai.admin.pojo; import lombok.Data; import lombok.experimental.Accessors; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysUser.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUser.java similarity index 94% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysUser.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUser.java index 674be5ff9..cdd54c51a 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysUser.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUser.java @@ -1,4 +1,4 @@ -package com.youlai.admin.entity; +package com.youlai.admin.pojo; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysUserRole.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUserRole.java similarity index 77% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysUserRole.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUserRole.java index bda8c02d9..86d4a8a74 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysUserRole.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUserRole.java @@ -1,4 +1,4 @@ -package com.youlai.admin.entity; +package com.youlai.admin.pojo; import lombok.Data; diff --git a/youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java b/youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java index e37b2474d..84fe9cdbc 100644 --- a/youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java +++ b/youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java @@ -13,8 +13,8 @@ import com.youlai.common.core.result.Result; import com.youlai.common.core.result.ResultCode; import com.youlai.common.web.exception.BizException; import com.youlai.mall.ums.dto.MemberDTO; -import com.youlai.mall.ums.entity.UmsMember; -import com.youlai.mall.ums.feign.RemoteUmsMemberService; +import com.youlai.mall.ums.pojo.UmsMember; +import com.youlai.mall.ums.api.UmsMemberFeignClient; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -44,7 +44,7 @@ public class AuthController { private TokenEndpoint tokenEndpoint; private RedisTemplate redisTemplate; private WxMaService wxService; - private RemoteUmsMemberService remoteUmsMemberService; + private UmsMemberFeignClient umsMemberFeignClient; private PasswordEncoder passwordEncoder; @@ -116,7 +116,7 @@ public class AuthController { String openid = session.getOpenid(); String sessionKey = session.getSessionKey(); - Result result = remoteUmsMemberService.loadMemberByOpenid(openid); + Result result = umsMemberFeignClient.loadMemberByOpenid(openid); if (!ResultCode.SUCCESS.getCode().equals(result.getCode())) { throw new BizException("获取会员信息失败"); } @@ -139,7 +139,7 @@ public class AuthController { .setPassword(passwordEncoder.encode(openid).replace(AuthConstants.BCRYPT, Strings.EMPTY)) // 加密密码移除前缀加密方式 {bcrypt} .setStatus(Constants.STATUS_NORMAL_VALUE); - Result res = remoteUmsMemberService.add(member); + Result res = umsMemberFeignClient.add(member); if (!ResultCode.SUCCESS.getCode().equals(res.getCode())) { throw new BizException("注册会员失败"); } diff --git a/youlai-auth/src/main/java/com/youlai/auth/service/UserDetailsServiceImpl.java b/youlai-auth/src/main/java/com/youlai/auth/service/UserDetailsServiceImpl.java index bf37a0f07..1fbc9f9f7 100644 --- a/youlai-auth/src/main/java/com/youlai/auth/service/UserDetailsServiceImpl.java +++ b/youlai-auth/src/main/java/com/youlai/auth/service/UserDetailsServiceImpl.java @@ -1,13 +1,13 @@ package com.youlai.auth.service; import com.youlai.admin.dto.UserDTO; -import com.youlai.admin.feign.RemoteAdminService; +import com.youlai.admin.api.AdminUserFeignClient; import com.youlai.auth.domain.User; import com.youlai.common.core.constant.AuthConstants; import com.youlai.common.core.result.Result; import com.youlai.common.core.result.ResultCode; import com.youlai.mall.ums.dto.MemberDTO; -import com.youlai.mall.ums.feign.RemoteUmsMemberService; +import com.youlai.mall.ums.api.UmsMemberFeignClient; import lombok.AllArgsConstructor; import org.springframework.security.authentication.AccountExpiredException; import org.springframework.security.authentication.CredentialsExpiredException; @@ -28,8 +28,8 @@ import javax.servlet.http.HttpServletRequest; @AllArgsConstructor public class UserDetailsServiceImpl implements UserDetailsService { - private RemoteAdminService remoteAdminService; - private RemoteUmsMemberService remoteUmsMemberService; + private AdminUserFeignClient adminUserFeignClient; + private UmsMemberFeignClient umsMemberFeignClient; private HttpServletRequest request; @Override @@ -38,7 +38,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { User user = null; switch (clientId) { case AuthConstants.ADMIN_CLIENT_ID: // 后台用户 - Result userResult = remoteAdminService.loadUserByUsername(username); + Result userResult = adminUserFeignClient.loadUserByUsername(username); if (userResult == null || !ResultCode.SUCCESS.getCode().equals(userResult.getCode())) { throw new UsernameNotFoundException("用户不存在"); } @@ -47,7 +47,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { user = new User(userDTO); break; case AuthConstants.WEAPP_CLIENT_ID: // 小程序会员 - Result memberResult = remoteUmsMemberService.loadMemberByOpenid(username); + Result memberResult = umsMemberFeignClient.loadMemberByOpenid(username); if (memberResult == null || !ResultCode.SUCCESS.getCode().equals(memberResult.getCode())) { throw new UsernameNotFoundException("会员不存在"); }