cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

升级springboot版本为2.6.7、mybatis plus版本为3.5.1、pagehelper版本为1.4.2、其它依赖升级

Browse Source
This commit is contained in:
taozi
2022-05-01 14:26:46 +08:00
parent 8d424d5425
commit 31c1d0561f
211 changed files with 604 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java → yshop-tools/src/main/java/co/yixiang/modules/tools/config/MultipartConfig.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.config;
package co.yixiang.modules.tools.config;
import org.springframework.boot.web.servlet.MultipartConfigFactory;
import org.springframework.context.annotation.Bean;

2
yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java → yshop-tools/src/main/java/co/yixiang/modules/tools/domain/AlipayConfig.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.domain;
package co.yixiang.modules.tools.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;

2
yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java → yshop-tools/src/main/java/co/yixiang/modules/tools/domain/EmailConfig.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.domain;
package co.yixiang.modules.tools.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;

2
yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java → yshop-tools/src/main/java/co/yixiang/modules/tools/domain/LocalStorage.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.domain;
package co.yixiang.modules.tools.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;

2
yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java → yshop-tools/src/main/java/co/yixiang/modules/tools/domain/Picture.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.domain;
package co.yixiang.modules.tools.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;

2
yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java → yshop-tools/src/main/java/co/yixiang/modules/tools/domain/QiniuConfig.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.domain;
package co.yixiang.modules.tools.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;

2
yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java → yshop-tools/src/main/java/co/yixiang/modules/tools/domain/QiniuContent.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.domain;
package co.yixiang.modules.tools.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;

2
yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java → yshop-tools/src/main/java/co/yixiang/modules/tools/domain/VerificationCode.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.domain;
package co.yixiang.modules.tools.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;

2
yshop-tools/src/main/java/co/yixiang/tools/domain/vo/EmailVo.java → yshop-tools/src/main/java/co/yixiang/modules/tools/domain/vo/EmailVo.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.domain.vo;
package co.yixiang.modules.tools.domain.vo;
import lombok.AllArgsConstructor;
import lombok.Data;

2
yshop-tools/src/main/java/co/yixiang/tools/domain/vo/TradeVo.java → yshop-tools/src/main/java/co/yixiang/modules/tools/domain/vo/TradeVo.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.domain.vo;
package co.yixiang.modules.tools.domain.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

8
yshop-tools/src/main/java/co/yixiang/tools/express/ExpressService.java → yshop-tools/src/main/java/co/yixiang/modules/tools/express/ExpressService.java
View File

