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

refactor:项目结构调整

Browse Source
This commit is contained in:
haoxr 2020-10-31 23:47:11 +08:00
parent 84bc008e84
commit 46aba70db8
45 changed files with 209 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
mall-oms/mall-oms-biz/pom.xml
View File

@ -1,72 +0,0 @@
<?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-oms</artifactId>
<groupId>com.youlai</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mall-oms-biz</artifactId>
<dependencies>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>mall-oms-api</artifactId>
<version>${youlai-common.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-db</artifactId>
<version>${youlai-common.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-knife4j</artifactId>
<version>${youlai-common.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-web</artifactId>
<version>${youlai-common.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-redis</artifactId>
<version>${youlai-common.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- nacos 依赖-->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

2
mall-oms/mall-oms-api/pom.xml → mall-oms/oms-api/pom.xml
View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mall-oms-api</artifactId>
<artifactId>oms-api</artifactId>
<dependencies>
<dependency>

61
mall-oms/oms-api/src/main/java/com/youlai/mall/oms/entity/OmsOrder.java Normal file
View File

@ -0,0 +1,61 @@
package com.youlai.mall.oms.entity;
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;
import java.util.Date;
@Data
public class OmsOrder extends BaseEntity {
@TableId(type= IdType.AUTO)
private Long id;
private String orderSn;
private Long memberId;
private Integer status;
private Integer sourceType;
private String consignee;
private String mobile;
private String postcode;
private String address;
private Long couponId;
private BigDecimal skuPrice;
private BigDecimal freightPrice;
private BigDecimal couponPrice;
private BigDecimal orderPrice;
private BigDecimal integrationPrice;
private BigDecimal payPrice;
private String payId;
private Integer payType;
private Date payTime;
private String shipSn;
}

8
mall-oms/pom.xml
View File

@ -13,19 +13,19 @@
<packaging>pom</packaging>
<modules>
<module>mall-oms-api</module>
<module>mall-oms-biz</module>
<module>oms-api</module>
<module>oms-biz</module>
</modules>
<properties>
<youlai-common.version>1.0.0-SNAPSHOT</youlai-common.version>
<youlai.version>1.0.0-SNAPSHOT</youlai.version>
</properties>
<dependencies>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-core</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
</dependencies>

72
mall-pms/mall-pms-biz/pom.xml
View File

@ -1,72 +0,0 @@
<?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>mall-pms-biz</artifactId>
<dependencies>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>mall-pms-api</artifactId>
<version>${youlai-common.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-db</artifactId>
<version>${youlai-common.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-knife4j</artifactId>
<version>${youlai-common.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-web</artifactId>
<version>${youlai-common.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-redis</artifactId>
<version>${youlai-common.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- nacos 依赖-->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

2
mall-pms/mall-pms-api/pom.xml → mall-pms/pms-api/pom.xml
View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mall-pms-api</artifactId>
<artifactId>pms-api</artifactId>
<dependencies>
<dependency>

24
mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsBrand.java Normal file
View File

@ -0,0 +1,24 @@
package com.youlai.mall.pms.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.youlai.common.core.base.BaseEntity;
import lombok.Data;
@Data
public class PmsBrand extends BaseEntity {
@TableId(type= IdType.AUTO)
private Long id;
private String name;
private String logo;
private String firstLetter;
private Integer sort;
private Integer status;
}

31
mall-pms/pms-api/src/main/java/com/youlai/mall/pms/entity/PmsCategory.java Normal file
View File

@ -0,0 +1,31 @@
package com.youlai.mall.pms.entity;
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 {
@TableId(type= IdType.AUTO)
private Long id;
private String name;
private Long parentId;
private Integer level;
private String icon;
private Integer sort;
private String unit;
private Integer count;
private Integer status;
}

8
mall-pms/pom.xml
View File

@ -13,19 +13,19 @@
<packaging>pom</packaging>
<modules>
<module>mall-pms-api</module>
<module>mall-pms-biz</module>
<module>pms-api</module>
<module>pms-biz</module>
</modules>
<properties>
<youlai-common.version>1.0.0-SNAPSHOT</youlai-common.version>
<youlai.version>1.0.0-SNAPSHOT</youlai.version>
</properties>
<dependencies>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-core</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
</dependencies>

8
mall-sms/pom.xml
View File

@ -13,19 +13,19 @@
<packaging>pom</packaging>
<modules>
<module>mall-sms-api</module>
<module>mall-sms-biz</module>
<module>sms-api</module>
<module>sms-biz</module>
</modules>
<properties>
<youlai-common.version>1.0.0-SNAPSHOT</youlai-common.version>
<youlai.version>1.0.0-SNAPSHOT</youlai.version>
</properties>
<dependencies>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-core</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
</dependencies>
</project>

2
mall-sms/mall-sms-api/pom.xml → mall-sms/sms-api/pom.xml
View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mall-sms-api</artifactId>
<artifactId>sms-api</artifactId>
<dependencies>
<dependency>

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

@ -1,12 +1,10 @@
package com.youlai.mall.sms.api;
package com.youlai.mall.sms.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.youlai.common.core.base.BaseEntity;
import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@Data

8
mall-ums/pom.xml
View File

@ -13,19 +13,19 @@
<packaging>pom</packaging>
<modules>
<module>mall-ums-api</module>
<module>mall-ums-biz</module>
<module>ums-api</module>
<module>ums-biz</module>
</modules>
<properties>
<youlai-common.version>1.0.0-SNAPSHOT</youlai-common.version>
<youlai.version>1.0.0-SNAPSHOT</youlai.version>
</properties>
<dependencies>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-core</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
</dependencies>
</project>

2
mall-ums/mall-ums-api/pom.xml → mall-ums/ums-api/pom.xml
View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mall-ums-api</artifactId>
<artifactId>ums-api</artifactId>
<dependencies>
<dependency>

2
mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/dto/MemberDTO.java → mall-ums/ums-api/src/main/java/com/youlai/mall/ums/dto/MemberDTO.java
View File

@ -1,4 +1,4 @@
package com.youlai.mall.ums.api.dto;
package com.youlai.mall.ums.dto;
import lombok.Data;

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

@ -1,4 +1,4 @@
package com.youlai.mall.ums.api.entity;
package com.youlai.mall.ums.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;

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

@ -1,8 +1,8 @@
package com.youlai.mall.ums.api.feign;
package com.youlai.mall.ums.feign;
import com.youlai.common.core.result.Result;
import com.youlai.mall.ums.api.dto.MemberDTO;
import com.youlai.mall.ums.api.entity.UmsMember;
import com.youlai.mall.ums.dto.MemberDTO;
import com.youlai.mall.ums.entity.UmsMember;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

2
mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/vo/MemberVO.java → mall-ums/ums-api/src/main/java/com/youlai/mall/ums/vo/MemberVO.java
View File

@ -1,4 +1,4 @@
package com.youlai.mall.ums.api.vo;
package com.youlai.mall.ums.vo;
import lombok.Data;

12
youlai-admin/youlai-admin-api/pom.xml → youlai-admin/admin-api/pom.xml
View File

@ -9,7 +9,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>youlai-admin-api</artifactId>
<artifactId>admin-api</artifactId>
<properties>
<youlai.version>1.0.0-SNAPSHOT</youlai.version>
</properties>
<dependencies>
<dependency>
@ -28,19 +32,19 @@
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-web</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-db</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-knife4j</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
</dependencies>
</project>

2
youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/dto/UserDTO.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/dto/UserDTO.java
View File

@ -1,4 +1,4 @@
package com.youlai.admin.api.dto;
package com.youlai.admin.dto;
import lombok.Data;
import lombok.NoArgsConstructor;

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

@ -1,4 +1,4 @@
package com.youlai.admin.api.entity;
package com.youlai.admin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

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

@ -1,4 +1,4 @@
package com.youlai.admin.api.entity;
package com.youlai.admin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

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

@ -1,4 +1,4 @@
package com.youlai.admin.api.entity;
package com.youlai.admin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

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

@ -1,4 +1,4 @@
package com.youlai.admin.api.entity;
package com.youlai.admin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

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

@ -1,4 +1,4 @@
package com.youlai.admin.api.entity;
package com.youlai.admin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

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

@ -1,4 +1,4 @@
package com.youlai.admin.api.entity;
package com.youlai.admin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

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

@ -1,4 +1,4 @@
package com.youlai.admin.api.entity;
package com.youlai.admin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

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

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

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

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

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

@ -1,4 +1,4 @@
package com.youlai.admin.api.entity;
package com.youlai.admin.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;

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

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

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

@ -1,6 +1,6 @@
package com.youlai.admin.api.feign;
package com.youlai.admin.feign;
import com.youlai.admin.api.dto.UserDTO;
import com.youlai.admin.dto.UserDTO;
import com.youlai.common.core.result.Result;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;

2
youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/vo/DeptVO.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/vo/DeptVO.java
View File

@ -1,4 +1,4 @@
package com.youlai.admin.api.vo;
package com.youlai.admin.vo;
import lombok.Data;

2
youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/vo/MenuVO.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/vo/MenuVO.java
View File

@ -1,4 +1,4 @@
package com.youlai.admin.api.vo;
package com.youlai.admin.vo;
import com.youlai.common.core.base.BaseEntity;
import lombok.Data;

2
youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/vo/RouterVO.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/vo/RouterVO.java
View File

@ -1,4 +1,4 @@
package com.youlai.admin.api.vo;
package com.youlai.admin.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;

2
youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/vo/TreeSelectVO.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/vo/TreeSelectVO.java
View File

@ -1,4 +1,4 @@
package com.youlai.admin.api.vo;
package com.youlai.admin.vo;
import lombok.Data;

2
youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/vo/UserVO.java → youlai-admin/admin-api/src/main/java/com/youlai/admin/vo/UserVO.java
View File

@ -1,4 +1,4 @@
package com.youlai.admin.api.vo;
package com.youlai.admin.vo;
import lombok.Data;

14
youlai-admin/pom.xml
View File

@ -13,26 +13,20 @@
<packaging>pom</packaging>
<modules>
<module>youlai-admin-api</module>
<module>youlai-admin-biz</module>
<module>admin-api</module>
<module>admin-biz</module>
</modules>
<properties>
<youlai-common.version>1.0.0-SNAPSHOT</youlai-common.version>
<youlai.version>1.0.0-SNAPSHOT</youlai.version>
</properties>
<dependencies>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-core</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
</dependencies>
</project>

22
youlai-auth/pom.xml
View File

@ -12,56 +12,56 @@
<artifactId>youlai-auth</artifactId>
<properties>
<youlai-common.version>1.0.0-SNAPSHOT</youlai-common.version>
<youlai.version>1.0.0-SNAPSHOT</youlai.version>
</properties>
<dependencies>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>mall-ums-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<artifactId>ums-api</artifactId>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-admin-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<artifactId>admin-api</artifactId>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-db</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-web</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-knife4j</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-core</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-redis</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-web</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>

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

@ -12,9 +12,9 @@ import com.youlai.common.core.constant.Constants;
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.api.dto.MemberDTO;
import com.youlai.mall.ums.api.entity.UmsMember;
import com.youlai.mall.ums.api.feign.RemoteUmsMemberService;
import com.youlai.mall.ums.dto.MemberDTO;
import com.youlai.mall.ums.entity.UmsMember;
import com.youlai.mall.ums.feign.RemoteUmsMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

4
youlai-auth/src/main/java/com/youlai/auth/domain/User.java
View File

@ -1,8 +1,8 @@
package com.youlai.auth.domain;
import com.youlai.admin.api.dto.UserDTO;
import com.youlai.admin.dto.UserDTO;
import com.youlai.common.core.constant.AuthConstants;
import com.youlai.mall.ums.api.dto.MemberDTO;
import com.youlai.mall.ums.dto.MemberDTO;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.security.core.GrantedAuthority;

8
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.api.dto.UserDTO;
import com.youlai.admin.api.feign.RemoteAdminService;
import com.youlai.admin.dto.UserDTO;
import com.youlai.admin.feign.RemoteAdminService;
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.api.dto.MemberDTO;
import com.youlai.mall.ums.api.feign.RemoteUmsMemberService;
import com.youlai.mall.ums.dto.MemberDTO;
import com.youlai.mall.ums.feign.RemoteUmsMemberService;
import lombok.AllArgsConstructor;
import org.springframework.security.authentication.AccountExpiredException;
import org.springframework.security.authentication.CredentialsExpiredException;

14
youlai-common/pom.xml
View File

@ -30,7 +30,7 @@
<mybatis-plus.version>3.3.1</mybatis-plus.version>
<redisson.version>3.12.5</redisson.version>
<common-pools.version>2.8.0</common-pools.version>
<youlai-common.version>1.0.0-SNAPSHOT</youlai-common.version>
<youlai.version>1.0.0-SNAPSHOT</youlai.version>
</properties>
<dependencyManagement>
@ -95,37 +95,37 @@
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-core</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-knife4j</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-redis</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-web</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-db</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-auth</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
</dependencies>

6
youlai-gateway/pom.xml
View File

@ -14,7 +14,7 @@
<artifactId>youlai-gateway</artifactId>
<properties>
<youlai-common.version>1.0.0-SNAPSHOT</youlai-common.version>
<youlai.version>1.0.0-SNAPSHOT</youlai.version>
</properties>
<dependencies>
@ -22,13 +22,13 @@
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-core</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>
<groupId>com.youlai</groupId>
<artifactId>youlai-common-redis</artifactId>
<version>${youlai-common.version}</version>
<version>${youlai.version}</version>
</dependency>
<dependency>

7
youlai-gateway/src/main/java/com/youlai/gateway/component/AuthorizationManager.java
View File

@ -3,7 +3,6 @@ package com.youlai.gateway.component;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil;
import com.youlai.common.core.constant.AuthConstants;
import com.youlai.gateway.config.WhiteListConfig;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.RedisTemplate;
@ -19,7 +18,10 @@ import org.springframework.util.AntPathMatcher;
import org.springframework.util.PathMatcher;
import reactor.core.publisher.Mono;
import java.util.*;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
/**
* 鉴权管理器
@ -52,6 +54,7 @@ public class AuthorizationManager implements ReactiveAuthorizationManager<Author
if (StrUtil.isBlank(token)) {
return Mono.just(new AuthorizationDecision(false));
}
// 从缓存取资源权限角色关系列表
Map<Object, Object> resourceRolesMap = redisTemplate.opsForHash().entries(AuthConstants.RESOURCE_ROLES_KEY);
Iterator<Object> iterator = resourceRolesMap.keySet().iterator();