Merge branch 'feature/my-invitation' of https://gitea.qinmian.online/CY/mcwl-ai into preview

# Conflicts:
#	pom.xml

mcwl-admin/pom.xml

@@ -55,6 +55,13 @@
             <artifactId>mcwl-quartz</artifactId>
         </dependency>
 
+        <!-- 我的邀请模块-->
+        <dependency>
+            <groupId>com.mcwl</groupId>
+            <artifactId>mcwl-myInvitation</artifactId>
+            <version>3.8.8</version>
+        </dependency>
+
         <!-- 代码生成-->
         <dependency>
             <groupId>com.mcwl</groupId>
@@ -80,15 +87,15 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>   
+            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>   
+                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>   
+                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>   
+                <version>3.1.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
-                </configuration>   
+                </configuration>
-           </plugin>   
+           </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>

mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/ConsumeController.java

@@ -0,0 +1,12 @@
+package com.mcwl.web.controller.myInvitation;
+
+
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController("/consume")
+public class ConsumeController {
+
+    
+
+
+}

mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/InvitationController.java

@@ -0,0 +1,49 @@
+package com.mcwl.web.controller.myInvitation;
+
+
+import com.mcwl.common.annotation.Anonymous;
+import com.mcwl.common.core.domain.AjaxResult;
+import com.mcwl.common.utils.SecurityUtils;
+import com.mcwl.myInvitation.domain.Invitation;
+import com.mcwl.myInvitation.service.InvitationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static com.mcwl.common.core.domain.AjaxResult.success;
+
+@RestController("/invitation")
+@RequiredArgsConstructor
+
+public class InvitationController {
+
+    private final InvitationService invitationService;
+
+
+    @GetMapping("/getInvitationCode")
+    @Anonymous
+    public AjaxResult getInvitationCode() {
+        // 获取当前用户
+        Long userId = SecurityUtils.getUserId();
+        String invitationCode = invitationService.getInvitationCode(userId);
+        return success("操作成功", invitationCode);
+    }
+
+    @GetMapping("/list")
+    public AjaxResult list() {
+        List<Invitation> list = invitationService.list();
+        return success(list);
+    }
+
+    @GetMapping("/getById")
+    public AjaxResult getById(Long id) {
+        Invitation invitation = invitationService.getById(id);
+        return success(invitation);
+    }
+
+
+
+
+}

mcwl-common/src/main/java/com/mcwl/common/constant/JwtConstants.java

@@ -0,0 +1,39 @@
+package com.mcwl.common.constant;
+
+public class JwtConstants {
+    /**
+     * 用户ID字段
+     */
+    public static final String DETAILS_USER_ID = "user_id";
+
+    /**
+     * 用户名字段
+     */
+    public static final String DETAILS_USERNAME = "user_name";
+
+    /**
+     * 用户标识
+     */
+    public static final String USER_KEY = "user_key";
+
+    /**
+     * 令牌秘钥
+     */
+    public final static String SECRET = "abcdefghijklmnopqrstuvwxyz";
+
+    /**
+     * 手机
+     */
+    public static final String USER_PHONE = "user_phone";
+
+
+    /**
+     * 用户token 的键的前缀
+     */
+    public static final String LOGIN_TOKEN = "login_token:";
+
+    /**
+     * token过期时间 1h = 60 * 60 * 1000L
+     */
+    public static final Long EXPIRATION = 60 * 60 * 1000L;
+}

mcwl-common/src/main/java/com/mcwl/common/utils/JwtUtils.java

