From dddd23a3652d919e4c6b9721416ea8ad4a2955b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Sun, 3 Jul 2022 14:35:40 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=97=B6=E9=97=B4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E5=8F=98=E6=9B=B4=E5=AE=9E=E4=BD=93=E7=B1=BB?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0gmt=5Fcreate=E2=86=92create?=
 =?UTF-8?q?=5Ftime,gmt=5Fmodified=E2=86=92update=5Ftime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/cache/InitPermissionRolesCache.java      |  2 ++
 .../ClientConverter.java}                          |  6 +++---
 .../DictItemConverter.java}                        |  4 ++--
 .../DictTypeConverter.java}                        |  6 ++----
 .../RoleConverter.java}                            |  8 ++++----
 .../UserConverter.java}                            |  6 +++---
 .../admin/listener/excel/UserImportListener.java   |  3 ++-
 .../main/java/com/youlai/admin/pojo/po/UserPO.java |  2 +-
 .../youlai/admin/pojo/vo/user/UserExportVO.java    |  2 +-
 .../java/com/youlai/admin/pojo/vo/user/UserVO.java |  2 +-
 .../admin/service/impl/SysDictItemServiceImpl.java | 12 ++++++------
 .../service/impl/SysDictTypeTypeServiceImpl.java   | 12 ++++++------
 .../service/impl/SysOauthClientServiceImpl.java    |  6 +++---
 .../admin/service/impl/SysRoleServiceImpl.java     | 10 +++++-----
 .../admin/service/impl/SysUserServiceImpl.java     | 14 +++++++-------
 .../main/resources/mapper/SysDictItemMapper.xml    |  8 ++++----
 .../src/main/resources/mapper/SysMenuMapper.xml    |  4 ++--
 .../main/resources/mapper/SysPermissionMapper.xml  |  4 ++--
 .../src/main/resources/mapper/SysUserMapper.xml    |  4 ++--
 19 files changed, 58 insertions(+), 57 deletions(-)
 rename youlai-admin/admin-boot/src/main/java/com/youlai/admin/{convert/ClientConvert.java => converter/ClientConverter.java} (80%)
 rename youlai-admin/admin-boot/src/main/java/com/youlai/admin/{convert/DictItemConvert.java => converter/DictItemConverter.java} (89%)
 rename youlai-admin/admin-boot/src/main/java/com/youlai/admin/{convert/DictTypeConvert.java => converter/DictTypeConverter.java} (75%)
 rename youlai-admin/admin-boot/src/main/java/com/youlai/admin/{convert/RoleConvert.java => converter/RoleConverter.java} (82%)
 rename youlai-admin/admin-boot/src/main/java/com/youlai/admin/{convert/UserConvert.java => converter/UserConverter.java} (92%)

diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/cache/InitPermissionRolesCache.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/cache/InitPermissionRolesCache.java
index b6e98d23..89c1bb89 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/cache/InitPermissionRolesCache.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/cache/InitPermissionRolesCache.java
@@ -7,7 +7,9 @@ import org.springframework.stereotype.Component;
 
 /**
  * 容器启动完成时加载角色权限规则至Redis缓存
+ *
  * @author haoxr
+ * @date 2021/5/1
  */
 @Component
 @AllArgsConstructor
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/ClientConvert.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/ClientConverter.java
similarity index 80%
rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/ClientConvert.java
rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/ClientConverter.java
index 78f34182..45eb69ff 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/ClientConvert.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/ClientConverter.java
@@ -1,4 +1,4 @@
-package com.youlai.admin.convert;
+package com.youlai.admin.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.admin.pojo.entity.SysOauthClient;
@@ -6,13 +6,13 @@ import com.youlai.admin.pojo.vo.client.ClientPageVO;
 import org.mapstruct.Mapper;
 
 /**
- * 客户端实体转换器
+ * 客户端对象转换器
  *
  * @author haoxr
  * @date 2022/6/11
  */
 @Mapper(componentModel = "spring")
