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

4
yshop-admin/pom.xml
View File

@ -64,8 +64,8 @@
<!-- quartz -->
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
</dependency>
<!--weixinpay-->
<dependency>

10
yshop-admin/src/main/java/co/yixiang/config/MybatisPlusConfig.java
View File

@ -1,7 +1,9 @@
package co.yixiang.config;
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@ -16,7 +18,9 @@ public class MybatisPlusConfig {
* mybatis-plus分页插件
*/
@Bean
public PaginationInterceptor paginationInterceptor() {
return new PaginationInterceptor();
public MybatisPlusInterceptor mybatisPlusInterceptor() {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
return interceptor;
}
}

2
yshop-admin/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java
View File

@ -1,6 +1,6 @@
package co.yixiang.modules.monitor.rest;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.monitor.domain.vo.RedisVo;
import co.yixiang.modules.monitor.service.RedisService;

2
yshop-admin/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java
View File

@ -1,7 +1,7 @@
package co.yixiang.modules.monitor.service.impl;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.logging.service.mapper.LogMapper;
import co.yixiang.modules.logging.service.mapper.LogMapper;
import co.yixiang.modules.monitor.domain.Visits;
import co.yixiang.modules.monitor.service.VisitsService;
import co.yixiang.modules.monitor.service.mapper.VisitsMapper;

3
yshop-admin/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java
View File

@ -7,7 +7,7 @@ package co.yixiang.modules.quartz.rest;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.quartz.domain.QuartzJob;
import co.yixiang.modules.quartz.service.QuartzJobService;
@ -17,7 +17,6 @@ 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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

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

@ -9,7 +9,7 @@ import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.exception.BadRequestException;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.security.config.SecurityProperties;
import co.yixiang.modules.security.security.TokenUtil;
import co.yixiang.modules.security.security.vo.AuthUser;

2
yshop-admin/src/main/java/co/yixiang/modules/security/rest/OnlineController.java
View File

@ -5,7 +5,7 @@
*/
package co.yixiang.modules.security.rest;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.security.service.OnlineUserService;
import io.swagger.annotations.Api;

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

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

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

@ -7,7 +7,7 @@ package co.yixiang.modules.system.rest;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.dict.domain.Dict;
import co.yixiang.modules.dict.service.DictService;

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

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

2
yshop-admin/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.config.DataScope;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.system.domain.Job;
import co.yixiang.modules.system.service.JobService;

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

@ -7,7 +7,7 @@ package co.yixiang.modules.system.rest;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.system.domain.Menu;
import co.yixiang.modules.system.service.MenuService;

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

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

6
yshop-admin/src/main/java/co/yixiang/modules/system/rest/SysUserController.java
View File

@ -11,7 +11,7 @@ import co.yixiang.config.DataScope;
import co.yixiang.constant.ShopConstants;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.system.domain.User;
import co.yixiang.modules.system.domain.vo.UserPassVo;
@ -21,8 +21,8 @@ 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.tools.domain.VerificationCode;
import co.yixiang.tools.service.VerificationCodeService;
import co.yixiang.modules.tools.domain.VerificationCode;
import co.yixiang.modules.tools.service.VerificationCodeService;
import co.yixiang.utils.PageUtil;
import co.yixiang.utils.SecurityUtils;
import co.yixiang.utils.YshopConstant;

4
yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java
View File

@ -166,8 +166,8 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, Dept> implement
*/
@Override
public void delDepts(List<Long> deptIds){
int jobCount = jobMapper.selectCount(Wrappers.<Job>lambdaQuery().in(Job::getDeptId,deptIds));
int roleCount = rolesDeptsMapper.selectCount(Wrappers.<RolesDepts>lambdaQuery()
Long jobCount = jobMapper.selectCount(Wrappers.<Job>lambdaQuery().in(Job::getDeptId,deptIds));
Long roleCount = rolesDeptsMapper.selectCount(Wrappers.<RolesDepts>lambdaQuery()
.in(RolesDepts::getDeptId,deptIds));
if(jobCount > 0) {
throw new BadRequestException( "所选部门中存在与岗位关联，请取消关联后再试");

4
yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java
View File

@ -313,8 +313,8 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
throw new EntityExistException(Menu.class,"name",resources.getName());
}
if(StringUtils.isNotBlank(resources.getComponentName())&&resources.getType()!=1&& !resources.getIFrame()){
int menuCount = this.lambdaQuery().eq(Menu::getComponentName,resources.getComponentName()).count();
if (StringUtils.isNotBlank(resources.getComponentName()) && resources.getType() != 1 && !resources.getIFrame()) {
Long menuCount = this.lambdaQuery().eq(Menu::getComponentName,resources.getComponentName()).count();
if(menuCount > 1) {
throw new YshopException("请保持菜单组件名称唯一");
}

2
yshop-admin/src/main/resources/config/application.yml
View File

@ -2,6 +2,8 @@ server:
port: 8001
spring:
main:
allow-circular-references: true
freemarker:
check-template-location: false
profiles:

2
yshop-admin/src/main/resources/template/generator/admin/ControllerP.ftl
View File

@ -10,7 +10,7 @@ package ${package}.rest;
import java.util.Arrays;
import co.yixiang.dozer.service.IGenerator;
import lombok.AllArgsConstructor;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.logging.aop.log.Log;
import ${package}.domain.${className};
import ${package}.service.${className}Service;
import ${package}.service.dto.${className}QueryCriteria;