@@ -0,0 +1,114 @@
+package com.mcwl.common.utils;
+
+import com.mcwl.common.constant.JwtConstants;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * @description: Jwt工具类
+ * @author DongZl
+ */
+public class JwtUtils {
+
+    /**
+     * 秘钥
+     */
+    public static String secret = JwtConstants.SECRET;
+
+    /**
+     * 从数据声明生成令牌
+     *
+     * @param claims 数据声明
+     * @return 令牌
+     */
+    public static String createToken(Map<String, Object> claims){
+        String token = Jwts.builder()
+                .addClaims(claims)
+                .signWith(SignatureAlgorithm.HS512, secret)
+                .setExpiration(new Date(System.currentTimeMillis() + JwtConstants.EXPIRATION))
+                .compact();
+        return token;
+    }
+
+    /**
+     * 从令牌中获取数据声明
+     *
+     * @param token 令牌
+     * @return 数据声明
+     */
+    public static Claims parseToken(String token){
+        return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody();
+    }
+    /**
+     * 根据令牌获取用户标识
+     *
+     * @param token 令牌
+     * @return 用户ID
+     */
+    public static String getUserKey(String token){
+        Claims claims = parseToken(token);
+        return getValue(claims, JwtConstants.USER_KEY);
+    }
+    /**
+     * 根据令牌获取用户标识
+     *
+     * @param claims 身份信息
+     * @return 用户ID
+     */
+    public static String getUserKey(Claims claims){
+        return getValue(claims, JwtConstants.USER_KEY);
+    }
+    /**
+     * 根据令牌获取用户ID
+     *
+     * @param token 令牌
+     * @return 用户ID
+     */
+    public static String getUserId(String token){
+        Claims claims = parseToken(token);
+        return getValue(claims, JwtConstants.DETAILS_USER_ID);
+    }
+    /**
+     * 根据身份信息获取用户ID
+     *
+     * @param claims 身份信息
+     * @return 用户ID
+     */
+    public static String getUserId(Claims claims){
+        return getValue(claims, JwtConstants.DETAILS_USER_ID);
+    }
+    /**
+     * 根据令牌获取用户名
+     *
+     * @param token 令牌
+     * @return 用户名
+     */
+    public static String getUserName(String token){
+        Claims claims = parseToken(token);
+        return getValue(claims, JwtConstants.DETAILS_USERNAME);
+    }
+    /**
+     * 根据身份信息获取用户名
+     *
+     * @param claims 身份信息
+     * @return 用户名
+     */
+    public static String getUserName(Claims claims){
+        return getValue(claims, JwtConstants.DETAILS_USERNAME);
+    }
+    /**
+     * 根据身份信息获取键值
+     *
+     * @param claims 身份信息
+     * @param key 键
+     * @return 值
+     */
+    public static String getValue(Claims claims, String key){
+        Object obj = claims.get(key);
+        return obj == null ? "" : obj.toString();
+    }
+}

mcwl-myInvitation/pom.xml

@@ -0,0 +1,42 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.mcwl</groupId>
+        <artifactId>mcwl</artifactId>
+        <version>3.8.8</version>
+    </parent>
+
+    <artifactId>mcwl-myInvitation</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <mybatis-plus.version>3.5.2</mybatis-plus.version>
+    </properties>
+
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.mcwl</groupId>
+            <artifactId>mcwl-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>${mybatis-plus.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Commission.java

@@ -0,0 +1,41 @@
+package com.mcwl.myInvitation.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mcwl.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Objects;
+
+// 提成表
+@Data
+@TableName("commissions")
+public class Commission extends BaseEntity {
+
+    @TableId
+    private Long id;
+
+    // 用户id
+    private Long userId;
+
+    // 消费id
+    private Long consumeId;
+
+    // 提成金额
+    private Double amount;
+
+    // 支付状态
+    private Integer payStatus;
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        Commission that = (Commission) o;
+        return Objects.equals(id, that.id) && Objects.equals(userId, that.userId) && Objects.equals(consumeId, that.consumeId) && Objects.equals(amount, that.amount) && Objects.equals(payStatus, that.payStatus);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, userId, consumeId, amount, payStatus);
+    }
+}

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java

@@ -0,0 +1,39 @@
+package com.mcwl.myInvitation.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mcwl.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.Objects;
+
+// 消费表
+@Data
+@TableName("consumes")
+public class Consume extends BaseEntity {
+
+    @TableId
+    private Long id;
+
+    // 用户id
+    private Long userId;
+
+    // 消费金额
+    private Double amount;
+
+    // 消费时间
+    private Date consumeDate;
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        Consume consume = (Consume) o;
+        return Objects.equals(id, consume.id) && Objects.equals(userId, consume.userId) && Objects.equals(amount, consume.amount) && Objects.equals(consumeDate, consume.consumeDate);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, userId, amount, consumeDate);
+    }
+}

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Invitation.java

@@ -0,0 +1,39 @@
+package com.mcwl.myInvitation.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mcwl.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Objects;
+
+// 邀请表
+@Data
+@TableName("invitations")
+public class Invitation extends BaseEntity {
+
+    @TableId
+    private Long id;
+
+    // 邀请者
+    private Long userId;
+
+    // 被邀请者
+    private Long userInviteId ;
+
+    // 邀请码
+    private String invitationCode;
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        Invitation that = (Invitation) o;
+        return Objects.equals(id, that.id) && Objects.equals(userId, that.userId) && Objects.equals(userInviteId, that.userInviteId) && Objects.equals(invitationCode, that.invitationCode);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, userId, userInviteId, invitationCode);
+    }
+}

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/mapper/CommissionMapper.java

