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

bug--解决冲突

Browse Source
This commit is contained in:
taozi
2020-05-14 20:21:09 +08:00
parent 2a15c530b9 75f9e2cc16
commit f8f4273853
96 changed files with 517 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
yshop-system/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>yshop</artifactId>
<groupId>co.yixiang</groupId>
<version>2.1</version>
<version>2.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -21,7 +21,7 @@
<dependency>
<groupId>co.yixiang</groupId>
<artifactId>yshop-generator</artifactId>
<version>2.1</version>
<version>2.2</version>
<exclusions>
<exclusion>
<groupId>co.yixiang</groupId>
@ -32,17 +32,17 @@
<dependency>
<groupId>co.yixiang</groupId>
<artifactId>yshop-shop</artifactId>
<version>2.1</version>
<version>2.2</version>
</dependency>
<dependency>
<groupId>co.yixiang</groupId>
<artifactId>yshop-mproot</artifactId>
<version>2.1</version>
<version>2.2</version>
</dependency>
<dependency>
<groupId>co.yixiang</groupId>
<artifactId>yshop-mp</artifactId>
<version>2.1</version>
<version>2.2</version>
<exclusions>
<exclusion>
<groupId>co.yixiang</groupId>

4
yshop-system/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java
View File

@ -8,7 +8,7 @@
*/
package co.yixiang.modules.quartz.rest;
import co.yixiang.aop.log.Log;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.quartz.domain.QuartzJob;
@ -18,8 +18,6 @@ import co.yixiang.modules.quartz.service.dto.QuartzJobDto;
import co.yixiang.modules.quartz.service.dto.QuartzJobQueryCriteria;
import co.yixiang.modules.quartz.service.dto.QuartzLogDto;
import co.yixiang.modules.quartz.service.dto.QuartzLogQueryCriteria;
import co.yixiang.modules.shop.domain.YxUser;
import co.yixiang.modules.system.service.dto.JobQueryCriteria;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

2
yshop-system/src/main/java/co/yixiang/modules/security/rest/AuthController.java
View File

@ -16,7 +16,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.aop.log.Log;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.security.config.SecurityProperties;
import co.yixiang.modules.security.security.TokenProvider;

4
yshop-system/src/main/java/co/yixiang/modules/security/rest/OnlineController.java
View File

@ -8,9 +8,7 @@
*/
package co.yixiang.modules.security.rest;
import cn.hutool.core.util.StrUtil;
import co.yixiang.aop.log.Log;
import co.yixiang.exception.BadRequestException;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.security.service.OnlineUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

2
yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java
View File

@ -9,7 +9,7 @@
package co.yixiang.modules.system.rest;
import cn.hutool.core.collection.CollectionUtil;
import co.yixiang.aop.log.Log;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.config.DataScope;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;

3
yshop-system/src/main/java/co/yixiang/modules/system/rest/DictController.java
View File

@ -7,8 +7,7 @@
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.system.rest;
import co.yixiang.aop.log.Log;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.system.domain.Dict;

2
yshop-system/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java
View File

@ -8,7 +8,7 @@
*/
package co.yixiang.modules.system.rest;
import co.yixiang.aop.log.Log;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.system.domain.DictDetail;
import co.yixiang.modules.system.service.DictDetailService;

2
yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java
View File

@ -8,7 +8,7 @@
*/
package co.yixiang.modules.system.rest;
import co.yixiang.aop.log.Log;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.config.DataScope;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;

2
yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java
View File

@ -8,7 +8,7 @@
*/
package co.yixiang.modules.system.rest;
import co.yixiang.aop.log.Log;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.shop.domain.YxSystemConfig;

2
yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java
View File

@ -9,7 +9,7 @@
package co.yixiang.modules.system.rest;
import cn.hutool.core.lang.Dict;
import co.yixiang.aop.log.Log;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.system.domain.Role;

2
yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java
View File

@ -10,7 +10,7 @@ package co.yixiang.modules.system.rest;
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
import co.yixiang.aop.log.Log;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.config.DataScope;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.modules.system.service.dto.UserDto;