卸载easy-trans 集成

config/local/easy-trans.yml

@@ -1,12 +0,0 @@
-# easy-trans 配置
-easy-trans:
-  # 字典缓存是否放到redis中 做二级缓存，微服务模式推荐开启
-  dict-use-redis: false
-  # 开启redis支持 微服务模式推荐使用redis
-  is-enable-redis: false
-  # 启用全局翻译(拦截所有responseBody进行自动翻译)，如果关闭需要手动调用翻译方法或者方法加注解，具体看文档
-  is-enable-global: true
-  # 启平铺模式(transMap的key平铺到和vo一个级别)
-  is-enable-tile: true
-  # 默认为true 如果前期先单体跑，后期可能改为springcloud微服务，可以先设置为false，后期设置为true，设置为false RPC翻译会走SIMPLE的逻辑
-  is-enable-cloud: false

eco-bom/pom.xml

@@ -23,11 +23,9 @@
         <mybatis-flex.version>1.10.9</mybatis-flex.version>
         <HikariCP.version>6.2.1</HikariCP.version>
         <hutool-5.version>5.8.36</hutool-5.version>
-        <easy-trans.version>3.0.6</easy-trans.version>
         <jackson.version>2.18.3</jackson.version>
         <jakarta.version>6.1.0</jakarta.version>
         <mapstruct-plus.version>1.4.8</mapstruct-plus.version>
-        <easy-trans.version>3.0.6</easy-trans.version>
         <deepseek4j.version>1.4.5</deepseek4j.version>
         <milvus.version>2.5.5</milvus.version>
         <jsqlparser.version>5.1</jsqlparser.version>
@@ -125,20 +123,6 @@
                 <version>${jackson.version}</version>
             </dependency>
 
-            <!-- easy-trans 注解翻译 -->
-            <dependency>
-                <groupId>com.fhs-opensource</groupId>
-                <artifactId>easy-trans-spring-boot-starter</artifactId>
-                <version>${easy-trans.version}</version>
-            </dependency>
-
-            <!-- easy-trans-mybatis-plus-extend -->
-            <dependency>
-                <groupId>com.fhs-opensource</groupId>
-                <artifactId>easy-trans-mybatis-flex-extend</artifactId>
-                <version>${easy-trans.version}</version>
-            </dependency>
-
             <!-- https://mvnrepository.com/artifact/com.dameng/DmJdbcDriver18 -->
             <dependency>
                 <groupId>com.dameng</groupId>

eco-common/com-orm/pom.xml

@@ -17,17 +17,5 @@
             <groupId>org.eco.vip</groupId>
             <artifactId>com-core</artifactId>
         </dependency>
-
-        <!-- easy-trans -->
-        <dependency>
-            <groupId>com.fhs-opensource</groupId>
-            <artifactId>easy-trans-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- easy-trans-mybatis-plus-extend -->
-        <dependency>
-            <groupId>com.fhs-opensource</groupId>
-            <artifactId>easy-trans-mybatis-flex-extend</artifactId>
-        </dependency>
     </dependencies>
 </project>

eco-common/com-orm/src/main/java/org/eco/vip/orm/domain/BaseEntity.java

@@ -7,9 +7,6 @@ package org.eco.vip.orm.domain;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fhs.core.trans.anno.Trans;
-import com.fhs.core.trans.constant.TransType;
-import com.fhs.core.trans.vo.TransPojo;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.RelationOneToOne;
 import lombok.Data;
@@ -24,7 +21,7 @@ import java.util.Date;
  * @date 2025/3/9 20:30
  */
 @Data
