重新加载包名称

eco-common/common-core/src/main/java/org/eco/common/core/core/domain/model/EmailLoginBody.java

@@ -3,6 +3,7 @@ package org.eco.common.core.core.domain.model;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 邮件登录对象
@@ -10,6 +11,7 @@ import lombok.Data;
  * @author wgk
  */
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class EmailLoginBody extends LoginBody {
 

eco-common/common-orm/pom.xml

@@ -30,6 +30,11 @@
             <artifactId>common-excel</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.mybatis-flex</groupId>
+            <artifactId>mybatis-flex-spring-boot3-starter</artifactId>
+        </dependency>
+
         <!-- pagehelper 分页插件 -->
         <dependency>
             <groupId>com.github.pagehelper</groupId>

eco-modules/system/src/main/java/org/eco/system/service/impl/SysDataScopeServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.mybatisflex.core.query.QueryMethods.select;
 import static org.eco.system.domain.table.SysDeptTableDef.SYS_DEPT;
 import static org.eco.system.domain.table.SysRoleDeptTableDef.SYS_ROLE_DEPT;
 import static org.eco.system.domain.table.SysUserTableDef.SYS_USER;

eco-modules/system/src/main/java/org/eco/system/service/impl/SysDeptServiceImpl.java

@@ -3,9 +3,11 @@ package org.eco.system.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ObjectUtil;
-import org.eco.system.domain.SysDept;
-import org.eco.system.domain.bo.SysDeptBo;
-import org.eco.system.service.ISysDeptService;
+import com.mybatisflex.core.query.QueryMethods;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.core.update.UpdateChain;
+import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
 import org.eco.common.core.constant.CacheNames;
 import org.eco.common.core.constant.UserConstants;
 import org.eco.common.core.core.text.Convert;
@@ -17,16 +19,14 @@ import org.eco.common.core.utils.StringUtils;
 import org.eco.common.core.utils.TreeBuildUtils;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
 import org.eco.common.security.utils.LoginHelper;
+import org.eco.system.domain.SysDept;
+import org.eco.system.domain.bo.SysDeptBo;
 import org.eco.system.domain.vo.SysDeptVo;
 import org.eco.system.domain.vo.SysRoleVo;
 import org.eco.system.mapper.SysDeptMapper;
 import org.eco.system.service.ISysDataScopeService;
+import org.eco.system.service.ISysDeptService;
 import org.eco.system.service.ISysRoleService;
-import com.mybatisflex.core.query.QueryMethods;
-import com.mybatisflex.core.query.QueryWrapper;
-import com.mybatisflex.core.update.UpdateChain;
-import jakarta.annotation.Resource;
-import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -35,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.mybatisflex.core.query.QueryMethods.select;
 import static org.eco.system.domain.table.SysDeptTableDef.SYS_DEPT;
 import static org.eco.system.domain.table.SysRoleDeptTableDef.SYS_ROLE_DEPT;
 

eco-modules/system/src/main/java/org/eco/system/service/impl/SysMenuServiceImpl.java

@@ -4,11 +4,9 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.StrUtil;
-import org.eco.system.domain.SysMenu;
-import org.eco.system.domain.SysTenantPackage;
-import org.eco.system.domain.bo.SysMenuBo;
-import org.eco.system.domain.vo.SysMenuVo;
-import org.eco.system.service.ISysRoleMenuService;
+import com.mybatisflex.core.query.QueryMethods;
+import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
 import org.eco.common.core.constant.Constants;
 import org.eco.common.core.constant.UserConstants;
 import org.eco.common.core.utils.MapstructUtils;
@@ -17,16 +15,18 @@ import org.eco.common.core.utils.StringUtils;
 import org.eco.common.core.utils.TreeBuildUtils;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
 import org.eco.common.security.utils.LoginHelper;
+import org.eco.system.domain.SysMenu;
+import org.eco.system.domain.SysTenantPackage;
+import org.eco.system.domain.bo.SysMenuBo;
 import org.eco.system.domain.vo.MetaVo;
 import org.eco.system.domain.vo.RouterVo;
+import org.eco.system.domain.vo.SysMenuVo;
 import org.eco.system.domain.vo.SysRoleVo;
 import org.eco.system.mapper.SysMenuMapper;
 import org.eco.system.mapper.SysTenantPackageMapper;
 import org.eco.system.service.ISysMenuService;
+import org.eco.system.service.ISysRoleMenuService;
 import org.eco.system.service.ISysRoleService;
-import com.mybatisflex.core.query.QueryMethods;
-import com.mybatisflex.core.query.QueryWrapper;
-import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -37,12 +37,13 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import static com.mybatisflex.core.query.QueryMethods.distinct;
+import static com.mybatisflex.core.query.QueryMethods.select;
 import static org.eco.system.domain.table.SysMenuTableDef.SYS_MENU;
 import static org.eco.system.domain.table.SysRoleMenuTableDef.SYS_ROLE_MENU;
 import static org.eco.system.domain.table.SysRoleTableDef.SYS_ROLE;
 import static org.eco.system.domain.table.SysUserRoleTableDef.SYS_USER_ROLE;
 import static org.eco.system.domain.table.SysUserTableDef.SYS_USER;
-import static com.mybatisflex.core.query.QueryMethods.distinct;
 
 /**
  * 菜单 业务层处理
@@ -135,8 +136,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl<SysMenuMapper, SysMenu>
             }
             queryWrapper.orderBy(SYS_MENU.PARENT_ID.asc(), SYS_MENU.ORDER_NUM.asc());
         }
-        List<SysMenuVo> menuList = this.listAs(queryWrapper, SysMenuVo.class);
-        return menuList;
+        return this.listAs(queryWrapper, SysMenuVo.class);
     }
 
     /**

eco-modules/system/src/main/java/org/eco/system/service/impl/SysUserServiceImpl.java

@@ -2,12 +2,13 @@ package org.eco.system.service.impl;
 
 import cn.dev33.satoken.secure.BCrypt;
 import cn.hutool.core.util.ObjectUtil;
-import org.eco.system.domain.SysUser;
-import org.eco.system.domain.SysUserPost;
-import org.eco.system.domain.bo.SysUserBo;
-import org.eco.system.service.ISysConfigService;
-import org.eco.system.service.ISysUserPostService;
-import org.eco.system.service.ISysUserService;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryMethods;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.core.update.UpdateChain;
+import jakarta.annotation.Resource;
+import jakarta.validation.Validator;
+import lombok.extern.slf4j.Slf4j;
 import org.eco.common.core.constant.CacheNames;
 import org.eco.common.core.constant.UserConstants;
 import org.eco.common.core.core.page.PageResult;
@@ -21,21 +22,20 @@ import org.eco.common.orm.core.page.PageQuery;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
 import org.eco.common.security.utils.LoginHelper;
 import org.eco.common.tenant.helper.TenantHelper;
+import org.eco.system.domain.SysUser;
+import org.eco.system.domain.SysUserPost;
+import org.eco.system.domain.bo.SysUserBo;
 import org.eco.system.domain.vo.SysPostVo;
 import org.eco.system.domain.vo.SysRoleVo;
 import org.eco.system.domain.vo.SysUserVo;
 import org.eco.system.mapper.SysUserMapper;
+import org.eco.system.service.ISysConfigService;
 import org.eco.system.service.ISysDataScopeService;
 import org.eco.system.service.ISysPostService;
 import org.eco.system.service.ISysRoleService;
+import org.eco.system.service.ISysUserPostService;
 import org.eco.system.service.ISysUserRoleService;
-import com.mybatisflex.core.paginate.Page;
-import com.mybatisflex.core.query.QueryMethods;
-import com.mybatisflex.core.query.QueryWrapper;
-import com.mybatisflex.core.update.UpdateChain;
-import jakarta.annotation.Resource;
-import jakarta.validation.Validator;
-import lombok.extern.slf4j.Slf4j;
+import org.eco.system.service.ISysUserService;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,12 +47,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.mybatisflex.core.query.QueryMethods.findInSet;
+import static com.mybatisflex.core.query.QueryMethods.number;
+import static com.mybatisflex.core.query.QueryMethods.select;
 import static org.eco.system.domain.table.SysDeptTableDef.SYS_DEPT;
 import static org.eco.system.domain.table.SysRoleTableDef.SYS_ROLE;
 import static org.eco.system.domain.table.SysUserRoleTableDef.SYS_USER_ROLE;
 import static org.eco.system.domain.table.SysUserTableDef.SYS_USER;
-import static com.mybatisflex.core.query.QueryMethods.findInSet;
-import static com.mybatisflex.core.query.QueryMethods.number;
 
 /**
  * 用户 业务层处理
@@ -119,21 +120,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     }
 
     private QueryWrapper buildOneQueryWrapper() {
-        /*  select u.user_id, u.tenant_id,u.dept_id, u.user_name, u.nick_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.gender, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
-        from sys_user u
-		    left join sys_dept d on u.dept_id = d.dept_id
-		    left join sys_user_role ur on u.user_id = ur.user_id
-		    left join sys_role r on r.role_id = ur.role_id */
-        /*return QueryWrapper.create()
-            .select(QueryMethods.distinct(SYS_USER.USER_ID,SYS_USER.TENANT_ID,SYS_USER.DEPT_ID,SYS_USER.NICK_NAME,SYS_USER.USER_NAME,SYS_USER.USER_TYPE,SYS_USER.EMAIL,SYS_USER.AVATAR,SYS_USER.PHONENUMBER,SYS_USER.PASSWORD,SYS_USER.GENDER,SYS_USER.STATUS,SYS_USER.DEL_FLAG,SYS_USER.LOGIN_IP,SYS_USER.LOGIN_DATE,SYS_USER.CREATE_BY,SYS_USER.CREATE_TIME,SYS_USER.REMARK,
-                SYS_DEPT.DEPT_ID,SYS_DEPT.PARENT_ID,SYS_DEPT.ANCESTORS,SYS_DEPT.DEPT_NAME,SYS_DEPT.ORDER_NUM,SYS_DEPT.LEADER,SYS_DEPT.STATUS.as("dept_status"),
-                SYS_ROLE.ROLE_ID,SYS_ROLE.ROLE_NAME,SYS_ROLE.ROLE_KEY,SYS_ROLE.ROLE_SORT,SYS_ROLE.DATA_SCOPE,SYS_ROLE.STATUS.as("role_status")))
-            .from(SYS_USER.as("u"))
-            .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
-            .leftJoin(SYS_USER_ROLE).as("ur").on(SYS_USER_ROLE.USER_ID.eq(SYS_USER.USER_ID))
-            .leftJoin(SYS_ROLE).as("r").on(SYS_ROLE.ROLE_ID.eq(SYS_USER_ROLE.ROLE_ID));*/
         return QueryWrapper.create()
             .select(QueryMethods.distinct(SYS_USER.USER_ID, SYS_USER.TENANT_ID, SYS_USER.DEPT_ID, SYS_USER.NICK_NAME, SYS_USER.USER_NAME, SYS_USER.USER_TYPE, SYS_USER.EMAIL, SYS_USER.AVATAR, SYS_USER.PHONENUMBER, SYS_USER.PASSWORD, SYS_USER.GENDER, SYS_USER.STATUS, SYS_USER.VERSION, SYS_USER.DEL_FLAG, SYS_USER.LOGIN_IP, SYS_USER.LOGIN_DATE, SYS_USER.CREATE_BY, SYS_USER.CREATE_TIME, SYS_USER.REMARK,
                 SYS_DEPT.DEPT_ID, SYS_DEPT.PARENT_ID, SYS_DEPT.ANCESTORS, SYS_DEPT.DEPT_NAME, SYS_DEPT.ORDER_NUM, SYS_DEPT.LEADER, SYS_DEPT.STATUS.as("dept_status")
@@ -141,8 +127,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             .from(SYS_USER.as("u"))
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
             .where(SYS_USER.DEL_FLAG.eq(0));
-        //.leftJoin(SYS_USER_ROLE).as("ur").on(SYS_USER_ROLE.USER_ID.eq(SYS_USER.USER_ID))
-        //.leftJoin(SYS_ROLE).as("r").on(SYS_ROLE.ROLE_ID.eq(SYS_USER_ROLE.ROLE_ID));
     }
 
 

eco-start/src/main/java/org/eco/web/controller/AuthController.java

@@ -1,13 +1,13 @@
-package com.eco.web.controller;
+package org.eco.web.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.eco.web.domain.vo.LoginTenantVo;
-import com.eco.web.domain.vo.LoginVo;
-import com.eco.web.domain.vo.TenantListVo;
-import com.eco.web.service.IAuthStrategy;
-import com.eco.web.service.SysLoginService;
+import org.eco.web.domain.vo.LoginTenantVo;
+import org.eco.web.domain.vo.LoginVo;
+import org.eco.web.domain.vo.TenantListVo;
+import org.eco.web.service.IAuthStrategy;
+import org.eco.web.service.SysLoginService;
 import org.eco.common.core.constant.UserConstants;
 import org.eco.common.core.core.domain.CommonResult;
 import org.eco.common.core.core.domain.model.LoginBody;

eco-start/src/main/java/org/eco/web/controller/CaptchaController.java

@@ -1,10 +1,10 @@
-package com.eco.web.controller;
+package org.eco.web.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.captcha.AbstractCaptcha;
 import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.util.IdUtil;
-import com.eco.web.domain.vo.CaptchaVo;
+import org.eco.web.domain.vo.CaptchaVo;
 import org.eco.common.core.annotation.RateLimiter;
 import org.eco.common.core.constant.Constants;
 import org.eco.common.core.constant.GlobalConstants;

eco-start/src/main/java/org/eco/web/controller/SysIndexController.java

@@ -1,4 +1,4 @@
-package com.eco.web.controller;
+package org.eco.web.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import org.eco.common.core.config.EcoConfig;

eco-start/src/main/java/org/eco/web/controller/common/CommonController.java

@@ -1,4 +1,4 @@
-package com.eco.web.controller.common;
+package org.eco.web.controller.common;
 
 import org.eco.common.core.config.EcoConfig;
 import org.eco.common.core.constant.Constants;

eco-start/src/main/java/org/eco/web/domain/vo/CaptchaVo.java

@@ -1,4 +1,4 @@
-package com.eco.web.domain.vo;
+package org.eco.web.domain.vo;
 
 import lombok.Data;
 

eco-start/src/main/java/org/eco/web/domain/vo/LoginTenantVo.java

@@ -1,4 +1,4 @@
-package com.eco.web.domain.vo;
+package org.eco.web.domain.vo;
 
 import lombok.Data;
 

eco-start/src/main/java/org/eco/web/domain/vo/LoginVo.java

@@ -1,4 +1,4 @@
-package com.eco.web.domain.vo;
+package org.eco.web.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

eco-start/src/main/java/org/eco/web/domain/vo/TenantListVo.java

@@ -1,4 +1,4 @@
-package com.eco.web.domain.vo;
+package org.eco.web.domain.vo;
 
 import org.eco.system.domain.vo.SysTenantVo;
 import io.github.linpeilie.annotations.AutoMapper;

eco-start/src/main/java/org/eco/web/service/IAuthStrategy.java

@@ -1,7 +1,7 @@
-package com.eco.web.service;
+package org.eco.web.service;
 
 
-import com.eco.web.domain.vo.LoginVo;
+import org.eco.web.domain.vo.LoginVo;
 import org.eco.common.core.exception.ServiceException;
 import org.eco.common.core.utils.SpringUtils;
 import org.eco.system.domain.SysClient;

eco-start/src/main/java/org/eco/web/service/SysLoginService.java

@@ -1,4 +1,4 @@
-package com.eco.web.service;
+package org.eco.web.service;
 
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.stp.StpUtil;

eco-start/src/main/java/org/eco/web/service/SysRegisterService.java

@@ -1,4 +1,4 @@
-package com.eco.web.service;
+package org.eco.web.service;
 
 import cn.dev33.satoken.secure.BCrypt;
 import org.eco.common.core.constant.Constants;

eco-start/src/main/java/org/eco/web/service/impl/EmailAuthStrategy.java

@@ -1,11 +1,11 @@
-package com.eco.web.service.impl;
+package org.eco.web.service.impl;
 
 import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.eco.web.domain.vo.LoginVo;
-import com.eco.web.service.IAuthStrategy;
-import com.eco.web.service.SysLoginService;
+import org.eco.web.domain.vo.LoginVo;
+import org.eco.web.service.IAuthStrategy;
+import org.eco.web.service.SysLoginService;
 import org.eco.common.core.constant.Constants;
 import org.eco.common.core.constant.GlobalConstants;
 import org.eco.common.core.core.domain.model.EmailLoginBody;

eco-start/src/main/java/org/eco/web/service/impl/PasswordAuthStrategy.java

@@ -1,12 +1,12 @@
-package com.eco.web.service.impl;
+package org.eco.web.service.impl;
 
 import cn.dev33.satoken.secure.BCrypt;
 import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.eco.web.domain.vo.LoginVo;
-import com.eco.web.service.IAuthStrategy;
-import com.eco.web.service.SysLoginService;
+import org.eco.web.domain.vo.LoginVo;
+import org.eco.web.service.IAuthStrategy;
+import org.eco.web.service.SysLoginService;
 import org.eco.common.core.constant.Constants;
 import org.eco.common.core.constant.GlobalConstants;
 import org.eco.common.core.core.domain.model.LoginUser;