diff --git a/yshop-api/src/main/java/co/yixiang/modules/notify/AliyunSmsSender.java b/yshop-api/src/main/java/co/yixiang/modules/notify/AliyunSmsSender.java index 3b0d1cc1..fe326111 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/notify/AliyunSmsSender.java +++ b/yshop-api/src/main/java/co/yixiang/modules/notify/AliyunSmsSender.java @@ -1,6 +1,6 @@ package co.yixiang.modules.notify; -import co.yixiang.utils.JacksonUtil; +import co.yixiang.tools.utils.JacksonUtil; import com.aliyuncs.CommonRequest; import com.aliyuncs.CommonResponse; import com.aliyuncs.DefaultAcsClient; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index 3bebe9c4..9bf8c12c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -16,8 +16,8 @@ import cn.hutool.core.util.StrUtil; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import co.yixiang.constant.ShopConstants; -import co.yixiang.domain.AlipayConfig; -import co.yixiang.domain.vo.TradeVo; +import co.yixiang.tools.domain.AlipayConfig; +import co.yixiang.tools.domain.vo.TradeVo; import co.yixiang.enums.*; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.activity.service.*; @@ -59,7 +59,7 @@ import co.yixiang.modules.user.web.vo.YxWechatUserQueryVo; import co.yixiang.mp.service.YxPayService; import co.yixiang.mp.service.YxTemplateService; import co.yixiang.mp.service.YxMiniPayService; -import co.yixiang.service.AlipayConfigService; +import co.yixiang.tools.service.AlipayConfigService; import co.yixiang.utils.OrderUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java index e5ed6d4c..7a8b7a13 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java @@ -16,14 +16,12 @@ import co.yixiang.annotation.AnonymousAccess; import co.yixiang.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.enums.AppFromEnum; import co.yixiang.enums.OrderInfoEnum; import co.yixiang.enums.PayTypeEnum; import co.yixiang.enums.RedisKeyEnum; -import co.yixiang.exception.BadRequestException; import co.yixiang.exception.ErrorRequestException; -import co.yixiang.express.ExpressService; -import co.yixiang.express.dao.ExpressInfo; +import co.yixiang.tools.express.ExpressService; +import co.yixiang.tools.express.dao.ExpressInfo; import co.yixiang.modules.activity.entity.YxStoreBargainUser; import co.yixiang.modules.activity.service.YxStoreBargainUserService; import co.yixiang.modules.activity.service.YxStorePinkService; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java index f9a31939..3b51fe35 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java @@ -1,8 +1,6 @@ package co.yixiang.mp.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -19,7 +17,7 @@ import java.io.Serializable; public class YxWechatMenu implements Serializable { @Id - @TableField(value = "`key`") + @TableId(value = "`key`") private String key; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/repository/YxArticleRepository.java b/yshop-mp/src/main/java/co/yixiang/mp/repository/YxArticleRepository.java deleted file mode 100644 index c6c6bdbb..00000000 --- a/yshop-mp/src/main/java/co/yixiang/mp/repository/YxArticleRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package co.yixiang.mp.repository; - - -import co.yixiang.mp.domain.YxArticle; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-10-07 -*/ -public interface YxArticleRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file diff --git a/yshop-mp/src/main/java/co/yixiang/mp/repository/YxWechatMenuRepository.java b/yshop-mp/src/main/java/co/yixiang/mp/repository/YxWechatMenuRepository.java deleted file mode 100644 index 0929b310..00000000 --- a/yshop-mp/src/main/java/co/yixiang/mp/repository/YxWechatMenuRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package co.yixiang.mp.repository; - - -import co.yixiang.mp.domain.YxWechatMenu; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-10-06 -*/ -public interface YxWechatMenuRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file diff --git a/yshop-mp/src/main/java/co/yixiang/mp/repository/YxWechatReplyRepository.java b/yshop-mp/src/main/java/co/yixiang/mp/repository/YxWechatReplyRepository.java deleted file mode 100644 index d7fb0eb0..00000000 --- a/yshop-mp/src/main/java/co/yixiang/mp/repository/YxWechatReplyRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package co.yixiang.mp.repository; - -import co.yixiang.mp.domain.YxWechatReply; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-10-10 -*/ -public interface YxWechatReplyRepository extends JpaRepository, JpaSpecificationExecutor { - - /** - * findByKey - * @param key - * @return - */ - YxWechatReply findByKey(String key); -} \ No newline at end of file diff --git a/yshop-mp/src/main/java/co/yixiang/mp/repository/YxWechatTemplateRepository.java b/yshop-mp/src/main/java/co/yixiang/mp/repository/YxWechatTemplateRepository.java deleted file mode 100644 index d724494a..00000000 --- a/yshop-mp/src/main/java/co/yixiang/mp/repository/YxWechatTemplateRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package co.yixiang.mp.repository; - -import co.yixiang.mp.domain.YxWechatTemplate; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author xuwenbo -* @date 2019-12-10 -*/ -public interface YxWechatTemplateRepository extends JpaRepository, JpaSpecificationExecutor { - YxWechatTemplate findByTempkey(String key); -} \ No newline at end of file diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java index b4dd2223..c531e5fe 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java @@ -15,7 +15,7 @@ import co.yixiang.utils.FileUtil; import co.yixiang.mp.service.YxArticleService; import co.yixiang.mp.service.dto.YxArticleDto; import co.yixiang.mp.service.dto.YxArticleQueryCriteria; -import co.yixiang.mp.service.mapper.YxArticleMapper; +import co.yixiang.mp.service.mapper.ArticleMapper; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.error.WxErrorException; @@ -53,7 +53,7 @@ import java.util.LinkedHashMap; @Service //@CacheConfig(cacheNames = "yxArticle") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxArticleServiceImpl extends BaseServiceImpl implements YxArticleService { +public class YxArticleServiceImpl extends BaseServiceImpl implements YxArticleService { private final IGenerator generator; @Value("${file.path}") diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java index 9a5d4554..0a8bfd3f 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java @@ -5,27 +5,21 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; import co.yixiang.mp.service.YxWechatMenuService; import co.yixiang.mp.service.dto.YxWechatMenuDto; import co.yixiang.mp.service.dto.YxWechatMenuQueryCriteria; -import co.yixiang.mp.service.mapper.YxWechatMenuMapper; +import co.yixiang.mp.service.mapper.WechatMenuMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import cn.hutool.core.util.IdUtil; // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; import java.util.*; import java.io.IOException; @@ -39,7 +33,7 @@ import javax.servlet.http.HttpServletResponse; @AllArgsConstructor //@CacheConfig(cacheNames = "yxWechatMenu") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxWechatMenuServiceImpl extends BaseServiceImpl implements YxWechatMenuService { +public class YxWechatMenuServiceImpl extends BaseServiceImpl implements YxWechatMenuService { private final IGenerator generator; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java index e6135b77..54524426 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java @@ -6,15 +6,13 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; import co.yixiang.mp.service.YxWechatReplyService; import co.yixiang.mp.service.dto.YxWechatReplyDto; import co.yixiang.mp.service.dto.YxWechatReplyQueryCriteria; -import co.yixiang.mp.service.mapper.YxWechatReplyMapper; +import co.yixiang.mp.service.mapper.WechatReplyMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -22,10 +20,7 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; import java.util.*; import java.io.IOException; @@ -39,7 +34,7 @@ import javax.servlet.http.HttpServletResponse; @AllArgsConstructor //@CacheConfig(cacheNames = "yxWechatReply") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxWechatReplyServiceImpl extends BaseServiceImpl implements YxWechatReplyService { +public class YxWechatReplyServiceImpl extends BaseServiceImpl implements YxWechatReplyService { private final IGenerator generator; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java index c65440e2..ed74dbc3 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java @@ -5,15 +5,13 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; import co.yixiang.mp.service.YxWechatTemplateService; import co.yixiang.mp.service.dto.YxWechatTemplateDto; import co.yixiang.mp.service.dto.YxWechatTemplateQueryCriteria; -import co.yixiang.mp.service.mapper.YxWechatTemplateMapper; +import co.yixiang.mp.service.mapper.WechatTemplateMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -21,10 +19,8 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; + import java.util.List; import java.util.Map; import java.io.IOException; @@ -40,7 +36,7 @@ import java.util.LinkedHashMap; @AllArgsConstructor //@CacheConfig(cacheNames = "yxWechatTemplate") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxWechatTemplateServiceImpl extends BaseServiceImpl implements YxWechatTemplateService { +public class YxWechatTemplateServiceImpl extends BaseServiceImpl implements YxWechatTemplateService { private final IGenerator generator; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/YxArticleMapper.java b/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/ArticleMapper.java similarity index 81% rename from yshop-mp/src/main/java/co/yixiang/mp/service/mapper/YxArticleMapper.java rename to yshop-mp/src/main/java/co/yixiang/mp/service/mapper/ArticleMapper.java index f3e1c846..8d873493 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/YxArticleMapper.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/ArticleMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxArticleMapper extends CoreMapper { +public interface ArticleMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/YxWechatMenuMapper.java b/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/WechatMenuMapper.java similarity index 79% rename from yshop-mp/src/main/java/co/yixiang/mp/service/mapper/YxWechatMenuMapper.java rename to yshop-mp/src/main/java/co/yixiang/mp/service/mapper/WechatMenuMapper.java index 689394bb..6deee28b 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/YxWechatMenuMapper.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/WechatMenuMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxWechatMenuMapper extends CoreMapper { +public interface WechatMenuMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/YxWechatReplyMapper.java b/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/WechatReplyMapper.java similarity index 79% rename from yshop-mp/src/main/java/co/yixiang/mp/service/mapper/YxWechatReplyMapper.java rename to yshop-mp/src/main/java/co/yixiang/mp/service/mapper/WechatReplyMapper.java index f393144e..85278b71 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/YxWechatReplyMapper.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/WechatReplyMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxWechatReplyMapper extends CoreMapper { +public interface WechatReplyMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/YxWechatTemplateMapper.java b/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/WechatTemplateMapper.java similarity index 75% rename from yshop-mp/src/main/java/co/yixiang/mp/service/mapper/YxWechatTemplateMapper.java rename to yshop-mp/src/main/java/co/yixiang/mp/service/mapper/WechatTemplateMapper.java index c5433df9..238d2ed6 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/YxWechatTemplateMapper.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/mapper/WechatTemplateMapper.java @@ -1,16 +1,16 @@ -package co.yixiang.mp.service.mapper; - -import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.mp.domain.YxWechatTemplate; -import org.apache.ibatis.annotations.Mapper; -import org.springframework.stereotype.Repository; - -/** -* @author xuwenbo -* @date 2020-05-12 -*/ -@Repository -@Mapper -public interface YxWechatTemplateMapper extends CoreMapper { - -} \ No newline at end of file +package co.yixiang.mp.service.mapper; + +import co.yixiang.common.mapper.CoreMapper; +import co.yixiang.mp.domain.YxWechatTemplate; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +/** +* @author xuwenbo +* @date 2020-05-12 +*/ +@Repository +@Mapper +public interface WechatTemplateMapper extends CoreMapper { + +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCombinationRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCombinationRepository.java similarity index 81% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCombinationRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCombinationRepository.java index 61743177..7f1382cc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCombinationRepository.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCombinationRepository.java @@ -10,9 +10,9 @@ import org.springframework.data.jpa.repository.Query; * @author hupeng * @date 2019-11-18 */ -public interface YxStoreCombinationRepository extends JpaRepository, JpaSpecificationExecutor { +public interface StoreCombinationRepository extends JpaRepository, JpaSpecificationExecutor { @Modifying @Query(value = "update yx_store_combination set is_show = ?1 where id = ?2",nativeQuery = true) void updateOnsale(int status, int id); -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueRepository.java similarity index 69% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueRepository.java index cb9accbb..d530fdb3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueRepository.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueRepository.java @@ -8,5 +8,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; * @author hupeng * @date 2019-11-09 */ -public interface YxStoreCouponIssueRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file +public interface StoreCouponIssueRepository extends JpaRepository, JpaSpecificationExecutor { +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueUserRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueUserRepository.java similarity index 68% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueUserRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueUserRepository.java index f76e0f64..173b2e05 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueUserRepository.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueUserRepository.java @@ -8,5 +8,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; * @author hupeng * @date 2019-11-09 */ -public interface YxStoreCouponIssueUserRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file +public interface StoreCouponIssueUserRepository extends JpaRepository, JpaSpecificationExecutor { +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponRepository.java similarity index 71% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponRepository.java index 4549838a..5f4d7760 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponRepository.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponRepository.java @@ -8,5 +8,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; * @author hupeng * @date 2019-11-09 */ -public interface YxStoreCouponRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file +public interface StoreCouponRepository extends JpaRepository, JpaSpecificationExecutor { +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponUserRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponUserRepository.java similarity index 69% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponUserRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponUserRepository.java index 910953bc..83e70eb4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponUserRepository.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponUserRepository.java @@ -8,5 +8,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; * @author hupeng * @date 2019-11-10 */ -public interface YxStoreCouponUserRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file +public interface StoreCouponUserRepository extends JpaRepository, JpaSpecificationExecutor { +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStorePinkRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StorePinkRepository.java similarity index 79% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStorePinkRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StorePinkRepository.java index f395db23..8cbe904f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStorePinkRepository.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StorePinkRepository.java @@ -8,7 +8,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; * @author hupeng * @date 2019-11-18 */ -public interface YxStorePinkRepository extends JpaRepository, JpaSpecificationExecutor { +public interface StorePinkRepository extends JpaRepository, JpaSpecificationExecutor { int countByCid(int cid); int countByCidAndKId(int cid, int kid); @@ -17,4 +17,4 @@ public interface YxStorePinkRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file +public interface StoreSeckillRepository extends JpaRepository, JpaSpecificationExecutor { +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreVisitRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreVisitRepository.java similarity index 76% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreVisitRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreVisitRepository.java index 5c9bfb95..692f02d6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreVisitRepository.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreVisitRepository.java @@ -8,6 +8,6 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; * @author hupeng * @date 2019-11-18 */ -public interface YxStoreVisitRepository extends JpaRepository, JpaSpecificationExecutor { +public interface StoreVisitRepository extends JpaRepository, JpaSpecificationExecutor { int countByProductIdAndProductType(int productId, String productType); -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxUserExtractRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/UserExtractRepository.java similarity index 71% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxUserExtractRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/UserExtractRepository.java index 20d35a14..99682f7b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxUserExtractRepository.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/UserExtractRepository.java @@ -8,5 +8,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; * @author hupeng * @date 2019-11-14 */ -public interface YxUserExtractRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file +public interface UserExtractRepository extends JpaRepository, JpaSpecificationExecutor { +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java index 5182761f..cc35ffac 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -14,15 +12,11 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity @Data -@Table(name="yx_user") public class YxUser implements Serializable { /** 用户id */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "uid") + @TableId(value = "uid", type = IdType.AUTO) private Integer uid; @@ -210,4 +204,4 @@ public class YxUser implements Serializable { public void copy(YxUser source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java index 61cf60c3..c0e55574 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java @@ -1,12 +1,13 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; + +import javax.persistence.Column; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.io.Serializable; @@ -14,15 +15,11 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity @Data -@Table(name="yx_wechat_user") public class YxWechatUser implements Serializable { /** 微信用户id */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "uid") + @TableId private Integer uid; @@ -151,4 +148,4 @@ public class YxWechatUser implements Serializable { public void copy(YxWechatUser source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java index 7f13daae..09ef3610 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java @@ -10,8 +10,8 @@ import co.yixiang.constant.ShopConstants; import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.OrderInfoEnum; import co.yixiang.exception.BadRequestException; -import co.yixiang.express.ExpressService; -import co.yixiang.express.dao.ExpressInfo; +import co.yixiang.tools.express.ExpressService; +import co.yixiang.tools.express.dao.ExpressInfo; import co.yixiang.modules.activity.service.YxStorePinkService; import co.yixiang.modules.shop.domain.YxStoreOrder; import co.yixiang.modules.shop.domain.YxStoreOrderStatus; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java index 297834c5..af1847d9 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java @@ -3,7 +3,6 @@ import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemConfig; import co.yixiang.modules.shop.service.dto.YxSystemConfigDto; import co.yixiang.modules.shop.service.dto.YxSystemConfigQueryCriteria; -import co.yixiang.utils.AliPayStatusEnum; import org.springframework.data.domain.Pageable; import java.util.Map; import java.util.List; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java index 8e64edd0..73285c7c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java @@ -1,19 +1,16 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxExpress; -import co.yixiang.exception.EntityExistException; import co.yixiang.common.service.impl.BaseServiceImpl; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxExpressService; import co.yixiang.modules.shop.service.dto.YxExpressDto; import co.yixiang.modules.shop.service.dto.YxExpressQueryCriteria; -import co.yixiang.modules.shop.service.mapper.YxExpressMapper; +import co.yixiang.modules.shop.service.mapper.ExpressMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -21,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; + import java.util.List; import java.util.Map; import java.io.IOException; @@ -40,7 +35,7 @@ import java.util.LinkedHashMap; @AllArgsConstructor //@CacheConfig(cacheNames = "yxExpress") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxExpressServiceImpl extends BaseServiceImpl implements YxExpressService { +public class YxExpressServiceImpl extends BaseServiceImpl implements YxExpressService { private final IGenerator generator; @@ -76,4 +71,4 @@ public class YxExpressServiceImpl extends BaseServiceImpl implements YxMaterialGroupService { +public class YxMaterialGroupServiceImpl extends BaseServiceImpl implements YxMaterialGroupService { private final IGenerator generator; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java index 1bb5c6b5..4e78809a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java @@ -4,27 +4,22 @@ import co.yixiang.modules.shop.domain.YxMaterial; import co.yixiang.common.service.impl.BaseServiceImpl; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxMaterialService; import co.yixiang.modules.shop.service.dto.YxMaterialDto; import co.yixiang.modules.shop.service.dto.YxMaterialQueryCriteria; -import co.yixiang.modules.shop.service.mapper.YxMaterialMapper; +import co.yixiang.modules.shop.service.mapper.MaterialMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import cn.hutool.core.util.IdUtil; // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; + import java.util.List; import java.util.Map; import java.io.IOException; @@ -40,7 +35,7 @@ import java.util.LinkedHashMap; @AllArgsConstructor //@CacheConfig(cacheNames = "yxMaterial") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxMaterialServiceImpl extends BaseServiceImpl implements YxMaterialService { +public class YxMaterialServiceImpl extends BaseServiceImpl implements YxMaterialService { private final IGenerator generator; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java index 0ee5b527..025c9d1f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java @@ -5,15 +5,13 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.shop.service.dto.CountDto; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxStoreCartService; import co.yixiang.modules.shop.service.dto.YxStoreCartDto; import co.yixiang.modules.shop.service.dto.YxStoreCartQueryCriteria; -import co.yixiang.modules.shop.service.mapper.YxStoreCartMapper; +import co.yixiang.modules.shop.service.mapper.StoreCartMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -21,10 +19,8 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; + import java.util.List; import java.util.Map; import java.io.IOException; @@ -40,11 +36,11 @@ import java.util.LinkedHashMap; @AllArgsConstructor //@CacheConfig(cacheNames = "yxStoreCart") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxStoreCartServiceImpl extends BaseServiceImpl implements YxStoreCartService { +public class YxStoreCartServiceImpl extends BaseServiceImpl implements YxStoreCartService { private final IGenerator generator; - private final YxStoreCartMapper storeCartMapper; + private final StoreCartMapper storeCartMapper; @Override //@Cacheable public Map queryAll(YxStoreCartQueryCriteria criteria, Pageable pageable) { diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java index 9214a0f6..8142b3cf 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java @@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxStoreCategory; import co.yixiang.common.service.impl.BaseServiceImpl; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxStoreCategoryService; import co.yixiang.modules.shop.service.dto.YxStoreCategoryDto; import co.yixiang.modules.shop.service.dto.YxStoreCategoryQueryCriteria; -import co.yixiang.modules.shop.service.mapper.YxStoreCategoryMapper; +import co.yixiang.modules.shop.service.mapper.StoreCategoryMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -20,10 +18,7 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; import org.springframework.util.CollectionUtils; import java.util.*; @@ -39,7 +34,7 @@ import javax.servlet.http.HttpServletResponse; @AllArgsConstructor //@CacheConfig(cacheNames = "yxStoreCategory") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxStoreCategoryServiceImpl extends BaseServiceImpl implements YxStoreCategoryService { +public class YxStoreCategoryServiceImpl extends BaseServiceImpl implements YxStoreCategoryService { private final IGenerator generator; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderCartInfoServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderCartInfoServiceImpl.java index 0ad57fdb..4e680b9a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderCartInfoServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderCartInfoServiceImpl.java @@ -10,7 +10,7 @@ import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxStoreOrderCartInfoService; import co.yixiang.modules.shop.service.dto.YxStoreOrderCartInfoDto; import co.yixiang.modules.shop.service.dto.YxStoreOrderCartInfoQueryCriteria; -import co.yixiang.modules.shop.service.mapper.YxStoreOrderCartInfoMapper; +import co.yixiang.modules.shop.service.mapper.StoreOrderCartInfoMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -35,7 +35,7 @@ import java.util.LinkedHashMap; @AllArgsConstructor //@CacheConfig(cacheNames = "yxStoreOrderCartInfo") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxStoreOrderCartInfoServiceImpl extends BaseServiceImpl implements YxStoreOrderCartInfoService { +public class YxStoreOrderCartInfoServiceImpl extends BaseServiceImpl implements YxStoreOrderCartInfoService { private final IGenerator generator; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java index 5153ca7f..b5fb28b6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java @@ -7,13 +7,13 @@ import co.yixiang.enums.OrderInfoEnum; import co.yixiang.exception.BadRequestException; import co.yixiang.exception.EntityExistException; import co.yixiang.modules.activity.domain.YxStorePink; -import co.yixiang.modules.activity.repository.YxStorePinkRepository; +import co.yixiang.modules.activity.repository.StorePinkRepository; import co.yixiang.modules.shop.domain.*; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.shop.service.*; import co.yixiang.modules.shop.service.dto.*; -import co.yixiang.modules.shop.service.mapper.YxStoreProductMapper; -import co.yixiang.modules.shop.service.mapper.YxUserMapper; +import co.yixiang.modules.shop.service.mapper.StoreProductMapper; +import co.yixiang.modules.shop.service.mapper.UserMapper; import co.yixiang.mp.service.YxMiniPayService; import co.yixiang.mp.service.YxPayService; import co.yixiang.utils.*; @@ -24,7 +24,7 @@ import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.modules.shop.service.mapper.YxStoreOrderMapper; +import co.yixiang.modules.shop.service.mapper.StoreOrderMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -49,12 +49,12 @@ import javax.servlet.http.HttpServletResponse; @AllArgsConstructor //@CacheConfig(cacheNames = "yxStoreOrder") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxStoreOrderServiceImpl extends BaseServiceImpl implements YxStoreOrderService { +public class YxStoreOrderServiceImpl extends BaseServiceImpl implements YxStoreOrderService { private final IGenerator generator; private YxUserService userService; - private YxUserMapper userMapper; - private YxStorePinkRepository storePinkRepository; + private UserMapper userMapper; + private StorePinkRepository storePinkRepository; private YxStoreOrderCartInfoService storeOrderCartInfoService; private final YxUserBillService yxUserBillService; private final YxStoreOrderStatusService yxStoreOrderStatusService; @@ -62,8 +62,8 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl implements YxStoreOrderStatusService { +public class YxStoreOrderStatusServiceImpl extends BaseServiceImpl implements YxStoreOrderStatusService { private final IGenerator generator; @@ -75,4 +71,4 @@ public class YxStoreOrderStatusServiceImpl extends BaseServiceImpl implements YxStoreProductAttrResultService { +public class YxStoreProductAttrResultServiceImpl extends BaseServiceImpl implements YxStoreProductAttrResultService { diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java index ebff0908..ca47ffe7 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java @@ -3,12 +3,8 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxStoreProductAttr; import co.yixiang.common.service.impl.BaseServiceImpl; import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxStoreProductAttrService; -import co.yixiang.modules.shop.service.mapper.YxStoreProductAttrMapper; +import co.yixiang.modules.shop.service.mapper.StoreProductAttrMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -16,14 +12,7 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng @@ -33,7 +22,7 @@ import java.util.LinkedHashMap; @AllArgsConstructor //@CacheConfig(cacheNames = "yxStoreProductAttr") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxStoreProductAttrServiceImpl extends BaseServiceImpl implements YxStoreProductAttrService { +public class YxStoreProductAttrServiceImpl extends BaseServiceImpl implements YxStoreProductAttrService { } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java index 0832934f..cc7e133c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java @@ -2,14 +2,9 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxStoreProductAttrValue; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.modules.shop.service.dto.YxStoreProductAttrValueQueryCriteria; import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxStoreProductAttrValueService; -import co.yixiang.modules.shop.service.mapper.YxStoreProductAttrValueMapper; +import co.yixiang.modules.shop.service.mapper.StoreProductAttrValueMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -17,14 +12,7 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng @@ -34,7 +22,7 @@ import java.util.LinkedHashMap; @AllArgsConstructor //@CacheConfig(cacheNames = "yxStoreProductAttrValue") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxStoreProductAttrValueServiceImpl extends BaseServiceImpl implements YxStoreProductAttrValueService { +public class YxStoreProductAttrValueServiceImpl extends BaseServiceImpl implements YxStoreProductAttrValueService { } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java index 2918360e..74981f47 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java @@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxStoreProductReply; import co.yixiang.common.service.impl.BaseServiceImpl; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxStoreProductReplyService; import co.yixiang.modules.shop.service.dto.YxStoreProductReplyDto; import co.yixiang.modules.shop.service.dto.YxStoreProductReplyQueryCriteria; -import co.yixiang.modules.shop.service.mapper.YxStoreProductReplyMapper; +import co.yixiang.modules.shop.service.mapper.StoreProductReplyMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -20,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; + import java.util.List; import java.util.Map; import java.io.IOException; @@ -39,7 +35,7 @@ import java.util.LinkedHashMap; @AllArgsConstructor //@CacheConfig(cacheNames = "yxStoreProductReply") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxStoreProductReplyServiceImpl extends BaseServiceImpl implements YxStoreProductReplyService { +public class YxStoreProductReplyServiceImpl extends BaseServiceImpl implements YxStoreProductReplyService { private final IGenerator generator; @@ -85,4 +81,4 @@ public class YxStoreProductReplyServiceImpl extends BaseServiceImpl implements YxStoreProductService { +public class YxStoreProductServiceImpl extends BaseServiceImpl implements YxStoreProductService { private final IGenerator generator; - private final YxStoreProductMapper storeProductMapper; + private final StoreProductMapper storeProductMapper; private final YxStoreProductAttrService yxStoreProductAttrService; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java index a32a38a9..79d73275 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java @@ -6,13 +6,12 @@ import co.yixiang.utils.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.shop.service.dto.YxSystemConfigDto; import co.yixiang.modules.shop.service.dto.YxSystemConfigQueryCriteria; -import co.yixiang.modules.shop.service.mapper.YxSystemConfigMapper; +import co.yixiang.modules.shop.service.mapper.SystemConfigMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -20,7 +19,6 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import java.util.List; @@ -38,7 +36,7 @@ import java.util.LinkedHashMap; @AllArgsConstructor //@CacheConfig(cacheNames = "yxSystemConfig") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxSystemConfigServiceImpl extends BaseServiceImpl implements YxSystemConfigService { +public class YxSystemConfigServiceImpl extends BaseServiceImpl implements YxSystemConfigService { private final IGenerator generator; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java index 4a5c3794..c75cc6f2 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java @@ -5,15 +5,13 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import com.alibaba.fastjson.JSON; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxSystemGroupDataService; import co.yixiang.modules.shop.service.dto.YxSystemGroupDataDto; import co.yixiang.modules.shop.service.dto.YxSystemGroupDataQueryCriteria; -import co.yixiang.modules.shop.service.mapper.YxSystemGroupDataMapper; +import co.yixiang.modules.shop.service.mapper.SystemGroupDataMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -21,10 +19,8 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; + import java.util.List; import java.util.Map; import java.io.IOException; @@ -40,7 +36,7 @@ import java.util.LinkedHashMap; @AllArgsConstructor //@CacheConfig(cacheNames = "yxSystemGroupData") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxSystemGroupDataServiceImpl extends BaseServiceImpl implements YxSystemGroupDataService { +public class YxSystemGroupDataServiceImpl extends BaseServiceImpl implements YxSystemGroupDataService { private final IGenerator generator; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java index 5e0d82b5..2ccab77e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java @@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxSystemStore; import co.yixiang.common.service.impl.BaseServiceImpl; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxSystemStoreService; import co.yixiang.modules.shop.service.dto.YxSystemStoreDto; import co.yixiang.modules.shop.service.dto.YxSystemStoreQueryCriteria; -import co.yixiang.modules.shop.service.mapper.YxSystemStoreMapper; +import co.yixiang.modules.shop.service.mapper.SystemStoreMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -20,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; + import java.util.List; import java.util.Map; import java.io.IOException; @@ -39,7 +35,7 @@ import java.util.LinkedHashMap; @AllArgsConstructor //@CacheConfig(cacheNames = "yxSystemStore") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxSystemStoreServiceImpl extends BaseServiceImpl implements YxSystemStoreService { +public class YxSystemStoreServiceImpl extends BaseServiceImpl implements YxSystemStoreService { private final IGenerator generator; @@ -84,4 +80,4 @@ public class YxSystemStoreServiceImpl extends BaseServiceImpl implements YxSystemStoreStaffService { +public class YxSystemStoreStaffServiceImpl extends BaseServiceImpl implements YxSystemStoreStaffService { private final IGenerator generator; @@ -81,4 +77,4 @@ public class YxSystemStoreStaffServiceImpl extends BaseServiceImpl implements YxSystemUserLevelService { +public class YxSystemUserLevelServiceImpl extends BaseServiceImpl implements YxSystemUserLevelService { private final IGenerator generator; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java index f1b2eaea..b07b1c52 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java @@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxSystemUserTask; import co.yixiang.common.service.impl.BaseServiceImpl; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxSystemUserTaskService; import co.yixiang.modules.shop.service.dto.YxSystemUserTaskDto; import co.yixiang.modules.shop.service.dto.YxSystemUserTaskQueryCriteria; -import co.yixiang.modules.shop.service.mapper.YxSystemUserTaskMapper; +import co.yixiang.modules.shop.service.mapper.SystemUserTaskMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -20,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; + import java.util.List; import java.util.Map; import java.io.IOException; @@ -39,7 +35,7 @@ import java.util.LinkedHashMap; @AllArgsConstructor //@CacheConfig(cacheNames = "yxSystemUserTask") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxSystemUserTaskServiceImpl extends BaseServiceImpl implements YxSystemUserTaskService { +public class YxSystemUserTaskServiceImpl extends BaseServiceImpl implements YxSystemUserTaskService { private final IGenerator generator; @@ -81,4 +77,4 @@ public class YxSystemUserTaskServiceImpl extends BaseServiceImpl implements YxUserBillService { +public class YxUserBillServiceImpl extends BaseServiceImpl implements YxUserBillService { private final IGenerator generator; @@ -82,4 +78,4 @@ public class YxUserBillServiceImpl extends BaseServiceImpl implements YxUserRechargeService { +public class YxUserRechargeServiceImpl extends BaseServiceImpl implements YxUserRechargeService { private final IGenerator generator; @@ -80,4 +76,4 @@ public class YxUserRechargeServiceImpl extends BaseServiceImpl implements YxUserService { +public class YxUserServiceImpl extends BaseServiceImpl implements YxUserService { private final IGenerator generator; - private final YxUserMapper yxUserMapper; + private final UserMapper yxUserMapper; @Override //@Cacheable diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java index 772090e2..46549d0a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java @@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxWechatUser; import co.yixiang.common.service.impl.BaseServiceImpl; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxWechatUserService; import co.yixiang.modules.shop.service.dto.YxWechatUserDto; import co.yixiang.modules.shop.service.dto.YxWechatUserQueryCriteria; -import co.yixiang.modules.shop.service.mapper.YxWechatUserMapper; +import co.yixiang.modules.shop.service.mapper.WechatUserMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -20,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; + import java.util.List; import java.util.Map; import java.io.IOException; @@ -39,7 +35,7 @@ import java.util.LinkedHashMap; @AllArgsConstructor //@CacheConfig(cacheNames = "yxWechatUser") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxWechatUserServiceImpl extends BaseServiceImpl implements YxWechatUserService { +public class YxWechatUserServiceImpl extends BaseServiceImpl implements YxWechatUserService { private final IGenerator generator; @@ -94,4 +90,4 @@ public class YxWechatUserServiceImpl extends BaseServiceImpl { +public interface ExpressMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialGroupMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/MaterialGroupMapper.java similarity index 79% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialGroupMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/MaterialGroupMapper.java index 4179bc8d..15199307 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialGroupMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/MaterialGroupMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxMaterialGroupMapper extends CoreMapper { +public interface MaterialGroupMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/MaterialMapper.java similarity index 81% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/MaterialMapper.java index 8d9c8b6b..b66992e3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/MaterialMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxMaterialMapper extends CoreMapper { +public interface MaterialMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCartMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreCartMapper.java similarity index 91% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCartMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreCartMapper.java index feea3c46..b1c2a300 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCartMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreCartMapper.java @@ -16,7 +16,7 @@ import java.util.List; */ @Repository @Mapper -public interface YxStoreCartMapper extends CoreMapper { +public interface StoreCartMapper extends CoreMapper { @Select("SELECT t.cate_name as catename from yx_store_cart c " + "LEFT JOIN yx_store_product p on c.product_id = p.id " + "LEFT JOIN yx_store_category t on p.cate_id = t.id " + diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCategoryMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreCategoryMapper.java similarity index 79% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCategoryMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreCategoryMapper.java index d0da4e07..321da49b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCategoryMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreCategoryMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxStoreCategoryMapper extends CoreMapper { +public interface StoreCategoryMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderCartInfoMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreOrderCartInfoMapper.java similarity index 78% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderCartInfoMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreOrderCartInfoMapper.java index a1b06c9f..391ec1e2 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderCartInfoMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreOrderCartInfoMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxStoreOrderCartInfoMapper extends CoreMapper { +public interface StoreOrderCartInfoMapper extends CoreMapper { } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreOrderMapper.java similarity index 95% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreOrderMapper.java index 84bbbcc0..7afb06a6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreOrderMapper.java @@ -17,7 +17,7 @@ import java.util.List; */ @Repository @Mapper -public interface YxStoreOrderMapper extends CoreMapper { +public interface StoreOrderMapper extends CoreMapper { // todo Integer countByPayTimeGreaterThanEqual(int today); // diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderStatusMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreOrderStatusMapper.java similarity index 78% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderStatusMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreOrderStatusMapper.java index 6890ca35..d41648f5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderStatusMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreOrderStatusMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxStoreOrderStatusMapper extends CoreMapper { +public interface StoreOrderStatusMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductAttrMapper.java similarity index 78% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductAttrMapper.java index f09cef2f..cc3dfe39 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductAttrMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxStoreProductAttrMapper extends CoreMapper { +public interface StoreProductAttrMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrResultMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductAttrResultMapper.java similarity index 76% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrResultMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductAttrResultMapper.java index 9c7d02de..266624d1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrResultMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductAttrResultMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxStoreProductAttrResultMapper extends CoreMapper { +public interface StoreProductAttrResultMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrValueMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductAttrValueMapper.java similarity index 77% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrValueMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductAttrValueMapper.java index 3bb7f327..e89e81f3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrValueMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductAttrValueMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxStoreProductAttrValueMapper extends CoreMapper { +public interface StoreProductAttrValueMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductMapper.java similarity index 90% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductMapper.java index 1ef98152..3e3c8c6e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductMapper.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxStoreProductMapper extends CoreMapper { +public interface StoreProductMapper extends CoreMapper { @Update("update yx_store_product set is_show = #{i} where id = #{id}") void updateDel(@Param("i")int i,@Param("id") Integer id); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductReplyMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductReplyMapper.java similarity index 78% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductReplyMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductReplyMapper.java index 7e79097f..abf11841 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductReplyMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductReplyMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxStoreProductReplyMapper extends CoreMapper { +public interface StoreProductReplyMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemConfigMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemConfigMapper.java similarity index 80% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemConfigMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemConfigMapper.java index 38f6ea86..4b9147b3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemConfigMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemConfigMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxSystemConfigMapper extends CoreMapper { +public interface SystemConfigMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemGroupDataMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemGroupDataMapper.java similarity index 79% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemGroupDataMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemGroupDataMapper.java index 4489d054..676f4667 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemGroupDataMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemGroupDataMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxSystemGroupDataMapper extends CoreMapper { +public interface SystemGroupDataMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemStoreMapper.java similarity index 80% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemStoreMapper.java index 6c6338b0..49741ae2 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemStoreMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxSystemStoreMapper extends CoreMapper { +public interface SystemStoreMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreStaffMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemStoreStaffMapper.java similarity index 78% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreStaffMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemStoreStaffMapper.java index 14355aab..4a6d715e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreStaffMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemStoreStaffMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxSystemStoreStaffMapper extends CoreMapper { +public interface SystemStoreStaffMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserLevelMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemUserLevelMapper.java similarity index 79% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserLevelMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemUserLevelMapper.java index c496a821..5e29efd8 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserLevelMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemUserLevelMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxSystemUserLevelMapper extends CoreMapper { +public interface SystemUserLevelMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserTaskMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemUserTaskMapper.java similarity index 79% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserTaskMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemUserTaskMapper.java index 1ae4b126..fbbe047d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserTaskMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemUserTaskMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxSystemUserTaskMapper extends CoreMapper { +public interface SystemUserTaskMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserBillMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java similarity index 81% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserBillMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java index bd934a30..fa43e97d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserBillMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxUserBillMapper extends CoreMapper { +public interface UserBillMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserMapper.java similarity index 94% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserMapper.java index bbb032be..bf28e037 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserMapper.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxUserMapper extends CoreMapper { +public interface UserMapper extends CoreMapper { @Update( "update yx_user set status = #{status} where uid = #{id}") void updateOnstatus(@Param("status") int status, @Param("id") int id); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserRechargeMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserRechargeMapper.java similarity index 80% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserRechargeMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserRechargeMapper.java index ca113a1f..9b243177 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserRechargeMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserRechargeMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxUserRechargeMapper extends CoreMapper { +public interface UserRechargeMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxWechatUserMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/WechatUserMapper.java similarity index 80% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxWechatUserMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/WechatUserMapper.java index 6b86a916..b46bf545 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxWechatUserMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/WechatUserMapper.java @@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository; */ @Repository @Mapper -public interface YxWechatUserMapper extends CoreMapper { +public interface WechatUserMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-system/src/main/java/co/yixiang/AppRun.java b/yshop-system/src/main/java/co/yixiang/AppRun.java index 786a6dc4..61102f11 100644 --- a/yshop-system/src/main/java/co/yixiang/AppRun.java +++ b/yshop-system/src/main/java/co/yixiang/AppRun.java @@ -2,6 +2,7 @@ package co.yixiang; import co.yixiang.modules.activity.service.YxStoreCouponUserService; import co.yixiang.annotation.AnonymousAccess; import co.yixiang.utils.SpringContextHolder; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @SpringBootApplication @EnableTransactionManagement +@MapperScan(basePackages = "co.yixiang.*.mapper") public class AppRun { public static void main(String[] args) { diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java index c24d1c5d..71d0a963 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java @@ -1,11 +1,10 @@ package co.yixiang.modules.system.rest; -import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.crypto.asymmetric.RSA; import co.yixiang.aop.log.Log; import co.yixiang.config.DataScope; -import co.yixiang.domain.VerificationCode; +import co.yixiang.tools.domain.VerificationCode; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.system.domain.User; import co.yixiang.modules.system.domain.vo.UserPassVo; @@ -15,7 +14,7 @@ import co.yixiang.modules.system.service.UserService; import co.yixiang.modules.system.service.dto.RoleSmallDTO; import co.yixiang.modules.system.service.dto.UserDTO; import co.yixiang.modules.system.service.dto.UserQueryCriteria; -import co.yixiang.service.VerificationCodeService; +import co.yixiang.tools.service.VerificationCodeService; import co.yixiang.utils.PageUtil; import co.yixiang.utils.SecurityUtils; import co.yixiang.utils.YshopConstant; diff --git a/yshop-system/src/main/resources/config/application-dev.yml b/yshop-system/src/main/resources/config/application-dev.yml index 91309795..ea421852 100644 --- a/yshop-system/src/main/resources/config/application-dev.yml +++ b/yshop-system/src/main/resources/config/application-dev.yml @@ -100,4 +100,3 @@ mybatis-plus: id-type: auto logic-delete-value: 1 logic-not-delete-value: 0 - mapper-locations: classpath*:mapper/**/*Mapper.xml diff --git a/yshop-system/src/main/resources/logback.xml b/yshop-system/src/main/resources/logback.xml index febb70eb..ba3e1ee2 100644 --- a/yshop-system/src/main/resources/logback.xml +++ b/yshop-system/src/main/resources/logback.xml @@ -93,4 +93,4 @@ - \ No newline at end of file + diff --git a/yshop-tools/src/main/java/co/yixiang/config/MultipartConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java similarity index 96% rename from yshop-tools/src/main/java/co/yixiang/config/MultipartConfig.java rename to yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java index bbd5e4cd..a99f3c96 100644 --- a/yshop-tools/src/main/java/co/yixiang/config/MultipartConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java @@ -1,4 +1,4 @@ -package co.yixiang.config; +package co.yixiang.tools.config; import org.springframework.boot.web.servlet.MultipartConfigFactory; import org.springframework.context.annotation.Bean; @@ -27,4 +27,4 @@ public class MultipartConfig { factory.setLocation(location); return factory.createMultipartConfig(); } -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/domain/AlipayConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java similarity index 86% rename from yshop-tools/src/main/java/co/yixiang/domain/AlipayConfig.java rename to yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java index 9104cf19..cae5cc6c 100644 --- a/yshop-tools/src/main/java/co/yixiang/domain/AlipayConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java @@ -1,12 +1,8 @@ -package co.yixiang.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +package co.yixiang.tools.domain; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; -import javax.validation.constraints.*; import java.io.Serializable; /** @@ -78,4 +74,4 @@ public class AlipayConfig implements Serializable { public void copy(AlipayConfig source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/domain/EmailConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java similarity index 80% rename from yshop-tools/src/main/java/co/yixiang/domain/EmailConfig.java rename to yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java index f5be44ad..367a2ca0 100644 --- a/yshop-tools/src/main/java/co/yixiang/domain/EmailConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java @@ -1,12 +1,8 @@ -package co.yixiang.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +package co.yixiang.tools.domain; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; -import javax.validation.constraints.*; import java.io.Serializable; /** @@ -53,4 +49,4 @@ public class EmailConfig implements Serializable { public void copy(EmailConfig source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/domain/LocalStorage.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java similarity index 93% rename from yshop-tools/src/main/java/co/yixiang/domain/LocalStorage.java rename to yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java index dc82ee82..2c5a95f8 100644 --- a/yshop-tools/src/main/java/co/yixiang/domain/LocalStorage.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java @@ -1,12 +1,10 @@ -package co.yixiang.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +package co.yixiang.tools.domain; import lombok.Data; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; -import javax.validation.constraints.*; import java.sql.Timestamp; import java.io.Serializable; diff --git a/yshop-tools/src/main/java/co/yixiang/domain/Picture.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java similarity index 92% rename from yshop-tools/src/main/java/co/yixiang/domain/Picture.java rename to yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java index 5a72887c..9354a131 100644 --- a/yshop-tools/src/main/java/co/yixiang/domain/Picture.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java @@ -1,12 +1,10 @@ -package co.yixiang.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +package co.yixiang.tools.domain; import lombok.Data; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; -import javax.validation.constraints.*; import java.sql.Timestamp; import java.io.Serializable; diff --git a/yshop-tools/src/main/java/co/yixiang/domain/QiniuConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java similarity index 85% rename from yshop-tools/src/main/java/co/yixiang/domain/QiniuConfig.java rename to yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java index 9399fda0..a88bb16b 100644 --- a/yshop-tools/src/main/java/co/yixiang/domain/QiniuConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java @@ -1,8 +1,5 @@ -package co.yixiang.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +package co.yixiang.tools.domain; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -59,4 +56,4 @@ public class QiniuConfig implements Serializable { public void copy(QiniuConfig source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/domain/QiniuContent.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java similarity index 91% rename from yshop-tools/src/main/java/co/yixiang/domain/QiniuContent.java rename to yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java index 62299f39..d0b60c30 100644 --- a/yshop-tools/src/main/java/co/yixiang/domain/QiniuContent.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java @@ -1,12 +1,10 @@ -package co.yixiang.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +package co.yixiang.tools.domain; import lombok.Data; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; -import javax.validation.constraints.*; import java.sql.Timestamp; import java.io.Serializable; @@ -64,4 +62,4 @@ public class QiniuContent implements Serializable { public void copy(QiniuContent source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/domain/VerificationCode.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java similarity index 97% rename from yshop-tools/src/main/java/co/yixiang/domain/VerificationCode.java rename to yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java index 5fa5ec3b..690e30f1 100644 --- a/yshop-tools/src/main/java/co/yixiang/domain/VerificationCode.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java @@ -1,4 +1,4 @@ -package co.yixiang.domain; +package co.yixiang.tools.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/domain/vo/EmailVo.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/vo/EmailVo.java similarity index 93% rename from yshop-tools/src/main/java/co/yixiang/domain/vo/EmailVo.java rename to yshop-tools/src/main/java/co/yixiang/tools/domain/vo/EmailVo.java index 9c1f129d..27d15f47 100644 --- a/yshop-tools/src/main/java/co/yixiang/domain/vo/EmailVo.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/vo/EmailVo.java @@ -1,4 +1,4 @@ -package co.yixiang.domain.vo; +package co.yixiang.tools.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/domain/vo/TradeVo.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/vo/TradeVo.java similarity index 97% rename from yshop-tools/src/main/java/co/yixiang/domain/vo/TradeVo.java rename to yshop-tools/src/main/java/co/yixiang/tools/domain/vo/TradeVo.java index 9d0c2f98..e72820df 100644 --- a/yshop-tools/src/main/java/co/yixiang/domain/vo/TradeVo.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/vo/TradeVo.java @@ -1,4 +1,4 @@ -package co.yixiang.domain.vo; +package co.yixiang.tools.domain.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/express/ExpressService.java b/yshop-tools/src/main/java/co/yixiang/tools/express/ExpressService.java similarity index 96% rename from yshop-tools/src/main/java/co/yixiang/express/ExpressService.java rename to yshop-tools/src/main/java/co/yixiang/tools/express/ExpressService.java index f26e1716..a167a15b 100644 --- a/yshop-tools/src/main/java/co/yixiang/express/ExpressService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/express/ExpressService.java @@ -1,8 +1,8 @@ -package co.yixiang.express; +package co.yixiang.tools.express; import cn.hutool.http.HttpUtil; -import co.yixiang.express.config.ExpressProperties; -import co.yixiang.express.dao.ExpressInfo; +import co.yixiang.tools.express.config.ExpressProperties; +import co.yixiang.tools.express.dao.ExpressInfo; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/yshop-tools/src/main/java/co/yixiang/express/config/ExpressAutoConfiguration.java b/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java similarity index 88% rename from yshop-tools/src/main/java/co/yixiang/express/config/ExpressAutoConfiguration.java rename to yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java index 2e5ee03b..de42f191 100644 --- a/yshop-tools/src/main/java/co/yixiang/express/config/ExpressAutoConfiguration.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java @@ -1,6 +1,6 @@ -package co.yixiang.express.config; +package co.yixiang.tools.express.config; -import co.yixiang.express.ExpressService; +import co.yixiang.tools.express.ExpressService; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/yshop-tools/src/main/java/co/yixiang/express/config/ExpressProperties.java b/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressProperties.java similarity index 96% rename from yshop-tools/src/main/java/co/yixiang/express/config/ExpressProperties.java rename to yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressProperties.java index f188b2c1..348599c6 100644 --- a/yshop-tools/src/main/java/co/yixiang/express/config/ExpressProperties.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressProperties.java @@ -1,4 +1,4 @@ -package co.yixiang.express.config; +package co.yixiang.tools.express.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/yshop-tools/src/main/java/co/yixiang/express/dao/ExpressInfo.java b/yshop-tools/src/main/java/co/yixiang/tools/express/dao/ExpressInfo.java similarity index 95% rename from yshop-tools/src/main/java/co/yixiang/express/dao/ExpressInfo.java rename to yshop-tools/src/main/java/co/yixiang/tools/express/dao/ExpressInfo.java index 5ec0d75b..6798528d 100644 --- a/yshop-tools/src/main/java/co/yixiang/express/dao/ExpressInfo.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/express/dao/ExpressInfo.java @@ -1,7 +1,7 @@ /** * Copyright 2018 bejson.com */ -package co.yixiang.express.dao; +package co.yixiang.tools.express.dao; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; @@ -38,4 +38,4 @@ public class ExpressInfo { private String OrderCode; -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/express/dao/Traces.java b/yshop-tools/src/main/java/co/yixiang/tools/express/dao/Traces.java similarity index 94% rename from yshop-tools/src/main/java/co/yixiang/express/dao/Traces.java rename to yshop-tools/src/main/java/co/yixiang/tools/express/dao/Traces.java index 4e4b298a..8ddee436 100644 --- a/yshop-tools/src/main/java/co/yixiang/express/dao/Traces.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/express/dao/Traces.java @@ -1,7 +1,7 @@ /** * Copyright 2018 bejson.com */ -package co.yixiang.express.dao; +package co.yixiang.tools.express.dao; import com.fasterxml.jackson.annotation.JsonProperty; @@ -34,4 +34,4 @@ public class Traces { this.AcceptTime = AcceptTime; } -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/repository/VerificationCodeRepository.java b/yshop-tools/src/main/java/co/yixiang/tools/repository/VerificationCodeRepository.java similarity index 85% rename from yshop-tools/src/main/java/co/yixiang/repository/VerificationCodeRepository.java rename to yshop-tools/src/main/java/co/yixiang/tools/repository/VerificationCodeRepository.java index 75548b65..80802889 100644 --- a/yshop-tools/src/main/java/co/yixiang/repository/VerificationCodeRepository.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/repository/VerificationCodeRepository.java @@ -1,6 +1,6 @@ -package co.yixiang.repository; +package co.yixiang.tools.repository; -import co.yixiang.domain.VerificationCode; +import co.yixiang.tools.domain.VerificationCode; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/yshop-tools/src/main/java/co/yixiang/rest/AliPayController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/AliPayController.java similarity index 95% rename from yshop-tools/src/main/java/co/yixiang/rest/AliPayController.java rename to yshop-tools/src/main/java/co/yixiang/tools/rest/AliPayController.java index 8bc3ca2b..0122aa87 100644 --- a/yshop-tools/src/main/java/co/yixiang/rest/AliPayController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/AliPayController.java @@ -1,15 +1,15 @@ -package co.yixiang.rest; +package co.yixiang.tools.rest; import co.yixiang.aop.log.Log; -import co.yixiang.service.AlipayConfigService; -import co.yixiang.utils.AliPayStatusEnum; +import co.yixiang.tools.service.AlipayConfigService; +import co.yixiang.tools.utils.AliPayStatusEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import co.yixiang.annotation.AnonymousAccess; -import co.yixiang.domain.vo.TradeVo; -import co.yixiang.domain.AlipayConfig; -import co.yixiang.utils.AlipayUtils; +import co.yixiang.tools.domain.vo.TradeVo; +import co.yixiang.tools.domain.AlipayConfig; +import co.yixiang.tools.utils.AlipayUtils; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/yshop-tools/src/main/java/co/yixiang/rest/EmailController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/EmailController.java similarity index 89% rename from yshop-tools/src/main/java/co/yixiang/rest/EmailController.java rename to yshop-tools/src/main/java/co/yixiang/tools/rest/EmailController.java index d038559d..90bfa989 100644 --- a/yshop-tools/src/main/java/co/yixiang/rest/EmailController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/EmailController.java @@ -1,11 +1,11 @@ -package co.yixiang.rest; +package co.yixiang.tools.rest; import co.yixiang.aop.log.Log; -import co.yixiang.service.EmailConfigService; +import co.yixiang.tools.service.EmailConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import co.yixiang.domain.vo.EmailVo; -import co.yixiang.domain.EmailConfig; +import co.yixiang.tools.domain.vo.EmailVo; +import co.yixiang.tools.domain.EmailConfig; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/yshop-tools/src/main/java/co/yixiang/rest/LocalStorageController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java similarity index 91% rename from yshop-tools/src/main/java/co/yixiang/rest/LocalStorageController.java rename to yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java index 902f3cf2..dac86152 100644 --- a/yshop-tools/src/main/java/co/yixiang/rest/LocalStorageController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java @@ -1,12 +1,12 @@ -package co.yixiang.rest; +package co.yixiang.tools.rest; import java.util.Arrays; import co.yixiang.dozer.service.IGenerator; import lombok.AllArgsConstructor; import co.yixiang.aop.log.Log; -import co.yixiang.domain.LocalStorage; -import co.yixiang.service.LocalStorageService; -import co.yixiang.service.dto.LocalStorageQueryCriteria; -import co.yixiang.service.dto.LocalStorageDto; +import co.yixiang.tools.domain.LocalStorage; +import co.yixiang.tools.service.LocalStorageService; +import co.yixiang.tools.service.dto.LocalStorageQueryCriteria; +import co.yixiang.tools.service.dto.LocalStorageDto; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -74,4 +74,4 @@ public class LocalStorageController { }); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/rest/PictureController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/PictureController.java similarity index 92% rename from yshop-tools/src/main/java/co/yixiang/rest/PictureController.java rename to yshop-tools/src/main/java/co/yixiang/tools/rest/PictureController.java index f232c7b8..e9e9e236 100644 --- a/yshop-tools/src/main/java/co/yixiang/rest/PictureController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/PictureController.java @@ -1,13 +1,13 @@ -package co.yixiang.rest; +package co.yixiang.tools.rest; +import co.yixiang.tools.service.dto.PictureDto; import co.yixiang.aop.log.Log; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.service.dto.PictureDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import co.yixiang.domain.Picture; -import co.yixiang.service.PictureService; -import co.yixiang.service.dto.PictureQueryCriteria; +import co.yixiang.tools.domain.Picture; +import co.yixiang.tools.service.PictureService; +import co.yixiang.tools.service.dto.PictureQueryCriteria; import co.yixiang.utils.SecurityUtils; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; diff --git a/yshop-tools/src/main/java/co/yixiang/rest/QiniuController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/QiniuController.java similarity index 93% rename from yshop-tools/src/main/java/co/yixiang/rest/QiniuController.java rename to yshop-tools/src/main/java/co/yixiang/tools/rest/QiniuController.java index 1f80b52d..433a2f2f 100644 --- a/yshop-tools/src/main/java/co/yixiang/rest/QiniuController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/QiniuController.java @@ -1,12 +1,10 @@ -package co.yixiang.rest; +package co.yixiang.tools.rest; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.domain.QiniuConfig; -import co.yixiang.domain.QiniuContent; -import co.yixiang.exception.BadRequestException; -import co.yixiang.service.QiNiuService; -import co.yixiang.service.dto.QiniuQueryCriteria; +import co.yixiang.tools.domain.QiniuConfig; +import co.yixiang.tools.domain.QiniuContent; +import co.yixiang.tools.service.QiNiuService; +import co.yixiang.tools.service.dto.QiniuQueryCriteria; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/yshop-tools/src/main/java/co/yixiang/rest/UploadController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/UploadController.java similarity index 80% rename from yshop-tools/src/main/java/co/yixiang/rest/UploadController.java rename to yshop-tools/src/main/java/co/yixiang/tools/rest/UploadController.java index 06553e72..34121faa 100644 --- a/yshop-tools/src/main/java/co/yixiang/rest/UploadController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/UploadController.java @@ -1,27 +1,19 @@ -package co.yixiang.rest; +package co.yixiang.tools.rest; import cn.hutool.core.util.StrUtil; import co.yixiang.annotation.AnonymousAccess; -import co.yixiang.aop.log.Log; -import co.yixiang.domain.LocalStorage; -import co.yixiang.domain.QiniuContent; -import co.yixiang.service.LocalStorageService; -import co.yixiang.service.QiNiuService; -import co.yixiang.service.dto.LocalStorageDto; -import co.yixiang.service.dto.LocalStorageQueryCriteria; +import co.yixiang.tools.domain.QiniuContent; +import co.yixiang.tools.service.LocalStorageService; +import co.yixiang.tools.service.QiNiuService; +import co.yixiang.tools.service.dto.LocalStorageDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/yshop-tools/src/main/java/co/yixiang/rest/VerificationCodeController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/VerificationCodeController.java similarity index 89% rename from yshop-tools/src/main/java/co/yixiang/rest/VerificationCodeController.java rename to yshop-tools/src/main/java/co/yixiang/tools/rest/VerificationCodeController.java index 4476279f..99a00bbe 100644 --- a/yshop-tools/src/main/java/co/yixiang/rest/VerificationCodeController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/VerificationCodeController.java @@ -1,12 +1,12 @@ -package co.yixiang.rest; +package co.yixiang.tools.rest; -import co.yixiang.service.EmailConfigService; +import co.yixiang.tools.service.EmailConfigService; import co.yixiang.utils.YshopConstant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import co.yixiang.domain.VerificationCode; -import co.yixiang.domain.vo.EmailVo; -import co.yixiang.service.VerificationCodeService; +import co.yixiang.tools.domain.VerificationCode; +import co.yixiang.tools.domain.vo.EmailVo; +import co.yixiang.tools.service.VerificationCodeService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/yshop-tools/src/main/java/co/yixiang/service/AlipayConfigService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/AlipayConfigService.java similarity index 88% rename from yshop-tools/src/main/java/co/yixiang/service/AlipayConfigService.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/AlipayConfigService.java index bfa07abe..eb54f667 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/AlipayConfigService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/AlipayConfigService.java @@ -1,7 +1,7 @@ -package co.yixiang.service; +package co.yixiang.tools.service; +import co.yixiang.tools.domain.AlipayConfig; +import co.yixiang.tools.domain.vo.TradeVo; import co.yixiang.common.service.BaseService; -import co.yixiang.domain.AlipayConfig; -import co.yixiang.domain.vo.TradeVo; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/service/EmailConfigService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/EmailConfigService.java similarity index 86% rename from yshop-tools/src/main/java/co/yixiang/service/EmailConfigService.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/EmailConfigService.java index ac0a19b3..63eb8012 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/EmailConfigService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/EmailConfigService.java @@ -1,7 +1,7 @@ -package co.yixiang.service; +package co.yixiang.tools.service; +import co.yixiang.tools.domain.EmailConfig; +import co.yixiang.tools.domain.vo.EmailVo; import co.yixiang.common.service.BaseService; -import co.yixiang.domain.EmailConfig; -import co.yixiang.domain.vo.EmailVo; import org.springframework.scheduling.annotation.Async; /** diff --git a/yshop-tools/src/main/java/co/yixiang/service/LocalStorageService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java similarity index 87% rename from yshop-tools/src/main/java/co/yixiang/service/LocalStorageService.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java index 5ee43f04..31cb57ba 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/LocalStorageService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java @@ -1,8 +1,8 @@ -package co.yixiang.service; +package co.yixiang.tools.service; +import co.yixiang.tools.domain.LocalStorage; +import co.yixiang.tools.service.dto.LocalStorageDto; import co.yixiang.common.service.BaseService; -import co.yixiang.domain.LocalStorage; -import co.yixiang.service.dto.LocalStorageDto; -import co.yixiang.service.dto.LocalStorageQueryCriteria; +import co.yixiang.tools.service.dto.LocalStorageQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/yshop-tools/src/main/java/co/yixiang/service/PictureService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/PictureService.java similarity index 88% rename from yshop-tools/src/main/java/co/yixiang/service/PictureService.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/PictureService.java index 6ab3d939..a09dceee 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/PictureService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/PictureService.java @@ -1,8 +1,8 @@ -package co.yixiang.service; +package co.yixiang.tools.service; +import co.yixiang.tools.domain.Picture; +import co.yixiang.tools.service.dto.PictureDto; import co.yixiang.common.service.BaseService; -import co.yixiang.domain.Picture; -import co.yixiang.service.dto.PictureDto; -import co.yixiang.service.dto.PictureQueryCriteria; +import co.yixiang.tools.service.dto.PictureQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/yshop-tools/src/main/java/co/yixiang/service/QiNiuService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/QiNiuService.java similarity index 92% rename from yshop-tools/src/main/java/co/yixiang/service/QiNiuService.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/QiNiuService.java index ada390a0..5b121210 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/QiNiuService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/QiNiuService.java @@ -1,8 +1,8 @@ -package co.yixiang.service; +package co.yixiang.tools.service; -import co.yixiang.domain.QiniuConfig; -import co.yixiang.domain.QiniuContent; -import co.yixiang.service.dto.QiniuQueryCriteria; +import co.yixiang.tools.domain.QiniuConfig; +import co.yixiang.tools.domain.QiniuContent; +import co.yixiang.tools.service.dto.QiniuQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/yshop-tools/src/main/java/co/yixiang/service/QiniuConfigService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuConfigService.java similarity index 81% rename from yshop-tools/src/main/java/co/yixiang/service/QiniuConfigService.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/QiniuConfigService.java index d3efc397..e487b364 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/QiniuConfigService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuConfigService.java @@ -1,9 +1,8 @@ -package co.yixiang.service; +package co.yixiang.tools.service; import co.yixiang.common.service.BaseService; -import co.yixiang.domain.QiniuConfig; -import co.yixiang.service.dto.QiniuConfigDto; -import co.yixiang.service.dto.QiniuConfigQueryCriteria; -import co.yixiang.service.dto.QiniuQueryCriteria; +import co.yixiang.tools.domain.QiniuConfig; +import co.yixiang.tools.service.dto.QiniuConfigDto; +import co.yixiang.tools.service.dto.QiniuQueryCriteria; import org.springframework.data.domain.Pageable; import java.util.Map; import java.util.List; diff --git a/yshop-tools/src/main/java/co/yixiang/service/QiniuContentService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuContentService.java similarity index 81% rename from yshop-tools/src/main/java/co/yixiang/service/QiniuContentService.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/QiniuContentService.java index 3150d033..7064273f 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/QiniuContentService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuContentService.java @@ -1,9 +1,8 @@ -package co.yixiang.service; +package co.yixiang.tools.service; +import co.yixiang.tools.service.dto.QiniuContentDto; import co.yixiang.common.service.BaseService; -import co.yixiang.domain.QiniuContent; -import co.yixiang.service.dto.QiniuContentDto; -import co.yixiang.service.dto.QiniuContentQueryCriteria; -import co.yixiang.service.dto.QiniuQueryCriteria; +import co.yixiang.tools.domain.QiniuContent; +import co.yixiang.tools.service.dto.QiniuQueryCriteria; import org.springframework.data.domain.Pageable; import java.util.Map; import java.util.List; diff --git a/yshop-tools/src/main/java/co/yixiang/service/VerificationCodeService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/VerificationCodeService.java similarity index 73% rename from yshop-tools/src/main/java/co/yixiang/service/VerificationCodeService.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/VerificationCodeService.java index 56bf7036..22737e05 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/VerificationCodeService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/VerificationCodeService.java @@ -1,7 +1,7 @@ -package co.yixiang.service; +package co.yixiang.tools.service; -import co.yixiang.domain.VerificationCode; -import co.yixiang.domain.vo.EmailVo; +import co.yixiang.tools.domain.VerificationCode; +import co.yixiang.tools.domain.vo.EmailVo; /** * @author Zheng Jie diff --git a/yshop-tools/src/main/java/co/yixiang/service/dto/LocalStorageDto.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java similarity index 91% rename from yshop-tools/src/main/java/co/yixiang/service/dto/LocalStorageDto.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java index 08a326fa..85837e4f 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/dto/LocalStorageDto.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java @@ -1,4 +1,4 @@ -package co.yixiang.service.dto; +package co.yixiang.tools.service.dto; import lombok.Data; import java.sql.Timestamp; diff --git a/yshop-tools/src/main/java/co/yixiang/service/dto/LocalStorageQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageQueryCriteria.java similarity index 90% rename from yshop-tools/src/main/java/co/yixiang/service/dto/LocalStorageQueryCriteria.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageQueryCriteria.java index 3bae21a4..8d1e637b 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/dto/LocalStorageQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageQueryCriteria.java @@ -1,4 +1,4 @@ -package co.yixiang.service.dto; +package co.yixiang.tools.service.dto; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/service/dto/PictureDto.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureDto.java similarity index 94% rename from yshop-tools/src/main/java/co/yixiang/service/dto/PictureDto.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureDto.java index 7212efab..a9fa23ee 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/dto/PictureDto.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureDto.java @@ -1,4 +1,4 @@ -package co.yixiang.service.dto; +package co.yixiang.tools.service.dto; import lombok.Data; import java.sql.Timestamp; @@ -40,4 +40,4 @@ public class PictureDto implements Serializable { /** 文件的MD5值 */ private String md5code; -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/service/dto/PictureQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureQueryCriteria.java similarity index 80% rename from yshop-tools/src/main/java/co/yixiang/service/dto/PictureQueryCriteria.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureQueryCriteria.java index e1af77d6..7330e453 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/dto/PictureQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureQueryCriteria.java @@ -1,4 +1,4 @@ -package co.yixiang.service.dto; +package co.yixiang.tools.service.dto; import lombok.Data; import java.util.List; @@ -10,4 +10,4 @@ import co.yixiang.annotation.Query; */ @Data public class PictureQueryCriteria{ -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/service/dto/QiniuConfigDto.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigDto.java similarity index 92% rename from yshop-tools/src/main/java/co/yixiang/service/dto/QiniuConfigDto.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigDto.java index 52708f22..ea7935f0 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/dto/QiniuConfigDto.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigDto.java @@ -1,4 +1,4 @@ -package co.yixiang.service.dto; +package co.yixiang.tools.service.dto; import lombok.Data; import java.io.Serializable; @@ -30,4 +30,4 @@ public class QiniuConfigDto implements Serializable { /** 机房 */ private String zone; -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/service/dto/QiniuConfigQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigQueryCriteria.java similarity index 80% rename from yshop-tools/src/main/java/co/yixiang/service/dto/QiniuConfigQueryCriteria.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigQueryCriteria.java index a93d27c3..d3c47ecf 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/dto/QiniuConfigQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigQueryCriteria.java @@ -1,4 +1,4 @@ -package co.yixiang.service.dto; +package co.yixiang.tools.service.dto; import lombok.Data; import java.util.List; @@ -10,4 +10,4 @@ import co.yixiang.annotation.Query; */ @Data public class QiniuConfigQueryCriteria{ -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/service/dto/QiniuContentDto.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentDto.java similarity index 93% rename from yshop-tools/src/main/java/co/yixiang/service/dto/QiniuContentDto.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentDto.java index 0fb5642f..66e673ef 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/dto/QiniuContentDto.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentDto.java @@ -1,4 +1,4 @@ -package co.yixiang.service.dto; +package co.yixiang.tools.service.dto; import lombok.Data; import java.sql.Timestamp; @@ -33,4 +33,4 @@ public class QiniuContentDto implements Serializable { private String url; private String suffix; -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/service/dto/QiniuContentQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentQueryCriteria.java similarity index 80% rename from yshop-tools/src/main/java/co/yixiang/service/dto/QiniuContentQueryCriteria.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentQueryCriteria.java index ddfa8bac..d172fc16 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/dto/QiniuContentQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentQueryCriteria.java @@ -1,4 +1,4 @@ -package co.yixiang.service.dto; +package co.yixiang.tools.service.dto; import lombok.Data; import java.util.List; @@ -10,4 +10,4 @@ import co.yixiang.annotation.Query; */ @Data public class QiniuContentQueryCriteria{ -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/service/dto/QiniuQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuQueryCriteria.java similarity index 90% rename from yshop-tools/src/main/java/co/yixiang/service/dto/QiniuQueryCriteria.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuQueryCriteria.java index 7920f0bd..3a9740df 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/dto/QiniuQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuQueryCriteria.java @@ -1,4 +1,4 @@ -package co.yixiang.service.dto; +package co.yixiang.tools.service.dto; import lombok.Data; import co.yixiang.annotation.Query; diff --git a/yshop-tools/src/main/java/co/yixiang/service/impl/AlipayConfigServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/AlipayConfigServiceImpl.java similarity index 91% rename from yshop-tools/src/main/java/co/yixiang/service/impl/AlipayConfigServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/impl/AlipayConfigServiceImpl.java index 6adf895c..d9f9cd1e 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/impl/AlipayConfigServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/AlipayConfigServiceImpl.java @@ -1,19 +1,16 @@ -package co.yixiang.service.impl; +package co.yixiang.tools.service.impl; -import co.yixiang.domain.AlipayConfig; +import co.yixiang.tools.domain.AlipayConfig; +import co.yixiang.tools.domain.vo.TradeVo; +import co.yixiang.tools.service.AlipayConfigService; +import co.yixiang.tools.service.mapper.AlipayConfigMapper; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.domain.vo.TradeVo; import co.yixiang.exception.BadRequestException; import com.alipay.api.AlipayClient; import com.alipay.api.DefaultAlipayClient; import com.alipay.api.request.AlipayTradePagePayRequest; import com.alipay.api.request.AlipayTradeWapPayRequest; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.AllArgsConstructor; -import co.yixiang.service.AlipayConfigService; -import co.yixiang.service.mapper.AlipayConfigMapper; -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; diff --git a/yshop-tools/src/main/java/co/yixiang/service/impl/EmailConfigServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java similarity index 88% rename from yshop-tools/src/main/java/co/yixiang/service/impl/EmailConfigServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java index ee05a827..0989b954 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/impl/EmailConfigServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java @@ -1,19 +1,16 @@ -package co.yixiang.service.impl; +package co.yixiang.tools.service.impl; import cn.hutool.extra.mail.Mail; import cn.hutool.extra.mail.MailAccount; -import co.yixiang.domain.EmailConfig; +import co.yixiang.tools.domain.EmailConfig; +import co.yixiang.tools.domain.vo.EmailVo; +import co.yixiang.tools.service.EmailConfigService; +import co.yixiang.tools.service.mapper.EmailConfigMapper; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.domain.vo.EmailVo; import co.yixiang.exception.BadRequestException; import co.yixiang.utils.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.service.EmailConfigService; -import co.yixiang.service.mapper.EmailConfigMapper; -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; diff --git a/yshop-tools/src/main/java/co/yixiang/service/impl/LocalStorageServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java similarity index 93% rename from yshop-tools/src/main/java/co/yixiang/service/impl/LocalStorageServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java index f14bd220..fbeab6a1 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/impl/LocalStorageServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java @@ -1,17 +1,17 @@ -package co.yixiang.service.impl; +package co.yixiang.tools.service.impl; import cn.hutool.core.util.ObjectUtil; -import co.yixiang.domain.LocalStorage; +import co.yixiang.tools.domain.LocalStorage; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.exception.BadRequestException; import co.yixiang.utils.*; import co.yixiang.dozer.service.IGenerator; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.service.LocalStorageService; -import co.yixiang.service.dto.LocalStorageDto; -import co.yixiang.service.dto.LocalStorageQueryCriteria; -import co.yixiang.service.mapper.LocalStorageMapper; +import co.yixiang.tools.service.LocalStorageService; +import co.yixiang.tools.service.dto.LocalStorageDto; +import co.yixiang.tools.service.dto.LocalStorageQueryCriteria; +import co.yixiang.tools.service.mapper.LocalStorageMapper; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/yshop-tools/src/main/java/co/yixiang/service/impl/PictureServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/PictureServiceImpl.java similarity index 95% rename from yshop-tools/src/main/java/co/yixiang/service/impl/PictureServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/impl/PictureServiceImpl.java index 1300fd33..605b87be 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/impl/PictureServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/PictureServiceImpl.java @@ -1,10 +1,14 @@ -package co.yixiang.service.impl; +package co.yixiang.tools.service.impl; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import co.yixiang.domain.Picture; +import co.yixiang.tools.domain.Picture; +import co.yixiang.tools.service.PictureService; +import co.yixiang.tools.service.dto.PictureDto; +import co.yixiang.tools.service.dto.PictureQueryCriteria; +import co.yixiang.tools.service.mapper.PictureMapper; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.exception.BadRequestException; import co.yixiang.dozer.service.IGenerator; @@ -16,10 +20,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.utils.FileUtil; -import co.yixiang.service.PictureService; -import co.yixiang.service.dto.PictureDto; -import co.yixiang.service.dto.PictureQueryCriteria; -import co.yixiang.service.mapper.PictureMapper; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/yshop-tools/src/main/java/co/yixiang/service/impl/QiNiuServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java similarity index 93% rename from yshop-tools/src/main/java/co/yixiang/service/impl/QiNiuServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java index 4bc46058..7dde7e5d 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/impl/QiNiuServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java @@ -1,17 +1,15 @@ -package co.yixiang.service.impl; +package co.yixiang.tools.service.impl; -import co.yixiang.domain.QiniuConfig; -import co.yixiang.domain.QiniuContent; +import co.yixiang.tools.domain.QiniuConfig; +import co.yixiang.tools.domain.QiniuContent; +import co.yixiang.tools.service.QiNiuService; +import co.yixiang.tools.service.QiniuConfigService; +import co.yixiang.tools.service.QiniuContentService; +import co.yixiang.tools.service.dto.QiniuQueryCriteria; +import co.yixiang.tools.utils.QiNiuUtil; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.service.QiNiuService; -import co.yixiang.service.QiniuConfigService; -import co.yixiang.service.QiniuContentService; -import co.yixiang.service.dto.QiniuConfigDto; -import co.yixiang.utils.QiNiuUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; import com.qiniu.common.QiniuException; import com.qiniu.http.Response; import com.qiniu.storage.BucketManager; @@ -20,13 +18,8 @@ import com.qiniu.storage.UploadManager; import com.qiniu.storage.model.DefaultPutRet; import com.qiniu.storage.model.FileInfo; import com.qiniu.util.Auth; -import co.yixiang.service.dto.QiniuQueryCriteria; import co.yixiang.exception.BadRequestException; import co.yixiang.utils.FileUtil; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; -import org.mapstruct.ap.internal.model.assignment.UpdateWrapper; import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; diff --git a/yshop-tools/src/main/java/co/yixiang/service/impl/QiniuConfigServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuConfigServiceImpl.java similarity index 84% rename from yshop-tools/src/main/java/co/yixiang/service/impl/QiniuConfigServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuConfigServiceImpl.java index 4ff5600f..8bb3671d 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/impl/QiniuConfigServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuConfigServiceImpl.java @@ -1,19 +1,16 @@ -package co.yixiang.service.impl; +package co.yixiang.tools.service.impl; -import co.yixiang.domain.QiniuConfig; +import co.yixiang.tools.service.QiniuConfigService; +import co.yixiang.tools.domain.QiniuConfig; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.service.dto.QiniuQueryCriteria; +import co.yixiang.tools.service.dto.QiniuQueryCriteria; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; -import co.yixiang.service.QiniuConfigService; -import co.yixiang.service.dto.QiniuConfigDto; -import co.yixiang.service.dto.QiniuConfigQueryCriteria; -import co.yixiang.service.mapper.QiniuConfigMapper; +import co.yixiang.tools.service.dto.QiniuConfigDto; +import co.yixiang.tools.service.mapper.QiniuConfigMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -21,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; + import java.util.List; import java.util.Map; import java.io.IOException; diff --git a/yshop-tools/src/main/java/co/yixiang/service/impl/QiniuContentServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuContentServiceImpl.java similarity index 83% rename from yshop-tools/src/main/java/co/yixiang/service/impl/QiniuContentServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuContentServiceImpl.java index 51c23e7e..0e74b1f1 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/impl/QiniuContentServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuContentServiceImpl.java @@ -1,19 +1,16 @@ -package co.yixiang.service.impl; +package co.yixiang.tools.service.impl; -import co.yixiang.domain.QiniuContent; +import co.yixiang.tools.service.dto.QiniuContentDto; +import co.yixiang.tools.domain.QiniuContent; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.service.dto.QiniuQueryCriteria; +import co.yixiang.tools.service.dto.QiniuQueryCriteria; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; -import co.yixiang.service.QiniuContentService; -import co.yixiang.service.dto.QiniuContentDto; -import co.yixiang.service.dto.QiniuContentQueryCriteria; -import co.yixiang.service.mapper.QiniuContentMapper; +import co.yixiang.tools.service.QiniuContentService; +import co.yixiang.tools.service.mapper.QiniuContentMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -21,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; + import java.util.List; import java.util.Map; import java.io.IOException; diff --git a/yshop-tools/src/main/java/co/yixiang/service/impl/VerificationCodeServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java similarity index 90% rename from yshop-tools/src/main/java/co/yixiang/service/impl/VerificationCodeServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java index 8cfced62..d3dc93e4 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/impl/VerificationCodeServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java @@ -1,4 +1,4 @@ -package co.yixiang.service.impl; +package co.yixiang.tools.service.impl; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.RandomUtil; @@ -6,15 +6,12 @@ import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; +import co.yixiang.tools.domain.VerificationCode; +import co.yixiang.tools.domain.vo.EmailVo; +import co.yixiang.tools.service.VerificationCodeService; +import co.yixiang.tools.service.mapper.VerificationCodeMapper; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.domain.AlipayConfig; -import co.yixiang.domain.VerificationCode; -import co.yixiang.domain.vo.EmailVo; -import co.yixiang.service.VerificationCodeService; import co.yixiang.exception.BadRequestException; -import co.yixiang.repository.VerificationCodeRepository; -import co.yixiang.service.mapper.AlipayConfigMapper; -import co.yixiang.service.mapper.VerificationCodeMapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/yshop-tools/src/main/java/co/yixiang/service/mapper/AlipayConfigMapper.java b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/AlipayConfigMapper.java similarity index 75% rename from yshop-tools/src/main/java/co/yixiang/service/mapper/AlipayConfigMapper.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/mapper/AlipayConfigMapper.java index 97108de0..aafbe80c 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/mapper/AlipayConfigMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/AlipayConfigMapper.java @@ -1,7 +1,7 @@ -package co.yixiang.service.mapper; +package co.yixiang.tools.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.domain.AlipayConfig; +import co.yixiang.tools.domain.AlipayConfig; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @@ -13,4 +13,4 @@ import org.springframework.stereotype.Repository; @Mapper public interface AlipayConfigMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/service/mapper/EmailConfigMapper.java b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/EmailConfigMapper.java similarity index 75% rename from yshop-tools/src/main/java/co/yixiang/service/mapper/EmailConfigMapper.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/mapper/EmailConfigMapper.java index 55f8f066..c27662db 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/mapper/EmailConfigMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/EmailConfigMapper.java @@ -1,7 +1,7 @@ -package co.yixiang.service.mapper; +package co.yixiang.tools.service.mapper; +import co.yixiang.tools.domain.EmailConfig; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.domain.EmailConfig; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @@ -13,4 +13,4 @@ import org.springframework.stereotype.Repository; @Mapper public interface EmailConfigMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/service/mapper/LocalStorageMapper.java b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/LocalStorageMapper.java similarity index 75% rename from yshop-tools/src/main/java/co/yixiang/service/mapper/LocalStorageMapper.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/mapper/LocalStorageMapper.java index 6508fba4..e3c03e85 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/mapper/LocalStorageMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/LocalStorageMapper.java @@ -1,7 +1,7 @@ -package co.yixiang.service.mapper; +package co.yixiang.tools.service.mapper; +import co.yixiang.tools.domain.LocalStorage; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.domain.LocalStorage; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @@ -13,4 +13,4 @@ import org.springframework.stereotype.Repository; @Mapper public interface LocalStorageMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/service/mapper/PictureMapper.java b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/PictureMapper.java similarity index 76% rename from yshop-tools/src/main/java/co/yixiang/service/mapper/PictureMapper.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/mapper/PictureMapper.java index d49830ba..c32b016c 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/mapper/PictureMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/PictureMapper.java @@ -1,7 +1,7 @@ -package co.yixiang.service.mapper; +package co.yixiang.tools.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.domain.Picture; +import co.yixiang.tools.domain.Picture; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @@ -13,4 +13,4 @@ import org.springframework.stereotype.Repository; @Mapper public interface PictureMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/service/mapper/QiniuConfigMapper.java b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuConfigMapper.java similarity index 81% rename from yshop-tools/src/main/java/co/yixiang/service/mapper/QiniuConfigMapper.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuConfigMapper.java index fa52bf55..9f89d093 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/mapper/QiniuConfigMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuConfigMapper.java @@ -1,8 +1,7 @@ -package co.yixiang.service.mapper; +package co.yixiang.tools.service.mapper; -import co.yixiang.base.BaseEntity; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.domain.QiniuConfig; +import co.yixiang.tools.domain.QiniuConfig; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; diff --git a/yshop-tools/src/main/java/co/yixiang/service/mapper/QiniuContentMapper.java b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuContentMapper.java similarity index 75% rename from yshop-tools/src/main/java/co/yixiang/service/mapper/QiniuContentMapper.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuContentMapper.java index e5b9cbb7..8476f1b9 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/mapper/QiniuContentMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuContentMapper.java @@ -1,7 +1,7 @@ -package co.yixiang.service.mapper; +package co.yixiang.tools.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.domain.QiniuContent; +import co.yixiang.tools.domain.QiniuContent; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @@ -13,4 +13,4 @@ import org.springframework.stereotype.Repository; @Mapper public interface QiniuContentMapper extends CoreMapper { -} \ No newline at end of file +} diff --git a/yshop-tools/src/main/java/co/yixiang/service/mapper/VerificationCodeMapper.java b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/VerificationCodeMapper.java similarity index 67% rename from yshop-tools/src/main/java/co/yixiang/service/mapper/VerificationCodeMapper.java rename to yshop-tools/src/main/java/co/yixiang/tools/service/mapper/VerificationCodeMapper.java index f071359a..3987bd42 100644 --- a/yshop-tools/src/main/java/co/yixiang/service/mapper/VerificationCodeMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/VerificationCodeMapper.java @@ -1,9 +1,8 @@ -package co.yixiang.service.mapper; +package co.yixiang.tools.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.domain.AlipayConfig; -import co.yixiang.domain.VerificationCode; +import co.yixiang.tools.domain.VerificationCode; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-tools/src/main/java/co/yixiang/utils/AliPayStatusEnum.java b/yshop-tools/src/main/java/co/yixiang/tools/utils/AliPayStatusEnum.java similarity index 94% rename from yshop-tools/src/main/java/co/yixiang/utils/AliPayStatusEnum.java rename to yshop-tools/src/main/java/co/yixiang/tools/utils/AliPayStatusEnum.java index 37b14587..28b1b8a1 100644 --- a/yshop-tools/src/main/java/co/yixiang/utils/AliPayStatusEnum.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/utils/AliPayStatusEnum.java @@ -1,4 +1,4 @@ -package co.yixiang.utils; +package co.yixiang.tools.utils; /** * 支付状态 diff --git a/yshop-tools/src/main/java/co/yixiang/utils/AlipayUtils.java b/yshop-tools/src/main/java/co/yixiang/tools/utils/AlipayUtils.java similarity index 96% rename from yshop-tools/src/main/java/co/yixiang/utils/AlipayUtils.java rename to yshop-tools/src/main/java/co/yixiang/tools/utils/AlipayUtils.java index 1960d66c..7625e07a 100644 --- a/yshop-tools/src/main/java/co/yixiang/utils/AlipayUtils.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/utils/AlipayUtils.java @@ -1,8 +1,8 @@ -package co.yixiang.utils; +package co.yixiang.tools.utils; +import co.yixiang.tools.domain.AlipayConfig; import com.alipay.api.AlipayApiException; import com.alipay.api.internal.util.AlipaySignature; -import co.yixiang.domain.AlipayConfig; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; diff --git a/yshop-tools/src/main/java/co/yixiang/utils/JacksonUtil.java b/yshop-tools/src/main/java/co/yixiang/tools/utils/JacksonUtil.java similarity index 99% rename from yshop-tools/src/main/java/co/yixiang/utils/JacksonUtil.java rename to yshop-tools/src/main/java/co/yixiang/tools/utils/JacksonUtil.java index db55ee6d..dd7aeaad 100644 --- a/yshop-tools/src/main/java/co/yixiang/utils/JacksonUtil.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/utils/JacksonUtil.java @@ -1,4 +1,4 @@ -package co.yixiang.utils; +package co.yixiang.tools.utils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/yshop-tools/src/main/java/co/yixiang/utils/QiNiuUtil.java b/yshop-tools/src/main/java/co/yixiang/tools/utils/QiNiuUtil.java similarity index 95% rename from yshop-tools/src/main/java/co/yixiang/utils/QiNiuUtil.java rename to yshop-tools/src/main/java/co/yixiang/tools/utils/QiNiuUtil.java index 80043950..fa328b67 100644 --- a/yshop-tools/src/main/java/co/yixiang/utils/QiNiuUtil.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/utils/QiNiuUtil.java @@ -1,5 +1,6 @@ -package co.yixiang.utils; +package co.yixiang.tools.utils; +import co.yixiang.utils.FileUtil; import com.qiniu.storage.Region; import java.text.SimpleDateFormat;