@ -3,12 +3,12 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.express;
package co.yixiang.modules.tools.express;
import cn.hutool.http.HttpUtil;
import co.yixiang.enums.ShipperCodeEnum;
import co.yixiang.tools.express.config.ExpressProperties;
import co.yixiang.tools.express.dao.ExpressInfo;
import co.yixiang.modules.tools.express.dao.ExpressInfo;
import co.yixiang.modules.tools.express.config.ExpressProperties;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -63,7 +63,7 @@ public class ExpressService implements Serializable {
* @param ShipperCode
* @return
*/
public ExpressInfo getExpressInfo(String OrderCode,String ShipperCode, String LogisticCode,String lastFourNumber) {
public ExpressInfo getExpressInfo(String OrderCode, String ShipperCode, String LogisticCode, String lastFourNumber) {
try {
String result = getOrderTracesByJson(OrderCode,ShipperCode, LogisticCode,lastFourNumber);
ObjectMapper objMap = new ObjectMapper();

4
yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java → yshop-tools/src/main/java/co/yixiang/modules/tools/express/config/ExpressAutoConfiguration.java
View File

@ -6,12 +6,12 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.tools.express.config;
package co.yixiang.modules.tools.express.config;
import co.yixiang.constant.ShopConstants;
import co.yixiang.enums.ShopCommonEnum;
import co.yixiang.tools.express.ExpressService;
import co.yixiang.modules.tools.express.ExpressService;
import co.yixiang.utils.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;

2
yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressProperties.java → yshop-tools/src/main/java/co/yixiang/modules/tools/express/config/ExpressProperties.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.express.config;
package co.yixiang.modules.tools.express.config;
import java.util.ArrayList;
import java.util.List;

2
yshop-tools/src/main/java/co/yixiang/tools/express/dao/ExpressInfo.java → yshop-tools/src/main/java/co/yixiang/modules/tools/express/dao/ExpressInfo.java
View File

@ -6,7 +6,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.express.dao;
package co.yixiang.modules.tools.express.dao;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;

2
yshop-tools/src/main/java/co/yixiang/tools/express/dao/Traces.java → yshop-tools/src/main/java/co/yixiang/modules/tools/express/dao/Traces.java
View File

@ -6,7 +6,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.express.dao;
package co.yixiang.modules.tools.express.dao;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;

14
yshop-tools/src/main/java/co/yixiang/tools/rest/AliPayController.java → yshop-tools/src/main/java/co/yixiang/modules/tools/rest/AliPayController.java
View File

@ -3,15 +3,15 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.rest;
package co.yixiang.modules.tools.rest;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.tools.domain.AlipayConfig;
import co.yixiang.tools.domain.vo.TradeVo;
import co.yixiang.tools.service.AlipayConfigService;
import co.yixiang.tools.utils.AliPayStatusEnum;
import co.yixiang.tools.utils.AlipayUtils;
import co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.tools.domain.AlipayConfig;
import co.yixiang.modules.tools.domain.vo.TradeVo;
import co.yixiang.modules.tools.service.AlipayConfigService;
import co.yixiang.modules.tools.utils.AliPayStatusEnum;
import co.yixiang.modules.tools.utils.AlipayUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

10
yshop-tools/src/main/java/co/yixiang/tools/rest/EmailController.java → yshop-tools/src/main/java/co/yixiang/modules/tools/rest/EmailController.java
View File

@ -3,12 +3,12 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.rest;
package co.yixiang.modules.tools.rest;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.tools.domain.EmailConfig;
import co.yixiang.tools.domain.vo.EmailVo;
import co.yixiang.tools.service.EmailConfigService;
import co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.tools.domain.EmailConfig;
import co.yixiang.modules.tools.domain.vo.EmailVo;
import co.yixiang.modules.tools.service.EmailConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.http.HttpStatus;

10
yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java → yshop-tools/src/main/java/co/yixiang/modules/tools/rest/LocalStorageController.java
View File

@ -3,13 +3,13 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.rest;
package co.yixiang.modules.tools.rest;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.tools.service.LocalStorageService;
import co.yixiang.tools.service.dto.LocalStorageDto;
import co.yixiang.tools.service.dto.LocalStorageQueryCriteria;
import co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.tools.service.LocalStorageService;
import co.yixiang.modules.tools.service.dto.LocalStorageDto;
import co.yixiang.modules.tools.service.dto.LocalStorageQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;

12
yshop-tools/src/main/java/co/yixiang/tools/rest/PictureController.java → yshop-tools/src/main/java/co/yixiang/modules/tools/rest/PictureController.java
View File

@ -3,14 +3,14 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.rest;
package co.yixiang.modules.tools.rest;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.logging.aop.log.Log;
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.modules.logging.aop.log.Log;
import co.yixiang.modules.tools.service.dto.PictureDto;
import co.yixiang.modules.tools.domain.Picture;
import co.yixiang.modules.tools.service.PictureService;
import co.yixiang.modules.tools.service.dto.PictureQueryCriteria;
import co.yixiang.utils.SecurityUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

12
yshop-tools/src/main/java/co/yixiang/tools/rest/QiniuController.java → yshop-tools/src/main/java/co/yixiang/modules/tools/rest/QiniuController.java
View File

@ -3,13 +3,13 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.rest;
package co.yixiang.modules.tools.rest;
import co.yixiang.logging.aop.log.Log;
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 co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.tools.domain.QiniuConfig;
import co.yixiang.modules.tools.domain.QiniuContent;
import co.yixiang.modules.tools.service.QiNiuService;
import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

11
yshop-tools/src/main/java/co/yixiang/tools/rest/UploadController.java → yshop-tools/src/main/java/co/yixiang/modules/tools/rest/UploadController.java
View File

@ -3,18 +3,17 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.rest;
package co.yixiang.modules.tools.rest;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.api.YshopException;
import co.yixiang.constant.ShopConstants;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.enums.ShopCommonEnum;
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 co.yixiang.modules.tools.service.dto.LocalStorageDto;
import co.yixiang.modules.tools.domain.QiniuContent;
import co.yixiang.modules.tools.service.LocalStorageService;
import co.yixiang.modules.tools.service.QiNiuService;
import co.yixiang.utils.RedisUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

10
yshop-tools/src/main/java/co/yixiang/tools/rest/VerificationCodeController.java → yshop-tools/src/main/java/co/yixiang/modules/tools/rest/VerificationCodeController.java
View File

@ -3,12 +3,12 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.rest;
package co.yixiang.modules.tools.rest;
import co.yixiang.tools.domain.VerificationCode;
import co.yixiang.tools.domain.vo.EmailVo;
import co.yixiang.tools.service.EmailConfigService;
import co.yixiang.tools.service.VerificationCodeService;
import co.yixiang.modules.tools.domain.VerificationCode;
import co.yixiang.modules.tools.domain.vo.EmailVo;
import co.yixiang.modules.tools.service.EmailConfigService;
import co.yixiang.modules.tools.service.VerificationCodeService;
import co.yixiang.utils.YshopConstant;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

6
yshop-tools/src/main/java/co/yixiang/tools/service/AlipayConfigService.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/AlipayConfigService.java
View File

@ -3,11 +3,11 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service;
package co.yixiang.modules.tools.service;
import co.yixiang.common.service.BaseService;
import co.yixiang.tools.domain.AlipayConfig;
import co.yixiang.tools.domain.vo.TradeVo;
import co.yixiang.modules.tools.domain.AlipayConfig;
import co.yixiang.modules.tools.domain.vo.TradeVo;
/**
* @author hupeng

6
yshop-tools/src/main/java/co/yixiang/tools/service/EmailConfigService.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/EmailConfigService.java
View File

@ -3,11 +3,11 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service;
package co.yixiang.modules.tools.service;
import co.yixiang.common.service.BaseService;
import co.yixiang.tools.domain.EmailConfig;
import co.yixiang.tools.domain.vo.EmailVo;
import co.yixiang.modules.tools.domain.EmailConfig;
import co.yixiang.modules.tools.domain.vo.EmailVo;
import org.springframework.scheduling.annotation.Async;
/**

8
yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/LocalStorageService.java
View File

@ -3,12 +3,12 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service;
package co.yixiang.modules.tools.service;
import co.yixiang.common.service.BaseService;
import co.yixiang.tools.domain.LocalStorage;
import co.yixiang.tools.service.dto.LocalStorageDto;
import co.yixiang.tools.service.dto.LocalStorageQueryCriteria;
import co.yixiang.modules.tools.service.dto.LocalStorageDto;
import co.yixiang.modules.tools.service.dto.LocalStorageQueryCriteria;
import co.yixiang.modules.tools.domain.LocalStorage;
import org.springframework.data.domain.Pageable;
import org.springframework.web.multipart.MultipartFile;

8
yshop-tools/src/main/java/co/yixiang/tools/service/PictureService.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/PictureService.java
View File

@ -3,12 +3,12 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service;
package co.yixiang.modules.tools.service;
import co.yixiang.common.service.BaseService;
import co.yixiang.tools.domain.Picture;
import co.yixiang.tools.service.dto.PictureDto;
import co.yixiang.tools.service.dto.PictureQueryCriteria;
import co.yixiang.modules.tools.service.dto.PictureDto;
import co.yixiang.modules.tools.service.dto.PictureQueryCriteria;
import co.yixiang.modules.tools.domain.Picture;
import org.springframework.data.domain.Pageable;
import org.springframework.web.multipart.MultipartFile;

8
yshop-tools/src/main/java/co/yixiang/tools/service/QiNiuService.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/QiNiuService.java
View File

@ -3,11 +3,11 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service;
package co.yixiang.modules.tools.service;
import co.yixiang.tools.domain.QiniuConfig;
import co.yixiang.tools.domain.QiniuContent;
import co.yixiang.tools.service.dto.QiniuQueryCriteria;
import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria;
import co.yixiang.modules.tools.domain.QiniuConfig;
import co.yixiang.modules.tools.domain.QiniuContent;
import org.springframework.data.domain.Pageable;
import org.springframework.web.multipart.MultipartFile;

8
yshop-tools/src/main/java/co/yixiang/tools/service/QiniuConfigService.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/QiniuConfigService.java
View File

@ -3,12 +3,12 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service;
package co.yixiang.modules.tools.service;
import co.yixiang.common.service.BaseService;
import co.yixiang.tools.domain.QiniuConfig;
import co.yixiang.tools.service.dto.QiniuConfigDto;
import co.yixiang.tools.service.dto.QiniuQueryCriteria;
import co.yixiang.modules.tools.service.dto.QiniuConfigDto;
import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria;
import co.yixiang.modules.tools.domain.QiniuConfig;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;

8
yshop-tools/src/main/java/co/yixiang/tools/service/QiniuContentService.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/QiniuContentService.java
View File

@ -3,12 +3,12 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service;
package co.yixiang.modules.tools.service;
import co.yixiang.common.service.BaseService;
import co.yixiang.tools.domain.QiniuContent;
import co.yixiang.tools.service.dto.QiniuContentDto;
import co.yixiang.tools.service.dto.QiniuQueryCriteria;
import co.yixiang.modules.tools.service.dto.QiniuContentDto;
import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria;
import co.yixiang.modules.tools.domain.QiniuContent;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;

6
yshop-tools/src/main/java/co/yixiang/tools/service/VerificationCodeService.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/VerificationCodeService.java
View File

@ -3,10 +3,10 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service;
package co.yixiang.modules.tools.service;
import co.yixiang.tools.domain.VerificationCode;
import co.yixiang.tools.domain.vo.EmailVo;
import co.yixiang.modules.tools.domain.VerificationCode;
import co.yixiang.modules.tools.domain.vo.EmailVo;
/**
* @author hupeng

2
yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/LocalStorageDto.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.dto;
package co.yixiang.modules.tools.service.dto;
import lombok.Data;

2
yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageQueryCriteria.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/LocalStorageQueryCriteria.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.dto;
package co.yixiang.modules.tools.service.dto;
import co.yixiang.annotation.Query;
import lombok.Data;

2
yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureDto.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/PictureDto.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.dto;
package co.yixiang.modules.tools.service.dto;
import lombok.Data;

2
yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureQueryCriteria.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/PictureQueryCriteria.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.dto;
package co.yixiang.modules.tools.service.dto;
import lombok.Data;

2
yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigDto.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuConfigDto.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.dto;
package co.yixiang.modules.tools.service.dto;
import lombok.Data;

2
yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigQueryCriteria.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuConfigQueryCriteria.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.dto;
package co.yixiang.modules.tools.service.dto;
import lombok.Data;

2
yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentDto.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuContentDto.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.dto;
package co.yixiang.modules.tools.service.dto;
import lombok.Data;

2
yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentQueryCriteria.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuContentQueryCriteria.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.dto;
package co.yixiang.modules.tools.service.dto;
import lombok.Data;

2
yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuQueryCriteria.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuQueryCriteria.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.dto;
package co.yixiang.modules.tools.service.dto;
import co.yixiang.annotation.Query;
import lombok.Data;

10
yshop-tools/src/main/java/co/yixiang/tools/service/impl/AlipayConfigServiceImpl.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/AlipayConfigServiceImpl.java
View File

@ -3,14 +3,14 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.impl;
package co.yixiang.modules.tools.service.impl;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.exception.BadRequestException;
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.modules.tools.domain.AlipayConfig;
import co.yixiang.modules.tools.domain.vo.TradeVo;
import co.yixiang.modules.tools.service.AlipayConfigService;
import co.yixiang.modules.tools.service.mapper.AlipayConfigMapper;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.request.AlipayTradePagePayRequest;

10
yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/EmailConfigServiceImpl.java
View File

@ -3,17 +3,17 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.impl;
package co.yixiang.modules.tools.service.impl;
import cn.hutool.extra.mail.Mail;
import cn.hutool.extra.mail.MailAccount;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
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.modules.tools.domain.EmailConfig;
import co.yixiang.modules.tools.domain.vo.EmailVo;
import co.yixiang.modules.tools.service.EmailConfigService;
import co.yixiang.modules.tools.service.mapper.EmailConfigMapper;
import co.yixiang.utils.EncryptUtils;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

13
yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/LocalStorageServiceImpl.java
View File

@ -3,20 +3,19 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.impl;
package co.yixiang.modules.tools.service.impl;
import cn.hutool.core.util.ObjectUtil;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
import co.yixiang.tools.domain.LocalStorage;
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 co.yixiang.modules.tools.domain.LocalStorage;
import co.yixiang.modules.tools.service.LocalStorageService;
import co.yixiang.modules.tools.service.dto.LocalStorageDto;
import co.yixiang.modules.tools.service.dto.LocalStorageQueryCriteria;
import co.yixiang.modules.tools.service.mapper.LocalStorageMapper;
import co.yixiang.utils.FileUtil;
import co.yixiang.utils.SecurityUtils;
import co.yixiang.utils.StringUtils;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.BeanUtils;

12
yshop-tools/src/main/java/co/yixiang/tools/service/impl/PictureServiceImpl.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/PictureServiceImpl.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.impl;
package co.yixiang.modules.tools.service.impl;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpUtil;
@ -13,11 +13,11 @@ import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
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.modules.tools.domain.Picture;
import co.yixiang.modules.tools.service.PictureService;
import co.yixiang.modules.tools.service.dto.PictureDto;
import co.yixiang.modules.tools.service.dto.PictureQueryCriteria;
import co.yixiang.modules.tools.service.mapper.PictureMapper;
import co.yixiang.utils.FileUtil;
import co.yixiang.utils.TranslatorUtil;
import co.yixiang.utils.ValidationUtil;

16
yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/QiNiuServiceImpl.java
View File

@ -3,17 +3,17 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.impl;
package co.yixiang.modules.tools.service.impl;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
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.modules.tools.domain.QiniuConfig;
import co.yixiang.modules.tools.domain.QiniuContent;
import co.yixiang.modules.tools.service.QiNiuService;
import co.yixiang.modules.tools.service.QiniuConfigService;
import co.yixiang.modules.tools.service.QiniuContentService;
import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria;
import co.yixiang.modules.tools.utils.QiNiuUtil;
import co.yixiang.utils.FileUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

12
yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuConfigServiceImpl.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/QiniuConfigServiceImpl.java
View File

@ -3,16 +3,16 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.impl;
package co.yixiang.modules.tools.service.impl;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.tools.domain.QiniuConfig;
import co.yixiang.tools.service.QiniuConfigService;
import co.yixiang.tools.service.dto.QiniuConfigDto;
import co.yixiang.tools.service.dto.QiniuQueryCriteria;
import co.yixiang.tools.service.mapper.QiniuConfigMapper;
import co.yixiang.modules.tools.service.mapper.QiniuConfigMapper;
import co.yixiang.modules.tools.domain.QiniuConfig;
import co.yixiang.modules.tools.service.QiniuConfigService;
import co.yixiang.modules.tools.service.dto.QiniuConfigDto;
import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria;
import co.yixiang.utils.FileUtil;
import com.github.pagehelper.PageInfo;
import lombok.AllArgsConstructor;

12
yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuContentServiceImpl.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/QiniuContentServiceImpl.java
View File

@ -3,16 +3,16 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.impl;
package co.yixiang.modules.tools.service.impl;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.tools.domain.QiniuContent;
import co.yixiang.tools.service.QiniuContentService;
import co.yixiang.tools.service.dto.QiniuContentDto;
import co.yixiang.tools.service.dto.QiniuQueryCriteria;
import co.yixiang.tools.service.mapper.QiniuContentMapper;
import co.yixiang.modules.tools.service.mapper.QiniuContentMapper;
import co.yixiang.modules.tools.domain.QiniuContent;
import co.yixiang.modules.tools.service.QiniuContentService;
import co.yixiang.modules.tools.service.dto.QiniuContentDto;
import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria;
import co.yixiang.utils.FileUtil;
import com.github.pagehelper.PageInfo;
import lombok.AllArgsConstructor;

10
yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/VerificationCodeServiceImpl.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.impl;
package co.yixiang.modules.tools.service.impl;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.RandomUtil;
@ -13,10 +13,10 @@ import cn.hutool.extra.template.TemplateEngine;
import cn.hutool.extra.template.TemplateUtil;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.exception.BadRequestException;
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.modules.tools.service.mapper.VerificationCodeMapper;
import co.yixiang.modules.tools.domain.VerificationCode;
import co.yixiang.modules.tools.domain.vo.EmailVo;
import co.yixiang.modules.tools.service.VerificationCodeService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import org.springframework.beans.factory.annotation.Value;

4
yshop-tools/src/main/java/co/yixiang/tools/service/mapper/AlipayConfigMapper.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/AlipayConfigMapper.java
View File

@ -3,10 +3,10 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.mapper;
package co.yixiang.modules.tools.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.tools.domain.AlipayConfig;
import co.yixiang.modules.tools.domain.AlipayConfig;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

4
yshop-tools/src/main/java/co/yixiang/tools/service/mapper/EmailConfigMapper.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/EmailConfigMapper.java
View File

@ -3,10 +3,10 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.mapper;
package co.yixiang.modules.tools.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.tools.domain.EmailConfig;
import co.yixiang.modules.tools.domain.EmailConfig;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

4
yshop-tools/src/main/java/co/yixiang/tools/service/mapper/LocalStorageMapper.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/LocalStorageMapper.java
View File

@ -3,10 +3,10 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.mapper;
package co.yixiang.modules.tools.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.tools.domain.LocalStorage;
import co.yixiang.modules.tools.domain.LocalStorage;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

4
yshop-tools/src/main/java/co/yixiang/tools/service/mapper/PictureMapper.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/PictureMapper.java
View File

@ -3,10 +3,10 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.mapper;
package co.yixiang.modules.tools.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.tools.domain.Picture;
import co.yixiang.modules.tools.domain.Picture;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

4
yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuConfigMapper.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/QiniuConfigMapper.java
View File

@ -3,10 +3,10 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.mapper;
package co.yixiang.modules.tools.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.tools.domain.QiniuConfig;
import co.yixiang.modules.tools.domain.QiniuConfig;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

4
yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuContentMapper.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/QiniuContentMapper.java
View File

@ -3,10 +3,10 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.mapper;
package co.yixiang.modules.tools.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.tools.domain.QiniuContent;
import co.yixiang.modules.tools.domain.QiniuContent;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

4
yshop-tools/src/main/java/co/yixiang/tools/service/mapper/VerificationCodeMapper.java → yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/VerificationCodeMapper.java
View File

@ -3,11 +3,11 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.service.mapper;
package co.yixiang.modules.tools.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.tools.domain.VerificationCode;
import co.yixiang.modules.tools.domain.VerificationCode;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

2
yshop-tools/src/main/java/co/yixiang/tools/utils/AliPayStatusEnum.java → yshop-tools/src/main/java/co/yixiang/modules/tools/utils/AliPayStatusEnum.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.utils;
package co.yixiang.modules.tools.utils;
/**
* 支付状态

4
yshop-tools/src/main/java/co/yixiang/tools/utils/AlipayUtils.java → yshop-tools/src/main/java/co/yixiang/modules/tools/utils/AlipayUtils.java
View File

@ -3,9 +3,9 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.utils;
package co.yixiang.modules.tools.utils;
import co.yixiang.tools.domain.AlipayConfig;
import co.yixiang.modules.tools.domain.AlipayConfig;
import com.alipay.api.AlipayApiException;
import com.alipay.api.internal.util.AlipaySignature;
import org.springframework.stereotype.Component;

2
yshop-tools/src/main/java/co/yixiang/tools/utils/JacksonUtil.java → yshop-tools/src/main/java/co/yixiang/modules/tools/utils/JacksonUtil.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.utils;
package co.yixiang.modules.tools.utils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;

2
yshop-tools/src/main/java/co/yixiang/tools/utils/QiNiuUtil.java → yshop-tools/src/main/java/co/yixiang/modules/tools/utils/QiNiuUtil.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.tools.utils;
package co.yixiang.modules.tools.utils;
import co.yixiang.utils.FileUtil;
import com.qiniu.storage.Region;