@@ -0,0 +1,13 @@
+package com.mcwl.myInvitation.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mcwl.myInvitation.domain.Commission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface CommissionMapper extends BaseMapper<Commission> {
+
+}

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/mapper/ConsumeMapper.java

@@ -0,0 +1,11 @@
+package com.mcwl.myInvitation.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mcwl.myInvitation.domain.Commission;
+import com.mcwl.myInvitation.domain.Consume;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ConsumeMapper extends BaseMapper<Consume> {
+
+}

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/mapper/InvitationMapper.java

@@ -0,0 +1,11 @@
+package com.mcwl.myInvitation.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mcwl.myInvitation.domain.Commission;
+import com.mcwl.myInvitation.domain.Invitation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface InvitationMapper extends BaseMapper<Invitation> {
+
+}

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/CommissionService.java

@@ -0,0 +1,8 @@
+package com.mcwl.myInvitation.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mcwl.myInvitation.domain.Commission;
+
+public interface CommissionService extends IService<Commission> {
+
+}

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/ConsumeService.java

@@ -0,0 +1,8 @@
+package com.mcwl.myInvitation.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mcwl.myInvitation.domain.Consume;
+
+public interface ConsumeService extends IService<Consume> {
+
+}

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/InvitationService.java

@@ -0,0 +1,14 @@
+package com.mcwl.myInvitation.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mcwl.myInvitation.domain.Invitation;
+
+public interface InvitationService extends IService<Invitation> {
+
+    /**
+     * 获取邀请码
+     * @param userId 用户id
+     * @return 邀请码
+     */
+    String getInvitationCode(Long userId);
+}

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/CommissionServiceImpl.java

@@ -0,0 +1,16 @@
+package com.mcwl.myInvitation.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mcwl.myInvitation.domain.Commission;
+import com.mcwl.myInvitation.mapper.CommissionMapper;
+import com.mcwl.myInvitation.service.CommissionService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+
+@Service
+@RequiredArgsConstructor
+public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commission> implements CommissionService {
+
+
+}

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/ConsumeServiceImpl.java

@@ -0,0 +1,15 @@
+package com.mcwl.myInvitation.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mcwl.myInvitation.domain.Consume;
+import com.mcwl.myInvitation.mapper.ConsumeMapper;
+import com.mcwl.myInvitation.service.ConsumeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class ConsumeServiceImpl extends ServiceImpl<ConsumeMapper, Consume> implements ConsumeService {
+
+
+}

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/InvitationServiceImpl.java

@@ -0,0 +1,28 @@
+package com.mcwl.myInvitation.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mcwl.common.constant.JwtConstants;
+import com.mcwl.common.utils.JwtUtils;
+import com.mcwl.myInvitation.domain.Invitation;
+import com.mcwl.myInvitation.mapper.InvitationMapper;
+import com.mcwl.myInvitation.service.InvitationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class InvitationServiceImpl extends ServiceImpl<InvitationMapper, Invitation> implements InvitationService {
+
+
+    @Override
+    public String getInvitationCode(Long userId) {
+        // 生成邀请码
+        Map<String, Object> claims = new HashMap<>() ;
+        claims.put(JwtConstants.DETAILS_USER_ID, userId);
+        String invitationCode = JwtUtils.createToken(claims);
+        return invitationCode;
+    }
+}

mcwl-myInvitation/src/main/resources/mapper/myInvitation/CommissionMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mcwl.myInvitation.mapper.CommissionMapper">
+
+
+
+</mapper>

mcwl-myInvitation/src/main/resources/mapper/myInvitation/ConsumeMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mcwl.myInvitation.mapper.ConsumeMapper">
+
+
+
+</mapper>

mcwl-myInvitation/src/main/resources/mapper/myInvitation/InvitationMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mcwl.myInvitation.mapper.InvitationMapper">
+
+
+
+</mapper>

pom.xml

@@ -228,6 +228,7 @@
         <module>mcwl-quartz</module>
         <module>mcwl-generator</module>
         <module>mcwl-common</module>
+        <module>mcwl-myInvitation</module>
         <module>mcwl-resource</module>
     </modules>
     <packaging>pom</packaging>