-public interface ClientConvert {
+public interface ClientConverter {
 
     ClientPageVO entity2PageVO(SysOauthClient entity);
 
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/DictItemConvert.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/DictItemConverter.java
similarity index 89%
rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/DictItemConvert.java
rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/DictItemConverter.java
index 2fbd008c..687cd66e 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/DictItemConvert.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/DictItemConverter.java
@@ -1,4 +1,4 @@
-package com.youlai.admin.convert;
+package com.youlai.admin.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.admin.pojo.entity.SysDictItem;
@@ -14,7 +14,7 @@ import org.mapstruct.Mapper;
  * @date 2022/6/8
  */
 @Mapper(componentModel = "spring")
-public interface DictItemConvert {
+public interface DictItemConverter {
 
     Page<DictItemPageVO> entity2Page(Page<SysDictItem> page);
 
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/DictTypeConvert.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/DictTypeConverter.java
similarity index 75%
rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/DictTypeConvert.java
rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/DictTypeConverter.java
index ad7284f9..18c0330f 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/DictTypeConvert.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/DictTypeConverter.java
@@ -1,10 +1,9 @@
-package com.youlai.admin.convert;
+package com.youlai.admin.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.admin.pojo.entity.SysDictType;
 import com.youlai.admin.pojo.form.DictTypeForm;
 import com.youlai.admin.pojo.vo.dict.DictTypePageVO;
-import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
 
 /**
@@ -14,12 +13,11 @@ import org.mapstruct.Mapper;
  * @date 2022/6/8
  */
 @Mapper(componentModel = "spring")
-public interface DictTypeConvert {
+public interface DictTypeConverter {
 
     Page<DictTypePageVO> entity2Page(Page<SysDictType> page);
 
     DictTypeForm entity2Form(SysDictType entity);
 
-    @InheritInverseConfiguration(name="entity2Form")
     SysDictType form2Entity(DictTypeForm entity);
 }
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/RoleConvert.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/RoleConverter.java
similarity index 82%
rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/RoleConvert.java
rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/RoleConverter.java
index 88cb0a1a..7514a2f8 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/RoleConvert.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/RoleConverter.java
@@ -1,4 +1,4 @@
-package com.youlai.admin.convert;
+package com.youlai.admin.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.admin.pojo.entity.SysRole;
@@ -12,13 +12,13 @@ import org.mapstruct.Mappings;
 import java.util.List;
 
 /**
- * 角色实体转换器
+ * 角色对象转换器
  *
  * @author haoxr
  * @date 2022/5/29
  */
 @Mapper(componentModel = "spring")
-public interface RoleConvert {
+public interface RoleConverter {
 
     Page<RolePageVO> entity2Page(Page<SysRole> page);
 
@@ -29,7 +29,7 @@ public interface RoleConvert {
     Option role2Option(SysRole role);
 
 
-    List<Option> roles2Options(List<SysRole> roleList);
+    List<Option> roles2Options(List<SysRole> roles);
 
     SysRole form2Entity(RoleForm roleForm);
 }
\ No newline at end of file
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/UserConvert.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/UserConverter.java
similarity index 92%
rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/UserConvert.java
rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/UserConverter.java
index 81467e38..94d7edb1 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/convert/UserConvert.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/converter/UserConverter.java
@@ -1,4 +1,4 @@
-package com.youlai.admin.convert;
+package com.youlai.admin.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.admin.pojo.entity.SysUser;
@@ -13,13 +13,13 @@ import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
 
 /**
- * 用户实体转换器
+ * 用户对象转换器
  *
  * @author haoxr
  * @date 2022/6/8
  */
 @Mapper(componentModel = "spring")
-public interface UserConvert {
+public interface UserConverter {
 
     @Mappings({
             @Mapping(target = "genderLabel", expression = "java(com.youlai.common.base.IBaseEnum.getLabelByValue(po.getGender(), com.youlai.common.enums.GenderEnum.class))")
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/listener/excel/UserImportListener.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/listener/excel/UserImportListener.java
index cb6f18ed..93b34967 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/listener/excel/UserImportListener.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/listener/excel/UserImportListener.java
@@ -7,6 +7,8 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
+ *
+ *
  *
  * @author haoxr
  * @date 2022/4/10 20:49
@@ -15,7 +17,6 @@ import org.springframework.stereotype.Component;
 @Scope("prototype")
 public class UserImportListener extends AnalysisEventListener<UserImportDTO.UserItem> {
 
-
     @Override
     public void invoke(UserImportDTO.UserItem userItem, AnalysisContext analysisContext) {
 
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/po/UserPO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/po/UserPO.java
index 93322b85..827b4db3 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/po/UserPO.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/po/UserPO.java
@@ -68,5 +68,5 @@ public class UserPO {
      * 创建时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date gmtCreate;
+    private Date createTime;
 }
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/user/UserExportVO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/user/UserExportVO.java
index 75f37066..42df6f9f 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/user/UserExportVO.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/user/UserExportVO.java
@@ -39,7 +39,7 @@ public class UserExportVO {
 
     @ExcelProperty(value = "创建时间")
     @DateTimeFormat("yyyy/MM/dd HH:mm:ss")
-    private LocalDateTime gmtCreate;
+    private LocalDateTime createTime;
 
 
 }
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/user/UserVO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/user/UserVO.java
index 24880b09..8eedd995 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/user/UserVO.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/user/UserVO.java
@@ -49,6 +49,6 @@ public class UserVO {
 
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date gmtCreate;
+    private Date createTime;
 
 }
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDictItemServiceImpl.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDictItemServiceImpl.java
index 07f6a261..fa4a3ca7 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDictItemServiceImpl.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDictItemServiceImpl.java
@@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.admin.convert.DictItemConvert;
+import com.youlai.admin.converter.DictItemConverter;
 import com.youlai.admin.mapper.SysDictItemMapper;
 import com.youlai.admin.pojo.entity.SysDictItem;
 import com.youlai.admin.pojo.form.DictItemForm;
@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDictItem> implements SysDictItemService {
 
-    private final DictItemConvert dictItemConvert;
+    private final DictItemConverter dictItemConverter;
 
     /**
      * 字典数据项分页列表
@@ -56,7 +56,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
         );
 
         // 实体转换
-        Page<DictItemPageVO> pageResult = dictItemConvert.entity2Page(dictItemPage);
+        Page<DictItemPageVO> pageResult = dictItemConverter.entity2Page(dictItemPage);
         return pageResult;
     }
 
@@ -83,7 +83,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
         Assert.isTrue(entity != null, "字典数据项不存在");
 
         // 实体转换
-        DictItemForm dictItemForm = dictItemConvert.entity2Form(entity);
+        DictItemForm dictItemForm = dictItemConverter.entity2Form(entity);
         return dictItemForm;
     }
 
@@ -96,7 +96,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
     @Override
     public boolean saveDictItem(DictItemForm dictItemForm) {
         // 实体对象转换 form->entity
-        SysDictItem entity = dictItemConvert.form2Entity(dictItemForm);
+        SysDictItem entity = dictItemConverter.form2Entity(dictItemForm);
         // 持久化
         boolean result = this.save(entity);
         return result;
@@ -111,7 +111,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
      */
     @Override
     public boolean updateDictItem(Long id, DictItemForm dictItemForm) {
-        SysDictItem entity = dictItemConvert.form2Entity(dictItemForm);
+        SysDictItem entity = dictItemConverter.form2Entity(dictItemForm);
         boolean result = this.updateById(entity);
         return result;
     }
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDictTypeTypeServiceImpl.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDictTypeTypeServiceImpl.java
index 1e743cae..0eaec2aa 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDictTypeTypeServiceImpl.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDictTypeTypeServiceImpl.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.admin.convert.DictTypeConvert;
+import com.youlai.admin.converter.DictTypeConverter;
 import com.youlai.admin.mapper.SysDictTypeMapper;
 import com.youlai.admin.pojo.entity.SysDictItem;
 import com.youlai.admin.pojo.entity.SysDictType;
@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
 public class SysDictTypeTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements SysDictTypeService {
 
     private final SysDictItemService dictItemService;
-    private final DictTypeConvert dictTypeConvert;
+    private final DictTypeConverter dictTypeConverter;
 
     /**
      * 字典分页列表
@@ -61,7 +61,7 @@ public class SysDictTypeTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, S
         );
 
         // 实体转换
-        Page<DictTypePageVO> pageResult = dictTypeConvert.entity2Page(dictTypePage);
+        Page<DictTypePageVO> pageResult = dictTypeConverter.entity2Page(dictTypePage);
         return pageResult;
     }
 
@@ -86,7 +86,7 @@ public class SysDictTypeTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, S
         Assert.isTrue(entity != null, "字典类型不存在");
 
         // 实体转换
-        DictTypeForm dictTypeForm = dictTypeConvert.entity2Form(entity);
+        DictTypeForm dictTypeForm = dictTypeConverter.entity2Form(entity);
         return dictTypeForm;
     }
 
@@ -99,7 +99,7 @@ public class SysDictTypeTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, S
     @Override
     public boolean saveDictType(DictTypeForm dictTypeForm) {
         // 实体对象转换 form->entity
-        SysDictType entity = dictTypeConvert.form2Entity(dictTypeForm);
+        SysDictType entity = dictTypeConverter.form2Entity(dictTypeForm);
         // 持久化
         boolean result = this.save(entity);
         return result;
@@ -119,7 +119,7 @@ public class SysDictTypeTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, S
         SysDictType sysDictType = this.getById(id);
         Assert.isTrue(sysDictType != null, "字典类型不存在");
 
-        SysDictType entity = dictTypeConvert.form2Entity(dictTypeForm);
+        SysDictType entity = dictTypeConverter.form2Entity(dictTypeForm);
         boolean result = this.updateById(entity);
         if (result) {
             // 字典类型code变化，同步修改字典项的类型code
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysOauthClientServiceImpl.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysOauthClientServiceImpl.java
index edf91811..6e851aca 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysOauthClientServiceImpl.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysOauthClientServiceImpl.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.admin.convert.ClientConvert;
+import com.youlai.admin.converter.ClientConverter;
 import com.youlai.admin.mapper.SysOauthClientMapper;
 import com.youlai.admin.pojo.entity.SysOauthClient;
 import com.youlai.admin.pojo.query.ClientPageQuery;
@@ -29,7 +29,7 @@ import java.util.Set;
 public class SysOauthClientServiceImpl extends ServiceImpl<SysOauthClientMapper, SysOauthClient> implements SysOauthClientService {
 
     private final StringRedisTemplate stringRedisTemplate;
-    private final ClientConvert clientConvert;
+    private final ClientConverter clientConverter;
 
     /**
      * 客户端分页列表
@@ -54,7 +54,7 @@ public class SysOauthClientServiceImpl extends ServiceImpl<SysOauthClientMapper,
         );
 
         // 实体转换
-        Page<ClientPageVO> voPage = clientConvert.entity2PageVO(entityPage);
+        Page<ClientPageVO> voPage = clientConverter.entity2PageVO(entityPage);
 
         return voPage;
     }
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysRoleServiceImpl.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysRoleServiceImpl.java
index 444515a2..2426d202 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysRoleServiceImpl.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysRoleServiceImpl.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.admin.convert.RoleConvert;
+import com.youlai.admin.converter.RoleConverter;
 import com.youlai.admin.mapper.SysRoleMapper;
 import com.youlai.admin.pojo.entity.SysRole;
 import com.youlai.admin.pojo.entity.SysRoleMenu;
@@ -47,7 +47,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     private final SysUserRoleService sysUserRoleService;
     private final SysRolePermissionService sysRolePermissionService;
     private final SysPermissionService sysPermissionService;
-    private final RoleConvert roleConvert;
+    private final RoleConverter roleConverter;
 
     /**
      * 角色分页列表
@@ -74,7 +74,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         );
 
         // 实体转换
-        Page<RolePageVO> pageResult = roleConvert.entity2Page(rolePage);
+        Page<RolePageVO> pageResult = roleConverter.entity2Page(rolePage);
         return pageResult;
     }
 
@@ -93,7 +93,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         );
 
         // 实体转换
-        List<Option> list = roleConvert.roles2Options(roleList);
+        List<Option> list = roleConverter.roles2Options(roleList);
         return list;
     }
 
@@ -115,7 +115,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         Assert.isTrue(count == 0, "角色名称或角色编码重复，请检查！");
 
         // 实体转换
-        SysRole role = roleConvert.form2Entity(roleForm);
+        SysRole role = roleConverter.form2Entity(roleForm);
 
         boolean result = this.saveOrUpdate(role);
         // 刷新权限缓存
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysUserServiceImpl.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysUserServiceImpl.java
index 78002755..63f0178c 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysUserServiceImpl.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysUserServiceImpl.java
@@ -17,7 +17,7 @@ import com.youlai.admin.pojo.vo.user.UserVO;
 import com.youlai.common.constant.SystemConstants;
 import com.youlai.common.enums.GenderEnum;
 import com.youlai.admin.listener.excel.UserImportListener;
-import com.youlai.admin.convert.UserConvert;
+import com.youlai.admin.converter.UserConverter;
 import com.youlai.admin.dto.UserAuthDTO;
 import com.youlai.admin.mapper.SysUserMapper;
 import com.youlai.admin.pojo.dto.UserImportDTO;
@@ -61,7 +61,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private final SysUserRoleService userRoleService;
     private final UserImportListener userImportListener;
     private final SysPermissionService permissionService;
-    private final UserConvert userConvert;
+    private final UserConverter userConverter;
 
     /**
      * 获取用户分页列表
@@ -81,7 +81,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         Page<UserPO> userPoPage = this.baseMapper.listUserPages(page, queryParams);
 
         // 实体转换
-        Page<UserVO> userVoPage = userConvert.po2Vo(userPoPage);
+        Page<UserVO> userVoPage = userConverter.po2Vo(userPoPage);
 
         return userVoPage;
     }
@@ -96,7 +96,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public UserForm getUserFormData(Long userId) {
         UserFormPO userFormPO = this.baseMapper.getUserFormData(userId);
         // 实体转换po->form
-        UserForm userForm = userConvert.po2Form(userFormPO);
+        UserForm userForm = userConverter.po2Form(userFormPO);
         return userForm;
     }
 
@@ -110,7 +110,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public boolean saveUser(UserForm userForm) {
 
         // 实体转换 form->entity
-        SysUser entity = userConvert.form2Entity(userForm);
+        SysUser entity = userConverter.form2Entity(userForm);
 
         // 设置默认加密密码
         String defaultEncryptPwd = passwordEncoder.encode(SystemConstants.DEFAULT_USER_PASSWORD);
@@ -172,7 +172,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 
         // form -> entity
-        SysUser entity = userConvert.form2Entity(userForm);
+        SysUser entity = userConverter.form2Entity(userForm);
 
         // 修改用户
         boolean result = this.updateById(entity);
@@ -345,7 +345,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 )
         );
         // entity->VO
-        LoginUserVO loginUserVO = userConvert.entity2LoginUser(user);
+        LoginUserVO loginUserVO = userConverter.entity2LoginUser(user);
 
         // 用户角色集合
         List<String> roles = UserUtils.getRoles();
diff --git a/youlai-admin/admin-boot/src/main/resources/mapper/SysDictItemMapper.xml b/youlai-admin/admin-boot/src/main/resources/mapper/SysDictItemMapper.xml
index 5521c91d..77fbd87e 100644
--- a/youlai-admin/admin-boot/src/main/resources/mapper/SysDictItemMapper.xml
+++ b/youlai-admin/admin-boot/src/main/resources/mapper/SysDictItemMapper.xml
@@ -13,15 +13,15 @@
             <result property="status" column="status" jdbcType="BOOLEAN"/>
             <result property="defaulted" column="defaulted" jdbcType="BOOLEAN"/>
             <result property="remark" column="remark" jdbcType="VARCHAR"/>
-            <result property="gmtCreate" column="gmt_create" jdbcType="TIMESTAMP"/>
-            <result  property="gmtModified" column="gmt_modified" jdbcType="TIMESTAMP"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result  property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id,name,value,
         dict_code,sort,status,
-        defaulted,remark,gmt_create,
-        gmt_modified
+        defaulted,remark,create_time,
+        update_time
     </sql>
 
 
diff --git a/youlai-admin/admin-boot/src/main/resources/mapper/SysMenuMapper.xml b/youlai-admin/admin-boot/src/main/resources/mapper/SysMenuMapper.xml
index 5d4ad3a9..0db3bc22 100644
--- a/youlai-admin/admin-boot/src/main/resources/mapper/SysMenuMapper.xml
+++ b/youlai-admin/admin-boot/src/main/resources/mapper/SysMenuMapper.xml
@@ -14,8 +14,8 @@
         <result property="icon" column="icon" jdbcType="VARCHAR"/>
         <result property="sort" column="sort" jdbcType="INTEGER"/>
         <result property="visible" column="visible" jdbcType="BOOLEAN"/>
-        <result property="gmtCreate" column="gmt_create" jdbcType="TIMESTAMP"/>
-        <result property="gmtModified" column="gmt_modified" jdbcType="TIMESTAMP"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="type" column="type" jdbcType="OTHER"/>
         <collection property="roles" ofType="string" javaType="list">
             <result column="code"/>
diff --git a/youlai-admin/admin-boot/src/main/resources/mapper/SysPermissionMapper.xml b/youlai-admin/admin-boot/src/main/resources/mapper/SysPermissionMapper.xml
index db534091..30db382d 100644
--- a/youlai-admin/admin-boot/src/main/resources/mapper/SysPermissionMapper.xml
+++ b/youlai-admin/admin-boot/src/main/resources/mapper/SysPermissionMapper.xml
@@ -10,8 +10,8 @@
         <result property="menuId" column="menu_id" jdbcType="BIGINT"/>
         <result property="urlPerm" column="url_perm" jdbcType="VARCHAR"/>
         <result property="btnPerm" column="btn_perm" jdbcType="VARCHAR"/>
-        <result property="gmtCreate" column="gmt_create" jdbcType="TIMESTAMP"/>
-        <result  property="gmtModified" column="gmt_modified" jdbcType="TIMESTAMP"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result  property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <collection property="roles" ofType="String" javaType="list">
             <result column="code"/>
         </collection>
diff --git a/youlai-admin/admin-boot/src/main/resources/mapper/SysUserMapper.xml b/youlai-admin/admin-boot/src/main/resources/mapper/SysUserMapper.xml
index 858af9e2..cb25c8f6 100644
--- a/youlai-admin/admin-boot/src/main/resources/mapper/SysUserMapper.xml
+++ b/youlai-admin/admin-boot/src/main/resources/mapper/SysUserMapper.xml
@@ -16,7 +16,7 @@
         u.STATUS,
         d.NAME AS dept_name,
         GROUP_CONCAT( r.NAME ) AS roleNames,
-        u.gmt_create
+        u.create_time
         FROM
         sys_user u
         LEFT JOIN sys_dept d ON u.dept_id = d.id
@@ -116,7 +116,7 @@
                 ELSE '未知'
             END gender,
             d.NAME AS dept_name,
-            u.gmt_create
+            u.create_time
         FROM
             sys_user u
             LEFT JOIN sys_dept d ON u.dept_id = d.id
-- 
GitLab