-public class BaseEntity implements Serializable, TransPojo {
+public class BaseEntity implements Serializable {
 
     /**
      * 租户编号
@@ -55,13 +52,13 @@ public class BaseEntity implements Serializable, TransPojo {
     /**
      * 创建者
      */
-//    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "createByName")
     private String createBy;
 
     /**
      * 创建者
      */
     @Column(ignore = true)
+    @RelationOneToOne(selfField = "createBy", targetTable = "system_user_t", targetField = "userId", valueField = "userName")
     private String createByName;
 
     /**
@@ -73,19 +70,13 @@ public class BaseEntity implements Serializable, TransPojo {
     /**
      * 更新者
      */
-//    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "updateByName")
     private String updateBy;
 
     /**
      * 更新者-姓名
      */
     @Column(ignore = true)
-    @RelationOneToOne(
-            selfField = "updateBy",
-            targetTable = "system_user_t",
-            targetField = "userId",
-            valueField = "userName"
-    )
+    @RelationOneToOne(selfField = "updateBy", targetTable = "system_user_t", targetField = "userId", valueField = "userName")
     private String updateByName;
 
     /**

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/org/Org.java

@@ -5,8 +5,6 @@
 package org.eco.vip.auth.domain.org;
 
 
-import com.fhs.core.trans.anno.Trans;
-import com.fhs.core.trans.constant.TransType;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
@@ -61,15 +59,8 @@ public class Org extends BaseEntity {
     /**
      * 负责人
      */
-    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "leader")
     private Long leaderId;
 
-    /**
-     * 负责人
-     */
-    @Column(ignore = true)
-    private String leader;
-
     /**
      * 联系电话
      */

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/org/pojo/OrgVO.java

@@ -5,9 +5,8 @@
 package org.eco.vip.auth.domain.org.pojo;
 
 
-import com.fhs.core.trans.anno.Trans;
-import com.fhs.core.trans.constant.TransType;
 import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.RelationOneToOne;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -54,12 +53,12 @@ public class OrgVO extends BaseEntity {
     /**
      * 负责人
      */
-    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "leader")
     private Long leaderId;
 
     /**
      * 负责人
      */
+    @RelationOneToOne(selfField = "leaderId", targetTable = "system_user_t", targetField = "userId", valueField = "userName")
     private String leader;
 
     /**

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/menu/MenuService.java

@@ -7,6 +7,7 @@ package org.eco.vip.auth.service.menu;
 
 
 import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
 import org.eco.vip.auth.domain.menu.Menu;
 import org.eco.vip.auth.domain.menu.pojo.MenuBO;
 import org.eco.vip.auth.domain.menu.pojo.MenuVO;
@@ -19,7 +20,6 @@ import org.eco.vip.orm.utils.RandomUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Set;
 
 import static org.eco.vip.auth.domain.menu.table.MenuTableDef.MENU;
 
@@ -32,6 +32,9 @@ import static org.eco.vip.auth.domain.menu.table.MenuTableDef.MENU;
 @Service
 public class MenuService extends BaseService<MenuMapper, Menu> implements IMenuService {
 
+    @Resource
+    private MenuMapper menuMapper;
+
     private QueryWrapper buildQueryWrapper(MenuBO menuBO) {
         return super.buildBaseQueryWrapper()
                 .and(MENU.CODE.eq(menuBO.getCode()))
@@ -52,7 +55,7 @@ public class MenuService extends BaseService<MenuMapper, Menu> implements IMenuS
     @Override
     public List<MenuVO> selectList(MenuBO menuBO) {
         QueryWrapper queryWrapper = buildQueryWrapper(menuBO);
-        return this.listAs(queryWrapper, MenuVO.class);
+        return menuMapper.selectListWithRelationsByQueryAs(queryWrapper, MenuVO.class);
     }
 
     @Override

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/org/OrgService.java

@@ -53,16 +53,14 @@ public class OrgService extends BaseService<OrgMapper, Org> implements IOrgServi
     @Override
     public PageResult<OrgVO> selectPage(OrgBO orgBO) {
         QueryWrapper queryWrapper = buildQueryWrapper(orgBO);
-        Page<OrgVO> page = this.pageAs(PageQuery.build(), queryWrapper, OrgVO.class);
+        Page<OrgVO> page = orgMapper.paginateWithRelationsAs(PageQuery.build(), queryWrapper, OrgVO.class);
         return PageResult.build(page);
     }
 
     @Override
     public List<OrgVO> selectList(OrgBO orgBO) {
         QueryWrapper queryWrapper = buildQueryWrapper(orgBO);
-//        this.s
         return orgMapper.selectListWithRelationsByQueryAs(queryWrapper, OrgVO.class);
-//        return this.listAs(queryWrapper, OrgVO.class);
     }
 
     @Override

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/permission/PermissionService.java

@@ -13,7 +13,6 @@ import org.eco.vip.auth.mapper.PermissionMapper;
 import org.eco.vip.auth.service.menu.IMenuService;
 import org.eco.vip.orm.service.BaseService;
 import org.eco.vip.orm.utils.BeanUtils;
-import org.eco.vip.orm.utils.StrUtils;
 import org.eco.vip.security.core.domain.SecurityPermissionBO;
 import org.eco.vip.security.core.domain.SecurityPermissionVO;
 import org.eco.vip.security.core.service.ISecurityPermissionService;
@@ -36,10 +35,13 @@ public class PermissionService extends BaseService<PermissionMapper, Permission>
     @Resource
     private IMenuService menuService;
 
+    @Resource
+    private PermissionMapper permissionMapper;
+
     @Override
     public List<PermissionVO> selectList() {
         QueryWrapper queryWrapper = new QueryWrapper();
-        return this.listAs(queryWrapper, PermissionVO.class);
+        return permissionMapper.selectListWithRelationsByQueryAs(queryWrapper, PermissionVO.class);
     }
 
     @Override

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/position/PositionService.java

@@ -8,6 +8,7 @@ package org.eco.vip.auth.service.position;
 
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
 import org.eco.vip.auth.domain.position.Position;
 import org.eco.vip.auth.domain.position.pojo.PositionBO;
 import org.eco.vip.auth.domain.position.pojo.PositionVO;
@@ -33,6 +34,9 @@ import static org.eco.vip.auth.domain.position.table.PositionTableDef.POSITION;
 @Service
 public class PositionService extends BaseService<PositionMapper, Position> implements IPositionService {
 
+    @Resource
+    private PositionMapper positionMapper;
+
     private QueryWrapper buildQueryWrapper(PositionBO positionBO) {
         return super.buildBaseQueryWrapper()
                 .and(POSITION.CATEGORY.eq(positionBO.getCategory()))
@@ -43,14 +47,14 @@ public class PositionService extends BaseService<PositionMapper, Position> imple
     @Override
     public PageResult<PositionVO> selectPage(PositionBO positionBO) {
         QueryWrapper queryWrapper = buildQueryWrapper(positionBO);
-        Page<PositionVO> page = this.pageAs(PageQuery.build(), queryWrapper, PositionVO.class);
+        Page<PositionVO> page = positionMapper.paginateWithRelationsAs(PageQuery.build(), queryWrapper, PositionVO.class);
         return PageResult.build(page);
     }
 
     @Override
     public List<PositionVO> selectList(PositionBO positionBO) {
         QueryWrapper queryWrapper = buildQueryWrapper(positionBO);
-        return this.listAs(queryWrapper, PositionVO.class);
+        return positionMapper.selectListWithRelationsByQueryAs(queryWrapper, PositionVO.class);
     }
 
     @Override

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/user/UserService.java

@@ -55,13 +55,14 @@ public class UserService extends BaseService<UserMapper, User> implements IUserS
     @Override
     public PageResult<UserVO> selectPage(UserBO userBO) {
         QueryWrapper queryWrapper = buildQueryWrapper(userBO);
-        Page<UserVO> page = this.pageAs(PageQuery.build(), queryWrapper, UserVO.class);
+        Page<UserVO> page = userMapper.paginateWithRelationsAs(PageQuery.build(), queryWrapper, UserVO.class);
         return PageResult.build(page);
     }
 
     @Override
-    public List<UserVO> selectList(UserBO roleBO) {
-        return List.of();
+    public List<UserVO> selectList(UserBO userBO) {
+        QueryWrapper queryWrapper = buildQueryWrapper(userBO);
+        return userMapper.selectListWithRelationsByQueryAs(queryWrapper, UserVO.class);
     }
 
     @Override

eco-start/src/main/resources/application.yml

@@ -21,7 +21,6 @@ spring:
       - file:config/${spring.profiles.active}/sa-token.yml
       - file:config/${spring.profiles.active}/datasource-${eco.db}.yml
       - file:config/${spring.profiles.active}/logging.yml
-      - file:config/${spring.profiles.active}/easy-trans.yml
       - file:config/${spring.profiles.active}/security.yml
   mvc:
     format: