diff --git a/pom.xml b/pom.xml index 1e26683..52542a9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.3 + 2.5.5 waynboot-common @@ -36,23 +36,23 @@ ${java.version} ${java.version} - 2.5.3 - 8.0.19 + 2.5.5 + 8.0.25 6.1.3.RELEASE 7.13.4 1.18.6 - 3.4.2 - 1.2.6 + 3.4.3.4 + 1.2.8 2.8.0 3.2.2 1.4 3.11 - 1.2.75 + 1.2.78 1.6.2 3.0.0 - 4.2.0 - 3.14.0 - 7.4.0 + 4.4.0 + 3.18.2 + 7.8.0 1.4.7 diff --git a/waynboot-admin-api/src/main/java/com/wayn/admin/framework/config/MybatisPlusConfig.java b/waynboot-admin-api/src/main/java/com/wayn/admin/framework/config/MybatisPlusConfig.java index 622f481..210440c 100644 --- a/waynboot-admin-api/src/main/java/com/wayn/admin/framework/config/MybatisPlusConfig.java +++ b/waynboot-admin-api/src/main/java/com/wayn/admin/framework/config/MybatisPlusConfig.java @@ -1,7 +1,6 @@ package com.wayn.admin.framework.config; import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.mybatis.spring.annotation.MapperScan; @@ -15,18 +14,12 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @Configuration @MapperScan("com.wayn.**.mapper") public class MybatisPlusConfig { - /** - * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除) - */ + + // 最新版 @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.H2)); return interceptor; } - - @Bean - public ConfigurationCustomizer configurationCustomizer() { - return configuration -> configuration.setUseDeprecatedExecutor(false); - } } diff --git a/waynboot-common/pom.xml b/waynboot-common/pom.xml index 26a1607..6220f25 100644 --- a/waynboot-common/pom.xml +++ b/waynboot-common/pom.xml @@ -147,14 +147,14 @@ com.github.binarywang weixin-java-pay - 3.8.0 + 4.1.9.B com.alipay.sdk alipay-sdk-java - 3.1.0 + 4.16.57.ALL diff --git a/waynboot-common/src/main/java/com/wayn/common/core/service/system/IRoleService.java b/waynboot-common/src/main/java/com/wayn/common/core/service/system/IRoleService.java index 05bdd6a..1326bc8 100644 --- a/waynboot-common/src/main/java/com/wayn/common/core/service/system/IRoleService.java +++ b/waynboot-common/src/main/java/com/wayn/common/core/service/system/IRoleService.java @@ -19,6 +19,7 @@ public interface IRoleService extends IService { /** * 查询角色列表 + * * @param role 查询参数 * @return 角色列表 */ @@ -93,5 +94,5 @@ public interface IRoleService extends IService { * @param roleId 角色id * @return int */ - int countUserRoleByRoleId(Long roleId); + long countUserRoleByRoleId(Long roleId); } diff --git a/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/DeptServiceImpl.java b/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/DeptServiceImpl.java index baf8a9d..86b2a55 100644 --- a/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/DeptServiceImpl.java +++ b/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/DeptServiceImpl.java @@ -1,10 +1,10 @@ package com.wayn.common.core.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wayn.common.constant.SysConstants; import com.wayn.common.core.domain.system.Dept; -import com.wayn.common.core.domain.system.User; import com.wayn.common.core.domain.vo.TreeVO; import com.wayn.common.core.mapper.system.DeptMapper; import com.wayn.common.core.service.system.IDeptService; @@ -45,14 +45,12 @@ public class DeptServiceImpl extends ServiceImpl implements ID @Override public boolean hasChildByDeptId(Long deptId) { - int count = count(new QueryWrapper().eq("parent_id", deptId)); - return count > 0; + return count(Wrappers.lambdaQuery(Dept.class).eq(Dept::getParentId, deptId)) > 0; } @Override public boolean checkDeptExistUser(Long deptId) { - int count = iUserService.count(new QueryWrapper().eq("dept_id", deptId)); - return count > 0; + return count(Wrappers.lambdaQuery(Dept.class).eq(Dept::getDeptId, deptId)) > 0; } @Override diff --git a/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/MenuServiceImpl.java b/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/MenuServiceImpl.java index 5a409f7..dda853e 100644 --- a/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/MenuServiceImpl.java +++ b/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/MenuServiceImpl.java @@ -1,6 +1,7 @@ package com.wayn.common.core.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wayn.common.constant.SysConstants; import com.wayn.common.core.domain.system.Menu; @@ -118,14 +119,12 @@ public class MenuServiceImpl extends ServiceImpl implements IM @Override public boolean hasChildByMenuId(Long menuId) { - int count = count(new QueryWrapper().eq("parent_id", menuId)); - return count > 0; + return count(Wrappers.lambdaQuery(Menu.class).eq(Menu::getParentId, menuId)) > 0; } @Override public boolean checkMenuExistRole(Long menuId) { - int count = iRoleMenuService.count(new QueryWrapper().eq("menu_id", menuId)); - return count > 0; + return count(Wrappers.lambdaQuery(Menu.class).eq(Menu::getMenuId, menuId)) > 0; } /** diff --git a/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/RoleServiceImpl.java b/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/RoleServiceImpl.java index eac380f..67d885d 100644 --- a/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/RoleServiceImpl.java +++ b/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/RoleServiceImpl.java @@ -2,6 +2,7 @@ package com.wayn.common.core.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wayn.common.constant.SysConstants; @@ -93,7 +94,7 @@ public class RoleServiceImpl extends ServiceImpl implements IR for (Long roleId : roleIds) { checkRoleAllowed(new Role(roleId)); Role role = getById(roleId); - int count = countUserRoleByRoleId(roleId); + long count = countUserRoleByRoleId(roleId); if (count > 0) { throw new BusinessException(String.format("%1$s已分配,不能删除", role.getRoleName())); } @@ -102,8 +103,8 @@ public class RoleServiceImpl extends ServiceImpl implements IR } @Override - public int countUserRoleByRoleId(Long roleId) { - return iUserRoleService.count(new QueryWrapper().eq("role_id", roleId)); + public long countUserRoleByRoleId(Long roleId) { + return iUserRoleService.count(Wrappers.lambdaQuery(UserRole.class).eq(UserRole::getRoleId, roleId)); } @Override diff --git a/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/UserServiceImpl.java b/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/UserServiceImpl.java index 4911c3a..10d6ace 100644 --- a/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/UserServiceImpl.java +++ b/waynboot-common/src/main/java/com/wayn/common/core/service/system/impl/UserServiceImpl.java @@ -2,6 +2,7 @@ package com.wayn.common.core.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wayn.common.constant.SysConstants; @@ -49,7 +50,7 @@ public class UserServiceImpl extends ServiceImpl implements IU @Override public String checkUserNameUnique(String userName) { - int count = count(new QueryWrapper().eq("user_name", userName)); + long count = count(Wrappers.lambdaQuery(User.class).eq(User::getUserName, userName)); if (count > 0) { return SysConstants.NOT_UNIQUE; } diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/LoginController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/LoginController.java index 21f7bcd..863a82c 100644 --- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/LoginController.java +++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/LoginController.java @@ -1,6 +1,7 @@ package com.wayn.mobile.api.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.wayn.common.constant.SysConstants; import com.wayn.common.core.domain.shop.Member; import com.wayn.common.core.domain.tool.EmailConfig; @@ -53,7 +54,7 @@ public class LoginController { return R.error(ReturnCodeEnum.USER_TWO_PASSWORD_NOT_SAME_ERROR); } // 验证手机号是否唯一 - int count = iMemberService.count(new QueryWrapper().eq("mobile", registryObj.getMobile())); + long count = iMemberService.count(Wrappers.lambdaQuery(Member.class).eq(Member::getMobile, registryObj.getMobile())); iMemberService.count(new QueryWrapper().eq("mobile", registryObj.getMobile())); if (count > 0) { return R.error(ReturnCodeEnum.USER_PHONE_HAS_REGISTER_ERROR); diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/CartServiceImpl.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/CartServiceImpl.java index fde4c7b..973ba9e 100644 --- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/CartServiceImpl.java +++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/CartServiceImpl.java @@ -106,7 +106,7 @@ public class CartServiceImpl extends ServiceImpl implements IC @Override public R goodsCount() { Long userId = MobileSecurityUtils.getUserId(); - int count = count(new QueryWrapper().eq("user_id", userId)); + long count = count(Wrappers.lambdaQuery(Cart.class).eq(Cart::getUserId, userId)); return R.success().add("count", count); } diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/util/OrderSnGenUtil.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/util/OrderSnGenUtil.java index 8541ddd..18a1c46 100644 --- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/util/OrderSnGenUtil.java +++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/util/OrderSnGenUtil.java @@ -1,7 +1,7 @@ package com.wayn.mobile.api.util; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.wayn.common.core.domain.shop.Order; import com.wayn.common.util.spring.SpringContextUtil; import com.wayn.mobile.api.service.IOrderService; @@ -32,11 +32,12 @@ public class OrderSnGenUtil { * @param userId 用户ID * @return 该用户今日第几次下单 */ - public static int countByOrderSn(Long userId) { + public static long countByOrderSn(Long userId) { IOrderService orderService = SpringContextUtil.getBean(IOrderService.class); - return orderService.count(new QueryWrapper().eq("user_id", userId) - .gt("create_time", LocalDate.now()) - .lt("create_time", LocalDate.now().plusDays(1))); + return orderService.count(Wrappers.lambdaQuery(Order.class) + .eq(Order::getUserId, userId) + .gt(Order::getCreateTime, LocalDate.now()) + .lt(Order::getCreateTime, LocalDate.now().plusDays(1))); } /** diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/MybatisPlusConfig.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/MybatisPlusConfig.java index 67f0c5d..a968a7f 100644 --- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/MybatisPlusConfig.java +++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/MybatisPlusConfig.java @@ -1,7 +1,6 @@ package com.wayn.mobile.framework.config; import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.mybatis.spring.annotation.MapperScan; @@ -15,18 +14,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @Configuration @MapperScan("com.wayn.**.mapper") public class MybatisPlusConfig { - /** - * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除) - */ + // 最新版 @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.H2)); return interceptor; } - - @Bean - public ConfigurationCustomizer configurationCustomizer() { - return configuration -> configuration.setUseDeprecatedExecutor(false); - } }