From 6e9cc612336d7a739782c07e60d05e1733c3fc6c Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Wed, 13 Dec 2023 17:56:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=B6=E6=9E=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/enums}/CtLeaveMessageEnum.java | 2 +- .../core/enums}/SystemSettingKeyEnum.java | 2 +- .../core}/mapper/CtLeaveMessageMapper.java | 2 +- .../core}/mapper/IntegralGlobalMapper.java | 2 +- .../common/core}/mapper/SysConfigMapper.java | 2 +- .../common/core}/mapper/SysDeptMapper.java | 2 +- .../core}/mapper/SysDictDataMapper.java | 2 +- .../core}/mapper/SysDictTypeMapper.java | 2 +- .../core}/mapper/SysFiringInfoMapper.java | 2 +- .../core}/mapper/SysLogininforMapper.java | 2 +- .../common/core}/mapper/SysMenuMapper.java | 2 +- .../common/core}/mapper/SysNoticeMapper.java | 2 +- .../common/core}/mapper/SysOperLogMapper.java | 2 +- .../common/core}/mapper/SysPostMapper.java | 2 +- .../common/core}/mapper/SysRegionMapper.java | 2 +- .../core}/mapper/SysRoleDeptMapper.java | 2 +- .../common/core}/mapper/SysRoleMapper.java | 2 +- .../core}/mapper/SysRoleMenuMapper.java | 2 +- .../common/core}/mapper/SysUserMapper.java | 2 +- .../core}/mapper/SysUserPostMapper.java | 2 +- .../core}/mapper/SysUserRoleMapper.java | 2 +- .../core}/mapper/WxOtherSettingMapper.java | 2 +- .../mapper/WxParameterSettingMapper.java | 2 +- .../core}/mapper/WxSystemSettingMapper.java | 2 +- .../core}/mapper/WxUserMemberMapper.java | 2 +- .../mapper}/CtLeaveMessageMapper.xml | 2 +- .../mapper}/IntegralGlobalMapper.xml | 2 +- .../resources/mapper}/SysConfigMapper.xml | 2 +- .../main/resources/mapper}/SysDeptMapper.xml | 2 +- .../resources/mapper}/SysDictDataMapper.xml | 2 +- .../resources/mapper}/SysDictTypeMapper.xml | 2 +- .../resources/mapper}/SysFiringInfoMapper.xml | 2 +- .../resources/mapper}/SysLogininforMapper.xml | 2 +- .../main/resources/mapper}/SysMenuMapper.xml | 2 +- .../resources/mapper}/SysNoticeMapper.xml | 2 +- .../resources/mapper}/SysOperLogMapper.xml | 2 +- .../main/resources/mapper}/SysPostMapper.xml | 2 +- .../resources/mapper}/SysRegionMapper.xml | 2 +- .../resources/mapper}/SysRoleDeptMapper.xml | 2 +- .../main/resources/mapper}/SysRoleMapper.xml | 2 +- .../resources/mapper}/SysRoleMenuMapper.xml | 2 +- .../main/resources/mapper}/SysUserMapper.xml | 2 +- .../resources/mapper}/SysUserPostMapper.xml | 2 +- .../resources/mapper}/SysUserRoleMapper.xml | 2 +- .../mapper}/WxOtherSettingMapper.xml | 2 +- .../mapper}/WxParameterSettingMapper.xml | 2 +- .../mapper}/WxSystemSettingMapper.xml | 2 +- .../resources/mapper}/WxUserMemberMapper.xml | 2 +- .../flossom-common-hzMapper/pom.xml | 29 ------------------- flossom-common/pom.xml | 1 - flossom-modules/flossom-mini-program/pom.xml | 6 ---- .../impl/CtleaveMessageServiceImpl.java | 4 +-- .../impl/SysFiringInfoServiceImpl.java | 2 +- .../service/impl/SysRegionServiceImpl.java | 2 +- .../impl/SystemSettingServiceImpl.java | 6 ++-- .../service/impl/WxUserMemberServiceImpl.java | 2 +- .../miniProgram/utils/MiniProgramUtils.java | 4 +-- flossom-modules/flossom-system/pom.xml | 6 ---- .../impl/CtLeaveMessageServiceImpl.java | 2 +- .../impl/IntegralGlobalServiceImpl.java | 2 +- .../service/impl/SysConfigServiceImpl.java | 2 +- .../service/impl/SysDeptServiceImpl.java | 4 +-- .../service/impl/SysDictDataServiceImpl.java | 2 +- .../service/impl/SysDictTypeServiceImpl.java | 4 +-- .../impl/SysFiringInfoServiceImpl.java | 2 +- .../impl/SysLogininforServiceImpl.java | 2 +- .../service/impl/SysMenuServiceImpl.java | 6 ++-- .../service/impl/SysNoticeServiceImpl.java | 2 +- .../service/impl/SysOperLogServiceImpl.java | 2 +- .../service/impl/SysPostServiceImpl.java | 4 +-- .../service/impl/SysRegionServiceImpl.java | 2 +- .../service/impl/SysRoleServiceImpl.java | 8 ++--- .../service/impl/SysUserServiceImpl.java | 2 +- .../impl/WxOtherSettingServiceImpl.java | 2 +- .../impl/WxParameterSettingServiceImpl.java | 2 +- .../impl/WxSystemSettingServiceImpl.java | 2 +- .../service/impl/WxUserMemberServiceImpl.java | 2 +- 77 files changed, 84 insertions(+), 128 deletions(-) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/Enums => flossom-common-core/src/main/java/com/flossom/common/core/enums}/CtLeaveMessageEnum.java (94%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/Enums => flossom-common-core/src/main/java/com/flossom/common/core/enums}/SystemSettingKeyEnum.java (95%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/CtLeaveMessageMapper.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/IntegralGlobalMapper.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysConfigMapper.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysDeptMapper.java (98%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysDictDataMapper.java (98%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysDictTypeMapper.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysFiringInfoMapper.java (96%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysLogininforMapper.java (95%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysMenuMapper.java (98%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysNoticeMapper.java (96%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysOperLogMapper.java (95%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysPostMapper.java (98%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysRegionMapper.java (96%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysRoleDeptMapper.java (95%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysRoleMapper.java (98%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysRoleMenuMapper.java (95%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysUserMapper.java (98%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysUserPostMapper.java (95%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/SysUserRoleMapper.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/WxOtherSettingMapper.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/WxParameterSettingMapper.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/WxSystemSettingMapper.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/mapper/WxUserMemberMapper.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/CtLeaveMessageMapper.xml (98%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/IntegralGlobalMapper.xml (97%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysConfigMapper.xml (98%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysDeptMapper.xml (98%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysDictDataMapper.xml (98%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysDictTypeMapper.xml (98%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysFiringInfoMapper.xml (98%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysLogininforMapper.xml (96%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysMenuMapper.xml (99%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysNoticeMapper.xml (98%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysOperLogMapper.xml (98%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysPostMapper.xml (98%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysRegionMapper.xml (97%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysRoleDeptMapper.xml (93%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysRoleMapper.xml (99%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysRoleMenuMapper.xml (93%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysUserMapper.xml (99%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysUserPostMapper.xml (93%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/SysUserRoleMapper.xml (95%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/WxOtherSettingMapper.xml (98%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/WxParameterSettingMapper.xml (98%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/WxSystemSettingMapper.xml (98%) rename flossom-common/{flossom-common-hzMapper/src/main/resources/mapper/hzMapper => flossom-common-core/src/main/resources/mapper}/WxUserMemberMapper.xml (99%) delete mode 100644 flossom-common/flossom-common-hzMapper/pom.xml diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/Enums/CtLeaveMessageEnum.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/CtLeaveMessageEnum.java similarity index 94% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/Enums/CtLeaveMessageEnum.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/CtLeaveMessageEnum.java index 8178232..c8bade0 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/Enums/CtLeaveMessageEnum.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/CtLeaveMessageEnum.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.Enums; +package com.flossom.common.core.enums; /** * 系统设置-key 枚举 diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/Enums/SystemSettingKeyEnum.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/SystemSettingKeyEnum.java similarity index 95% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/Enums/SystemSettingKeyEnum.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/SystemSettingKeyEnum.java index 116e366..44c2060 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/Enums/SystemSettingKeyEnum.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/SystemSettingKeyEnum.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.Enums; +package com.flossom.common.core.enums; /** * 系统设置-key 枚举 diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/CtLeaveMessageMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/CtLeaveMessageMapper.java similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/CtLeaveMessageMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/CtLeaveMessageMapper.java index e62a42f..ab59747 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/CtLeaveMessageMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/CtLeaveMessageMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.CtLeaveMessage; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/IntegralGlobalMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/IntegralGlobalMapper.java similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/IntegralGlobalMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/IntegralGlobalMapper.java index 1f32af6..c30a2fb 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/IntegralGlobalMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/IntegralGlobalMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.IntegralGlobal; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysConfigMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysConfigMapper.java similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysConfigMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysConfigMapper.java index 9dcd1c6..6d6f01c 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysConfigMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysConfigMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDeptMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysDeptMapper.java similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDeptMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysDeptMapper.java index af99694..34584a1 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDeptMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysDeptMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.SysDept; import org.apache.ibatis.annotations.Param; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictDataMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysDictDataMapper.java similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictDataMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysDictDataMapper.java index a309bb2..c010d8a 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictDataMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysDictDataMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.SysDictData; import org.apache.ibatis.annotations.Param; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictTypeMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysDictTypeMapper.java similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictTypeMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysDictTypeMapper.java index 01a975b..1b4e623 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictTypeMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysDictTypeMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.SysDictType; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysFiringInfoMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysFiringInfoMapper.java similarity index 96% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysFiringInfoMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysFiringInfoMapper.java index 3da9f83..596b524 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysFiringInfoMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysFiringInfoMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysLogininforMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysLogininforMapper.java similarity index 95% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysLogininforMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysLogininforMapper.java index 83b8b2f..5579f57 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysLogininforMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysLogininforMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.SysLogininfor; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysMenuMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysMenuMapper.java similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysMenuMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysMenuMapper.java index 3f8eb1a..08786d0 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysMenuMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysMenuMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.SysMenu; import org.apache.ibatis.annotations.Param; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysNoticeMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysNoticeMapper.java similarity index 96% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysNoticeMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysNoticeMapper.java index a573596..7be86aa 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysNoticeMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysNoticeMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysOperLogMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysOperLogMapper.java similarity index 95% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysOperLogMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysOperLogMapper.java index 2f5d46d..edbddaf 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysOperLogMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysOperLogMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.SysOperLog; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysPostMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysPostMapper.java similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysPostMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysPostMapper.java index aa2141d..12df632 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysPostMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysPostMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRegionMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRegionMapper.java similarity index 96% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRegionMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRegionMapper.java index 46218f6..b2ddc8e 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRegionMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRegionMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.SysRegion; import org.apache.ibatis.annotations.Param; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleDeptMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRoleDeptMapper.java similarity index 95% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleDeptMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRoleDeptMapper.java index 3604443..45ddf3e 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleDeptMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRoleDeptMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.SysRoleDept; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRoleMapper.java similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRoleMapper.java index 2bb1bed..3c05f9a 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRoleMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.SysRole; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMenuMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRoleMenuMapper.java similarity index 95% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMenuMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRoleMenuMapper.java index c106f35..2d9b994 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMenuMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRoleMenuMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysUserMapper.java similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysUserMapper.java index e226dd2..f3f8e57 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysUserMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.SysUser; import org.apache.ibatis.annotations.Param; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserPostMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysUserPostMapper.java similarity index 95% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserPostMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysUserPostMapper.java index 7d91a18..99570f6 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserPostMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysUserPostMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserRoleMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysUserRoleMapper.java similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserRoleMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysUserRoleMapper.java index 47a9557..06c185b 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserRoleMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysUserRoleMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.SysUserRole; import org.apache.ibatis.annotations.Param; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxOtherSettingMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxOtherSettingMapper.java similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxOtherSettingMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxOtherSettingMapper.java index 2ab746b..46aa1cc 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxOtherSettingMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxOtherSettingMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.WxOtherSetting; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxParameterSettingMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxParameterSettingMapper.java similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxParameterSettingMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxParameterSettingMapper.java index 4f60c33..0bc1a48 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxParameterSettingMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxParameterSettingMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.WxParameterSetting; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxSystemSettingMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxSystemSettingMapper.java similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxSystemSettingMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxSystemSettingMapper.java index 0bad61d..bfc07a9 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxSystemSettingMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxSystemSettingMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.WxSystemSetting; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxUserMemberMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxUserMemberMapper.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java index a0d2745..9234280 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxUserMemberMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.mapper; +package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.WxUserMember; diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/CtLeaveMessageMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/CtLeaveMessageMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml index 63d45ab..4006782 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/CtLeaveMessageMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/IntegralGlobalMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/IntegralGlobalMapper.xml similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/IntegralGlobalMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/IntegralGlobalMapper.xml index 66b48a6..45a3a3a 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/IntegralGlobalMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/IntegralGlobalMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysConfigMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysConfigMapper.xml similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysConfigMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysConfigMapper.xml index 4d5bb40..7d216cd 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysConfigMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDeptMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysDeptMapper.xml similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDeptMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysDeptMapper.xml index 4000670..af21dec 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDeptMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictDataMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysDictDataMapper.xml similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictDataMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysDictDataMapper.xml index 480271a..17391e1 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictDataMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictTypeMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysDictTypeMapper.xml similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictTypeMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysDictTypeMapper.xml index 54bdaa4..b9b01aa 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictTypeMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysFiringInfoMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysFiringInfoMapper.xml similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysFiringInfoMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysFiringInfoMapper.xml index 9769969..20f98cb 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysFiringInfoMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysFiringInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysLogininforMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysLogininforMapper.xml similarity index 96% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysLogininforMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysLogininforMapper.xml index b581088..e631c38 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysLogininforMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysMenuMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysMenuMapper.xml similarity index 99% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysMenuMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysMenuMapper.xml index d32f235..4fe350b 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysMenuMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysNoticeMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysNoticeMapper.xml similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysNoticeMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysNoticeMapper.xml index 56e9162..36bb300 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysNoticeMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysOperLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysOperLogMapper.xml similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysOperLogMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysOperLogMapper.xml index 7da60d6..a7c48a5 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysOperLogMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysPostMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysPostMapper.xml similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysPostMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysPostMapper.xml index 817811d..544dc88 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysPostMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRegionMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysRegionMapper.xml similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRegionMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysRegionMapper.xml index 2e028db..bf39ed8 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRegionMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysRegionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRoleDeptMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysRoleDeptMapper.xml similarity index 93% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRoleDeptMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysRoleDeptMapper.xml index 330570c..1094967 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRoleDeptMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRoleMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysRoleMapper.xml similarity index 99% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRoleMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysRoleMapper.xml index 44dc129..aa05e8f 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRoleMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRoleMenuMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysRoleMenuMapper.xml similarity index 93% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRoleMenuMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysRoleMenuMapper.xml index e7aa5bd..5aa40e5 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRoleMenuMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysUserMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysUserMapper.xml similarity index 99% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysUserMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysUserMapper.xml index 824ab4d..2d6ebac 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysUserMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysUserPostMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysUserPostMapper.xml similarity index 93% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysUserPostMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysUserPostMapper.xml index 25419b9..a4ffefb 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysUserPostMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysUserRoleMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysUserRoleMapper.xml similarity index 95% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysUserRoleMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/SysUserRoleMapper.xml index ab186aa..2576ac7 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysUserRoleMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxOtherSettingMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxOtherSettingMapper.xml similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxOtherSettingMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/WxOtherSettingMapper.xml index 484bbdb..582066c 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxOtherSettingMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxOtherSettingMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxParameterSettingMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxParameterSettingMapper.xml similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxParameterSettingMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/WxParameterSettingMapper.xml index 82bad66..8e499ed 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxParameterSettingMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxParameterSettingMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxSystemSettingMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxSystemSettingMapper.xml similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxSystemSettingMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/WxSystemSettingMapper.xml index 20454f9..ef9ac85 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxSystemSettingMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxSystemSettingMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml similarity index 99% rename from flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxUserMemberMapper.xml rename to flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml index d1e6305..f055afe 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxUserMemberMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/flossom-common/flossom-common-hzMapper/pom.xml b/flossom-common/flossom-common-hzMapper/pom.xml deleted file mode 100644 index f3fcff3..0000000 --- a/flossom-common/flossom-common-hzMapper/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - com.flossom - flossom-common - 3.6.3 - - 4.0.0 - - flossom-common-hzMapper - - - flossom-common-mapper接口 - - - - - com.flossom - flossom-common-core - - - com.flossom - flossom-api-system - - - - diff --git a/flossom-common/pom.xml b/flossom-common/pom.xml index cf31c65..4dfb843 100644 --- a/flossom-common/pom.xml +++ b/flossom-common/pom.xml @@ -14,7 +14,6 @@ flossom-common-redis flossom-common-seata flossom-common-swagger - flossom-common-hzMapper flossom-common-security flossom-common-datascope flossom-common-datasource diff --git a/flossom-modules/flossom-mini-program/pom.xml b/flossom-modules/flossom-mini-program/pom.xml index d342ea6..bbce8c2 100644 --- a/flossom-modules/flossom-mini-program/pom.xml +++ b/flossom-modules/flossom-mini-program/pom.xml @@ -84,12 +84,6 @@ flossom-api-system - - com.flossom - flossom-common-hzMapper - 3.6.3 - - org.apache.httpcomponents diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java index 32b9c79..3410b92 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java @@ -1,8 +1,8 @@ package com.flossom.miniProgram.service.impl; import com.flossom.common.core.domain.entity.CtLeaveMessage; -import com.flossom.hzMapper.Enums.CtLeaveMessageEnum; -import com.flossom.hzMapper.mapper.CtLeaveMessageMapper; +import com.flossom.common.core.enums.CtLeaveMessageEnum; +import com.flossom.common.core.mapper.CtLeaveMessageMapper; import com.flossom.miniProgram.service.ICtleaveMeassageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysFiringInfoServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysFiringInfoServiceImpl.java index a93dca5..7dc8620 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysFiringInfoServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysFiringInfoServiceImpl.java @@ -1,7 +1,7 @@ package com.flossom.miniProgram.service.impl; import com.flossom.common.core.domain.SysFiringInfo; -import com.flossom.hzMapper.mapper.SysFiringInfoMapper; +import com.flossom.common.core.mapper.SysFiringInfoMapper; import com.flossom.miniProgram.service.ISysFiringInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysRegionServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysRegionServiceImpl.java index 515e505..508e3c9 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysRegionServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysRegionServiceImpl.java @@ -1,7 +1,7 @@ package com.flossom.miniProgram.service.impl; import com.flossom.common.core.domain.entity.SysRegion; -import com.flossom.hzMapper.mapper.SysRegionMapper; +import com.flossom.common.core.mapper.SysRegionMapper; import com.flossom.miniProgram.service.ISysRegionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SystemSettingServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SystemSettingServiceImpl.java index 8aa8052..1f0e927 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SystemSettingServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SystemSettingServiceImpl.java @@ -2,9 +2,9 @@ package com.flossom.miniProgram.service.impl; import com.flossom.common.core.domain.entity.WxOtherSetting; import com.flossom.common.core.domain.entity.WxSystemSetting; -import com.flossom.hzMapper.Enums.SystemSettingKeyEnum; -import com.flossom.hzMapper.mapper.WxOtherSettingMapper; -import com.flossom.hzMapper.mapper.WxSystemSettingMapper; +import com.flossom.common.core.enums.SystemSettingKeyEnum; +import com.flossom.common.core.mapper.WxOtherSettingMapper; +import com.flossom.common.core.mapper.WxSystemSettingMapper; import com.flossom.miniProgram.service.ISystemSettingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java index 3c6b7a1..6d98143 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java @@ -9,11 +9,11 @@ import com.flossom.common.core.domain.R; import com.flossom.common.core.domain.RegisterBody; import com.flossom.common.core.domain.entity.WxUserMember; import com.flossom.common.core.exception.ServiceException; +import com.flossom.common.core.mapper.WxUserMemberMapper; import com.flossom.common.core.utils.DateUtils; import com.flossom.common.core.web.domain.AjaxResult; import com.flossom.common.redis.service.RedisService; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.hzMapper.mapper.WxUserMemberMapper; import com.flossom.miniProgram.domain.vo.LoginUserVo; import com.flossom.miniProgram.domain.vo.UserMemberUpdateVo; import com.flossom.miniProgram.domain.vo.WxCode2PhoneRet; diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java index 7b5b1c1..78c2b19 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java @@ -1,14 +1,12 @@ package com.flossom.miniProgram.utils; import com.flossom.common.core.domain.entity.WxParameterSetting; -import com.flossom.hzMapper.mapper.WxParameterSettingMapper; +import com.flossom.common.core.mapper.WxParameterSettingMapper; import com.flossom.miniProgram.config.properties.WxConfig; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/flossom-modules/flossom-system/pom.xml b/flossom-modules/flossom-system/pom.xml index 398e93d..ba9f35a 100644 --- a/flossom-modules/flossom-system/pom.xml +++ b/flossom-modules/flossom-system/pom.xml @@ -77,12 +77,6 @@ com.flossom flossom-common-swagger - - - com.flossom - flossom-common-hzMapper - 3.6.3 - diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/CtLeaveMessageServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/CtLeaveMessageServiceImpl.java index 9ac5218..129dfa8 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/CtLeaveMessageServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/CtLeaveMessageServiceImpl.java @@ -3,8 +3,8 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.entity.CtLeaveMessage; +import com.flossom.common.core.mapper.CtLeaveMessageMapper; import com.flossom.common.core.utils.DateUtils; -import com.flossom.hzMapper.mapper.CtLeaveMessageMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.system.service.ICtLeaveMessageService; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/IntegralGlobalServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/IntegralGlobalServiceImpl.java index 20ed8e6..0685cd7 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/IntegralGlobalServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/IntegralGlobalServiceImpl.java @@ -3,9 +3,9 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.entity.IntegralGlobal; +import com.flossom.common.core.mapper.IntegralGlobalMapper; import com.flossom.common.core.utils.DateUtils; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.hzMapper.mapper.IntegralGlobalMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.system.service.IIntegralGlobalService; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysConfigServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysConfigServiceImpl.java index 2163c75..b0c71ff 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysConfigServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysConfigServiceImpl.java @@ -5,7 +5,7 @@ import java.util.List; import javax.annotation.PostConstruct; import com.flossom.common.core.domain.entity.SysConfig; -import com.flossom.hzMapper.mapper.SysConfigMapper; +import com.flossom.common.core.mapper.SysConfigMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.common.core.constant.CacheConstants; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDeptServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDeptServiceImpl.java index 4eec949..2632804 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDeptServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDeptServiceImpl.java @@ -9,8 +9,8 @@ import com.flossom.common.core.domain.entity.SysDept; import com.flossom.common.core.domain.entity.SysRole; import com.flossom.common.core.domain.entity.SysUser; import com.flossom.common.core.domain.vo.TreeSelect; -import com.flossom.hzMapper.mapper.SysDeptMapper; -import com.flossom.hzMapper.mapper.SysRoleMapper; +import com.flossom.common.core.mapper.SysDeptMapper; +import com.flossom.common.core.mapper.SysRoleMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.common.core.constant.UserConstants; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDictDataServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDictDataServiceImpl.java index 67dff3a..118f6ce 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDictDataServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDictDataServiceImpl.java @@ -3,7 +3,7 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.entity.SysDictData; -import com.flossom.hzMapper.mapper.SysDictDataMapper; +import com.flossom.common.core.mapper.SysDictDataMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.common.security.utils.DictUtils; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDictTypeServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDictTypeServiceImpl.java index 7e15ee1..4fd65ce 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDictTypeServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDictTypeServiceImpl.java @@ -8,8 +8,8 @@ import javax.annotation.PostConstruct; import com.flossom.common.core.domain.entity.SysDictData; import com.flossom.common.core.domain.entity.SysDictType; -import com.flossom.hzMapper.mapper.SysDictDataMapper; -import com.flossom.hzMapper.mapper.SysDictTypeMapper; +import com.flossom.common.core.mapper.SysDictDataMapper; +import com.flossom.common.core.mapper.SysDictTypeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysFiringInfoServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysFiringInfoServiceImpl.java index 0399ced..2d3094f 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysFiringInfoServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysFiringInfoServiceImpl.java @@ -3,9 +3,9 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.SysFiringInfo; +import com.flossom.common.core.mapper.SysFiringInfoMapper; import com.flossom.common.core.utils.DateUtils; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.hzMapper.mapper.SysFiringInfoMapper; import com.flossom.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysLogininforServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysLogininforServiceImpl.java index 340abd4..9b3a415 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysLogininforServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysLogininforServiceImpl.java @@ -3,7 +3,7 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.entity.SysLogininfor; -import com.flossom.hzMapper.mapper.SysLogininforMapper; +import com.flossom.common.core.mapper.SysLogininforMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.system.service.ISysLogininforService; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysMenuServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysMenuServiceImpl.java index 77b6afa..6cd78ad 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysMenuServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysMenuServiceImpl.java @@ -15,9 +15,9 @@ import com.flossom.common.core.domain.entity.SysUser; import com.flossom.common.core.domain.vo.MetaVo; import com.flossom.common.core.domain.vo.RouterVo; import com.flossom.common.core.domain.vo.TreeSelect; -import com.flossom.hzMapper.mapper.SysMenuMapper; -import com.flossom.hzMapper.mapper.SysRoleMapper; -import com.flossom.hzMapper.mapper.SysRoleMenuMapper; +import com.flossom.common.core.mapper.SysMenuMapper; +import com.flossom.common.core.mapper.SysRoleMapper; +import com.flossom.common.core.mapper.SysRoleMenuMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.common.core.constant.Constants; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysNoticeServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysNoticeServiceImpl.java index c4089c0..702d2d9 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysNoticeServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysNoticeServiceImpl.java @@ -3,7 +3,7 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.entity.SysNotice; -import com.flossom.hzMapper.mapper.SysNoticeMapper; +import com.flossom.common.core.mapper.SysNoticeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.system.service.ISysNoticeService; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysOperLogServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysOperLogServiceImpl.java index 4f8a842..6e2ec86 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysOperLogServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysOperLogServiceImpl.java @@ -3,7 +3,7 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.entity.SysOperLog; -import com.flossom.hzMapper.mapper.SysOperLogMapper; +import com.flossom.common.core.mapper.SysOperLogMapper; import com.flossom.system.service.ISysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysPostServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysPostServiceImpl.java index b9d1903..68db8e0 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysPostServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysPostServiceImpl.java @@ -3,8 +3,8 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.entity.SysPost; -import com.flossom.hzMapper.mapper.SysPostMapper; -import com.flossom.hzMapper.mapper.SysUserPostMapper; +import com.flossom.common.core.mapper.SysPostMapper; +import com.flossom.common.core.mapper.SysUserPostMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.common.core.constant.UserConstants; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRegionServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRegionServiceImpl.java index 7f1d4e9..e60e3db 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRegionServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRegionServiceImpl.java @@ -3,7 +3,7 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.entity.SysRegion; -import com.flossom.hzMapper.mapper.SysRegionMapper; +import com.flossom.common.core.mapper.SysRegionMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.system.service.ISysRegionService; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRoleServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRoleServiceImpl.java index 2fc3d5f..69a81f9 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRoleServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRoleServiceImpl.java @@ -7,10 +7,10 @@ import java.util.List; import java.util.Set; import com.flossom.common.core.domain.entity.*; -import com.flossom.hzMapper.mapper.SysRoleDeptMapper; -import com.flossom.hzMapper.mapper.SysRoleMapper; -import com.flossom.hzMapper.mapper.SysRoleMenuMapper; -import com.flossom.hzMapper.mapper.SysUserRoleMapper; +import com.flossom.common.core.mapper.SysRoleDeptMapper; +import com.flossom.common.core.mapper.SysRoleMapper; +import com.flossom.common.core.mapper.SysRoleMenuMapper; +import com.flossom.common.core.mapper.SysUserRoleMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserServiceImpl.java index cf50061..618fcac 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserServiceImpl.java @@ -6,7 +6,7 @@ import java.util.stream.Collectors; import javax.validation.Validator; import com.flossom.common.core.domain.entity.*; -import com.flossom.hzMapper.mapper.*; +import com.flossom.common.core.mapper.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxOtherSettingServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxOtherSettingServiceImpl.java index 542f517..8101569 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxOtherSettingServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxOtherSettingServiceImpl.java @@ -3,8 +3,8 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.entity.WxOtherSetting; +import com.flossom.common.core.mapper.WxOtherSettingMapper; import com.flossom.common.core.utils.DateUtils; -import com.flossom.hzMapper.mapper.WxOtherSettingMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.system.service.IWxOtherSettingService; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxParameterSettingServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxParameterSettingServiceImpl.java index 3c7981d..b2c51ff 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxParameterSettingServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxParameterSettingServiceImpl.java @@ -3,8 +3,8 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.entity.WxParameterSetting; +import com.flossom.common.core.mapper.WxParameterSettingMapper; import com.flossom.common.core.utils.DateUtils; -import com.flossom.hzMapper.mapper.WxParameterSettingMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.system.service.IWxParameterSettingService; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxSystemSettingServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxSystemSettingServiceImpl.java index 9e0a852..c7dc545 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxSystemSettingServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxSystemSettingServiceImpl.java @@ -3,8 +3,8 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.entity.WxSystemSetting; +import com.flossom.common.core.mapper.WxSystemSettingMapper; import com.flossom.common.core.utils.DateUtils; -import com.flossom.hzMapper.mapper.WxSystemSettingMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.system.service.IWxSystemSettingService; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java index 7b79bb3..f52d92a 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java @@ -3,8 +3,8 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.entity.WxUserMember; +import com.flossom.common.core.mapper.WxUserMemberMapper; import com.flossom.common.core.utils.DateUtils; -import com.flossom.hzMapper.mapper.WxUserMemberMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.system.service.IWxUserMemberService;