diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/AliPayController.java b/admin/src/main/java/com/baiye/modules/scrm/controller/AliPayController.java similarity index 86% rename from admin/src/main/java/com/baiye/modules/distribute/controller/AliPayController.java rename to admin/src/main/java/com/baiye/modules/scrm/controller/AliPayController.java index 599b7aa..9394738 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/AliPayController.java +++ b/admin/src/main/java/com/baiye/modules/scrm/controller/AliPayController.java @@ -1,9 +1,9 @@ -package com.baiye.modules.distribute.controller; +package com.baiye.modules.scrm.controller; -import com.baiye.modules.distribute.dto.AliPayPcDTO; -import com.baiye.modules.distribute.entity.PayOrder; -import com.baiye.modules.distribute.service.AliPayService; +import com.baiye.modules.scrm.dto.AliPayPcDTO; +import com.baiye.modules.scrm.entity.PayOrder; +import com.baiye.modules.scrm.service.AliPayService; import com.baiye.result.R; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/LoginEquipmentController.java b/admin/src/main/java/com/baiye/modules/scrm/controller/LoginEquipmentController.java similarity index 82% rename from admin/src/main/java/com/baiye/modules/distribute/controller/LoginEquipmentController.java rename to admin/src/main/java/com/baiye/modules/scrm/controller/LoginEquipmentController.java index 62576eb..96380fe 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/LoginEquipmentController.java +++ b/admin/src/main/java/com/baiye/modules/scrm/controller/LoginEquipmentController.java @@ -1,10 +1,10 @@ -package com.baiye.modules.distribute.controller; +package com.baiye.modules.scrm.controller; import com.baiye.domain.PageParam; import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.qo.AccountQo; -import com.baiye.modules.distribute.service.LoginEquipmentService; -import com.baiye.modules.distribute.vo.WeChatAccountVO; +import com.baiye.modules.scrm.qo.AccountQo; +import com.baiye.modules.scrm.service.LoginEquipmentService; +import com.baiye.modules.scrm.vo.WeChatAccountVO; import com.baiye.result.R; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/PayOrderController.java b/admin/src/main/java/com/baiye/modules/scrm/controller/PayOrderController.java similarity index 81% rename from admin/src/main/java/com/baiye/modules/distribute/controller/PayOrderController.java rename to admin/src/main/java/com/baiye/modules/scrm/controller/PayOrderController.java index 436466c..7777ba0 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/PayOrderController.java +++ b/admin/src/main/java/com/baiye/modules/scrm/controller/PayOrderController.java @@ -1,10 +1,10 @@ -package com.baiye.modules.distribute.controller; +package com.baiye.modules.scrm.controller; import com.baiye.domain.PageParam; import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.qo.PayOrderQo; -import com.baiye.modules.distribute.service.PayOrderService; -import com.baiye.modules.distribute.vo.PayOrderVO; +import com.baiye.modules.scrm.qo.PayOrderQo; +import com.baiye.modules.scrm.service.PayOrderService; +import com.baiye.modules.scrm.vo.PayOrderVO; import com.baiye.result.R; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/WeChatController.java b/admin/src/main/java/com/baiye/modules/scrm/controller/WeChatController.java similarity index 80% rename from admin/src/main/java/com/baiye/modules/distribute/controller/WeChatController.java rename to admin/src/main/java/com/baiye/modules/scrm/controller/WeChatController.java index 25e0492..b853b69 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/WeChatController.java +++ b/admin/src/main/java/com/baiye/modules/scrm/controller/WeChatController.java @@ -1,33 +1,27 @@ -package com.baiye.modules.distribute.controller; +package com.baiye.modules.scrm.controller; -import cn.hutool.http.HttpUtil; -import com.baiye.constant.WeChatRequestConstants; import com.baiye.domain.PageParam; import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.dto.CreateCodeDTO; -import com.baiye.modules.distribute.dto.PushCodeDTO; -import com.baiye.modules.distribute.dto.WeChatAddFriendDTO; -import com.baiye.modules.distribute.dto.WeChatStatisticsDTO; -import com.baiye.modules.distribute.qo.AccountQo; -import com.baiye.modules.distribute.service.WeChatService; -import com.baiye.modules.distribute.service.WechatFriendService; -import com.baiye.modules.distribute.vo.AccountStatisticsVO; -import com.baiye.modules.distribute.vo.AddFriendVo; -import com.baiye.modules.distribute.vo.StatisticsFriendVO; -import com.baiye.modules.distribute.vo.WeChatAccountVO; +import com.baiye.modules.scrm.dto.CreateCodeDTO; +import com.baiye.modules.scrm.dto.PushCodeDTO; +import com.baiye.modules.scrm.dto.WeChatAddFriendDTO; +import com.baiye.modules.scrm.dto.WeChatStatisticsDTO; +import com.baiye.modules.scrm.qo.AccountQo; +import com.baiye.modules.scrm.service.WeChatService; +import com.baiye.modules.scrm.service.WechatFriendService; +import com.baiye.modules.scrm.vo.AccountStatisticsVO; +import com.baiye.modules.scrm.vo.AddFriendVo; +import com.baiye.modules.scrm.vo.StatisticsFriendVO; +import com.baiye.modules.scrm.vo.WeChatAccountVO; import com.baiye.result.R; import com.baiye.security.util.SecurityUtils; -import com.google.common.collect.Maps; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.Data; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.Date; import java.util.List; -import java.util.Map; /** * @author Enzo diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/WechatCallbackController.java b/admin/src/main/java/com/baiye/modules/scrm/controller/WechatCallbackController.java similarity index 89% rename from admin/src/main/java/com/baiye/modules/distribute/controller/WechatCallbackController.java rename to admin/src/main/java/com/baiye/modules/scrm/controller/WechatCallbackController.java index 487c7be..07a4055 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/WechatCallbackController.java +++ b/admin/src/main/java/com/baiye/modules/scrm/controller/WechatCallbackController.java @@ -1,7 +1,7 @@ -package com.baiye.modules.distribute.controller; +package com.baiye.modules.scrm.controller; import cn.hutool.json.JSONUtil; -import com.baiye.modules.distribute.service.WechatCallbackService; +import com.baiye.modules.scrm.service.WechatCallbackService; import com.baiye.result.R; import com.baiye.result.WeChatResponse; import lombok.RequiredArgsConstructor; diff --git a/admin/src/main/java/com/baiye/modules/distribute/converter/PayOrderConverter.java b/admin/src/main/java/com/baiye/modules/scrm/converter/PayOrderConverter.java similarity index 70% rename from admin/src/main/java/com/baiye/modules/distribute/converter/PayOrderConverter.java rename to admin/src/main/java/com/baiye/modules/scrm/converter/PayOrderConverter.java index 5b3bd94..a56b633 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/converter/PayOrderConverter.java +++ b/admin/src/main/java/com/baiye/modules/scrm/converter/PayOrderConverter.java @@ -1,7 +1,7 @@ -package com.baiye.modules.distribute.converter; +package com.baiye.modules.scrm.converter; -import com.baiye.modules.distribute.entity.PayOrder; -import com.baiye.modules.distribute.vo.PayOrderVO; +import com.baiye.modules.scrm.entity.PayOrder; +import com.baiye.modules.scrm.vo.PayOrderVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/admin/src/main/java/com/baiye/modules/distribute/converter/WeChatAccountConverter.java b/admin/src/main/java/com/baiye/modules/scrm/converter/WeChatAccountConverter.java similarity index 70% rename from admin/src/main/java/com/baiye/modules/distribute/converter/WeChatAccountConverter.java rename to admin/src/main/java/com/baiye/modules/scrm/converter/WeChatAccountConverter.java index 305bdf0..c809a72 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/converter/WeChatAccountConverter.java +++ b/admin/src/main/java/com/baiye/modules/scrm/converter/WeChatAccountConverter.java @@ -1,7 +1,7 @@ -package com.baiye.modules.distribute.converter; +package com.baiye.modules.scrm.converter; -import com.baiye.modules.distribute.entity.WeChatAccount; -import com.baiye.modules.distribute.vo.WeChatAccountVO; +import com.baiye.modules.scrm.entity.WeChatAccount; +import com.baiye.modules.scrm.vo.WeChatAccountVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/AliPayPcDTO.java b/admin/src/main/java/com/baiye/modules/scrm/dto/AliPayPcDTO.java similarity index 94% rename from admin/src/main/java/com/baiye/modules/distribute/dto/AliPayPcDTO.java rename to admin/src/main/java/com/baiye/modules/scrm/dto/AliPayPcDTO.java index 3aedb42..bdc41db 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/AliPayPcDTO.java +++ b/admin/src/main/java/com/baiye/modules/scrm/dto/AliPayPcDTO.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.dto; +package com.baiye.modules.scrm.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/CreateCodeDTO.java b/admin/src/main/java/com/baiye/modules/scrm/dto/CreateCodeDTO.java similarity index 85% rename from admin/src/main/java/com/baiye/modules/distribute/dto/CreateCodeDTO.java rename to admin/src/main/java/com/baiye/modules/scrm/dto/CreateCodeDTO.java index 0ae3b51..acf9725 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/CreateCodeDTO.java +++ b/admin/src/main/java/com/baiye/modules/scrm/dto/CreateCodeDTO.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.dto; +package com.baiye.modules.scrm.dto; import lombok.Data; diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/EquipmentDTO.java b/admin/src/main/java/com/baiye/modules/scrm/dto/EquipmentDTO.java similarity index 90% rename from admin/src/main/java/com/baiye/modules/distribute/dto/EquipmentDTO.java rename to admin/src/main/java/com/baiye/modules/scrm/dto/EquipmentDTO.java index 1b023bf..4e38e71 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/EquipmentDTO.java +++ b/admin/src/main/java/com/baiye/modules/scrm/dto/EquipmentDTO.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.dto; +package com.baiye.modules.scrm.dto; import lombok.*; diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/PushCodeDTO.java b/admin/src/main/java/com/baiye/modules/scrm/dto/PushCodeDTO.java similarity index 81% rename from admin/src/main/java/com/baiye/modules/distribute/dto/PushCodeDTO.java rename to admin/src/main/java/com/baiye/modules/scrm/dto/PushCodeDTO.java index 3edfb2f..95e58bc 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/PushCodeDTO.java +++ b/admin/src/main/java/com/baiye/modules/scrm/dto/PushCodeDTO.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.dto; +package com.baiye.modules.scrm.dto; import lombok.Data; diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/WeChatAccountDTO.java b/admin/src/main/java/com/baiye/modules/scrm/dto/WeChatAccountDTO.java similarity index 89% rename from admin/src/main/java/com/baiye/modules/distribute/dto/WeChatAccountDTO.java rename to admin/src/main/java/com/baiye/modules/scrm/dto/WeChatAccountDTO.java index e216871..2a77f82 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/WeChatAccountDTO.java +++ b/admin/src/main/java/com/baiye/modules/scrm/dto/WeChatAccountDTO.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.dto; +package com.baiye.modules.scrm.dto; import lombok.Data; diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/WeChatAddFriendDTO.java b/admin/src/main/java/com/baiye/modules/scrm/dto/WeChatAddFriendDTO.java similarity index 91% rename from admin/src/main/java/com/baiye/modules/distribute/dto/WeChatAddFriendDTO.java rename to admin/src/main/java/com/baiye/modules/scrm/dto/WeChatAddFriendDTO.java index ed65c3b..e03f709 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/WeChatAddFriendDTO.java +++ b/admin/src/main/java/com/baiye/modules/scrm/dto/WeChatAddFriendDTO.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.dto; +package com.baiye.modules.scrm.dto; import lombok.*; diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/WeChatFriendDTO.java b/admin/src/main/java/com/baiye/modules/scrm/dto/WeChatFriendDTO.java similarity index 94% rename from admin/src/main/java/com/baiye/modules/distribute/dto/WeChatFriendDTO.java rename to admin/src/main/java/com/baiye/modules/scrm/dto/WeChatFriendDTO.java index 6eca382..cb30ad5 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/WeChatFriendDTO.java +++ b/admin/src/main/java/com/baiye/modules/scrm/dto/WeChatFriendDTO.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.dto; +package com.baiye.modules.scrm.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/WeChatStatisticsDTO.java b/admin/src/main/java/com/baiye/modules/scrm/dto/WeChatStatisticsDTO.java similarity index 90% rename from admin/src/main/java/com/baiye/modules/distribute/dto/WeChatStatisticsDTO.java rename to admin/src/main/java/com/baiye/modules/scrm/dto/WeChatStatisticsDTO.java index 634d886..a1c7b93 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/WeChatStatisticsDTO.java +++ b/admin/src/main/java/com/baiye/modules/scrm/dto/WeChatStatisticsDTO.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.dto; +package com.baiye.modules.scrm.dto; import lombok.*; import org.springframework.format.annotation.DateTimeFormat; diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/WeChatUserLoginDTO.java b/admin/src/main/java/com/baiye/modules/scrm/dto/WeChatUserLoginDTO.java similarity index 87% rename from admin/src/main/java/com/baiye/modules/distribute/dto/WeChatUserLoginDTO.java rename to admin/src/main/java/com/baiye/modules/scrm/dto/WeChatUserLoginDTO.java index 7c523f8..b71f78f 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/WeChatUserLoginDTO.java +++ b/admin/src/main/java/com/baiye/modules/scrm/dto/WeChatUserLoginDTO.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.dto; +package com.baiye.modules.scrm.dto; import lombok.Data; diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueEntity.java b/admin/src/main/java/com/baiye/modules/scrm/entity/ClueEntity.java similarity index 98% rename from admin/src/main/java/com/baiye/modules/distribute/entity/ClueEntity.java rename to admin/src/main/java/com/baiye/modules/scrm/entity/ClueEntity.java index 9db956d..ac15aac 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueEntity.java +++ b/admin/src/main/java/com/baiye/modules/scrm/entity/ClueEntity.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.entity; +package com.baiye.modules.scrm.entity; import com.baiye.entity.LogicDeletedBaseEntity; import com.baiye.extend.mybatis.plus.alias.TableAlias; diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/LoginEquipment.java b/admin/src/main/java/com/baiye/modules/scrm/entity/LoginEquipment.java similarity index 96% rename from admin/src/main/java/com/baiye/modules/distribute/entity/LoginEquipment.java rename to admin/src/main/java/com/baiye/modules/scrm/entity/LoginEquipment.java index 1b0aca8..b886028 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/LoginEquipment.java +++ b/admin/src/main/java/com/baiye/modules/scrm/entity/LoginEquipment.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.entity; +package com.baiye.modules.scrm.entity; import com.baiye.entity.BaseEntity; import com.baiye.extend.mybatis.plus.alias.TableAlias; diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/PayOrder.java b/admin/src/main/java/com/baiye/modules/scrm/entity/PayOrder.java similarity index 97% rename from admin/src/main/java/com/baiye/modules/distribute/entity/PayOrder.java rename to admin/src/main/java/com/baiye/modules/scrm/entity/PayOrder.java index 0a4d82b..e282e7e 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/PayOrder.java +++ b/admin/src/main/java/com/baiye/modules/scrm/entity/PayOrder.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.entity; +package com.baiye.modules.scrm.entity; import cn.hutool.core.date.DatePattern; import com.baiye.entity.BaseEntity; diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/WeChatAccount.java b/admin/src/main/java/com/baiye/modules/scrm/entity/WeChatAccount.java similarity index 97% rename from admin/src/main/java/com/baiye/modules/distribute/entity/WeChatAccount.java rename to admin/src/main/java/com/baiye/modules/scrm/entity/WeChatAccount.java index 5224517..edae382 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/WeChatAccount.java +++ b/admin/src/main/java/com/baiye/modules/scrm/entity/WeChatAccount.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.entity; +package com.baiye.modules.scrm.entity; import com.baiye.entity.LogicDeletedBaseEntity; import com.baiye.extend.mybatis.plus.alias.TableAlias; diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/WeChatEquipment.java b/admin/src/main/java/com/baiye/modules/scrm/entity/WeChatEquipment.java similarity index 94% rename from admin/src/main/java/com/baiye/modules/distribute/entity/WeChatEquipment.java rename to admin/src/main/java/com/baiye/modules/scrm/entity/WeChatEquipment.java index 7146408..a68baa5 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/WeChatEquipment.java +++ b/admin/src/main/java/com/baiye/modules/scrm/entity/WeChatEquipment.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.entity; +package com.baiye.modules.scrm.entity; import com.baiye.extend.mybatis.plus.alias.TableAlias; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/WeChatFriedRecord.java b/admin/src/main/java/com/baiye/modules/scrm/entity/WeChatFriedRecord.java similarity index 96% rename from admin/src/main/java/com/baiye/modules/distribute/entity/WeChatFriedRecord.java rename to admin/src/main/java/com/baiye/modules/scrm/entity/WeChatFriedRecord.java index b0ed566..429a094 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/WeChatFriedRecord.java +++ b/admin/src/main/java/com/baiye/modules/scrm/entity/WeChatFriedRecord.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.entity; +package com.baiye.modules.scrm.entity; import com.baiye.extend.mybatis.plus.alias.TableAlias; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/LoginEquipmentMapper.java b/admin/src/main/java/com/baiye/modules/scrm/mapper/LoginEquipmentMapper.java similarity index 89% rename from admin/src/main/java/com/baiye/modules/distribute/mapper/LoginEquipmentMapper.java rename to admin/src/main/java/com/baiye/modules/scrm/mapper/LoginEquipmentMapper.java index 2878408..420fcfa 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/LoginEquipmentMapper.java +++ b/admin/src/main/java/com/baiye/modules/scrm/mapper/LoginEquipmentMapper.java @@ -1,17 +1,16 @@ -package com.baiye.modules.distribute.mapper; +package com.baiye.modules.scrm.mapper; import cn.hutool.core.date.DateTime; -import com.baiye.constant.DefaultNumberConstants; import com.baiye.domain.PageParam; import com.baiye.domain.PageResult; import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.entity.LoginEquipment; -import com.baiye.modules.distribute.entity.WeChatAccount; -import com.baiye.modules.distribute.qo.AccountQo; -import com.baiye.modules.distribute.vo.WeChatAccountVO; -import com.baiye.modules.distribute.vo.WeChatAddFriendVo; +import com.baiye.modules.scrm.entity.LoginEquipment; +import com.baiye.modules.scrm.entity.WeChatAccount; +import com.baiye.modules.scrm.qo.AccountQo; +import com.baiye.modules.scrm.vo.WeChatAccountVO; +import com.baiye.modules.scrm.vo.WeChatAddFriendVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import org.apache.ibatis.annotations.Mapper; diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/PayOrderMapper.java b/admin/src/main/java/com/baiye/modules/scrm/mapper/PayOrderMapper.java similarity index 87% rename from admin/src/main/java/com/baiye/modules/distribute/mapper/PayOrderMapper.java rename to admin/src/main/java/com/baiye/modules/scrm/mapper/PayOrderMapper.java index 0327015..a661298 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/PayOrderMapper.java +++ b/admin/src/main/java/com/baiye/modules/scrm/mapper/PayOrderMapper.java @@ -1,14 +1,14 @@ -package com.baiye.modules.distribute.mapper; +package com.baiye.modules.scrm.mapper; import com.baiye.domain.PageParam; import com.baiye.domain.PageResult; import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.converter.PayOrderConverter; -import com.baiye.modules.distribute.entity.PayOrder; -import com.baiye.modules.distribute.qo.PayOrderQo; -import com.baiye.modules.distribute.vo.PayOrderVO; +import com.baiye.modules.scrm.converter.PayOrderConverter; +import com.baiye.modules.scrm.entity.PayOrder; +import com.baiye.modules.scrm.qo.PayOrderQo; +import com.baiye.modules.scrm.vo.PayOrderVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import org.apache.ibatis.annotations.Mapper; diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatAccountMapper.java b/admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatAccountMapper.java similarity index 92% rename from admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatAccountMapper.java rename to admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatAccountMapper.java index 0dbc2c2..4771d96 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatAccountMapper.java +++ b/admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatAccountMapper.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.mapper; +package com.baiye.modules.scrm.mapper; import cn.hutool.core.collection.CollUtil; import com.baiye.constant.DefaultNumberConstants; @@ -7,10 +7,10 @@ import com.baiye.domain.PageResult; import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.converter.WeChatAccountConverter; -import com.baiye.modules.distribute.entity.WeChatAccount; -import com.baiye.modules.distribute.qo.AccountQo; -import com.baiye.modules.distribute.vo.WeChatAccountVO; +import com.baiye.modules.scrm.converter.WeChatAccountConverter; +import com.baiye.modules.scrm.entity.WeChatAccount; +import com.baiye.modules.scrm.qo.AccountQo; +import com.baiye.modules.scrm.vo.WeChatAccountVO; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatEquipmentMapper.java b/admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatEquipmentMapper.java similarity index 86% rename from admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatEquipmentMapper.java rename to admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatEquipmentMapper.java index a2116d7..e985162 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatEquipmentMapper.java +++ b/admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatEquipmentMapper.java @@ -1,8 +1,8 @@ -package com.baiye.modules.distribute.mapper; +package com.baiye.modules.scrm.mapper; import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.entity.WeChatEquipment; +import com.baiye.modules.scrm.entity.WeChatEquipment; import org.apache.ibatis.annotations.Mapper; /** diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatFriendMapper.java b/admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatFriendMapper.java similarity index 88% rename from admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatFriendMapper.java rename to admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatFriendMapper.java index 5db5262..bcb0c87 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatFriendMapper.java +++ b/admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatFriendMapper.java @@ -1,11 +1,11 @@ -package com.baiye.modules.distribute.mapper; +package com.baiye.modules.scrm.mapper; import cn.hutool.core.date.DateTime; import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.entity.WeChatFriedRecord; -import com.baiye.modules.distribute.vo.StatisticsFriendVO; -import com.baiye.modules.distribute.vo.WeChatAddFriendVo; +import com.baiye.modules.scrm.entity.WeChatFriedRecord; +import com.baiye.modules.scrm.vo.StatisticsFriendVO; +import com.baiye.modules.scrm.vo.WeChatAddFriendVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/AccountQo.java b/admin/src/main/java/com/baiye/modules/scrm/qo/AccountQo.java similarity index 92% rename from admin/src/main/java/com/baiye/modules/distribute/qo/AccountQo.java rename to admin/src/main/java/com/baiye/modules/scrm/qo/AccountQo.java index 09fbb8c..c550e5b 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/AccountQo.java +++ b/admin/src/main/java/com/baiye/modules/scrm/qo/AccountQo.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.qo; +package com.baiye.modules.scrm.qo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/PayOrderQo.java b/admin/src/main/java/com/baiye/modules/scrm/qo/PayOrderQo.java similarity index 91% rename from admin/src/main/java/com/baiye/modules/distribute/qo/PayOrderQo.java rename to admin/src/main/java/com/baiye/modules/scrm/qo/PayOrderQo.java index d3cb6d7..7a38791 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/PayOrderQo.java +++ b/admin/src/main/java/com/baiye/modules/scrm/qo/PayOrderQo.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.qo; +package com.baiye.modules.scrm.qo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/AliPayService.java b/admin/src/main/java/com/baiye/modules/scrm/service/AliPayService.java similarity index 70% rename from admin/src/main/java/com/baiye/modules/distribute/service/AliPayService.java rename to admin/src/main/java/com/baiye/modules/scrm/service/AliPayService.java index 80e4534..f7a4541 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/AliPayService.java +++ b/admin/src/main/java/com/baiye/modules/scrm/service/AliPayService.java @@ -1,14 +1,11 @@ -package com.baiye.modules.distribute.service; +package com.baiye.modules.scrm.service; import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.dto.AliPayPcDTO; -import com.baiye.modules.distribute.entity.PayOrder; -import com.baiye.modules.distribute.entity.WeChatAccount; -import com.baiye.result.R; +import com.baiye.modules.scrm.dto.AliPayPcDTO; +import com.baiye.modules.scrm.entity.PayOrder; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.Map; /** diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/LoginEquipmentService.java b/admin/src/main/java/com/baiye/modules/scrm/service/LoginEquipmentService.java similarity index 83% rename from admin/src/main/java/com/baiye/modules/distribute/service/LoginEquipmentService.java rename to admin/src/main/java/com/baiye/modules/scrm/service/LoginEquipmentService.java index 348f41d..21eb8b9 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/LoginEquipmentService.java +++ b/admin/src/main/java/com/baiye/modules/scrm/service/LoginEquipmentService.java @@ -1,12 +1,12 @@ -package com.baiye.modules.distribute.service; +package com.baiye.modules.scrm.service; import com.baiye.domain.PageParam; import com.baiye.domain.PageResult; import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.entity.LoginEquipment; -import com.baiye.modules.distribute.qo.AccountQo; -import com.baiye.modules.distribute.vo.WeChatAccountVO; -import com.baiye.modules.distribute.vo.WeChatAddFriendVo; +import com.baiye.modules.scrm.entity.LoginEquipment; +import com.baiye.modules.scrm.qo.AccountQo; +import com.baiye.modules.scrm.vo.WeChatAccountVO; +import com.baiye.modules.scrm.vo.WeChatAddFriendVo; import java.util.List; diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/PayOrderService.java b/admin/src/main/java/com/baiye/modules/scrm/service/PayOrderService.java similarity index 67% rename from admin/src/main/java/com/baiye/modules/distribute/service/PayOrderService.java rename to admin/src/main/java/com/baiye/modules/scrm/service/PayOrderService.java index ac82bc5..ec677cc 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/PayOrderService.java +++ b/admin/src/main/java/com/baiye/modules/scrm/service/PayOrderService.java @@ -1,11 +1,11 @@ -package com.baiye.modules.distribute.service; +package com.baiye.modules.scrm.service; import com.baiye.domain.PageParam; import com.baiye.domain.PageResult; import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.entity.PayOrder; -import com.baiye.modules.distribute.qo.PayOrderQo; -import com.baiye.modules.distribute.vo.PayOrderVO; +import com.baiye.modules.scrm.entity.PayOrder; +import com.baiye.modules.scrm.qo.PayOrderQo; +import com.baiye.modules.scrm.vo.PayOrderVO; /** * @author Enzo diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/WeChatService.java b/admin/src/main/java/com/baiye/modules/scrm/service/WeChatService.java similarity index 80% rename from admin/src/main/java/com/baiye/modules/distribute/service/WeChatService.java rename to admin/src/main/java/com/baiye/modules/scrm/service/WeChatService.java index 74c861f..93be2fd 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/WeChatService.java +++ b/admin/src/main/java/com/baiye/modules/scrm/service/WeChatService.java @@ -1,17 +1,17 @@ -package com.baiye.modules.distribute.service; +package com.baiye.modules.scrm.service; import com.baiye.domain.PageParam; import com.baiye.domain.PageResult; import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.dto.CreateCodeDTO; -import com.baiye.modules.distribute.dto.PushCodeDTO; -import com.baiye.modules.distribute.dto.WeChatAddFriendDTO; -import com.baiye.modules.distribute.dto.WeChatUserLoginDTO; -import com.baiye.modules.distribute.entity.WeChatAccount; -import com.baiye.modules.distribute.qo.AccountQo; -import com.baiye.modules.distribute.vo.AccountStatisticsVO; -import com.baiye.modules.distribute.vo.AddFriendVo; -import com.baiye.modules.distribute.vo.WeChatAccountVO; +import com.baiye.modules.scrm.dto.CreateCodeDTO; +import com.baiye.modules.scrm.dto.PushCodeDTO; +import com.baiye.modules.scrm.dto.WeChatAddFriendDTO; +import com.baiye.modules.scrm.dto.WeChatUserLoginDTO; +import com.baiye.modules.scrm.entity.WeChatAccount; +import com.baiye.modules.scrm.qo.AccountQo; +import com.baiye.modules.scrm.vo.AccountStatisticsVO; +import com.baiye.modules.scrm.vo.AddFriendVo; +import com.baiye.modules.scrm.vo.WeChatAccountVO; /** * @author Enzo diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/WechatCallbackService.java b/admin/src/main/java/com/baiye/modules/scrm/service/WechatCallbackService.java similarity index 83% rename from admin/src/main/java/com/baiye/modules/distribute/service/WechatCallbackService.java rename to admin/src/main/java/com/baiye/modules/scrm/service/WechatCallbackService.java index a987486..8189a30 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/WechatCallbackService.java +++ b/admin/src/main/java/com/baiye/modules/scrm/service/WechatCallbackService.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.service; +package com.baiye.modules.scrm.service; import com.baiye.result.WeChatResponse; diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/WechatFriendService.java b/admin/src/main/java/com/baiye/modules/scrm/service/WechatFriendService.java similarity index 71% rename from admin/src/main/java/com/baiye/modules/distribute/service/WechatFriendService.java rename to admin/src/main/java/com/baiye/modules/scrm/service/WechatFriendService.java index f77ed1e..835b25b 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/WechatFriendService.java +++ b/admin/src/main/java/com/baiye/modules/scrm/service/WechatFriendService.java @@ -1,12 +1,12 @@ -package com.baiye.modules.distribute.service; +package com.baiye.modules.scrm.service; import com.baiye.domain.PageResult; import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.dto.WeChatFriendDTO; -import com.baiye.modules.distribute.dto.WeChatStatisticsDTO; -import com.baiye.modules.distribute.entity.WeChatFriedRecord; -import com.baiye.modules.distribute.vo.AddFriendVo; -import com.baiye.modules.distribute.vo.StatisticsFriendVO; +import com.baiye.modules.scrm.dto.WeChatFriendDTO; +import com.baiye.modules.scrm.dto.WeChatStatisticsDTO; +import com.baiye.modules.scrm.entity.WeChatFriedRecord; +import com.baiye.modules.scrm.vo.AddFriendVo; +import com.baiye.modules.scrm.vo.StatisticsFriendVO; import java.util.List; diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/AliPayServiceImpl.java b/admin/src/main/java/com/baiye/modules/scrm/service/impl/AliPayServiceImpl.java similarity index 95% rename from admin/src/main/java/com/baiye/modules/distribute/service/impl/AliPayServiceImpl.java rename to admin/src/main/java/com/baiye/modules/scrm/service/impl/AliPayServiceImpl.java index a393389..29fa841 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/AliPayServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/scrm/service/impl/AliPayServiceImpl.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.service.impl; +package com.baiye.modules.scrm.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; @@ -15,12 +15,12 @@ import com.baiye.constant.PayConstants; import com.baiye.constant.enums.ResponseCode; import com.baiye.exception.BadRequestException; import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.dto.AliPayPcDTO; -import com.baiye.modules.distribute.entity.PayOrder; -import com.baiye.modules.distribute.mapper.PayOrderMapper; -import com.baiye.modules.distribute.service.AliPayService; -import com.baiye.modules.distribute.service.LoginEquipmentService; -import com.baiye.modules.distribute.service.WeChatService; +import com.baiye.modules.scrm.dto.AliPayPcDTO; +import com.baiye.modules.scrm.entity.PayOrder; +import com.baiye.modules.scrm.mapper.PayOrderMapper; +import com.baiye.modules.scrm.service.AliPayService; +import com.baiye.modules.scrm.service.LoginEquipmentService; +import com.baiye.modules.scrm.service.WeChatService; import com.baiye.security.util.SecurityUtils; import com.baiye.system.properties.AliPayProperties; import com.google.common.collect.Maps; diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/LoginEquipmentServiceImpl.java b/admin/src/main/java/com/baiye/modules/scrm/service/impl/LoginEquipmentServiceImpl.java similarity index 89% rename from admin/src/main/java/com/baiye/modules/distribute/service/impl/LoginEquipmentServiceImpl.java rename to admin/src/main/java/com/baiye/modules/scrm/service/impl/LoginEquipmentServiceImpl.java index d8ed376..b80d32d 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/LoginEquipmentServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/scrm/service/impl/LoginEquipmentServiceImpl.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.service.impl; +package com.baiye.modules.scrm.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; @@ -12,13 +12,13 @@ import com.baiye.domain.PageParam; import com.baiye.domain.PageResult; import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.dto.WeChatAccountDTO; -import com.baiye.modules.distribute.entity.LoginEquipment; -import com.baiye.modules.distribute.mapper.LoginEquipmentMapper; -import com.baiye.modules.distribute.qo.AccountQo; -import com.baiye.modules.distribute.service.LoginEquipmentService; -import com.baiye.modules.distribute.vo.WeChatAccountVO; -import com.baiye.modules.distribute.vo.WeChatAddFriendVo; +import com.baiye.modules.scrm.dto.WeChatAccountDTO; +import com.baiye.modules.scrm.entity.LoginEquipment; +import com.baiye.modules.scrm.mapper.LoginEquipmentMapper; +import com.baiye.modules.scrm.qo.AccountQo; +import com.baiye.modules.scrm.service.LoginEquipmentService; +import com.baiye.modules.scrm.vo.WeChatAccountVO; +import com.baiye.modules.scrm.vo.WeChatAddFriendVo; import com.baiye.result.WeChatResponse; import com.baiye.security.util.SecurityUtils; import com.baiye.system.properties.WeChatProperties; diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/PayOrderServiceImpl.java b/admin/src/main/java/com/baiye/modules/scrm/service/impl/PayOrderServiceImpl.java similarity index 68% rename from admin/src/main/java/com/baiye/modules/distribute/service/impl/PayOrderServiceImpl.java rename to admin/src/main/java/com/baiye/modules/scrm/service/impl/PayOrderServiceImpl.java index f7c2c02..ec21c05 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/PayOrderServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/scrm/service/impl/PayOrderServiceImpl.java @@ -1,13 +1,13 @@ -package com.baiye.modules.distribute.service.impl; +package com.baiye.modules.scrm.service.impl; import com.baiye.domain.PageParam; import com.baiye.domain.PageResult; import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.entity.PayOrder; -import com.baiye.modules.distribute.mapper.PayOrderMapper; -import com.baiye.modules.distribute.qo.PayOrderQo; -import com.baiye.modules.distribute.service.PayOrderService; -import com.baiye.modules.distribute.vo.PayOrderVO; +import com.baiye.modules.scrm.entity.PayOrder; +import com.baiye.modules.scrm.mapper.PayOrderMapper; +import com.baiye.modules.scrm.qo.PayOrderQo; +import com.baiye.modules.scrm.service.PayOrderService; +import com.baiye.modules.scrm.vo.PayOrderVO; import com.baiye.security.util.SecurityUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/WeChatServiceImpl.java b/admin/src/main/java/com/baiye/modules/scrm/service/impl/WeChatServiceImpl.java similarity index 94% rename from admin/src/main/java/com/baiye/modules/distribute/service/impl/WeChatServiceImpl.java rename to admin/src/main/java/com/baiye/modules/scrm/service/impl/WeChatServiceImpl.java index ee91bc7..e569c85 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/WeChatServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/scrm/service/impl/WeChatServiceImpl.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.service.impl; +package com.baiye.modules.scrm.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; @@ -19,20 +19,20 @@ import com.baiye.domain.PageResult; import com.baiye.enums.PackageEnum; import com.baiye.exception.BadRequestException; import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.dto.*; -import com.baiye.modules.distribute.entity.LoginEquipment; -import com.baiye.modules.distribute.entity.WeChatAccount; -import com.baiye.modules.distribute.entity.WeChatEquipment; -import com.baiye.modules.distribute.mapper.WeChatAccountMapper; -import com.baiye.modules.distribute.mapper.WeChatEquipmentMapper; -import com.baiye.modules.distribute.qo.AccountQo; -import com.baiye.modules.distribute.service.LoginEquipmentService; -import com.baiye.modules.distribute.service.WeChatService; -import com.baiye.modules.distribute.service.WechatFriendService; -import com.baiye.modules.distribute.vo.AccountStatisticsVO; -import com.baiye.modules.distribute.vo.AddFriendVo; -import com.baiye.modules.distribute.vo.WeChatAccountVO; -import com.baiye.modules.distribute.vo.WeChatAddFriendVo; +import com.baiye.modules.scrm.dto.*; +import com.baiye.modules.scrm.entity.LoginEquipment; +import com.baiye.modules.scrm.entity.WeChatAccount; +import com.baiye.modules.scrm.entity.WeChatEquipment; +import com.baiye.modules.scrm.mapper.WeChatAccountMapper; +import com.baiye.modules.scrm.mapper.WeChatEquipmentMapper; +import com.baiye.modules.scrm.qo.AccountQo; +import com.baiye.modules.scrm.service.LoginEquipmentService; +import com.baiye.modules.scrm.service.WeChatService; +import com.baiye.modules.scrm.service.WechatFriendService; +import com.baiye.modules.scrm.vo.AccountStatisticsVO; +import com.baiye.modules.scrm.vo.AddFriendVo; +import com.baiye.modules.scrm.vo.WeChatAccountVO; +import com.baiye.modules.scrm.vo.WeChatAddFriendVo; import com.baiye.result.WeChatResponse; import com.baiye.security.util.SecurityUtils; import com.baiye.system.properties.WeChatProperties; diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/WechatCallbackServiceImpl.java b/admin/src/main/java/com/baiye/modules/scrm/service/impl/WechatCallbackServiceImpl.java similarity index 84% rename from admin/src/main/java/com/baiye/modules/distribute/service/impl/WechatCallbackServiceImpl.java rename to admin/src/main/java/com/baiye/modules/scrm/service/impl/WechatCallbackServiceImpl.java index 5993de4..d898c4b 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/WechatCallbackServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/scrm/service/impl/WechatCallbackServiceImpl.java @@ -1,17 +1,16 @@ -package com.baiye.modules.distribute.service.impl; +package com.baiye.modules.scrm.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.baiye.constant.DefaultNumberConstants; import com.baiye.constant.WechatCallbackConstant; -import com.baiye.modules.distribute.dto.WeChatFriendDTO; -import com.baiye.modules.distribute.dto.WeChatUserLoginDTO; -import com.baiye.modules.distribute.entity.LoginEquipment; -import com.baiye.modules.distribute.entity.WeChatAccount; -import com.baiye.modules.distribute.service.LoginEquipmentService; -import com.baiye.modules.distribute.service.WeChatService; -import com.baiye.modules.distribute.service.WechatCallbackService; -import com.baiye.modules.distribute.service.WechatFriendService; +import com.baiye.modules.scrm.dto.WeChatFriendDTO; +import com.baiye.modules.scrm.dto.WeChatUserLoginDTO; +import com.baiye.modules.scrm.entity.LoginEquipment; +import com.baiye.modules.scrm.service.LoginEquipmentService; +import com.baiye.modules.scrm.service.WeChatService; +import com.baiye.modules.scrm.service.WechatCallbackService; +import com.baiye.modules.scrm.service.WechatFriendService; import com.baiye.notify.event.StationNotifyPushEvent; import com.baiye.notify.model.domain.AnnouncementNotifyInfo; import com.baiye.result.WeChatResponse; diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/WechatFriendServiceImpl.java b/admin/src/main/java/com/baiye/modules/scrm/service/impl/WechatFriendServiceImpl.java similarity index 90% rename from admin/src/main/java/com/baiye/modules/distribute/service/impl/WechatFriendServiceImpl.java rename to admin/src/main/java/com/baiye/modules/scrm/service/impl/WechatFriendServiceImpl.java index 0a64da6..4f7bad8 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/WechatFriendServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/scrm/service/impl/WechatFriendServiceImpl.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.service.impl; +package com.baiye.modules.scrm.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -10,16 +10,16 @@ import com.baiye.domain.PageResult; import com.baiye.enums.StatisticsEnum; import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.dto.WeChatFriendDTO; -import com.baiye.modules.distribute.dto.WeChatStatisticsDTO; -import com.baiye.modules.distribute.entity.WeChatFriedRecord; -import com.baiye.modules.distribute.mapper.LoginEquipmentMapper; -import com.baiye.modules.distribute.mapper.WeChatFriendMapper; -import com.baiye.modules.distribute.service.WechatFriendService; -import com.baiye.modules.distribute.vo.AddFriendVo; -import com.baiye.modules.distribute.vo.StatisticsFriendVO; -import com.baiye.modules.distribute.vo.WeChatAccountVO; -import com.baiye.modules.distribute.vo.WeChatAddFriendVo; +import com.baiye.modules.scrm.dto.WeChatFriendDTO; +import com.baiye.modules.scrm.dto.WeChatStatisticsDTO; +import com.baiye.modules.scrm.entity.WeChatFriedRecord; +import com.baiye.modules.scrm.mapper.LoginEquipmentMapper; +import com.baiye.modules.scrm.mapper.WeChatFriendMapper; +import com.baiye.modules.scrm.service.WechatFriendService; +import com.baiye.modules.scrm.vo.AddFriendVo; +import com.baiye.modules.scrm.vo.StatisticsFriendVO; +import com.baiye.modules.scrm.vo.WeChatAccountVO; +import com.baiye.modules.scrm.vo.WeChatAddFriendVo; import com.baiye.security.util.SecurityUtils; import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/AccountStatisticsVO.java b/admin/src/main/java/com/baiye/modules/scrm/vo/AccountStatisticsVO.java similarity index 85% rename from admin/src/main/java/com/baiye/modules/distribute/vo/AccountStatisticsVO.java rename to admin/src/main/java/com/baiye/modules/scrm/vo/AccountStatisticsVO.java index 2037309..3aead73 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/AccountStatisticsVO.java +++ b/admin/src/main/java/com/baiye/modules/scrm/vo/AccountStatisticsVO.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.vo; +package com.baiye.modules.scrm.vo; import lombok.Data; diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/AddFriendVo.java b/admin/src/main/java/com/baiye/modules/scrm/vo/AddFriendVo.java similarity index 95% rename from admin/src/main/java/com/baiye/modules/distribute/vo/AddFriendVo.java rename to admin/src/main/java/com/baiye/modules/scrm/vo/AddFriendVo.java index b05d706..0eefde5 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/AddFriendVo.java +++ b/admin/src/main/java/com/baiye/modules/scrm/vo/AddFriendVo.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.vo; +package com.baiye.modules.scrm.vo; import com.baiye.constant.DefaultNumberConstants; import lombok.*; diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/PayOrderVO.java b/admin/src/main/java/com/baiye/modules/scrm/vo/PayOrderVO.java similarity index 95% rename from admin/src/main/java/com/baiye/modules/distribute/vo/PayOrderVO.java rename to admin/src/main/java/com/baiye/modules/scrm/vo/PayOrderVO.java index 1e3c359..3b85962 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/PayOrderVO.java +++ b/admin/src/main/java/com/baiye/modules/scrm/vo/PayOrderVO.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.vo; +package com.baiye.modules.scrm.vo; import cn.hutool.core.date.DatePattern; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/StatisticsFriendVO.java b/admin/src/main/java/com/baiye/modules/scrm/vo/StatisticsFriendVO.java similarity index 80% rename from admin/src/main/java/com/baiye/modules/distribute/vo/StatisticsFriendVO.java rename to admin/src/main/java/com/baiye/modules/scrm/vo/StatisticsFriendVO.java index 9aa058a..3516c4d 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/StatisticsFriendVO.java +++ b/admin/src/main/java/com/baiye/modules/scrm/vo/StatisticsFriendVO.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.vo; +package com.baiye.modules.scrm.vo; import lombok.Data; diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/WeChatAccountVO.java b/admin/src/main/java/com/baiye/modules/scrm/vo/WeChatAccountVO.java similarity index 97% rename from admin/src/main/java/com/baiye/modules/distribute/vo/WeChatAccountVO.java rename to admin/src/main/java/com/baiye/modules/scrm/vo/WeChatAccountVO.java index 78d6839..f9093a2 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/WeChatAccountVO.java +++ b/admin/src/main/java/com/baiye/modules/scrm/vo/WeChatAccountVO.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.vo; +package com.baiye.modules.scrm.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/WeChatAddFriendVo.java b/admin/src/main/java/com/baiye/modules/scrm/vo/WeChatAddFriendVo.java similarity index 82% rename from admin/src/main/java/com/baiye/modules/distribute/vo/WeChatAddFriendVo.java rename to admin/src/main/java/com/baiye/modules/scrm/vo/WeChatAddFriendVo.java index 10e7ec4..f321801 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/WeChatAddFriendVo.java +++ b/admin/src/main/java/com/baiye/modules/scrm/vo/WeChatAddFriendVo.java @@ -1,4 +1,4 @@ -package com.baiye.modules.distribute.vo; +package com.baiye.modules.scrm.vo; import lombok.Data; diff --git a/admin/src/main/java/com/baiye/schedule/AccountTask.java b/admin/src/main/java/com/baiye/schedule/AccountTask.java index c47188b..bf19550 100644 --- a/admin/src/main/java/com/baiye/schedule/AccountTask.java +++ b/admin/src/main/java/com/baiye/schedule/AccountTask.java @@ -6,8 +6,8 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.http.HttpUtil; import com.baiye.constant.DefaultNumberConstants; import com.baiye.constant.WeChatRequestConstants; -import com.baiye.modules.distribute.entity.LoginEquipment; -import com.baiye.modules.distribute.service.LoginEquipmentService; +import com.baiye.modules.scrm.entity.LoginEquipment; +import com.baiye.modules.scrm.service.LoginEquipmentService; import com.baiye.system.properties.WeChatProperties; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/admin/src/main/java/com/baiye/schedule/DynamicController.java b/admin/src/main/java/com/baiye/schedule/DynamicController.java index a2e5690..4fd8869 100644 --- a/admin/src/main/java/com/baiye/schedule/DynamicController.java +++ b/admin/src/main/java/com/baiye/schedule/DynamicController.java @@ -3,6 +3,7 @@ package com.baiye.schedule; import com.baiye.common.job.handler.ElasticJobHandler; import com.baiye.result.R; import com.baiye.schedule.handler.DynamicJob; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -20,10 +21,10 @@ import java.util.Objects; @Slf4j @RestController @RequestMapping("/dynamic") +@RequiredArgsConstructor public class DynamicController { - @Autowired - private ElasticJobHandler elasticJobHandler; + private final ElasticJobHandler elasticJobHandler; /** * 创建动态定时任务 diff --git a/admin/src/main/resources/mapper/LoginEquipmentMapper.xml b/admin/src/main/resources/mapper/LoginEquipmentMapper.xml index 840935b..18877fb 100644 --- a/admin/src/main/resources/mapper/LoginEquipmentMapper.xml +++ b/admin/src/main/resources/mapper/LoginEquipmentMapper.xml @@ -1,6 +1,6 @@ - + wa.username, wa.nickname, @@ -22,7 +22,7 @@ le.expiration_time - SELECT FROM @@ -47,7 +47,7 @@ order by le.id desc - SELECT DATE_FORMAT(f.create_time, '%m-%d') dayStr , count(1) as num , add_friend_type @@ -59,7 +59,7 @@ ORDER BY dayStr - SELECT FROM @@ -68,7 +68,7 @@ LEFT join tb_wechat_account wa on wa.id = we.account_id where le.user_id = #{userId} - SELECT FROM diff --git a/admin/src/main/resources/mapper/WeChatFriendMapper.xml b/admin/src/main/resources/mapper/WeChatFriendMapper.xml index 414333d..9de9713 100644 --- a/admin/src/main/resources/mapper/WeChatFriendMapper.xml +++ b/admin/src/main/resources/mapper/WeChatFriendMapper.xml @@ -1,8 +1,8 @@ - + - SELECT add_friend_type, @@ -15,7 +15,7 @@ add_friend_type - SELECT DATE_FORMAT(create_time, '%m-%d') dayStr , count(1) as num , add_friend_type diff --git a/marketing-scrm-admin/admin-websocket/.flattened-pom.xml b/marketing-scrm-admin/admin-websocket/.flattened-pom.xml index e2e2687..8ebd334 100644 --- a/marketing-scrm-admin/admin-websocket/.flattened-pom.xml +++ b/marketing-scrm-admin/admin-websocket/.flattened-pom.xml @@ -23,7 +23,7 @@ com.baiye - distribute-notify-biz + marketing-scrm-notify-biz 1.0.0 compile diff --git a/marketing-scrm-admin/admin-websocket/pom.xml b/marketing-scrm-admin/admin-websocket/pom.xml index 3cd0d34..652ae60 100644 --- a/marketing-scrm-admin/admin-websocket/pom.xml +++ b/marketing-scrm-admin/admin-websocket/pom.xml @@ -23,7 +23,7 @@ com.baiye - distribute-notify-biz + marketing-scrm-notify-biz 1.0.0 compile diff --git a/marketing-scrm-notify/distribute-notify-biz/pom.xml b/marketing-scrm-notify/marketing-scrm-notify-biz/pom.xml similarity index 93% rename from marketing-scrm-notify/distribute-notify-biz/pom.xml rename to marketing-scrm-notify/marketing-scrm-notify-biz/pom.xml index 973f867..71acd01 100644 --- a/marketing-scrm-notify/distribute-notify-biz/pom.xml +++ b/marketing-scrm-notify/marketing-scrm-notify-biz/pom.xml @@ -17,7 +17,7 @@ com.baiye - distribute-notify-model + marketing-scrm-notify-model ${revision} diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/event/AnnouncementCloseEvent.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/event/AnnouncementCloseEvent.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/event/AnnouncementCloseEvent.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/event/AnnouncementCloseEvent.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/event/NotifyPublishEvent.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/event/NotifyPublishEvent.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/event/NotifyPublishEvent.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/event/NotifyPublishEvent.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/event/StationNotifyPushEvent.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/event/StationNotifyPushEvent.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/event/StationNotifyPushEvent.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/event/StationNotifyPushEvent.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/event/UserAnnouncementReadEvent.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/event/UserAnnouncementReadEvent.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/event/UserAnnouncementReadEvent.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/event/UserAnnouncementReadEvent.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/AbstractNotifyInfoHandler.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/AbstractNotifyInfoHandler.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/AbstractNotifyInfoHandler.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/AbstractNotifyInfoHandler.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/NotifyInfoDelegateHandler.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/NotifyInfoDelegateHandler.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/NotifyInfoDelegateHandler.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/NotifyInfoDelegateHandler.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/NotifyInfoHandler.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/NotifyInfoHandler.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/NotifyInfoHandler.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/NotifyInfoHandler.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/impl/AnnouncementNotifyInfoHandler.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/impl/AnnouncementNotifyInfoHandler.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/impl/AnnouncementNotifyInfoHandler.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/impl/AnnouncementNotifyInfoHandler.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/impl/AnnouncementPushMessage.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/impl/AnnouncementPushMessage.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/impl/AnnouncementPushMessage.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/impl/AnnouncementPushMessage.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/listener/AnnouncementLoginEventListener.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/listener/AnnouncementLoginEventListener.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/listener/AnnouncementLoginEventListener.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/listener/AnnouncementLoginEventListener.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/listener/NotifyPublishEventListener.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/listener/NotifyPublishEventListener.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/listener/NotifyPublishEventListener.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/listener/NotifyPublishEventListener.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/mapper/AnnouncementMapper.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/mapper/AnnouncementMapper.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/mapper/AnnouncementMapper.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/mapper/AnnouncementMapper.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/mapper/UserAnnouncementMapper.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/mapper/UserAnnouncementMapper.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/mapper/UserAnnouncementMapper.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/mapper/UserAnnouncementMapper.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/MailNotifyPusher.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/MailNotifyPusher.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/MailNotifyPusher.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/MailNotifyPusher.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/NotifyPushExecutor.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/NotifyPushExecutor.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/NotifyPushExecutor.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/NotifyPushExecutor.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/NotifyPusher.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/NotifyPusher.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/NotifyPusher.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/NotifyPusher.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/SmsNotifyPusher.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/SmsNotifyPusher.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/SmsNotifyPusher.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/SmsNotifyPusher.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/StationNotifyPusher.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/StationNotifyPusher.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/StationNotifyPusher.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/StationNotifyPusher.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/AllRecipientFilter.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/AllRecipientFilter.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/AllRecipientFilter.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/AllRecipientFilter.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/RecipientFilter.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/RecipientFilter.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/RecipientFilter.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/RecipientFilter.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/RecipientHandler.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/RecipientHandler.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/RecipientHandler.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/RecipientHandler.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyOrganizationRecipientFilter.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyOrganizationRecipientFilter.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyOrganizationRecipientFilter.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyOrganizationRecipientFilter.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyRoleRecipientFilter.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyRoleRecipientFilter.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyRoleRecipientFilter.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyRoleRecipientFilter.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyUserRecipientFilter.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyUserRecipientFilter.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyUserRecipientFilter.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyUserRecipientFilter.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyUserTypeRecipientFilter.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyUserTypeRecipientFilter.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyUserTypeRecipientFilter.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyUserTypeRecipientFilter.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/AnnouncementService.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/AnnouncementService.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/AnnouncementService.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/AnnouncementService.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/UserAnnouncementService.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/UserAnnouncementService.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/UserAnnouncementService.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/UserAnnouncementService.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/impl/AnnouncementServiceImpl.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/impl/AnnouncementServiceImpl.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/impl/AnnouncementServiceImpl.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/impl/AnnouncementServiceImpl.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/impl/UserAnnouncementEventListener.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/impl/UserAnnouncementEventListener.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/impl/UserAnnouncementEventListener.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/impl/UserAnnouncementEventListener.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/impl/UserAnnouncementServiceImpl.java b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/impl/UserAnnouncementServiceImpl.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/impl/UserAnnouncementServiceImpl.java rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/impl/UserAnnouncementServiceImpl.java diff --git a/marketing-scrm-notify/distribute-notify-biz/src/main/resources/mapper/AnnouncementMapper.xml b/marketing-scrm-notify/marketing-scrm-notify-biz/src/main/resources/mapper/AnnouncementMapper.xml similarity index 100% rename from marketing-scrm-notify/distribute-notify-biz/src/main/resources/mapper/AnnouncementMapper.xml rename to marketing-scrm-notify/marketing-scrm-notify-biz/src/main/resources/mapper/AnnouncementMapper.xml diff --git a/marketing-scrm-notify/distribute-notify-controller/pom.xml b/marketing-scrm-notify/marketing-scrm-notify-controller/pom.xml similarity index 89% rename from marketing-scrm-notify/distribute-notify-controller/pom.xml rename to marketing-scrm-notify/marketing-scrm-notify-controller/pom.xml index 5173303..988f738 100644 --- a/marketing-scrm-notify/distribute-notify-controller/pom.xml +++ b/marketing-scrm-notify/marketing-scrm-notify-controller/pom.xml @@ -18,8 +18,8 @@ com.baiye - distribute-notify-biz - ${revision} + marketing-scrm-notify-biz + 1.0.0 diff --git a/marketing-scrm-notify/distribute-notify-controller/src/main/java/com/baiye/notify/controller/AnnouncementController.java b/marketing-scrm-notify/marketing-scrm-notify-controller/src/main/java/com/baiye/notify/controller/AnnouncementController.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-controller/src/main/java/com/baiye/notify/controller/AnnouncementController.java rename to marketing-scrm-notify/marketing-scrm-notify-controller/src/main/java/com/baiye/notify/controller/AnnouncementController.java diff --git a/marketing-scrm-notify/distribute-notify-controller/src/main/java/com/baiye/notify/controller/UserAnnouncementController.java b/marketing-scrm-notify/marketing-scrm-notify-controller/src/main/java/com/baiye/notify/controller/UserAnnouncementController.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-controller/src/main/java/com/baiye/notify/controller/UserAnnouncementController.java rename to marketing-scrm-notify/marketing-scrm-notify-controller/src/main/java/com/baiye/notify/controller/UserAnnouncementController.java diff --git a/marketing-scrm-notify/distribute-notify-model/pom.xml b/marketing-scrm-notify/marketing-scrm-notify-model/pom.xml similarity index 95% rename from marketing-scrm-notify/distribute-notify-model/pom.xml rename to marketing-scrm-notify/marketing-scrm-notify-model/pom.xml index 6af2b52..79889bd 100644 --- a/marketing-scrm-notify/distribute-notify-model/pom.xml +++ b/marketing-scrm-notify/marketing-scrm-notify-model/pom.xml @@ -7,7 +7,7 @@ ${revision} 4.0.0 - distribute-notify-model + marketing-scrm-notify-model diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/converter/AnnouncementConverter.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/converter/AnnouncementConverter.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/converter/AnnouncementConverter.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/converter/AnnouncementConverter.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/converter/NotifyInfoConverter.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/converter/NotifyInfoConverter.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/converter/NotifyInfoConverter.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/converter/NotifyInfoConverter.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/converter/UserAnnouncementConverter.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/converter/UserAnnouncementConverter.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/converter/UserAnnouncementConverter.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/converter/UserAnnouncementConverter.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/enums/AnnouncementStatusEnum.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/enums/AnnouncementStatusEnum.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/enums/AnnouncementStatusEnum.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/enums/AnnouncementStatusEnum.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/enums/NotifyChannelEnum.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/enums/NotifyChannelEnum.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/enums/NotifyChannelEnum.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/enums/NotifyChannelEnum.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/enums/NotifyRecipientFilterTypeEnum.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/enums/NotifyRecipientFilterTypeEnum.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/enums/NotifyRecipientFilterTypeEnum.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/enums/NotifyRecipientFilterTypeEnum.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/enums/UserAnnouncementStateEnum.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/enums/UserAnnouncementStateEnum.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/enums/UserAnnouncementStateEnum.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/enums/UserAnnouncementStateEnum.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/domain/AnnouncementNotifyInfo.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/domain/AnnouncementNotifyInfo.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/domain/AnnouncementNotifyInfo.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/domain/AnnouncementNotifyInfo.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/domain/NotifyInfo.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/domain/NotifyInfo.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/domain/NotifyInfo.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/domain/NotifyInfo.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/dto/AnnouncementDTO.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/dto/AnnouncementDTO.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/dto/AnnouncementDTO.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/dto/AnnouncementDTO.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/entity/Announcement.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/entity/Announcement.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/entity/Announcement.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/entity/Announcement.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/entity/UserAnnouncement.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/entity/UserAnnouncement.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/entity/UserAnnouncement.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/entity/UserAnnouncement.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/qo/AnnouncementQO.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/qo/AnnouncementQO.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/qo/AnnouncementQO.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/qo/AnnouncementQO.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/qo/UserAnnouncementQO.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/qo/UserAnnouncementQO.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/qo/UserAnnouncementQO.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/qo/UserAnnouncementQO.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/vo/AnnouncementPageVO.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/vo/AnnouncementPageVO.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/vo/AnnouncementPageVO.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/vo/AnnouncementPageVO.java diff --git a/marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/vo/UserAnnouncementPageVO.java b/marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/vo/UserAnnouncementPageVO.java similarity index 100% rename from marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/vo/UserAnnouncementPageVO.java rename to marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/vo/UserAnnouncementPageVO.java diff --git a/marketing-scrm-notify/pom.xml b/marketing-scrm-notify/pom.xml index 5b94692..1f3813d 100644 --- a/marketing-scrm-notify/pom.xml +++ b/marketing-scrm-notify/pom.xml @@ -11,8 +11,8 @@ pom - distribute-notify-biz - distribute-notify-controller - distribute-notify-model + marketing-scrm-notify-biz + marketing-scrm-notify-controller + marketing-scrm-notify-model