1.同步future

@@ -23,16 +23,10 @@
 
         <dependency>
             <groupId>com.topdraw</groupId>
-            <artifactId>cronos-system</artifactId>
-            <version>${cronos.version}</version>
+            <artifactId>core-service</artifactId>
+            <version>1.0.0</version>
         </dependency>
 
-        <!--<dependency>
-            <groupId>com.topdraw</groupId>
-            <artifactId>code-generator</artifactId>
-            <version>3.1.0</version>
-        </dependency>
--->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-cache</artifactId>

 package com.topdraw;
 
 
-import com.topdraw.utils.SpringContextHolder;
+import com.topdraw.base.modules.utils.SpringContextHolder;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;

 package com.topdraw.business.module.contact.vis.rest;
 
-import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
+import com.topdraw.base.modules.common.ResultInfo;
+import com.topdraw.base.modules.exception.BadRequestException;
 import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.business.module.contact.vis.domain.ActivityAddress;
 import com.topdraw.business.module.contact.vis.service.ActivityAddressService;
-import com.topdraw.exception.BadRequestException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.Assert;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;

 package com.topdraw.business.module.contact.vis.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.contact.vis.domain.ActivityAddress;
 import com.topdraw.util.TimestampUtil;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.contact.vis.repository.ActivityAddressRepository;
 import com.topdraw.business.module.contact.vis.service.ActivityAddressService;
 import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO;
 import com.topdraw.business.module.contact.vis.service.mapper.ActivityAddressMapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CachePut;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

 package com.topdraw.business.module.contact.vis.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.contact.vis.domain.ActivityAddress;
 import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.coupon.history.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
 import com.topdraw.business.module.coupon.history.domain.CouponHistoryBuilder;
 import com.topdraw.util.LocalDateTimeUtil;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.coupon.history.repository.CouponHistoryRepository;
 import com.topdraw.business.module.coupon.history.service.CouponHistoryService;
 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryDTO;
