mirrors/youlai-mall
1
0
Fork 0
mirror of https://gitee.com/youlaitech/youlai-mall.git synced 2024-12-22 20:54:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor:项目结构调整

Browse Source
This commit is contained in:
haoxr 2020-11-13 21:31:32 +08:00
parent f1ce1eb931
commit b5ca430125
27 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mall-oms/oms-api/src/main/java/com/youlai/mall/oms/entity/OmsOrder.java → mall-oms/oms-api/src/main/java/com/youlai/mall/oms/pojo/OmsOrder.java
View File

@ -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;

8
mall-pms/pms-api/src/main/java/com/youlai/mall/pms/bo/PmsSpuBO.java
View File

@ -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;

2
mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsBrand.java → mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsBrand.java
View File

@ -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;

4
mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsCategory.java → mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsCategory.java
View File

@ -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 {

4
mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSku.java → mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSku.java
View File

@ -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)

2
mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSpu.java → mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpu.java
View File

@ -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;

2
mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSpuAttribute.java → mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuAttribute.java
View File

@ -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;

5
mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsSpuSpecification.java → mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/PmsSpuSpecification.java
View File

@ -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

15
mall-pms/pms-search/pom.xml Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>mall-pms</artifactId>
<groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pms-search</artifactId>
</project>

1
mall-pms/pom.xml
View File

@ -15,6 +15,7 @@
<modules>
<module>pms-api</module>
<module>pms-biz</module>
<module>pms-search</module>
</modules>
<properties>

2
mall-sms/sms-api/src/main/java/com/youlai/mall/sms/entity/SmsAdvert.java → mall-sms/sms-api/src/main/java/com/youlai/mall/sms/pojo/SmsAdvert.java
View File

@ -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;

6
mall-ums/ums-api/src/main/java/com/youlai/mall/ums/feign/RemoteUmsMemberService.java → mall-ums/ums-api/src/main/java/com/youlai/mall/ums/api/UmsMemberFeignClient.java
View File

@ -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<MemberDTO> loadMemberByOpenid(@PathVariable String openid);

5
mall-ums/ums-api/src/main/java/com/youlai/mall/ums/entity/UmsMember.java → mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/UmsMember.java
View File

@ -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)

4
youlai-admin/admin-api/src/main/java/com/youlai/admin/feign/RemoteAdminService.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/api/AdminUserFeignClient.java
View File

@ -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<UserDTO> loadUserByUsername(@PathVariable String username);

2
youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/OauthClientDetails.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/OauthClientDetails.java
View File

@ -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;

2
youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysDept.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDept.java
View File

@ -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;

2
youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysDict.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDict.java
View File

@ -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;

2
youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysDictType.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysDictType.java
View File

@ -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;

2
youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysMenu.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysMenu.java
View File

@ -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;

2
youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysResource.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysResource.java
View File

@ -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;

2
youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysRole.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRole.java
View File

@ -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;

2
youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysRoleMenu.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRoleMenu.java
View File

@ -1,4 +1,4 @@
package com.youlai.admin.entity;
package com.youlai.admin.pojo;
import lombok.Data;
import lombok.experimental.Accessors;

2
youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysRoleResource.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysRoleResource.java
View File

@ -1,4 +1,4 @@
package com.youlai.admin.entity;
package com.youlai.admin.pojo;
import lombok.Data;
import lombok.experimental.Accessors;

2
youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysUser.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUser.java
View File

@ -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;

2
youlai-admin/admin-api/src/main/java/com/youlai/admin/entity/SysUserRole.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/SysUserRole.java
View File

@ -1,4 +1,4 @@
package com.youlai.admin.entity;
package com.youlai.admin.pojo;
import lombok.Data;

10
youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java
View File

@ -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<MemberDTO> result = remoteUmsMemberService.loadMemberByOpenid(openid);
Result<MemberDTO> 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("注册会员失败");
}

12
youlai-auth/src/main/java/com/youlai/auth/service/UserDetailsServiceImpl.java
View File

@ -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<UserDTO> userResult = remoteAdminService.loadUserByUsername(username);
Result<UserDTO> 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<MemberDTO> memberResult = remoteUmsMemberService.loadMemberByOpenid(username);
Result<MemberDTO> memberResult = umsMemberFeignClient.loadMemberByOpenid(username);
if (memberResult == null || !ResultCode.SUCCESS.getCode().equals(memberResult.getCode())) {
throw new UsernameNotFoundException("会员不存在");
}