update 优化整体代码 适配jdk17

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java

@@ -1,32 +1,16 @@
 package org.dromara.system.domain.convert;
 
+import io.github.linpeilie.BaseMapper;
 import org.dromara.system.api.domain.vo.RemoteDictDataVo;
 import org.dromara.system.domain.vo.SysDictDataVo;
 import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
+import org.mapstruct.MappingConstants;
 
 /**
  * 字典数据转换器
  * @author zhujie
  */
-@Mapper
-public interface SysDictDataVoConvert {
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+public interface SysDictDataVoConvert extends BaseMapper<SysDictDataVo, RemoteDictDataVo> {
 
-    SysDictDataVoConvert INSTANCE = Mappers.getMapper(SysDictDataVoConvert.class);
-
-    /**
-     * SysDictDataVoToRemoteDictDataVo
-     * @param sysDictDataVo 待转换对象
-     * @return 转换后对象
-     */
-    RemoteDictDataVo convert(SysDictDataVo sysDictDataVo);
-
-    /**
-     * SysDictDataVoListToRemoteDictDataVoList
-     * @param sysDictDataVos 待转换对象
-     * @return 转换后对象
-     */
-    List<RemoteDictDataVo> convertList(List<SysDictDataVo> sysDictDataVos);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java

@@ -1,23 +1,16 @@
 package org.dromara.system.domain.convert;
 
+import io.github.linpeilie.BaseMapper;
 import org.dromara.system.api.domain.bo.RemoteLogininforBo;
 import org.dromara.system.domain.bo.SysLogininforBo;
 import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
+import org.mapstruct.MappingConstants;
 
 /**
  * 登录日志转换器
  * @author zhujie
  */
-@Mapper
-public interface SysLogininforBoConvert {
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+public interface SysLogininforBoConvert extends BaseMapper<RemoteLogininforBo, SysLogininforBo> {
 
-    SysLogininforBoConvert INSTANCE = Mappers.getMapper(SysLogininforBoConvert.class);
-
-    /**
-     * RemoteLogininforBoToSysLogininforBo
-     * @param remoteLogininforBo 待转换对象
-     * @return 转换后对象
-     */
-    SysLogininforBo convert(RemoteLogininforBo remoteLogininforBo);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java

@@ -1,19 +1,18 @@
 package org.dromara.system.domain.convert;
 
+import io.github.linpeilie.BaseMapper;
 import org.dromara.system.api.domain.bo.RemoteOperLogBo;
 import org.dromara.system.domain.bo.SysOperLogBo;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.factory.Mappers;
+import org.mapstruct.MappingConstants;
 
 /**
  * 操作日志转换器
  * @author zhujie
  */
-@Mapper
-public interface SysOperLogBoConvert {
-
-    SysOperLogBoConvert INSTANCE = Mappers.getMapper(SysOperLogBoConvert.class);
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+public interface SysOperLogBoConvert extends BaseMapper<RemoteOperLogBo, SysOperLogBo> {
 
     /**
      * RemoteOperLogBoToSysOperLogBo

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java

@@ -1,32 +1,16 @@
 package org.dromara.system.domain.convert;
 
+import io.github.linpeilie.BaseMapper;
 import org.dromara.system.api.domain.vo.RemoteTenantVo;
 import org.dromara.system.domain.vo.SysTenantVo;
 import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
+import org.mapstruct.MappingConstants;
 
 /**
  * 租户转换器
  * @author zhujie
  */
-@Mapper
-public interface SysTenantVoConvert {
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+public interface SysTenantVoConvert extends BaseMapper<SysTenantVo, RemoteTenantVo> {
 
-    SysTenantVoConvert INSTANCE = Mappers.getMapper(SysTenantVoConvert.class);
-
-    /**
-     * SysTenantVoToRemoteTenantVo
-     * @param sysTenantVo 待转换对象
-     * @return 转换后对象
-     */
-    RemoteTenantVo convert(SysTenantVo sysTenantVo);
-
-    /**
-     * SysTenantVoListToRemoteTenantVoList
-     * @param sysTenantVos 待转换对象
-     * @return 转换后对象
-     */
-    List<RemoteTenantVo> convertList(List<SysTenantVo> sysTenantVos);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java

@@ -1,19 +1,21 @@
 package org.dromara.system.domain.convert;
 
+import io.github.linpeilie.BaseMapper;
+import org.dromara.system.api.domain.bo.RemoteOperLogBo;
 import org.dromara.system.api.domain.bo.RemoteUserBo;
+import org.dromara.system.domain.bo.SysOperLogBo;
 import org.dromara.system.domain.bo.SysUserBo;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
+import org.mapstruct.MappingConstants;
 import org.mapstruct.factory.Mappers;
 
 /**
  * 用户信息转换器
  * @author zhujie
  */
-@Mapper
-public interface SysUserBoConvert {
-
-    SysUserBoConvert INSTANCE = Mappers.getMapper(SysUserBoConvert.class);
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+public interface SysUserBoConvert extends BaseMapper<RemoteUserBo, SysUserBo> {
 
     /**
      * RemoteUserBoToSysUserBo

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java

@@ -2,13 +2,19 @@ package org.dromara.system.domain.vo;
 
 import lombok.Data;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * 用户头像信息
  *
  * @author Michelle.Chung
  */
 @Data
-public class AvatarVo {
+public class AvatarVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     /**
      * 头像地址

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java

@@ -2,6 +2,8 @@ package org.dromara.system.domain.vo;
 
 import lombok.Data;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -12,7 +14,10 @@ import java.util.Properties;
  * @author Michelle.Chung
  */
 @Data
-public class CacheListInfoVo {
+public class CacheListInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     private Properties info;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java

@@ -3,6 +3,8 @@ package org.dromara.system.domain.vo;
 import cn.hutool.core.lang.tree.Tree;
 import lombok.Data;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -11,7 +13,10 @@ import java.util.List;
  * @author Michelle.Chung
  */
 @Data
-public class DeptTreeSelectVo {
+public class DeptTreeSelectVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     /**
      * 选中部门列表

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java

@@ -3,6 +3,8 @@ package org.dromara.system.domain.vo;
 import cn.hutool.core.lang.tree.Tree;
 import lombok.Data;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -11,7 +13,10 @@ import java.util.List;
  * @author Michelle.Chung
  */
 @Data
-public class MenuTreeSelectVo {
+public class MenuTreeSelectVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     /**
      * 选中菜单列表

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java

@@ -3,6 +3,9 @@ package org.dromara.system.domain.vo;
 import lombok.Data;
 import org.dromara.common.core.utils.StringUtils;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * 路由显示信息
  *
@@ -10,7 +13,10 @@ import org.dromara.common.core.utils.StringUtils;
  */
 
 @Data
-public class MetaVo {
+public class MetaVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     /**
      * 设置该路由在侧边栏和面包屑中展示的名字

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java

@@ -2,13 +2,19 @@ package org.dromara.system.domain.vo;
 
 import lombok.Data;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * 用户个人信息
  *
  * @author Michelle.Chung
  */
 @Data
-public class ProfileVo {
+public class ProfileVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     /**
      * 用户信息

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java

@@ -3,6 +3,8 @@ package org.dromara.system.domain.vo;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -12,7 +14,10 @@ import java.util.List;
  */
 @Data
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class RouterVo {
+public class RouterVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     /**
      * 路由名字

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java

@@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysConfig;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -22,6 +23,7 @@ import java.util.Date;
 @AutoMapper(target = SysConfig.class)
 public class SysConfigVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java

@@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysDept;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -21,6 +22,7 @@ import java.util.Date;
 @AutoMapper(target = SysDept.class)
 public class SysDeptVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java

@@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysDictData;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -22,6 +23,7 @@ import java.util.Date;
 @AutoMapper(target = SysDictData.class)
 public class SysDictDataVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java

@@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysDictType;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -22,6 +23,7 @@ import java.util.Date;
 @AutoMapper(target = SysDictType.class)
 public class SysDictTypeVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java

@@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysLogininfor;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -24,6 +25,7 @@ import java.util.Date;
 @AutoMapper(target = SysLogininfor.class)
 public class SysLogininforVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java

@@ -4,6 +4,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.system.domain.SysMenu;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
@@ -19,6 +20,7 @@ import java.util.List;
 @AutoMapper(target = SysMenu.class)
 public class SysMenuVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java

@@ -6,6 +6,7 @@ import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.system.domain.SysNotice;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -20,6 +21,7 @@ import java.util.Date;
 @AutoMapper(target = SysNotice.class)
 public class SysNoticeVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java

@@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysOperLog;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -23,6 +24,7 @@ import java.util.Date;
 @AutoMapper(target = SysOperLog.class)
 public class SysOperLogVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java

@@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysPost;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -23,6 +24,7 @@ import java.util.Date;
 @AutoMapper(target = SysPost.class)
 public class SysPostVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java

@@ -9,6 +9,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysRole;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -22,6 +23,7 @@ import java.util.Date;
 @AutoMapper(target = SysRole.class)
 public class SysRoleVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java

@@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysTenantPackage;
 
+import java.io.Serial;
 import java.io.Serializable;
 
 
@@ -21,6 +22,7 @@ import java.io.Serializable;
 @AutoMapper(target = SysTenantPackage.class)
 public class SysTenantPackageVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -22,6 +23,7 @@ import java.util.Date;
 @AutoMapper(target = SysUserVo.class, convertGenerate = false)
 public class SysUserExportVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java

@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 
+import java.io.Serial;
 import java.io.Serializable;
 
 
@@ -20,6 +21,7 @@ import java.io.Serializable;
 // @Accessors(chain = true) // 导入不允许使用 会找不到set方法
 public class SysUserImportVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java

@@ -2,6 +2,8 @@ package org.dromara.system.domain.vo;
 
 import lombok.Data;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -10,7 +12,10 @@ import java.util.List;
  * @author Michelle.Chung
  */
 @Data
-public class SysUserInfoVo {
+public class SysUserInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     /**
      * 用户信息

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java

@@ -10,6 +10,7 @@ import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.system.domain.SysUser;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -24,6 +25,7 @@ import java.util.List;
 @AutoMapper(target = SysUser.class)
 public class SysUserVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java

@@ -2,6 +2,8 @@ package org.dromara.system.domain.vo;
 
 import lombok.Data;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.Set;
 
 /**
@@ -10,7 +12,10 @@ import java.util.Set;
  * @author Michelle.Chung
  */
 @Data
-public class UserInfoVo {
+public class UserInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     /**
      * 用户基本信息

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java

@@ -2,9 +2,9 @@ package org.dromara.system.dubbo;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.system.api.RemoteDictService;
 import org.dromara.system.api.domain.vo.RemoteDictDataVo;
-import org.dromara.system.domain.convert.SysDictDataVoConvert;
 import org.dromara.system.domain.vo.SysDictDataVo;
 import org.dromara.system.service.ISysDictTypeService;
 import org.springframework.stereotype.Service;
@@ -26,8 +26,8 @@ public class RemoteDictServiceImpl implements RemoteDictService {
 
     @Override
     public List<RemoteDictDataVo> selectDictDataByType(String dictType) {
-        List<SysDictDataVo> sysDictDataVos = sysDictTypeService.selectDictDataByType(dictType);
-        return SysDictDataVoConvert.INSTANCE.convertList(sysDictDataVos);
+        List<SysDictDataVo> list = sysDictTypeService.selectDictDataByType(dictType);
+        return MapstructUtils.convert(list, RemoteDictDataVo.class);
     }
 
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java

@@ -2,13 +2,12 @@ package org.dromara.system.dubbo;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.system.api.RemoteLogService;
 import org.dromara.system.api.domain.bo.RemoteLogininforBo;
 import org.dromara.system.api.domain.bo.RemoteOperLogBo;
 import org.dromara.system.domain.bo.SysLogininforBo;
 import org.dromara.system.domain.bo.SysOperLogBo;
-import org.dromara.system.domain.convert.SysLogininforBoConvert;
-import org.dromara.system.domain.convert.SysOperLogBoConvert;
 import org.dromara.system.service.ISysLogininforService;
 import org.dromara.system.service.ISysOperLogService;
 import org.springframework.stereotype.Service;
@@ -28,13 +27,13 @@ public class RemoteLogServiceImpl implements RemoteLogService {
 
     @Override
     public void saveLog(RemoteOperLogBo remoteOperLogBo) {
-        SysOperLogBo sysOperLogBo = SysOperLogBoConvert.INSTANCE.convert(remoteOperLogBo);
+        SysOperLogBo sysOperLogBo = MapstructUtils.convert(remoteOperLogBo, SysOperLogBo.class);
         operLogService.insertOperlog(sysOperLogBo);
     }
 
     @Override
     public void saveLogininfor(RemoteLogininforBo remoteLogininforBo) {
-        SysLogininforBo sysLogininforBo = SysLogininforBoConvert.INSTANCE.convert(remoteLogininforBo);
+        SysLogininforBo sysLogininforBo = MapstructUtils.convert(remoteLogininforBo, SysLogininforBo.class);
         logininforService.insertLogininfor(sysLogininforBo);
     }
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java

@@ -2,10 +2,10 @@ package org.dromara.system.dubbo;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.system.api.RemoteTenantService;
 import org.dromara.system.api.domain.vo.RemoteTenantVo;
 import org.dromara.system.domain.bo.SysTenantBo;
-import org.dromara.system.domain.convert.SysTenantVoConvert;
 import org.dromara.system.domain.vo.SysTenantVo;
 import org.dromara.system.service.ISysTenantService;
 import org.springframework.stereotype.Service;
@@ -27,8 +27,8 @@ public class RemoteTenantServiceImpl implements RemoteTenantService {
      */
     @Override
     public RemoteTenantVo queryByTenantId(String tenantId) {
-        SysTenantVo sysTenantVo = tenantService.queryByTenantId(tenantId);
-        return SysTenantVoConvert.INSTANCE.convert(sysTenantVo);
+        SysTenantVo vo = tenantService.queryByTenantId(tenantId);
+        return MapstructUtils.convert(vo, RemoteTenantVo.class);
     }
 
     /**
@@ -36,8 +36,8 @@ public class RemoteTenantServiceImpl implements RemoteTenantService {
      */
     @Override
     public List<RemoteTenantVo> queryList() {
-        List<SysTenantVo> sysTenantVos = tenantService.queryList(new SysTenantBo());
-        return SysTenantVoConvert.INSTANCE.convertList(sysTenantVos);
+        List<SysTenantVo> list = tenantService.queryList(new SysTenantBo());
+        return MapstructUtils.convert(list, RemoteTenantVo.class);
     }
 
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java

@@ -8,6 +8,7 @@ import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.common.core.enums.UserStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.system.api.RemoteUserService;
 import org.dromara.system.api.domain.bo.RemoteUserBo;
 import org.dromara.system.api.model.LoginUser;
@@ -15,7 +16,6 @@ import org.dromara.system.api.model.RoleDTO;
 import org.dromara.system.api.model.XcxLoginUser;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.bo.SysUserBo;
-import org.dromara.system.domain.convert.SysUserBoConvert;
 import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.mapper.SysUserMapper;
 import org.dromara.system.service.ISysConfigService;
@@ -110,7 +110,7 @@ public class RemoteUserServiceImpl implements RemoteUserService {
 
     @Override
     public Boolean registerUserInfo(RemoteUserBo remoteUserBo) {
-        SysUserBo sysUserBo = SysUserBoConvert.INSTANCE.convert(remoteUserBo);
+        SysUserBo sysUserBo = MapstructUtils.convert(remoteUserBo, SysUserBo.class);
         String username = sysUserBo.getUserName();
         if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
             throw new ServiceException("当前系统没有开启注册功能");