@@ -13,11 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.sql.Date;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 
 /**
  * @author XiangHan

 package com.topdraw.business.module.coupon.history.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryDTO;
 import org.mapstruct.Mapper;

@@ -7,13 +7,13 @@ import com.topdraw.business.module.coupon.repository.CouponRepository;
 import com.topdraw.business.module.coupon.service.CouponService;
 import com.topdraw.business.module.coupon.service.dto.CouponDTO;
 import com.topdraw.business.module.coupon.service.mapper.CouponMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
-import com.topdraw.utils.StringUtils;
 
 
 /**

 package com.topdraw.business.module.coupon.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.coupon.domain.Coupon;
 import com.topdraw.business.module.coupon.service.dto.CouponDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.exp.detail.service.impl;
 
+import com.topdraw.base.modules.utils.RedisUtils;
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
 import com.topdraw.business.module.exp.detail.domain.ExpDetailBuilder;
-import com.topdraw.utils.RedisUtils;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.exp.detail.repository.ExpDetailRepository;
 import com.topdraw.business.module.exp.detail.service.ExpDetailService;
 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailDTO;
 import com.topdraw.business.module.exp.detail.service.mapper.ExpDetailMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.util.Assert;
-import com.topdraw.utils.StringUtils;
 
 
 /**

 package com.topdraw.business.module.exp.detail.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.exp.history.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.exp.history.domain.ExpHistory;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.exp.history.repository.ExpHistoryRepository;
 import com.topdraw.business.module.exp.history.service.ExpHistoryService;
 import com.topdraw.business.module.exp.history.service.dto.ExpHistoryDTO;
 import com.topdraw.business.module.exp.history.service.mapper.ExpHistoryMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import com.topdraw.utils.StringUtils;
 
 
 /**

 package com.topdraw.business.module.exp.history.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.exp.history.domain.ExpHistory;
 import com.topdraw.business.module.exp.history.service.dto.ExpHistoryDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.member.address.rest;
 
-import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.common.validated.CreateGroup;
 import com.topdraw.business.module.common.validated.UpdateGroup;
 import com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO;
-import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
 import com.topdraw.business.process.service.member.MemberAddressOperationService;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.business.module.member.address.domain.MemberAddress;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

 package com.topdraw.business.module.member.address.service.impl;
 
+import com.topdraw.base.modules.utils.RedisUtils;
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.member.address.domain.MemberAddress;
 import com.topdraw.business.module.member.address.domain.MemberAddressBuilder;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
-import com.topdraw.utils.RedisUtils;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.member.address.repository.MemberAddressRepository;
 import com.topdraw.business.module.member.address.service.MemberAddressService;
 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;

 package com.topdraw.business.module.member.address.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.member.address.domain.MemberAddress;
 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.member.group.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.member.group.domain.Group;
 import com.topdraw.business.module.member.group.repository.GroupRepository;
 import com.topdraw.business.module.member.group.service.GroupService;
 import com.topdraw.business.module.member.group.service.dto.GroupDTO;
 import com.topdraw.business.module.member.group.service.mapper.GroupMapper;
-import com.topdraw.utils.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

 package com.topdraw.business.module.member.group.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.member.group.domain.MemberGroup;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.member.group.repository.MemberGroupRepository;
 import com.topdraw.business.module.member.group.service.MemberGroupService;
 import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO;

 package com.topdraw.business.module.member.group.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.member.group.domain.Group;
 import com.topdraw.business.module.member.group.service.dto.GroupDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.member.group.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.member.group.domain.MemberGroup;
 import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.member.level.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.member.level.domain.MemberLevel;
 import com.topdraw.business.RedisKeyConstants;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.member.level.repository.MemberLevelRepository;
 import com.topdraw.business.module.member.level.service.MemberLevelService;
 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO;
 import com.topdraw.business.module.member.level.service.mapper.MemberLevelMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import com.topdraw.utils.StringUtils;
 
 /**
  * @author XiangHan

 package com.topdraw.business.module.member.level.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.member.level.domain.MemberLevel;
 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.member.profile.rest;
 
-import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.common.validated.CreateGroup;
 import com.topdraw.business.module.common.validated.UpdateGroup;
 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
 import com.topdraw.business.process.service.member.MemberProfileOperationService;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.business.module.member.profile.domain.MemberProfile;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

 package com.topdraw.business.module.member.profile.service.impl;
 
+import com.topdraw.base.modules.utils.RedisUtils;
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.profile.domain.MemberProfile;
 import com.topdraw.business.module.member.profile.domain.MemberProfileBuilder;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
-import com.topdraw.util.Base64Util;
 import com.topdraw.util.RegexUtil;
-import com.topdraw.utils.RedisUtils;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.member.profile.repository.MemberProfileRepository;
 import com.topdraw.business.module.member.profile.service.MemberProfileService;
 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;

 package com.topdraw.business.module.member.profile.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.member.profile.domain.MemberProfile;
 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.member.relatedinfo.rest;
 
-import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.common.validated.CreateGroup;
 import com.topdraw.business.module.common.validated.UpdateGroup;
 import com.topdraw.business.module.member.relatedinfo.service.dto.BasicMemberRelatedInfoDTO;
 import com.topdraw.business.process.service.member.MemberRelatedInfoOperationService;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

 package com.topdraw.business.module.member.relatedinfo.service.impl;
 
+import com.topdraw.base.modules.exception.BadRequestException;
+import com.topdraw.base.modules.utils.RedisUtils;
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfoBuilder;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
-import com.topdraw.exception.BadRequestException;
 import com.topdraw.exception.GlobeExceptionMsg;
 import com.topdraw.util.Base64Util;
-import com.topdraw.utils.RedisUtils;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.member.relatedinfo.repository.MemberRelatedInfoRepository;
 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService;
 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;

 package com.topdraw.business.module.member.relatedinfo.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.member.rest;
 
-import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.common.validated.CreateGroup;
 import com.topdraw.business.module.common.validated.UpdateGroup;
 import com.topdraw.business.module.member.domain.Member;
@@ -8,7 +9,6 @@ import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.module.user.iptv.domain.UserTv;
 import com.topdraw.business.process.service.member.MemberOperationService;
 import com.topdraw.business.process.service.UserOperationService;
-import com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +19,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * @author XiangHan

@@ -2,6 +2,8 @@ package com.topdraw.business.module.member.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.topdraw.base.modules.exception.BadRequestException;
+import com.topdraw.base.modules.utils.RedisUtils;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.domain.MemberBuilder;
 import com.topdraw.business.module.member.domain.MemberSimple;
@@ -16,9 +18,7 @@ import com.topdraw.business.module.member.service.dto.MemberSimpleDTO;
 import com.topdraw.business.module.member.service.mapper.MemberMapper;
 import com.topdraw.business.module.member.service.mapper.MemberSimpleMapper;
 import com.topdraw.business.RedisKeyConstants;
-import com.topdraw.exception.BadRequestException;
 import com.topdraw.exception.GlobeExceptionMsg;
-import com.topdraw.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

 package com.topdraw.business.module.member.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.member.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.member.domain.MemberSimple;
 import com.topdraw.business.module.member.service.dto.MemberSimpleDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.member.viphistory.service.impl;
 
 
-import com.topdraw.aspect.AsyncMqSend;
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
@@ -12,7 +12,6 @@ import com.topdraw.business.module.member.viphistory.service.MemberVipHistorySer
 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO;
 import com.topdraw.business.module.member.viphistory.service.mapper.MemberVipHistoryMapper;
 import com.topdraw.util.TimestampUtil;
-import com.topdraw.utils.ValidationUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -90,8 +89,7 @@ public class MemberVipHistoryServiceImpl implements MemberVipHistoryService {
     @Override
     public MemberVipHistory findByTime(Long memberId, Timestamp nowTime) {
         LocalDateTime localDateTime = TimestampUtil.timestamp2LocalDateTime(nowTime);
-        MemberVipHistory memberVipHistory = this.memberVipHistoryRepository.findByTime(memberId, localDateTime).orElseGet(MemberVipHistory::new);
-        return memberVipHistory;
+        return this.memberVipHistoryRepository.findByTime(memberId, localDateTime).orElseGet(MemberVipHistory::new);
     }
 
     private MemberDTO checkMember(MemberVipHistory resources){

 package com.topdraw.business.module.member.viphistory.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.points.available.service.dto;
 
+import com.topdraw.base.modules.annotation.Query;
 import lombok.Data;
-import com.topdraw.annotation.Query;
 
 import java.sql.Timestamp;
 

 package com.topdraw.business.module.points.available.service.impl;
 
+import com.topdraw.base.modules.utils.RedisUtils;
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.points.available.domain.PointsAvailable;
-import com.topdraw.utils.RedisUtils;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.points.available.repository.PointsAvailableRepository;
 import com.topdraw.business.module.points.available.service.PointsAvailableService;
 import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO;
 import com.topdraw.business.module.points.available.service.mapper.PointsAvailableMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.util.Assert;
-import com.topdraw.utils.StringUtils;
 
 import java.sql.Timestamp;
-import java.time.LocalDateTime;
 import java.util.*;
 
 /**

 package com.topdraw.business.module.points.available.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.points.available.domain.PointsAvailable;
 import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.points.detail.detailhistory.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.points.detail.detailhistory.domain.PointsDetailHistory;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.points.detail.detailhistory.repository.PointsDetailHistoryRepository;
 import com.topdraw.business.module.points.detail.detailhistory.service.PointsDetailHistoryService;
 import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO;
 import com.topdraw.business.module.points.detail.detailhistory.service.mapper.PointsDetailHistoryMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.util.Assert;
-import com.topdraw.utils.StringUtils;
 
 /**
  * @author XiangHan

 package com.topdraw.business.module.points.detail.detailhistory.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.points.detail.detailhistory.domain.PointsDetailHistory;
 import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.points.detail.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.points.detail.domain.PointsDetail;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.points.detail.repository.PointsDetailRepository;
 import com.topdraw.business.module.points.detail.service.PointsDetailService;
 import com.topdraw.business.module.points.detail.service.dto.PointsDetailDTO;
 import com.topdraw.business.module.points.detail.service.mapper.PointsDetailMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.util.Assert;
-import com.topdraw.utils.StringUtils;
 
 import java.util.List;
 import java.util.Objects;

 package com.topdraw.business.module.points.detail.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.points.detail.domain.PointsDetail;
 import com.topdraw.business.module.points.detail.service.dto.PointsDetailDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.points.service.impl;
 
+import com.topdraw.base.modules.utils.RedisUtils;
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.points.domain.Points;
-import com.topdraw.utils.RedisUtils;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.points.repository.PointsRepository;
 import com.topdraw.business.module.points.service.PointsService;
 import com.topdraw.business.module.points.service.dto.PointsDTO;

 package com.topdraw.business.module.points.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.points.domain.Points;
 import com.topdraw.business.module.points.service.dto.PointsDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.rights.history.service.dto;
 
-import com.topdraw.annotation.Query;
+import com.topdraw.base.modules.annotation.Query;
 import lombok.Data;
 
 import java.sql.Timestamp;

 package com.topdraw.business.module.rights.history.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.module.rights.history.domain.RightsHistory;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.rights.history.repository.RightsHistoryRepository;
 import com.topdraw.business.module.rights.history.service.RightsHistoryService;
 import com.topdraw.business.module.rights.history.service.dto.RightsHistoryDTO;
-import com.topdraw.business.module.rights.history.service.dto.RightsHistoryQueryCriteria;
 import com.topdraw.business.module.rights.history.service.mapper.RightsHistoryMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,8 +36,7 @@ public class RightsHistoryServiceImpl implements RightsHistoryService {
     @Override
     public List<RightsHistoryDTO> findByMemberIdOrMemberCode(Long memberId, String memberCode) {
         MemberDTO memberDTO = this.memberService.checkMember(memberId, memberCode);
-        List<RightsHistoryDTO> rightsHistoryDTOList = this.rightsHistoryRepository.findByMemberId(memberDTO.getId());
-        return rightsHistoryDTOList;
+        return this.rightsHistoryRepository.findByMemberId(memberDTO.getId());
     }
 
     @Override

 package com.topdraw.business.module.rights.history.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.rights.history.domain.RightsHistory;
 import com.topdraw.business.module.rights.history.service.dto.RightsHistoryDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.rights.permanentrights.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.rights.permanentrights.domain.PermanentRights;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.rights.permanentrights.repository.PermanentRightsRepository;
 import com.topdraw.business.module.rights.permanentrights.service.PermanentRightsService;
 import com.topdraw.business.module.rights.permanentrights.service.dto.PermanentRightsDTO;
 import com.topdraw.business.module.rights.permanentrights.service.mapper.PermanentRightsMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import com.topdraw.utils.StringUtils;
 
 /**
  * @author XiangHan

 package com.topdraw.business.module.rights.permanentrights.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.rights.permanentrights.domain.PermanentRights;
 import com.topdraw.business.module.rights.permanentrights.service.dto.PermanentRightsDTO;
 import org.mapstruct.Mapper;

@@ -2,11 +2,11 @@ package com.topdraw.business.module.rights.service.impl;
 
 import com.topdraw.business.module.rights.domain.Rights;
 import com.topdraw.business.RedisKeyConstants;
-import com.topdraw.utils.*;
 import com.topdraw.business.module.rights.repository.RightsRepository;
 import com.topdraw.business.module.rights.service.RightsService;
 import com.topdraw.business.module.rights.service.dto.RightsDTO;
 import com.topdraw.business.module.rights.service.mapper.RightsMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;

 package com.topdraw.business.module.rights.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.rights.domain.Rights;
 import com.topdraw.business.module.rights.service.dto.RightsDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.task.attribute.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.task.attribute.domain.TaskAttr;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.task.attribute.repository.TaskAttrRepository;
 import com.topdraw.business.module.task.attribute.service.TaskAttrService;
 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO;

 package com.topdraw.business.module.task.attribute.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.task.attribute.domain.TaskAttr;
 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.task.progress.service.impl;
 
+import com.topdraw.base.modules.utils.RedisUtils;
 import com.topdraw.business.module.task.progress.domain.TrTaskProgress;
 import com.topdraw.business.RedisKeyConstants;
-import com.topdraw.utils.RedisUtils;
 import com.topdraw.business.module.task.progress.repository.TrTaskProgressRepository;
 import com.topdraw.business.module.task.progress.service.TrTaskProgressService;
 import com.topdraw.business.module.task.progress.service.dto.TrTaskProgressDTO;
@@ -44,14 +44,12 @@ public class TrTaskProgressServiceImpl implements TrTaskProgressService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-//    @CachePut(cacheNames = RedisKeyConstants.cacheTaskProcessByMemberId, key = "#resources.memberId+':'+#resources.taskId+':'+#date", unless = "#result == null ")
     public TrTaskProgress create(TrTaskProgress resources, String date) {
         return this.trTaskProgressRepository.save(resources);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-//    @CachePut(cacheNames = RedisKeyConstants.cacheTaskProcessByMemberId, key = "#resources.memberId+':'+#resources.taskId+':'+#date", unless = "#result == null ")
     public TrTaskProgress update(TrTaskProgress resources, String date) {
         return this.trTaskProgressRepository.save(resources);
     }

 package com.topdraw.business.module.task.progress.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.task.progress.domain.TrTaskProgress;
 import com.topdraw.business.module.task.progress.service.dto.TrTaskProgressDTO;
 import org.mapstruct.Mapper;

@@ -3,6 +3,7 @@ package com.topdraw.business.module.task.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.topdraw.base.modules.utils.RedisUtils;
 import com.topdraw.business.module.task.attribute.service.TaskAttrService;
 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO;
 import com.topdraw.business.module.task.domain.Task;
@@ -11,7 +12,6 @@ import com.topdraw.business.module.task.service.TaskService;
 import com.topdraw.business.module.task.service.dto.TaskDTO;
 import com.topdraw.business.module.task.service.mapper.TaskMapper;
 import com.topdraw.business.RedisKeyConstants;
-import com.topdraw.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 package com.topdraw.business.module.task.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.task.domain.Task;
 import com.topdraw.business.module.task.service.dto.TaskDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.task.template.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.task.template.domain.TaskTemplate;
 import com.topdraw.business.module.task.template.domain.TaskTemplateBuilder;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.task.template.repository.TaskTemplateRepository;
 import com.topdraw.business.module.task.template.service.TaskTemplateService;
 import com.topdraw.business.module.task.template.service.dto.TaskTemplateDTO;
 import com.topdraw.business.module.task.template.service.mapper.TaskTemplateMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.util.Assert;
-import com.topdraw.utils.StringUtils;
 
 import java.util.List;
 import java.util.Objects;
@@ -85,8 +85,7 @@ public class TaskTemplateServiceImpl implements TaskTemplateService {
 
     @Override
     public Long countByCodeAndType(TaskTemplate taskTemplate) {
-        Long count = this.taskTemplateRepository.countByCodeAndType(taskTemplate.getCode(), taskTemplate.getType());
-        return count;
+        return this.taskTemplateRepository.countByCodeAndType(taskTemplate.getCode(), taskTemplate.getType());
     }
 
 }

 package com.topdraw.business.module.task.template.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.task.template.domain.TaskTemplate;
 import com.topdraw.business.module.task.template.service.dto.TaskTemplateDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.user.app.rest;
 
-import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.user.app.domain.UserApp;
 import com.topdraw.business.module.user.app.domain.UserAppBind;
 import com.topdraw.business.module.user.app.service.UserAppBindService;
@@ -10,7 +11,6 @@ import com.topdraw.business.module.vis.hainan.apple.domain.VisUserApple;
 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq;
 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo;
 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.business.module.user.app.service.UserAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -121,8 +121,7 @@ public class UserAppController {
             return ResultInfo.failure("修改app账号最后登录时间、昵称和头像和用户名失败,参数错误,app账号不得为空");
         }
 
-        boolean result = this.userAppService.updateAppLastActiveTimeAndNicknameAndHeadImgById(resources);
-        return ResultInfo.success(result);
+        return ResultInfo.success(this.userAppService.updateAppLastActiveTimeAndNicknameAndHeadImgById(resources));
     }
 
     @PostMapping(value = "/updateAppLastActiveTimeAndNicknameAndHeadImg")
@@ -136,8 +135,7 @@ public class UserAppController {
             return ResultInfo.failure("修改app账号密码失败,参数错误,app账号不得为空");
         }
 
-        boolean result = this.userAppService.updateAppLastActiveTimeAndNicknameAndHeadImg(resources);
-        return ResultInfo.success(result);
+        return ResultInfo.success(this.userAppService.updateAppLastActiveTimeAndNicknameAndHeadImg(resources));
     }
 
     @PostMapping(value = "/updateAppPasswordByUsername")
@@ -163,8 +161,7 @@ public class UserAppController {
 //            return ResultInfo.failure("密码必须包含大小写字母和数字的组合，不能使用特殊字符，长度在 8-25 之间");
 //        }
 
-        boolean result = this.userAppService.updatePasswordByUsername(resources);
-        return ResultInfo.success(result);
+        return ResultInfo.success(this.userAppService.updatePasswordByUsername(resources));
     }
 
     @PostMapping(value = "/updateLastActiveTime")
@@ -177,8 +174,7 @@ public class UserAppController {
             log.error("修改app账号最新登录时间失败,参数错误,app账号不得为空,[updateLastActiveTime#{}]", resources);
             return ResultInfo.failure("修改app账号最新登录时间失败,参数错误,app账号不得为空");
         }
-        boolean result = this.userAppService.updateLastActiveTime(resources);
-        return ResultInfo.success(result);
+        return ResultInfo.success(this.userAppService.updateLastActiveTime(resources));
     }
 
     @PostMapping(value = "/saveThirdAccount")
@@ -198,8 +194,7 @@ public class UserAppController {
             resources.setUserAppId(id);
         }
 
-        UserAppBindDTO userAppBindDTO = this.userAppBindService.create(resources);
-        return ResultInfo.success(userAppBindDTO);
+        return ResultInfo.success(this.userAppBindService.create(resources));
     }
 
     @PostMapping(value = "/updateValidStatusAndUserAppIdAndNickname")
@@ -229,8 +224,7 @@ public class UserAppController {
             return ResultInfo.failure("修改第三方账号, 参数错误, app账号不得为空");
         }
 
-        boolean result = this.userAppBindService.updateValidStatusAndUserAppIdAndNickname(resources);
-        return ResultInfo.success(result);
+        return ResultInfo.success(this.userAppBindService.updateValidStatusAndUserAppIdAndNickname(resources));
     }
 
     @PostMapping(value = "/updateThirdAccountNickname")
@@ -251,7 +245,6 @@ public class UserAppController {
             return ResultInfo.failure("修改第三方账号昵称, 参数错误, 昵称不得为空");
         }
 
-        boolean result = this.userAppBindService.updateThirdAccountNickname(resources);
-        return ResultInfo.success(result);
+        return ResultInfo.success(this.userAppBindService.updateThirdAccountNickname(resources));
     }
 }

 package com.topdraw.business.module.user.app.service;
 
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.user.app.domain.UserApp;
 import com.topdraw.business.module.user.app.domain.UserAppBind;
 import com.topdraw.business.module.user.app.service.dto.UserAppDTO;
@@ -8,7 +9,6 @@ import com.topdraw.business.module.vis.hainan.apple.domain.VisUserApple;
 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq;
 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo;
 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin;
-import com.topdraw.common.ResultInfo;
 
 /**
  * @author XiangHan

 package com.topdraw.business.module.user.app.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.user.app.domain.UserAppBind;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.user.app.repository.UserAppBindRepository;
 import com.topdraw.business.module.user.app.service.UserAppBindService;
 import com.topdraw.business.module.user.app.service.dto.UserAppBindDTO;

 package com.topdraw.business.module.user.app.service.impl;
 
 import com.topdraw.aspect.AsyncMqSend;
+import com.topdraw.base.modules.common.ResultInfo;
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.domain.MemberBuilder;
 import com.topdraw.business.module.member.domain.MemberTypeConstant;
@@ -22,16 +24,14 @@ import com.topdraw.business.module.vis.hainan.apple.service.VisUserAppleService;
 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq;
 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo;
 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.util.Base64Util;
 import com.topdraw.util.TimestampUtil;
-import com.topdraw.utils.StringUtils;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.user.app.repository.UserAppRepository;
 import com.topdraw.business.module.user.app.service.UserAppService;
 import com.topdraw.business.module.user.app.service.dto.UserAppDTO;
 import com.topdraw.business.module.user.app.service.mapper.UserAppMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

 package com.topdraw.business.module.user.app.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.user.app.domain.UserAppBind;
 import com.topdraw.business.module.user.app.service.dto.UserAppBindDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.user.app.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.user.app.domain.UserApp;
 import com.topdraw.business.module.user.app.service.dto.UserAppDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.user.app.service.mapper;
 
-import com.topdraw.base.BaseMapper;
-import com.topdraw.business.module.user.app.domain.UserApp;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.user.app.domain.UserAppSimple;
-import com.topdraw.business.module.user.app.service.dto.UserAppDTO;
 import com.topdraw.business.module.user.app.service.dto.UserAppSimpleDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;

 package com.topdraw.business.module.user.iptv.domain;
 
-import com.topdraw.business.module.member.domain.Member;
-import com.topdraw.exception.BadRequestException;
 import com.topdraw.exception.GlobeExceptionMsg;
 import com.topdraw.util.TimestampUtil;
 import org.apache.commons.lang3.StringUtils;

 package com.topdraw.business.module.user.iptv.growreport.rest;
 
-import com.topdraw.aop.log.Log;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.business.module.user.iptv.growreport.domain.GrowthReport;
 import com.topdraw.business.module.user.iptv.growreport.service.GrowthReportService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
@@ -22,7 +20,6 @@ public class GrowthReportController {
     @Autowired
     private GrowthReportService GrowthReportService;
 
-    @Log
     @PostMapping
     @ApiOperation("新增GrowthReport")
     public ResultInfo create(@Validated @RequestBody GrowthReport resources) {
@@ -30,7 +27,6 @@ public class GrowthReportController {
         return ResultInfo.success();
     }
 
-    @Log
     @PutMapping
     @ApiOperation("修改GrowthReport")
     public ResultInfo update(@Validated @RequestBody GrowthReport resources) {
@@ -39,7 +35,6 @@ public class GrowthReportController {
     }
 
 
-    @Log
     @DeleteMapping(value = "/{id}")
     @ApiOperation("删除GrowthReport")
     public ResultInfo delete(@PathVariable Long id) {

 package com.topdraw.business.module.user.iptv.growreport.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.user.iptv.growreport.domain.GrowthReport;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.user.iptv.growreport.repository.GrowthReportRepository;
 import com.topdraw.business.module.user.iptv.growreport.service.GrowthReportService;
 import com.topdraw.business.module.user.iptv.growreport.service.dto.GrowthReportDTO;
@@ -13,14 +13,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.dao.EmptyResultDataAccessException;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.util.Assert;
-import com.topdraw.utils.PageUtil;
-import com.topdraw.utils.QueryHelp;
 
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author XiangHan

 package com.topdraw.business.module.user.iptv.growreport.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.user.iptv.growreport.domain.GrowthReport;
 import com.topdraw.business.module.user.iptv.growreport.service.dto.GrowthReportDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.user.iptv.rest;
 
-import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
+import com.topdraw.base.modules.common.ResultInfo;
+import com.topdraw.base.modules.exception.BadRequestException;
 import com.topdraw.business.module.user.iptv.domain.UserTv;
 import com.topdraw.business.module.user.iptv.service.UserTvService;
 import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO;
-import com.topdraw.common.ResultInfo;
-import com.topdraw.exception.BadRequestException;
 import com.topdraw.exception.GlobeExceptionMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

@@ -3,6 +3,9 @@ package com.topdraw.business.module.user.iptv.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.topdraw.aspect.AsyncMqSend;
+import com.topdraw.base.modules.exception.EntityNotFoundException;
+import com.topdraw.base.modules.utils.RedisUtils;
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.module.user.iptv.domain.UserTv;
@@ -11,10 +14,7 @@ import com.topdraw.business.module.user.iptv.repository.UserTvSimpleRepository;
 import com.topdraw.business.module.user.iptv.service.dto.UserTvSimpleDTO;
 import com.topdraw.business.module.user.iptv.service.mapper.UserTvSimpleMapper;
 import com.topdraw.business.RedisKeyConstants;
-import com.topdraw.exception.EntityNotFoundException;
 import com.topdraw.exception.GlobeExceptionMsg;
-import com.topdraw.utils.RedisUtils;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.user.iptv.repository.UserTvRepository;
 import com.topdraw.business.module.user.iptv.service.UserTvService;
 import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO;

 package com.topdraw.business.module.user.iptv.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.user.iptv.domain.UserTv;
 import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.user.iptv.service.mapper;
 
-import com.topdraw.base.BaseMapper;
-import com.topdraw.business.module.user.iptv.domain.UserTv;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.user.iptv.domain.UserTvSimple;
 import com.topdraw.business.module.user.iptv.service.dto.UserTvSimpleDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.user.weixin.collection.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.user.weixin.collection.domain.UserCollectionDetail;
 import com.topdraw.business.module.user.weixin.collection.repository.UserCollectionDetailRepository;
 import com.topdraw.business.module.user.weixin.collection.service.UserCollectionDetailService;
 import com.topdraw.business.module.user.weixin.collection.service.dto.UserCollectionDetailDTO;
 import com.topdraw.business.module.user.weixin.collection.service.mapper.UserCollectionDetailMapper;
-import com.topdraw.utils.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.stereotype.Service;

 package com.topdraw.business.module.user.weixin.collection.service.impl;
 
+import com.topdraw.base.modules.utils.FileUtil;
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.user.weixin.collection.domain.UserCollection;
 import com.topdraw.business.module.user.weixin.collection.repository.UserCollectionRepository;
 import com.topdraw.business.module.user.weixin.collection.service.UserCollectionService;
 import com.topdraw.business.module.user.weixin.collection.service.dto.UserCollectionDTO;
 import com.topdraw.business.module.user.weixin.collection.service.mapper.UserCollectionMapper;
-import com.topdraw.utils.FileUtil;
-import com.topdraw.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.stereotype.Service;

 package com.topdraw.business.module.user.weixin.collection.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.user.weixin.collection.domain.UserCollectionDetail;
 import com.topdraw.business.module.user.weixin.collection.service.dto.UserCollectionDetailDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.user.weixin.collection.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.user.weixin.collection.domain.UserCollection;
 import com.topdraw.business.module.user.weixin.collection.service.dto.UserCollectionDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.user.weixin.domain;
 
+import com.topdraw.base.modules.exception.BadRequestException;
 import com.topdraw.business.module.member.domain.Member;
-import com.topdraw.exception.BadRequestException;
 import com.topdraw.exception.GlobeExceptionMsg;
-import com.topdraw.util.TimestampUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import java.sql.Timestamp;

 package com.topdraw.business.module.user.weixin.rest;
 
-import com.topdraw.annotation.AnonymousAccess;
-import com.topdraw.common.ResultInfo;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.user.weixin.domain.UserWeixin;
 import com.topdraw.business.module.user.weixin.service.UserWeixinService;
 import org.springframework.beans.factory.annotation.Autowired;

 package com.topdraw.business.module.user.weixin.service.dto;
 
-import com.topdraw.annotation.Query;
+import com.topdraw.base.modules.annotation.Query;
 import lombok.Data;
 
 /**

 package com.topdraw.business.module.user.weixin.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.user.weixin.domain.UserWeixin;
 import com.topdraw.business.module.user.weixin.domain.UserWeixinBuilder;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.user.weixin.repository.UserWeixinRepository;
 import com.topdraw.business.module.user.weixin.service.UserWeixinService;
 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO;

 package com.topdraw.business.module.user.weixin.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.user.weixin.domain.UserWeixin;
 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.user.weixin.subscribe.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.user.weixin.subscribe.domain.WechatSubscribeRecord;
 import com.topdraw.business.module.user.weixin.subscribe.service.dto.WechatSubscribeRecordDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.user.weixin.wechatshare.rest;
 
 import com.alibaba.fastjson.JSONObject;
-import com.topdraw.aop.log.Log;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.business.module.user.weixin.wechatshare.domain.WechatShareRecord;
 import com.topdraw.business.module.user.weixin.wechatshare.service.WechatShareRecordService;
@@ -24,7 +23,6 @@ public class WechatShareRecordController {
     @Autowired
     private WechatShareRecordService wechatShareRecordService;
 
-    @Log
     @PostMapping(value = "/create")
     @ApiOperation("新增WechatShareRecord")
     public ResultInfo create(@Validated @RequestBody WechatShareRecord resources) {
@@ -32,7 +30,6 @@ public class WechatShareRecordController {
         return ResultInfo.success();
     }
 
-    @Log
     @PostMapping(value = "/update")
     @ApiOperation("修改WechatShareRecord")
     public ResultInfo update(@Validated @RequestBody WechatShareRecord resources) {
@@ -40,7 +37,6 @@ public class WechatShareRecordController {
         return ResultInfo.success();
     }
 
-    @Log
     @PostMapping(value = "/createOrUpdate")
     @ApiOperation("修改WechatShareRecord")
     public ResultInfo createOrUpdate(@Validated @RequestBody String content) {

 package com.topdraw.business.module.user.weixin.wechatshare.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.user.weixin.wechatshare.domain.WechatShareRecord;
 import com.topdraw.util.IdWorker;
-import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.user.weixin.wechatshare.repository.WechatShareRecordRepository;
 import com.topdraw.business.module.user.weixin.wechatshare.service.WechatShareRecordService;
 import com.topdraw.business.module.user.weixin.wechatshare.service.dto.WechatShareRecordDTO;
 import com.topdraw.business.module.user.weixin.wechatshare.service.mapper.WechatShareRecordMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import com.topdraw.utils.StringUtils;
 
 import java.util.*;
 

 package com.topdraw.business.module.user.weixin.wechatshare.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.user.weixin.wechatshare.domain.WechatShareRecord;
 import com.topdraw.business.module.user.weixin.wechatshare.service.dto.WechatShareRecordDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.vis.hainan.app.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.vis.hainan.app.domain.VisUser;
 import com.topdraw.business.module.vis.hainan.app.repository.VisUserRepository;
 import com.topdraw.business.module.vis.hainan.app.service.VisUserService;
 import com.topdraw.business.module.vis.hainan.app.service.dto.VisUserDTO;
 import com.topdraw.business.module.vis.hainan.app.service.mapper.VisUserMapper;
-import com.topdraw.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

 package com.topdraw.business.module.vis.hainan.app.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.vis.hainan.app.domain.VisUser;
 import com.topdraw.business.module.vis.hainan.app.service.dto.VisUserDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.vis.hainan.apple.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.vis.hainan.apple.domain.VisUserApple;
 import com.topdraw.business.module.vis.hainan.apple.repository.VisUserAppleRepository;
 import com.topdraw.business.module.vis.hainan.apple.service.VisUserAppleService;
 import com.topdraw.business.module.vis.hainan.apple.service.dto.VisUserAppleDTO;
 import com.topdraw.business.module.vis.hainan.apple.service.mapper.VisUserAppleMapper;
-import com.topdraw.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

 package com.topdraw.business.module.vis.hainan.apple.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.vis.hainan.apple.domain.VisUserApple;
 import com.topdraw.business.module.vis.hainan.apple.service.dto.VisUserAppleDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.vis.hainan.qq.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq;
 import com.topdraw.business.module.vis.hainan.qq.repository.VisUserQqRepository;
 import com.topdraw.business.module.vis.hainan.qq.service.VisUserQqService;
 import com.topdraw.business.module.vis.hainan.qq.service.dto.VisUserQqDTO;
 import com.topdraw.business.module.vis.hainan.qq.service.mapper.VisUserQqMapper;
-import com.topdraw.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

 package com.topdraw.business.module.vis.hainan.qq.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq;
 import com.topdraw.business.module.vis.hainan.qq.service.dto.VisUserQqDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.vis.hainan.weibo.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo;
 import com.topdraw.business.module.vis.hainan.weibo.repository.VisUserWeiboRepository;
 import com.topdraw.business.module.vis.hainan.weibo.service.VisUserWeiboService;
 import com.topdraw.business.module.vis.hainan.weibo.service.dto.VisUserWeiboDTO;
 import com.topdraw.business.module.vis.hainan.weibo.service.mapper.VisUserWeiboMapper;
-import com.topdraw.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

 package com.topdraw.business.module.vis.hainan.weibo.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo;
 import com.topdraw.business.module.vis.hainan.weibo.service.dto.VisUserWeiboDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.business.module.vis.hainan.weixin.service.impl;
 
+import com.topdraw.base.modules.utils.ValidationUtil;
 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin;
 import com.topdraw.business.module.vis.hainan.weixin.repository.VisUserWeixinRepository;
 import com.topdraw.business.module.vis.hainan.weixin.service.VisUserWeixinService;
 import com.topdraw.business.module.vis.hainan.weixin.service.dto.VisUserWeixinDTO;
 import com.topdraw.business.module.vis.hainan.weixin.service.mapper.VisUserWeixinMapper;
-import com.topdraw.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

 package com.topdraw.business.module.vis.hainan.weixin.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin;
 import com.topdraw.business.module.vis.hainan.weixin.service.dto.VisUserWeixinDTO;
 import org.mapstruct.Mapper;

@@ -2,7 +2,7 @@ package com.topdraw.business.process.domian.weixin;
 
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.topdraw.annotation.Query;
+import com.topdraw.base.modules.annotation.Query;
 import lombok.Data;
 
 import java.sql.Timestamp;

 package com.topdraw.business.process.rest;
 
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.process.domian.TempCoupon;
 import com.topdraw.business.process.service.CouponOperationService;
-import com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

 package com.topdraw.business.process.rest;
 
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.process.domian.TempExp;
 import com.topdraw.business.process.service.ExpOperationService;
-import com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -13,9 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
 import java.util.Objects;
 
 /**

 package com.topdraw.business.process.rest;
 
-import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
+import com.topdraw.base.modules.common.IResultInfo;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.common.validated.UpdateGroup;
 import com.topdraw.business.module.member.address.domain.MemberAddress;
 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
@@ -8,8 +10,6 @@ import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.process.domian.member.MemberOperationBean;
 import com.topdraw.business.process.service.member.MemberOperationService;
-import com.topdraw.common.IResultInfo;
-import com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

 package com.topdraw.business.process.rest;
 
-import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
+import com.topdraw.base.modules.common.ResultInfo;
+import com.topdraw.base.modules.exception.BadRequestException;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.module.user.iptv.service.UserTvService;
@@ -11,9 +13,7 @@ import com.topdraw.business.process.domian.TempCustomPointBean;
 import com.topdraw.business.process.domian.TempPoints;
 import com.topdraw.business.process.service.dto.CustomPointsResult;
 import com.topdraw.business.process.service.PointsOperationService;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.business.LocalConstants;
-import com.topdraw.exception.BadRequestException;
 import com.topdraw.exception.GlobeExceptionMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

 package com.topdraw.business.process.rest;
 
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.rights.history.domain.RightsHistory;
 import com.topdraw.business.process.service.RightsOperationService;
-import com.topdraw.common.ResultInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

 package com.topdraw.business.process.rest;
 
-import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
+import com.topdraw.base.modules.common.IResultInfo;
+import com.topdraw.base.modules.common.ResultInfo;
+import com.topdraw.base.modules.exception.BadRequestException;
 import com.topdraw.business.module.common.validated.CreateGroup;
 import com.topdraw.business.module.task.domain.Task;
 import com.topdraw.business.module.task.service.dto.TaskDTO;
 import com.topdraw.business.process.domian.TempIptvUser;
 import com.topdraw.business.process.service.TaskOperationService;
 import com.topdraw.business.process.service.dto.TaskOperationQueryCriteria;
-import com.topdraw.common.IResultInfo;
-import com.topdraw.common.ResultInfo;
-import com.topdraw.exception.BadRequestException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.Objects;
-//byte[] b = Base64Utils.decodeFromString(baseStrs[1]);
 
 @Api("任务处理")
 @RestController

 package com.topdraw.business.process.rest;
 
-import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
 import com.topdraw.business.module.task.template.domain.TaskTemplate;
-import com.topdraw.business.module.task.template.service.dto.TaskTemplateDTO;
 import com.topdraw.business.process.service.TaskTemplateOperationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

@@ -4,7 +4,11 @@ import cn.hutool.core.util.ObjectUtil;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
+import com.topdraw.base.modules.common.ResultInfo;
+import com.topdraw.base.modules.exception.BadRequestException;
+import com.topdraw.base.modules.exception.EntityNotFoundException;
+import com.topdraw.base.modules.utils.RedisUtils;
 import com.topdraw.business.module.common.validated.CreateGroup;
 import com.topdraw.business.module.common.validated.UpdateGroup;
 import com.topdraw.business.module.member.service.MemberService;
@@ -24,16 +28,12 @@ import com.topdraw.business.process.domian.member.MemberOperationBean;
 import com.topdraw.business.process.domian.weixin.*;
 import com.topdraw.business.process.service.UserOperationService;
 import com.topdraw.business.process.service.member.MemberOperationService;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.util.RedisKeyUtil;
 import com.topdraw.config.WechatConfig;
-import com.topdraw.exception.BadRequestException;
-import com.topdraw.exception.EntityNotFoundException;
 import com.topdraw.exception.GlobeExceptionMsg;
 import com.topdraw.resttemplate.RestTemplateClient;
 import com.topdraw.util.Base64Util;
 import com.topdraw.util.JSONUtil;
-import com.topdraw.utils.RedisUtils;
 import com.topdraw.weixin.service.WeChatConstants;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -463,7 +463,7 @@ public class UserOperationController {
      * @throws ConfigurationException
      */
     private Map<String, String> getWeixinInfoByAppid(String appid) throws ConfigurationException {
-        if (com.topdraw.utils.StringUtils.isBlank(appid)) {
+        if (StringUtils.isBlank(appid)) {
             throw new RuntimeException("wxAppid can not be null");
         }
         List<Map<String, String>> list = weixinInfoConfig.getWechatAppList();

 package com.topdraw.business.process.service;
 
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.task.domain.Task;
 import com.topdraw.business.module.task.service.dto.TaskDTO;
-import com.topdraw.common.ResultInfo;
 
 /**
  * @description 权益操作接口

 package com.topdraw.business.process.service;
 
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.module.user.app.domain.UserApp;
 import com.topdraw.business.module.user.app.domain.UserAppBind;
@@ -14,7 +15,6 @@ import com.topdraw.business.process.domian.weixin.BindBean;
 import com.topdraw.business.process.domian.weixin.SubscribeBean;
 import com.topdraw.business.process.domian.weixin.TvUnBindBean;
 import com.topdraw.business.process.domian.weixin.WeixinUnBindBean;
-import com.topdraw.common.ResultInfo;
 
 
 public interface UserOperationService {

 package com.topdraw.business.process.service.impl;
 
 import com.topdraw.aspect.AsyncMqSend;
+import com.topdraw.base.modules.utils.RedisUtils;
 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
 import com.topdraw.business.module.coupon.history.service.CouponHistoryService;
 import com.topdraw.business.module.coupon.service.CouponService;
@@ -13,7 +14,6 @@ import com.topdraw.business.process.domian.TempCoupon;
 import com.topdraw.business.process.service.RightsOperationService;
 import com.topdraw.business.RedisKeyConstants;
 import com.topdraw.util.TimestampUtil;
-import com.topdraw.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeanUtils;

 package com.topdraw.business.process.service.impl;
 
 import com.topdraw.aspect.AsyncMqSend;
+import com.topdraw.base.modules.utils.RedisUtils;
 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
 import com.topdraw.business.module.exp.detail.service.ExpDetailService;
 import com.topdraw.business.module.member.domain.Member;
@@ -13,9 +14,8 @@ import com.topdraw.business.process.service.member.MemberOperationService;
 import com.topdraw.business.process.domian.TempExp;
 import com.topdraw.business.RedisKeyConstants;
 import com.topdraw.util.TimestampUtil;
-import com.topdraw.utils.RedisUtils;
-import com.topdraw.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

@@ -2,6 +2,7 @@ package com.topdraw.business.process.service.impl;
 
 
 import com.topdraw.aspect.AsyncMqSend;
+import com.topdraw.base.modules.utils.RedisUtils;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
@@ -18,9 +19,8 @@ import com.topdraw.business.RedisKeyConstants;
 import com.topdraw.util.DateUtil;
 import com.topdraw.util.IdWorker;
 import com.topdraw.util.TimestampUtil;
-import com.topdraw.utils.RedisUtils;
-import com.topdraw.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

@@ -3,6 +3,8 @@ package com.topdraw.business.process.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.topdraw.aspect.AsyncMqSend;
+import com.topdraw.base.modules.common.ResultInfo;
+import com.topdraw.base.modules.utils.RedisUtils;
 import com.topdraw.business.module.coupon.service.CouponService;
 import com.topdraw.business.module.coupon.service.dto.CouponDTO;
 import com.topdraw.business.module.member.service.dto.MemberSimpleDTO;
@@ -34,10 +36,8 @@ import com.topdraw.business.LocalConstants;
 import com.topdraw.business.module.rights.constant.RightTypeConstants;
 import com.topdraw.business.module.task.template.constant.TaskEventType;
 import com.topdraw.business.RedisKeyConstants;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.mq.module.mq.DataSyncMsg;
 import com.topdraw.util.*;
-import com.topdraw.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.aop.framework.AopContext;
@@ -339,7 +339,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
         List<Task> tasks = this.taskService.findByEventAndMemberLevelAndVip(event, memberDTO.getLevel(), memberDTO.getVip());
         log.info("查询任务列表, dealTask# tasks ==>> [{}]",tasks);
         if (Objects.isNull(tasks) || CollectionUtils.isEmpty(tasks)) {
-            return Collections.singletonList(null);
+            return null;
         }
 
         // 获取当前会员所有任务的完成进度
@@ -896,6 +896,10 @@ public class TaskOperationServiceImpl implements TaskOperationService {
         Timestamp expireTime = task.getExpireTime();
         // 积分类型(0:定值、1:随机)
         Integer pointsType = task.getPointsType();
+        if (Objects.isNull(pointsType)) {
+            log.error("当前任务的积分类型不存在，请检查数据 task ==>> {}", task);
+            return;
+        }
         // 随机积分的最大值
         Integer rewardMaxPoints = task.getRewardMaxPoints();
         if (Objects.nonNull(rewardPoints) && rewardPoints > 0) {

@@ -6,7 +6,6 @@ import com.topdraw.business.module.task.template.domain.TaskTemplateBuilder;
 import com.topdraw.business.module.task.template.service.TaskTemplateService;
 import com.topdraw.business.module.task.template.service.dto.TaskTemplateDTO;
 import com.topdraw.business.process.service.TaskTemplateOperationService;
-import com.topdraw.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeanUtils;

@@ -6,6 +6,11 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.topdraw.aspect.AsyncMqSend;
+import com.topdraw.base.modules.common.ResultInfo;
+import com.topdraw.base.modules.exception.BadRequestException;
+import com.topdraw.base.modules.exception.EntityNotFoundException;
+import com.topdraw.base.modules.utils.QueryHelp;
+import com.topdraw.base.modules.utils.RedisUtils;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.domain.MemberBuilder;
 import com.topdraw.business.module.member.domain.MemberTypeConstant;
@@ -48,15 +53,10 @@ import com.topdraw.business.process.service.dto.MemberAndWeixinUserDTO;
 import com.topdraw.business.process.service.mapper.CollectionMq2DetailMapper;
 import com.topdraw.business.LocalConstants;
 import com.topdraw.business.RedisKeyConstants;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.util.RedisKeyUtil;
-import com.topdraw.exception.BadRequestException;
-import com.topdraw.exception.EntityNotFoundException;
 import com.topdraw.exception.GlobeExceptionMsg;
 import com.topdraw.resttemplate.RestTemplateClient;
 import com.topdraw.util.TimestampUtil;
-import com.topdraw.utils.QueryHelp;
-import com.topdraw.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.aop.framework.AopContext;
@@ -1462,6 +1462,7 @@ public class UserOperationServiceImpl implements UserOperationService {
         if (UserConstant.platform_dx.contains(platform)) {
             bindIptvPlatformType = PLATFORM_LIST[1];
         }
+        member.setId(memberDTO.getId());
         member.setUserIptvId(userTvDTO.getId());
         member.setBindIptvTime(TimestampUtil.now());
         member.setBindIptvPlatformType(bindIptvPlatformType);

 package com.topdraw.business.process.service.impl.member;
 
 import com.topdraw.aspect.AsyncMqSend;
+import com.topdraw.base.modules.exception.BadRequestException;
 import com.topdraw.business.module.member.address.domain.MemberAddress;
 import com.topdraw.business.module.member.address.service.MemberAddressService;
 import com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO;
@@ -8,7 +9,6 @@ import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.process.service.member.MemberAddressOperationService;
-import com.topdraw.exception.BadRequestException;
 import com.topdraw.exception.GlobeExceptionMsg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.aop.framework.AopContext;

 package com.topdraw.business.process.service.impl.member;
 
 import com.topdraw.aspect.AsyncMqSend;
+import com.topdraw.base.modules.exception.EntityExistException;
+import com.topdraw.base.modules.exception.EntityNotFoundException;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.profile.domain.MemberProfile;
 import com.topdraw.business.module.member.profile.service.MemberProfileService;
@@ -9,8 +11,6 @@ import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.process.service.dto.MemberProfileAndMemberDTO;
 import com.topdraw.business.process.service.member.MemberProfileOperationService;
-import com.topdraw.exception.EntityExistException;
-import com.topdraw.exception.EntityNotFoundException;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

 package com.topdraw.business.process.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.business.module.user.weixin.collection.domain.UserCollectionDetail;
 import com.topdraw.business.process.domian.weixin.UserCollectionMq;
 import org.mapstruct.Mapper;

 package com.topdraw.util;
 
 import com.alibaba.fastjson.JSONObject;
-import com.topdraw.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 

 package com.topdraw.weixin.rest;
 
-import com.topdraw.annotation.AnonymousAccess;
-import com.topdraw.common.ResultInfo;
+import com.topdraw.base.modules.annotation.AnonymousAccess;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.weixin.service.UserWeixinWeixinMessageTemplateService;
 import com.topdraw.weixin.service.dto.UpdateUserWeixinWeixinMessageTemplateQueryCriteria;
 import io.swagger.annotations.Api;

 package com.topdraw.weixin.service.dto;
 
-import com.topdraw.annotation.Query;
+import com.topdraw.base.modules.annotation.Query;
 import lombok.Data;
 
 /**

 package com.topdraw.weixin.service.dto;
 
-import com.topdraw.annotation.Query;
+import com.topdraw.base.modules.annotation.Query;
 import lombok.Data;
 
 import java.util.List;

 package com.topdraw.weixin.service.impl;
 
 
-import com.topdraw.utils.QueryHelp;
+import com.topdraw.base.modules.utils.QueryHelp;
 import com.topdraw.weixin.domain.UserWeixinWeixinMessageTemplate;
 import com.topdraw.weixin.domain.WeixinMessageTemplate;
 import com.topdraw.weixin.repository.UserWeixinWeixinMessageTemplateRepository;

 package com.topdraw.weixin.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.weixin.domain.UserWeixinWeixinMessageTemplate;
 import com.topdraw.weixin.service.dto.UserWeixinWeixinMessageTemplateDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.weixin.service.mapper;
 
-import com.topdraw.base.BaseMapper;
+import com.topdraw.base.modules.base.BaseMapper;
 import com.topdraw.weixin.domain.WeixinMessageTemplate;
 import com.topdraw.weixin.service.dto.WeixinMessageTemplateDTO;
 import org.mapstruct.Mapper;

 package com.topdraw.code;
 
 import com.topdraw.BaseTest;
-import com.topdraw.domain.GenConfig;
-import com.topdraw.domain.vo.ColumnInfo;
 import com.topdraw.MemberServiceApplication;
-import com.topdraw.service.GeneratorService;
+import com.topdraw.generator.modules.domain.GenConfig;
+import com.topdraw.generator.modules.domain.vo.ColumnInfo;
+import com.topdraw.generator.modules.service.GeneratorService;
 import lombok.var;
 import org.junit.Test;
 import org.junit.runner.RunWith;

@@ -3,7 +3,6 @@ package com.topdraw.test.business.basicdata.member;
 import com.topdraw.business.module.member.rest.MemberController;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.BaseTest;
-import com.topdraw.common.ResultInfo;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 

 package com.topdraw.test.business.basicdata.member.rest;
 
 import com.alibaba.fastjson.JSON;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.member.address.domain.MemberAddress;
 import com.topdraw.business.module.member.address.rest.MemberAddressController;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.BaseTest;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;

 package com.topdraw.test.business.basicdata.member.rest;
 
 import com.alibaba.fastjson.JSON;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.rest.MemberController;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.BaseTest;
 import com.topdraw.util.IdWorker;
-import com.topdraw.util.TimestampUtil;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.time.LocalDateTime;
 
 public class MemberControllerTest extends BaseTest {
 

 package com.topdraw.test.business.basicdata.member.rest;
 
 import com.alibaba.fastjson.JSON;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
 import com.topdraw.business.module.member.relatedinfo.rest.MemberRelatedInfoController;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.BaseTest;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.time.LocalDate;
-
 //public class MemberControllerTest {
 public class MemberRelatedInfoControllerTest extends BaseTest {
 

 package com.topdraw.test.business.process.rest;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.topdraw.BaseTest;
-import com.topdraw.business.process.domian.TempCoupon;
 import com.topdraw.business.process.rest.CouponOperationController;
-import com.topdraw.common.ResultInfo;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 public class CouponOperationControllerTest extends BaseTest {

@@ -2,20 +2,13 @@ package com.topdraw.test.business.process.rest;
 
 import com.alibaba.fastjson.JSON;
 import com.topdraw.BaseTest;
-import com.topdraw.business.process.domian.TempCoupon;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.process.domian.TempExp;
-import com.topdraw.business.process.rest.CouponOperationController;
 import com.topdraw.business.process.rest.ExpOperationController;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.util.TimestampUtil;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
 public class ExpOperationControllerTest extends BaseTest {
 
     @Autowired

@@ -2,9 +2,9 @@ package com.topdraw.test.business.process.rest;
 
 import com.alibaba.fastjson.JSON;
 import com.topdraw.BaseTest;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.process.domian.TempPoints;
 import com.topdraw.business.process.rest.PointsOperationController;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.util.TimestampUtil;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;

@@ -2,9 +2,9 @@ package com.topdraw.test.business.process.rest;
 
 
 import com.topdraw.BaseTest;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.rights.history.domain.RightsHistory;
 import com.topdraw.business.process.rest.RightsOperationController;
-import com.topdraw.common.ResultInfo;
 import com.topdraw.util.TimestampUtil;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;

 package com.topdraw.test.business.process.rest;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.topdraw.BaseTest;
+import com.topdraw.base.modules.common.ResultInfo;
 import com.topdraw.business.module.user.app.domain.UserApp;
 import com.topdraw.business.module.user.iptv.domain.UserTv;
 import com.topdraw.business.module.user.weixin.domain.UserWeixin;
 import com.topdraw.business.process.domian.weixin.BindBean;
-import com.topdraw.business.process.domian.weixin.SubscribeBean;
 import com.topdraw.business.process.domian.weixin.TvUnBindBean;
 import com.topdraw.business.process.domian.weixin.WeixinUnBindBean;
 import com.topdraw.business.process.rest.UserOperationController;
-import com.topdraw.common.ResultInfo;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.Base64Utils;
 
 import java.sql.Timestamp;
-import java.util.HashMap;
 
 public class UserOperationControllerTest extends BaseTest {