From 95b75b9d743ed12bc4ec46314f9c5022ae8849cb Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Tue, 12 Dec 2023 15:06:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flossom/system/api/RemoteAuthService.java | 11 ++--- .../flossom/system/api/RemoteFileService.java | 2 +- .../flossom/system/api/RemoteLogService.java | 4 +- .../flossom/system/api/RemoteUserService.java | 2 +- .../factory/RemoteAuthFallbackFactory.java | 13 +++--- .../factory/RemoteFileFallbackFactory.java | 2 +- .../api/factory/RemoteLogFallbackFactory.java | 4 +- .../factory/RemoteUserFallbackFactory.java | 2 +- .../flossom/system/api/model/LoginUser.java | 44 ++++++++++++++++++- .../auth/controller/TokenController.java | 13 ++++++ .../com/flossom/auth/form/WxLoginBody.java | 13 ++++++ .../flossom/auth/service/SysLoginService.java | 2 +- .../auth/service/SysPasswordService.java | 3 +- .../auth/service/SysRecordLogService.java | 2 +- .../core/constant/SecurityConstants.java | 15 +++++++ .../common/core/constant/UserConstants.java | 6 +-- .../core/context/SecurityContextHolder.java | 20 +++++++++ .../common/core}/domain/LoginBody.java | 2 +- .../common/core}/domain/RegisterBody.java | 2 +- .../flossom/common/core}/domain/SysFile.java | 2 +- .../common/core}/domain/SysFiringInfo.java | 2 +- .../common/core}/domain/SysUserOnline.java | 2 +- .../core/domain/entity}/CtLeaveMessage.java | 2 +- .../core/domain/entity}/IntegralGlobal.java | 2 +- .../common/core/domain/entity}/SysConfig.java | 2 +- .../common/core/domain/entity}/SysDept.java | 13 +++--- .../core/domain/entity}/SysDictData.java | 11 ++--- .../core/domain/entity}/SysDictType.java | 13 +++--- .../core/domain/entity}/SysLogininfor.java | 5 ++- .../common/core/domain/entity}/SysMenu.java | 2 +- .../common/core/domain/entity}/SysNotice.java | 2 +- .../core/domain/entity}/SysOperLog.java | 5 ++- .../common/core/domain/entity}/SysPost.java | 2 +- .../common/core/domain/entity}/SysRegion.java | 2 +- .../common/core/domain/entity}/SysRole.java | 15 ++++--- .../core/domain/entity}/SysRoleDept.java | 2 +- .../core/domain/entity}/SysRoleMenu.java | 2 +- .../common/core/domain/entity}/SysUser.java | 15 ++++--- .../core/domain/entity}/SysUserPost.java | 2 +- .../core/domain/entity}/SysUserRole.java | 2 +- .../core/domain/entity}/WxSystemSetting.java | 2 +- .../core/domain/entity}/WxUserMember.java | 4 +- .../common/core}/domain/vo/MetaVo.java | 2 +- .../common/core}/domain/vo/RouterVo.java | 2 +- .../common/core}/domain/vo/TreeSelect.java | 6 +-- .../flossom/common/core/utils/JwtUtils.java | 22 ++++++++++ .../datascope/aspect/DataScopeAspect.java | 5 ++- .../hzMapper/mapper/CtLeaveMessageMapper.java | 3 +- .../hzMapper/mapper/IntegralGlobalMapper.java | 3 +- .../hzMapper/mapper/SysConfigMapper.java | 3 +- .../hzMapper/mapper/SysDeptMapper.java | 2 +- .../hzMapper/mapper/SysDictDataMapper.java | 2 +- .../hzMapper/mapper/SysDictTypeMapper.java | 3 +- .../hzMapper/mapper/SysFiringInfoMapper.java | 3 +- .../hzMapper/mapper/SysLogininforMapper.java | 3 +- .../hzMapper/mapper/SysMenuMapper.java | 2 +- .../hzMapper/mapper/SysNoticeMapper.java | 3 +- .../hzMapper/mapper/SysOperLogMapper.java | 3 +- .../hzMapper/mapper/SysPostMapper.java | 3 +- .../hzMapper/mapper/SysRegionMapper.java | 2 +- .../hzMapper/mapper/SysRoleDeptMapper.java | 2 +- .../hzMapper/mapper/SysRoleMapper.java | 2 +- .../hzMapper/mapper/SysRoleMenuMapper.java | 3 +- .../hzMapper/mapper/SysUserMapper.java | 2 +- .../hzMapper/mapper/SysUserPostMapper.java | 3 +- .../hzMapper/mapper/SysUserRoleMapper.java | 2 +- .../mapper/WxSystemSettingMapper.java | 3 +- .../hzMapper/mapper/WxUserMemberMapper.java | 4 +- .../mapper/hzMapper/SysRegionMapper.xml | 2 +- .../mapper/hzMapper/WxUserMemberMapper.xml | 2 +- .../flossom/common/log/aspect/LogAspect.java | 2 +- .../common/log/service/AsyncLogService.java | 2 +- .../interceptor/HeaderInterceptor.java | 21 ++++----- .../common/security/utils/DictUtils.java | 2 +- .../common/security/utils/SecurityUtils.java | 16 +++++++ .../flossom/gateway/filter/AuthFilter.java | 7 +++ .../file/controller/SysFileController.java | 2 +- .../CtleaveMessageApiController.java | 2 +- .../miniProgram/domain/vo/LoginUserVo.java | 2 +- .../service/ICtleaveMeassageService.java | 3 +- .../service/ISysRegionService.java | 3 +- .../service/ISystemSettingService.java | 3 +- .../service/IWxUserMemberService.java | 1 - .../impl/CtleaveMessageServiceImpl.java | 2 +- .../service/impl/SysRegionServiceImpl.java | 2 +- .../impl/SystemSettingServiceImpl.java | 2 +- .../service/impl/WxUserMemberServiceImpl.java | 20 ++++----- .../controller/CtLeaveMessageController.java | 2 +- .../controller/IntegralGlobalController.java | 2 +- .../controller/SysConfigController.java | 2 +- .../system/controller/SysDeptController.java | 3 +- .../controller/SysDictDataController.java | 2 +- .../controller/SysDictTypeController.java | 2 +- .../controller/SysFiringInfoController.java | 2 +- .../controller/SysLogininforController.java | 2 +- .../system/controller/SysMenuController.java | 2 +- .../controller/SysNoticeController.java | 2 +- .../controller/SysOperlogController.java | 2 +- .../system/controller/SysPostController.java | 2 +- .../controller/SysProfileController.java | 4 +- .../controller/SysRegionController.java | 2 +- .../system/controller/SysRoleController.java | 8 ++-- .../system/controller/SysUserController.java | 6 +-- .../controller/SysUserOnlineController.java | 2 +- .../controller/WxSystemSettingController.java | 2 +- .../controller/WxUserMemberController.java | 2 +- .../service/ICtLeaveMessageService.java | 3 +- .../service/IIntegralGlobalService.java | 3 +- .../system/service/ISysConfigService.java | 3 +- .../system/service/ISysDeptService.java | 5 ++- .../system/service/ISysDictDataService.java | 3 +- .../system/service/ISysDictTypeService.java | 5 ++- .../system/service/ISysFiringInfoService.java | 3 +- .../system/service/ISysLogininforService.java | 3 +- .../system/service/ISysMenuService.java | 7 +-- .../system/service/ISysNoticeService.java | 3 +- .../system/service/ISysOperLogService.java | 3 +- .../system/service/ISysPermissionService.java | 3 +- .../system/service/ISysPostService.java | 3 +- .../system/service/ISysRegionService.java | 3 +- .../system/service/ISysRoleService.java | 5 ++- .../system/service/ISysUserOnlineService.java | 2 +- .../system/service/ISysUserService.java | 3 +- .../service/IWxSystemSettingService.java | 3 +- .../system/service/IWxUserMemberService.java | 3 +- .../impl/CtLeaveMessageServiceImpl.java | 2 +- .../impl/IntegralGlobalServiceImpl.java | 2 +- .../service/impl/SysConfigServiceImpl.java | 2 +- .../service/impl/SysDeptServiceImpl.java | 8 ++-- .../service/impl/SysDictDataServiceImpl.java | 2 +- .../service/impl/SysDictTypeServiceImpl.java | 4 +- .../impl/SysFiringInfoServiceImpl.java | 2 +- .../impl/SysLogininforServiceImpl.java | 2 +- .../service/impl/SysMenuServiceImpl.java | 12 ++--- .../service/impl/SysNoticeServiceImpl.java | 2 +- .../service/impl/SysOperLogServiceImpl.java | 2 +- .../impl/SysPermissionServiceImpl.java | 4 +- .../service/impl/SysPostServiceImpl.java | 2 +- .../service/impl/SysRegionServiceImpl.java | 2 +- .../service/impl/SysRoleServiceImpl.java | 6 +-- .../impl/SysUserOnlineServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 6 +-- .../impl/WxSystemSettingServiceImpl.java | 2 +- .../service/impl/WxUserMemberServiceImpl.java | 2 +- 144 files changed, 411 insertions(+), 234 deletions(-) create mode 100644 flossom-auth/src/main/java/com/flossom/auth/form/WxLoginBody.java rename {flossom-api/flossom-api-system/src/main/java/com/flossom/system/api => flossom-common/flossom-common-core/src/main/java/com/flossom/common/core}/domain/LoginBody.java (93%) rename {flossom-api/flossom-api-system/src/main/java/com/flossom/system/api => flossom-common/flossom-common-core/src/main/java/com/flossom/common/core}/domain/RegisterBody.java (71%) rename {flossom-api/flossom-api-system/src/main/java/com/flossom/system/api => flossom-common/flossom-common-core/src/main/java/com/flossom/common/core}/domain/SysFile.java (95%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/domain/SysFiringInfo.java (98%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/domain/SysUserOnline.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain => flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/CtLeaveMessage.java (98%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain => flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/IntegralGlobal.java (96%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain => flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysConfig.java (98%) rename {flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain => flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysDept.java (98%) rename {flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain => flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysDictData.java (98%) rename {flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain => flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysDictType.java (98%) rename {flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain => flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysLogininfor.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain => flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysMenu.java (99%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain => flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysNotice.java (98%) rename {flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain => flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysOperLog.java (99%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain => flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysPost.java (98%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain => flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysRegion.java (97%) rename {flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain => flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysRole.java (99%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain => flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysRoleDept.java (94%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain => flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysRoleMenu.java (94%) rename {flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain => flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysUser.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain => flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysUserPost.java (94%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain => flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/SysUserRole.java (94%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain => flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/WxSystemSetting.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain => flossom-common-core/src/main/java/com/flossom/common/core/domain/entity}/WxUserMember.java (98%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/domain/vo/MetaVo.java (97%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/domain/vo/RouterVo.java (98%) rename flossom-common/{flossom-common-hzMapper/src/main/java/com/flossom/hzMapper => flossom-common-core/src/main/java/com/flossom/common/core}/domain/vo/TreeSelect.java (90%) diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteAuthService.java b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteAuthService.java index e8a91d6..3525dd5 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteAuthService.java +++ b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteAuthService.java @@ -1,13 +1,11 @@ package com.flossom.system.api; -import com.flossom.common.core.constant.SecurityConstants; import com.flossom.common.core.constant.ServiceNameConstants; +import com.flossom.common.core.domain.LoginBody; import com.flossom.common.core.domain.R; -import com.flossom.system.api.domain.LoginBody; -import com.flossom.system.api.domain.RegisterBody; -import com.flossom.system.api.domain.SysUser; +import com.flossom.common.core.domain.RegisterBody; +import com.flossom.common.core.domain.entity.WxUserMember; import com.flossom.system.api.factory.RemoteUserFallbackFactory; -import com.flossom.system.api.model.LoginUser; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -25,6 +23,9 @@ public interface RemoteAuthService @PostMapping("login") public R> login(@RequestBody LoginBody form); + @PostMapping("wxLogin") + public R> wxLogin(@RequestBody WxUserMember form); + @PostMapping("register") public R register(@RequestBody RegisterBody registerBody); diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteFileService.java b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteFileService.java index 85632ae..cdd9bbf 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteFileService.java +++ b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteFileService.java @@ -1,5 +1,6 @@ package com.flossom.system.api; +import com.flossom.common.core.domain.SysFile; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; @@ -7,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; import com.flossom.common.core.constant.ServiceNameConstants; import com.flossom.common.core.domain.R; -import com.flossom.system.api.domain.SysFile; import com.flossom.system.api.factory.RemoteFileFallbackFactory; /** diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteLogService.java b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteLogService.java index 70f7ecd..0374131 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteLogService.java +++ b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteLogService.java @@ -1,5 +1,7 @@ package com.flossom.system.api; +import com.flossom.common.core.domain.entity.SysLogininfor; +import com.flossom.common.core.domain.entity.SysOperLog; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -7,8 +9,6 @@ import org.springframework.web.bind.annotation.RequestHeader; import com.flossom.common.core.constant.SecurityConstants; import com.flossom.common.core.constant.ServiceNameConstants; import com.flossom.common.core.domain.R; -import com.flossom.system.api.domain.SysLogininfor; -import com.flossom.system.api.domain.SysOperLog; import com.flossom.system.api.factory.RemoteLogFallbackFactory; /** diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteUserService.java b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteUserService.java index b1dad86..265b507 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteUserService.java +++ b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteUserService.java @@ -1,5 +1,6 @@ package com.flossom.system.api; +import com.flossom.common.core.domain.entity.SysUser; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -9,7 +10,6 @@ import org.springframework.web.bind.annotation.RequestHeader; import com.flossom.common.core.constant.SecurityConstants; import com.flossom.common.core.constant.ServiceNameConstants; import com.flossom.common.core.domain.R; -import com.flossom.system.api.domain.SysUser; import com.flossom.system.api.factory.RemoteUserFallbackFactory; import com.flossom.system.api.model.LoginUser; diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteAuthFallbackFactory.java b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteAuthFallbackFactory.java index 778e181..a16df81 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteAuthFallbackFactory.java +++ b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteAuthFallbackFactory.java @@ -1,12 +1,10 @@ package com.flossom.system.api.factory; +import com.flossom.common.core.domain.LoginBody; 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.system.api.RemoteAuthService; -import com.flossom.system.api.RemoteUserService; -import com.flossom.system.api.domain.LoginBody; -import com.flossom.system.api.domain.RegisterBody; -import com.flossom.system.api.domain.SysUser; -import com.flossom.system.api.model.LoginUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -33,6 +31,11 @@ public class RemoteAuthFallbackFactory implements FallbackFactory> wxLogin(WxUserMember form) { + return R.fail("用户登录失败:" + throwable.getMessage()); + } + @Override public R register(RegisterBody registerBody) { return R.fail("用户注册失败:" + throwable.getMessage()); diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteFileFallbackFactory.java b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteFileFallbackFactory.java index b3c0003..eba1f04 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteFileFallbackFactory.java +++ b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteFileFallbackFactory.java @@ -1,7 +1,7 @@ package com.flossom.system.api.factory; +import com.flossom.common.core.domain.SysFile; import com.flossom.system.api.RemoteFileService; -import com.flossom.system.api.domain.SysFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteLogFallbackFactory.java b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteLogFallbackFactory.java index 758bc23..e7e83df 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteLogFallbackFactory.java +++ b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteLogFallbackFactory.java @@ -1,8 +1,8 @@ package com.flossom.system.api.factory; +import com.flossom.common.core.domain.entity.SysLogininfor; +import com.flossom.common.core.domain.entity.SysOperLog; import com.flossom.system.api.RemoteLogService; -import com.flossom.system.api.domain.SysLogininfor; -import com.flossom.system.api.domain.SysOperLog; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteUserFallbackFactory.java b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteUserFallbackFactory.java index ac781d9..38cc12c 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteUserFallbackFactory.java +++ b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteUserFallbackFactory.java @@ -1,7 +1,7 @@ package com.flossom.system.api.factory; +import com.flossom.common.core.domain.entity.SysUser; import com.flossom.system.api.RemoteUserService; -import com.flossom.system.api.domain.SysUser; import com.flossom.system.api.model.LoginUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/model/LoginUser.java b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/model/LoginUser.java index d48b508..b50366e 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/model/LoginUser.java +++ b/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/model/LoginUser.java @@ -2,7 +2,9 @@ package com.flossom.system.api.model; import java.io.Serializable; import java.util.Set; -import com.flossom.system.api.domain.SysUser; + +import com.flossom.common.core.domain.entity.SysUser; +import com.flossom.common.core.domain.entity.WxUserMember; /** * 用户信息 @@ -23,11 +25,21 @@ public class LoginUser implements Serializable */ private Long userid; + /** + * 微信用户名id + */ + private Long wxUserid; + /** * 用户名 */ private String username; + /** + * 微信用户名 + */ + private String wxUsername; + /** * 登录时间 */ @@ -58,6 +70,11 @@ public class LoginUser implements Serializable */ private SysUser sysUser; + /** + * 微信用户信息 + */ + private WxUserMember wxUserMember; + public String getToken() { return token; @@ -147,4 +164,29 @@ public class LoginUser implements Serializable { this.sysUser = sysUser; } + + + public Long getWxUserid() { + return wxUserid; + } + + public void setWxUserid(Long wxUserid) { + this.wxUserid = wxUserid; + } + + public String getWxUsername() { + return wxUsername; + } + + public void setWxUsername(String wxUsername) { + this.wxUsername = wxUsername; + } + + public WxUserMember getWxUserMember() { + return wxUserMember; + } + + public void setWxUserMember(WxUserMember wxUser) { + this.wxUserMember = wxUser; + } } diff --git a/flossom-auth/src/main/java/com/flossom/auth/controller/TokenController.java b/flossom-auth/src/main/java/com/flossom/auth/controller/TokenController.java index fca2d7a..3c626cf 100644 --- a/flossom-auth/src/main/java/com/flossom/auth/controller/TokenController.java +++ b/flossom-auth/src/main/java/com/flossom/auth/controller/TokenController.java @@ -4,7 +4,9 @@ import javax.servlet.http.HttpServletRequest; import com.flossom.auth.form.LoginBody; import com.flossom.auth.form.RegisterBody; +import com.flossom.auth.form.WxLoginBody; import com.flossom.auth.service.SysLoginService; +import com.flossom.common.core.constant.UserConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -41,6 +43,17 @@ public class TokenController return R.ok(tokenService.createToken(userInfo)); } + @PostMapping("wxLogin") + public R wxLogin(@RequestBody WxLoginBody form) + { + // 用户登录 + LoginUser userInfo = sysLoginService.login(form.getOpenid(), UserConstants.WX_SYSTEM_USER_PASSWORD); + // 设置微信用户信息 + userInfo.setWxUserMember(form); + // 获取登录token + return R.ok(tokenService.createToken(userInfo)); + } + @DeleteMapping("logout") public R logout(HttpServletRequest request) { diff --git a/flossom-auth/src/main/java/com/flossom/auth/form/WxLoginBody.java b/flossom-auth/src/main/java/com/flossom/auth/form/WxLoginBody.java new file mode 100644 index 0000000..b751b5e --- /dev/null +++ b/flossom-auth/src/main/java/com/flossom/auth/form/WxLoginBody.java @@ -0,0 +1,13 @@ +package com.flossom.auth.form; + + +import com.flossom.common.core.domain.entity.WxUserMember; + +/** + * 微信用户登录对象 + * + * @author flossom + */ +public class WxLoginBody extends WxUserMember { + +} diff --git a/flossom-auth/src/main/java/com/flossom/auth/service/SysLoginService.java b/flossom-auth/src/main/java/com/flossom/auth/service/SysLoginService.java index 0879e5d..000ecf4 100644 --- a/flossom-auth/src/main/java/com/flossom/auth/service/SysLoginService.java +++ b/flossom-auth/src/main/java/com/flossom/auth/service/SysLoginService.java @@ -1,5 +1,6 @@ package com.flossom.auth.service; +import com.flossom.common.core.domain.entity.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.flossom.common.core.constant.CacheConstants; @@ -15,7 +16,6 @@ import com.flossom.common.core.utils.ip.IpUtils; import com.flossom.common.redis.service.RedisService; import com.flossom.common.security.utils.SecurityUtils; import com.flossom.system.api.RemoteUserService; -import com.flossom.system.api.domain.SysUser; import com.flossom.system.api.model.LoginUser; /** diff --git a/flossom-auth/src/main/java/com/flossom/auth/service/SysPasswordService.java b/flossom-auth/src/main/java/com/flossom/auth/service/SysPasswordService.java index 32cced9..be792f8 100644 --- a/flossom-auth/src/main/java/com/flossom/auth/service/SysPasswordService.java +++ b/flossom-auth/src/main/java/com/flossom/auth/service/SysPasswordService.java @@ -1,6 +1,8 @@ package com.flossom.auth.service; import java.util.concurrent.TimeUnit; + +import com.flossom.common.core.domain.entity.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.flossom.common.core.constant.CacheConstants; @@ -8,7 +10,6 @@ import com.flossom.common.core.constant.Constants; import com.flossom.common.core.exception.ServiceException; import com.flossom.common.redis.service.RedisService; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.system.api.domain.SysUser; /** * 登录密码方法 diff --git a/flossom-auth/src/main/java/com/flossom/auth/service/SysRecordLogService.java b/flossom-auth/src/main/java/com/flossom/auth/service/SysRecordLogService.java index cc2ac9d..5d086f1 100644 --- a/flossom-auth/src/main/java/com/flossom/auth/service/SysRecordLogService.java +++ b/flossom-auth/src/main/java/com/flossom/auth/service/SysRecordLogService.java @@ -1,5 +1,6 @@ package com.flossom.auth.service; +import com.flossom.common.core.domain.entity.SysLogininfor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.flossom.common.core.constant.Constants; @@ -7,7 +8,6 @@ import com.flossom.common.core.constant.SecurityConstants; import com.flossom.common.core.utils.StringUtils; import com.flossom.common.core.utils.ip.IpUtils; import com.flossom.system.api.RemoteLogService; -import com.flossom.system.api.domain.SysLogininfor; /** * 记录日志方法 diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/SecurityConstants.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/SecurityConstants.java index 0b86c65..a9d58c2 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/SecurityConstants.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/SecurityConstants.java @@ -12,11 +12,21 @@ public class SecurityConstants */ public static final String DETAILS_USER_ID = "user_id"; + /** + * 微信用户ID字段 + */ + public static final String WX_DETAILS_USER_ID = "wx_user_id"; + /** * 用户名字段 */ public static final String DETAILS_USERNAME = "username"; + /** + * 微信用户名字段 + */ + public static final String WX_DETAILS_USERNAME = "wx_username"; + /** * 授权信息字段 */ @@ -42,6 +52,11 @@ public class SecurityConstants */ public static final String LOGIN_USER = "login_user"; + /** + * 登录用户 + */ + public static final String WX_LOGIN_USER = "wx_login_user"; + /** * 角色权限 */ diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/UserConstants.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/UserConstants.java index 18dc3eb..344ea6d 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/UserConstants.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/UserConstants.java @@ -79,9 +79,7 @@ public class UserConstants public static final int PASSWORD_MAX_LENGTH = 20; /** - * 微信用户的后台账号 + * 微信用户的后台密碼 */ - public static final String WX_SYSTEM_USER_USERNAME = "wxhz"; - - public static final String WX_SYSTEM_USER_PASSWORD = "hzAnonymous9090.@"; + public static final String WX_SYSTEM_USER_PASSWORD = "hzUserName.nonymous.@123"; } diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/context/SecurityContextHolder.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/context/SecurityContextHolder.java index 6f71f9a..788ef4a 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/context/SecurityContextHolder.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/context/SecurityContextHolder.java @@ -56,21 +56,41 @@ public class SecurityContextHolder return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L); } + public static Long getWxUserId() + { + return Convert.toLong(get(SecurityConstants.WX_DETAILS_USER_ID), 0L); + } + public static void setUserId(String account) { set(SecurityConstants.DETAILS_USER_ID, account); } + public static void setWxUserId(String account) + { + set(SecurityConstants.WX_DETAILS_USER_ID, account); + } + public static String getUserName() { return get(SecurityConstants.DETAILS_USERNAME); } + public static String getWxUserName() + { + return get(SecurityConstants.WX_DETAILS_USERNAME); + } + public static void setUserName(String username) { set(SecurityConstants.DETAILS_USERNAME, username); } + public static void setWxUserName(String username) + { + set(SecurityConstants.WX_DETAILS_USERNAME, username); + } + public static String getUserKey() { return get(SecurityConstants.USER_KEY); diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/LoginBody.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/LoginBody.java similarity index 93% rename from flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/LoginBody.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/LoginBody.java index 97b52e1..1f977cd 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/LoginBody.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/LoginBody.java @@ -1,4 +1,4 @@ -package com.flossom.system.api.domain; +package com.flossom.common.core.domain; /** * 用户登录对象 diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/RegisterBody.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/RegisterBody.java similarity index 71% rename from flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/RegisterBody.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/RegisterBody.java index faf01f3..3fda33f 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/RegisterBody.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/RegisterBody.java @@ -1,4 +1,4 @@ -package com.flossom.system.api.domain; +package com.flossom.common.core.domain; /** * 用户注册对象 diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysFile.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysFile.java similarity index 95% rename from flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysFile.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysFile.java index 7f586d5..2634e46 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysFile.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysFile.java @@ -1,4 +1,4 @@ -package com.flossom.system.api.domain; +package com.flossom.common.core.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysFiringInfo.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysFiringInfo.java similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysFiringInfo.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysFiringInfo.java index 99da04f..5a35161 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysFiringInfo.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysFiringInfo.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.web.domain.BaseEntity; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserOnline.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysUserOnline.java similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserOnline.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysUserOnline.java index 1811458..6cde8aa 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserOnline.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysUserOnline.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain; /** * 当前在线会话 diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/CtLeaveMessage.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/CtLeaveMessage.java similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/CtLeaveMessage.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/CtLeaveMessage.java index 043251f..434ef23 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/CtLeaveMessage.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/CtLeaveMessage.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain.entity; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.web.domain.BaseEntity; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/IntegralGlobal.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/IntegralGlobal.java similarity index 96% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/IntegralGlobal.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/IntegralGlobal.java index e59358a..11b8221 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/IntegralGlobal.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/IntegralGlobal.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain.entity; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.web.domain.BaseEntity; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysConfig.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysConfig.java similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysConfig.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysConfig.java index d56e7ab..5999fd7 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysConfig.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysConfig.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain.entity; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.annotation.Excel.ColumnType; diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysDept.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysDept.java similarity index 98% rename from flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysDept.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysDept.java index 8f6a761..02038ef 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysDept.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysDept.java @@ -1,14 +1,15 @@ -package com.flossom.system.api.domain; +package com.flossom.common.core.domain.entity; + +import com.flossom.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; -import java.util.ArrayList; -import java.util.List; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.flossom.common.core.web.domain.BaseEntity; +import java.util.ArrayList; +import java.util.List; /** * 部门表 sys_dept diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysDictData.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysDictData.java similarity index 98% rename from flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysDictData.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysDictData.java index d79e4ea..c88f38a 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysDictData.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysDictData.java @@ -1,13 +1,14 @@ -package com.flossom.system.api.domain; +package com.flossom.common.core.domain.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.annotation.Excel.ColumnType; import com.flossom.common.core.constant.UserConstants; import com.flossom.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 字典数据表 sys_dict_data diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysDictType.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysDictType.java similarity index 98% rename from flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysDictType.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysDictType.java index 8f37912..93f77f9 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysDictType.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysDictType.java @@ -1,13 +1,14 @@ -package com.flossom.system.api.domain; +package com.flossom.common.core.domain.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.annotation.Excel.ColumnType; import com.flossom.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; /** * 字典类型表 sys_dict_type diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysLogininfor.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysLogininfor.java similarity index 97% rename from flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysLogininfor.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysLogininfor.java index e984a2f..3f7def7 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysLogininfor.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysLogininfor.java @@ -1,11 +1,12 @@ -package com.flossom.system.api.domain; +package com.flossom.common.core.domain.entity; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.annotation.Excel.ColumnType; import com.flossom.common.core.web.domain.BaseEntity; +import java.util.Date; + /** * 系统访问记录表 sys_logininfor * diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysMenu.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysMenu.java similarity index 99% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysMenu.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysMenu.java index f4231ad..b64db41 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysMenu.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysMenu.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain.entity; import com.flossom.common.core.web.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysNotice.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysNotice.java similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysNotice.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysNotice.java index 26b7032..506f64d 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysNotice.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysNotice.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain.entity; import com.flossom.common.core.web.domain.BaseEntity; import com.flossom.common.core.xss.Xss; diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysOperLog.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysOperLog.java similarity index 99% rename from flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysOperLog.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysOperLog.java index 7142d19..91638dc 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysOperLog.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysOperLog.java @@ -1,11 +1,12 @@ -package com.flossom.system.api.domain; +package com.flossom.common.core.domain.entity; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.annotation.Excel.ColumnType; import com.flossom.common.core.web.domain.BaseEntity; +import java.util.Date; + /** * 操作日志记录表 oper_log * diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysPost.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysPost.java similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysPost.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysPost.java index dac91ef..58b1e75 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysPost.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysPost.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain.entity; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.annotation.Excel.ColumnType; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRegion.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRegion.java similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRegion.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRegion.java index 0028b32..60cf109 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRegion.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRegion.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain.entity; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.web.domain.BaseEntity; diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysRole.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRole.java similarity index 99% rename from flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysRole.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRole.java index 5b875b8..3c92f6f 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysRole.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRole.java @@ -1,14 +1,15 @@ -package com.flossom.system.api.domain; +package com.flossom.common.core.domain.entity; -import java.util.Set; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.annotation.Excel.ColumnType; import com.flossom.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.Set; /** * 角色表 sys_role diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleDept.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRoleDept.java similarity index 94% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleDept.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRoleDept.java index c512679..0ecf352 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleDept.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain.entity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleMenu.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRoleMenu.java similarity index 94% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleMenu.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRoleMenu.java index 71e8a04..4030125 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleMenu.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain.entity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysUser.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysUser.java similarity index 97% rename from flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysUser.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysUser.java index fec3406..0630fe7 100644 --- a/flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/domain/SysUser.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysUser.java @@ -1,16 +1,19 @@ -package com.flossom.system.api.domain; +package com.flossom.common.core.domain.entity; -import java.util.Date; -import java.util.List; -import javax.validation.constraints.*; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.annotation.Excel.ColumnType; import com.flossom.common.core.annotation.Excel.Type; import com.flossom.common.core.annotation.Excels; import com.flossom.common.core.web.domain.BaseEntity; import com.flossom.common.core.xss.Xss; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; /** * 用户对象 sys_user diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserPost.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysUserPost.java similarity index 94% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserPost.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysUserPost.java index 136dca8..c231489 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserPost.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysUserPost.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain.entity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserRole.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysUserRole.java similarity index 94% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserRole.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysUserRole.java index b74ca35..1709032 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserRole.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysUserRole.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain.entity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxSystemSetting.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxSystemSetting.java similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxSystemSetting.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxSystemSetting.java index 4f515c7..bcbbb4a 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxSystemSetting.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxSystemSetting.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain.entity; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.web.domain.BaseEntity; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxUserMember.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxUserMember.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java index fb4f025..a8daf14 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxUserMember.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java @@ -1,10 +1,8 @@ -package com.flossom.hzMapper.domain; +package com.flossom.common.core.domain.entity; import com.fasterxml.jackson.annotation.JsonFormat; import com.flossom.common.core.annotation.Excel; import com.flossom.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import java.math.BigDecimal; import java.util.Date; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/MetaVo.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/MetaVo.java similarity index 97% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/MetaVo.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/MetaVo.java index 747ec9c..e059593 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/MetaVo.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/MetaVo.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain.vo; +package com.flossom.common.core.domain.vo; import com.flossom.common.core.utils.StringUtils; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/RouterVo.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/RouterVo.java similarity index 98% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/RouterVo.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/RouterVo.java index efe0739..924613b 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/RouterVo.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.flossom.hzMapper.domain.vo; +package com.flossom.common.core.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/TreeSelect.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/TreeSelect.java similarity index 90% rename from flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/TreeSelect.java rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/TreeSelect.java index 5b63496..479a8a3 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/TreeSelect.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/TreeSelect.java @@ -1,8 +1,8 @@ -package com.flossom.hzMapper.domain.vo; +package com.flossom.common.core.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; -import com.flossom.hzMapper.domain.SysMenu; -import com.flossom.system.api.domain.SysDept; +import com.flossom.common.core.domain.entity.SysDept; +import com.flossom.common.core.domain.entity.SysMenu; import java.io.Serializable; import java.util.List; diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/JwtUtils.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/JwtUtils.java index c9d2cf5..60ae7c0 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/JwtUtils.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/JwtUtils.java @@ -87,6 +87,17 @@ public class JwtUtils return getValue(claims, SecurityConstants.DETAILS_USER_ID); } + /** + * 根据身份信息获取微信用户ID + * + * @param claims 身份信息 + * @return 用户ID + */ + public static String getWxUserId(Claims claims) + { + return getValue(claims, SecurityConstants.WX_DETAILS_USER_ID); + } + /** * 根据令牌获取用户名 * @@ -110,6 +121,17 @@ public class JwtUtils return getValue(claims, SecurityConstants.DETAILS_USERNAME); } + /** + * 根据身份信息获取微信用户名 + * + * @param claims 身份信息 + * @return 用户名 + */ + public static String getWxUserName(Claims claims) + { + return getValue(claims, SecurityConstants.WX_DETAILS_USERNAME); + } + /** * 根据身份信息获取键值 * diff --git a/flossom-common/flossom-common-datascope/src/main/java/com/flossom/common/datascope/aspect/DataScopeAspect.java b/flossom-common/flossom-common-datascope/src/main/java/com/flossom/common/datascope/aspect/DataScopeAspect.java index a5bc6b4..0d952a9 100644 --- a/flossom-common/flossom-common-datascope/src/main/java/com/flossom/common/datascope/aspect/DataScopeAspect.java +++ b/flossom-common/flossom-common-datascope/src/main/java/com/flossom/common/datascope/aspect/DataScopeAspect.java @@ -2,6 +2,9 @@ package com.flossom.common.datascope.aspect; import java.util.ArrayList; import java.util.List; + +import com.flossom.common.core.domain.entity.SysRole; +import com.flossom.common.core.domain.entity.SysUser; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; @@ -12,8 +15,6 @@ import com.flossom.common.core.utils.StringUtils; import com.flossom.common.core.web.domain.BaseEntity; import com.flossom.common.datascope.annotation.DataScope; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.system.api.domain.SysRole; -import com.flossom.system.api.domain.SysUser; import com.flossom.system.api.model.LoginUser; /** diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/CtLeaveMessageMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/CtLeaveMessageMapper.java index 7b34f8e..e62a42f 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/CtLeaveMessageMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/CtLeaveMessageMapper.java @@ -1,6 +1,7 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.CtLeaveMessage; + +import com.flossom.common.core.domain.entity.CtLeaveMessage; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/IntegralGlobalMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/IntegralGlobalMapper.java index b213b33..1f32af6 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/IntegralGlobalMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/IntegralGlobalMapper.java @@ -1,6 +1,7 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.IntegralGlobal; + +import com.flossom.common.core.domain.entity.IntegralGlobal; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysConfigMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysConfigMapper.java index c12f59f..9dcd1c6 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysConfigMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysConfigMapper.java @@ -1,7 +1,8 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.SysConfig; + +import com.flossom.common.core.domain.entity.SysConfig; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDeptMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDeptMapper.java index d21ba81..af99694 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDeptMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDeptMapper.java @@ -1,6 +1,6 @@ package com.flossom.hzMapper.mapper; -import com.flossom.system.api.domain.SysDept; +import com.flossom.common.core.domain.entity.SysDept; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictDataMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictDataMapper.java index 68a81e7..a309bb2 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictDataMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictDataMapper.java @@ -1,6 +1,6 @@ package com.flossom.hzMapper.mapper; -import com.flossom.system.api.domain.SysDictData; +import com.flossom.common.core.domain.entity.SysDictData; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictTypeMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictTypeMapper.java index 3a3ba94..01a975b 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictTypeMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictTypeMapper.java @@ -1,6 +1,7 @@ package com.flossom.hzMapper.mapper; -import com.flossom.system.api.domain.SysDictType; + +import com.flossom.common.core.domain.entity.SysDictType; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysFiringInfoMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysFiringInfoMapper.java index f1ce290..3da9f83 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysFiringInfoMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysFiringInfoMapper.java @@ -1,7 +1,8 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.SysFiringInfo; + +import com.flossom.common.core.domain.SysFiringInfo; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysLogininforMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysLogininforMapper.java index ae6527d..83b8b2f 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysLogininforMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysLogininforMapper.java @@ -1,6 +1,7 @@ package com.flossom.hzMapper.mapper; -import com.flossom.system.api.domain.SysLogininfor; + +import com.flossom.common.core.domain.entity.SysLogininfor; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysMenuMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysMenuMapper.java index 32eacdc..3f8eb1a 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysMenuMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysMenuMapper.java @@ -1,6 +1,6 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.SysMenu; +import com.flossom.common.core.domain.entity.SysMenu; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysNoticeMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysNoticeMapper.java index 416149b..a573596 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysNoticeMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysNoticeMapper.java @@ -1,7 +1,8 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.SysNotice; + +import com.flossom.common.core.domain.entity.SysNotice; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysOperLogMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysOperLogMapper.java index da23a11..2f5d46d 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysOperLogMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysOperLogMapper.java @@ -1,6 +1,7 @@ package com.flossom.hzMapper.mapper; -import com.flossom.system.api.domain.SysOperLog; + +import com.flossom.common.core.domain.entity.SysOperLog; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysPostMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysPostMapper.java index 049aaa2..aa2141d 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysPostMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysPostMapper.java @@ -1,7 +1,8 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.SysPost; + +import com.flossom.common.core.domain.entity.SysPost; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRegionMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRegionMapper.java index 937931a..46218f6 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRegionMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRegionMapper.java @@ -1,6 +1,6 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.SysRegion; +import com.flossom.common.core.domain.entity.SysRegion; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleDeptMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleDeptMapper.java index 6366fb2..3604443 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleDeptMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleDeptMapper.java @@ -1,7 +1,7 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.SysRoleDept; +import com.flossom.common.core.domain.entity.SysRoleDept; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMapper.java index 15d03fd..2bb1bed 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMapper.java @@ -1,6 +1,6 @@ package com.flossom.hzMapper.mapper; -import com.flossom.system.api.domain.SysRole; +import com.flossom.common.core.domain.entity.SysRole; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMenuMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMenuMapper.java index 132bb3b..c106f35 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMenuMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMenuMapper.java @@ -1,7 +1,8 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.SysRoleMenu; + +import com.flossom.common.core.domain.entity.SysRoleMenu; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserMapper.java index ec8efd1..e226dd2 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserMapper.java @@ -1,6 +1,6 @@ package com.flossom.hzMapper.mapper; -import com.flossom.system.api.domain.SysUser; +import com.flossom.common.core.domain.entity.SysUser; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserPostMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserPostMapper.java index 35fa6f6..7d91a18 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserPostMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserPostMapper.java @@ -1,7 +1,8 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.SysUserPost; + +import com.flossom.common.core.domain.entity.SysUserPost; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserRoleMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserRoleMapper.java index 34b7844..47a9557 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserRoleMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserRoleMapper.java @@ -1,6 +1,6 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.SysUserRole; +import com.flossom.common.core.domain.entity.SysUserRole; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxSystemSettingMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxSystemSettingMapper.java index d33d8dc..0bad61d 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxSystemSettingMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxSystemSettingMapper.java @@ -1,6 +1,7 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.WxSystemSetting; + +import com.flossom.common.core.domain.entity.WxSystemSetting; import java.util.List; diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxUserMemberMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxUserMemberMapper.java index 76d6665..a0d2745 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxUserMemberMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxUserMemberMapper.java @@ -1,7 +1,7 @@ package com.flossom.hzMapper.mapper; -import com.flossom.hzMapper.domain.WxUserMember; +import com.flossom.common.core.domain.entity.WxUserMember; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -71,5 +71,5 @@ public interface WxUserMemberMapper { WxUserMember selectWxUserMemberByOpenId(@Param("openid") String openid); - void upgradeMember(@Param("phoneNumber") String phoneNumber, @Param("id") String id); + void upgradeMember(@Param("phoneNumber") String phoneNumber, @Param("id") Integer id); } diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRegionMapper.xml b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRegionMapper.xml index dec0a6b..a1beeea 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRegionMapper.xml +++ b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRegionMapper.xml @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - WHERE parent_id = #{pid} diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxUserMemberMapper.xml index 702d224..662f87f 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxUserMemberMapper.xml +++ b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxUserMemberMapper.xml @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - WHERE openid = #{openid} diff --git a/flossom-common/flossom-common-log/src/main/java/com/flossom/common/log/aspect/LogAspect.java b/flossom-common/flossom-common-log/src/main/java/com/flossom/common/log/aspect/LogAspect.java index a65a18b..58a94ce 100644 --- a/flossom-common/flossom-common-log/src/main/java/com/flossom/common/log/aspect/LogAspect.java +++ b/flossom-common/flossom-common-log/src/main/java/com/flossom/common/log/aspect/LogAspect.java @@ -5,6 +5,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.flossom.common.core.domain.entity.SysOperLog; import com.flossom.common.log.enums.BusinessStatus; import org.apache.commons.lang3.ArrayUtils; import org.aspectj.lang.JoinPoint; @@ -28,7 +29,6 @@ import com.flossom.common.log.annotation.Log; import com.flossom.common.log.filter.PropertyPreExcludeFilter; import com.flossom.common.log.service.AsyncLogService; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.system.api.domain.SysOperLog; /** * 操作日志记录处理 diff --git a/flossom-common/flossom-common-log/src/main/java/com/flossom/common/log/service/AsyncLogService.java b/flossom-common/flossom-common-log/src/main/java/com/flossom/common/log/service/AsyncLogService.java index 2c10b7d..83338a2 100644 --- a/flossom-common/flossom-common-log/src/main/java/com/flossom/common/log/service/AsyncLogService.java +++ b/flossom-common/flossom-common-log/src/main/java/com/flossom/common/log/service/AsyncLogService.java @@ -1,11 +1,11 @@ package com.flossom.common.log.service; +import com.flossom.common.core.domain.entity.SysOperLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import com.flossom.common.core.constant.SecurityConstants; import com.flossom.system.api.RemoteLogService; -import com.flossom.system.api.domain.SysOperLog; /** * 异步调用日志服务 diff --git a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/interceptor/HeaderInterceptor.java b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/interceptor/HeaderInterceptor.java index b2c0b1a..64f791e 100644 --- a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/interceptor/HeaderInterceptor.java +++ b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/interceptor/HeaderInterceptor.java @@ -2,6 +2,7 @@ package com.flossom.common.security.interceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.AsyncHandlerInterceptor; import com.flossom.common.core.constant.SecurityConstants; @@ -18,26 +19,23 @@ import com.flossom.system.api.model.LoginUser; * * @author flossom */ -public class HeaderInterceptor implements AsyncHandlerInterceptor -{ +public class HeaderInterceptor implements AsyncHandlerInterceptor { @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception - { - if (!(handler instanceof HandlerMethod)) - { + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + if (!(handler instanceof HandlerMethod)) { return true; } SecurityContextHolder.setUserId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USER_ID)); SecurityContextHolder.setUserName(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USERNAME)); + SecurityContextHolder.setWxUserId(ServletUtils.getHeader(request, SecurityConstants.WX_DETAILS_USER_ID)); + SecurityContextHolder.setWxUserName(ServletUtils.getHeader(request, SecurityConstants.WX_DETAILS_USERNAME)); SecurityContextHolder.setUserKey(ServletUtils.getHeader(request, SecurityConstants.USER_KEY)); String token = SecurityUtils.getToken(); - if (StringUtils.isNotEmpty(token)) - { + if (StringUtils.isNotEmpty(token)) { LoginUser loginUser = AuthUtil.getLoginUser(token); - if (StringUtils.isNotNull(loginUser)) - { + if (StringUtils.isNotNull(loginUser)) { AuthUtil.verifyLoginUserExpire(loginUser); SecurityContextHolder.set(SecurityConstants.LOGIN_USER, loginUser); } @@ -47,8 +45,7 @@ public class HeaderInterceptor implements AsyncHandlerInterceptor @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) - throws Exception - { + throws Exception { SecurityContextHolder.remove(); } } diff --git a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/DictUtils.java b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/DictUtils.java index 47837ae..336a6c2 100644 --- a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/DictUtils.java +++ b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/DictUtils.java @@ -4,10 +4,10 @@ import java.util.Collection; import java.util.List; import com.alibaba.fastjson2.JSONArray; import com.flossom.common.core.constant.CacheConstants; +import com.flossom.common.core.domain.entity.SysDictData; import com.flossom.common.core.utils.SpringUtils; import com.flossom.common.core.utils.StringUtils; import com.flossom.common.redis.service.RedisService; -import com.flossom.system.api.domain.SysDictData; /** * 字典工具类 diff --git a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/SecurityUtils.java b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/SecurityUtils.java index 21bd025..631245d 100644 --- a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/SecurityUtils.java +++ b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/SecurityUtils.java @@ -24,6 +24,14 @@ public class SecurityUtils return SecurityContextHolder.getUserId(); } + /** + * 获取用户ID + */ + public static Long getWxUserId() + { + return SecurityContextHolder.getWxUserId(); + } + /** * 获取用户名称 */ @@ -32,6 +40,14 @@ public class SecurityUtils return SecurityContextHolder.getUserName(); } + /** + * 获取用户名称 + */ + public static String getWxUsername() + { + return SecurityContextHolder.getWxUserName(); + } + /** * 获取用户key */ diff --git a/flossom-gateway/src/main/java/com/flossom/gateway/filter/AuthFilter.java b/flossom-gateway/src/main/java/com/flossom/gateway/filter/AuthFilter.java index 0432f92..4bde947 100644 --- a/flossom-gateway/src/main/java/com/flossom/gateway/filter/AuthFilter.java +++ b/flossom-gateway/src/main/java/com/flossom/gateway/filter/AuthFilter.java @@ -78,6 +78,13 @@ public class AuthFilter implements GlobalFilter, Ordered addHeader(mutate, SecurityConstants.USER_KEY, userkey); addHeader(mutate, SecurityConstants.DETAILS_USER_ID, userid); addHeader(mutate, SecurityConstants.DETAILS_USERNAME, username); + if(StringUtils.isNotBlank(JwtUtils.getWxUserId(claims))) { + addHeader(mutate, SecurityConstants.WX_DETAILS_USER_ID, JwtUtils.getWxUserId(claims)); + } + if(StringUtils.isNotBlank(JwtUtils.getWxUserName(claims))) { + addHeader(mutate, SecurityConstants.WX_DETAILS_USERNAME, JwtUtils.getWxUserName(claims)); + } + // 内部请求来源参数清除 removeHeader(mutate, SecurityConstants.FROM_SOURCE); return chain.filter(exchange.mutate().request(mutate.build()).build()); diff --git a/flossom-modules/flossom-file/src/main/java/com/flossom/file/controller/SysFileController.java b/flossom-modules/flossom-file/src/main/java/com/flossom/file/controller/SysFileController.java index c6e6e2c..4fc3902 100644 --- a/flossom-modules/flossom-file/src/main/java/com/flossom/file/controller/SysFileController.java +++ b/flossom-modules/flossom-file/src/main/java/com/flossom/file/controller/SysFileController.java @@ -1,5 +1,6 @@ package com.flossom.file.controller; +import com.flossom.common.core.domain.SysFile; import com.flossom.file.service.ISysFileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,7 +10,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import com.flossom.common.core.domain.R; import com.flossom.common.core.utils.file.FileUtils; -import com.flossom.system.api.domain.SysFile; /** * 文件请求处理 diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/CtleaveMessageApiController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/CtleaveMessageApiController.java index 3a35cf7..2bcfca1 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/CtleaveMessageApiController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/CtleaveMessageApiController.java @@ -1,11 +1,11 @@ package com.flossom.miniProgram.controller; +import com.flossom.common.core.domain.entity.CtLeaveMessage; import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.domain.AjaxResult; import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; -import com.flossom.hzMapper.domain.CtLeaveMessage; import com.flossom.miniProgram.service.ICtleaveMeassageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/LoginUserVo.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/LoginUserVo.java index df5cd33..56a1a4f 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/LoginUserVo.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/LoginUserVo.java @@ -1,6 +1,6 @@ package com.flossom.miniProgram.domain.vo; -import com.flossom.hzMapper.domain.WxUserMember; +import com.flossom.common.core.domain.entity.WxUserMember; public class LoginUserVo extends WxUserMember { diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ICtleaveMeassageService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ICtleaveMeassageService.java index 7828e43..81644ef 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ICtleaveMeassageService.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ICtleaveMeassageService.java @@ -1,6 +1,7 @@ package com.flossom.miniProgram.service; -import com.flossom.hzMapper.domain.CtLeaveMessage; + +import com.flossom.common.core.domain.entity.CtLeaveMessage; public interface ICtleaveMeassageService { /** diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISysRegionService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISysRegionService.java index deba902..6982e68 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISysRegionService.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISysRegionService.java @@ -1,6 +1,7 @@ package com.flossom.miniProgram.service; -import com.flossom.hzMapper.domain.SysRegion; + +import com.flossom.common.core.domain.entity.SysRegion; import java.util.List; diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISystemSettingService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISystemSettingService.java index dec564b..9bd0665 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISystemSettingService.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISystemSettingService.java @@ -1,6 +1,7 @@ package com.flossom.miniProgram.service; -import com.flossom.hzMapper.domain.WxSystemSetting; + +import com.flossom.common.core.domain.entity.WxSystemSetting; public interface ISystemSettingService { diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserMemberService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserMemberService.java index 232c6f4..154dd81 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserMemberService.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserMemberService.java @@ -1,7 +1,6 @@ package com.flossom.miniProgram.service; import com.flossom.common.core.web.domain.AjaxResult; -import com.flossom.hzMapper.domain.WxUserMember; import com.flossom.miniProgram.domain.vo.LoginUserVo; import com.flossom.miniProgram.domain.vo.UserMemberUpdateVo; 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 5c46608..32b9c79 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,7 +1,7 @@ package com.flossom.miniProgram.service.impl; +import com.flossom.common.core.domain.entity.CtLeaveMessage; import com.flossom.hzMapper.Enums.CtLeaveMessageEnum; -import com.flossom.hzMapper.domain.CtLeaveMessage; import com.flossom.hzMapper.mapper.CtLeaveMessageMapper; import com.flossom.miniProgram.service.ICtleaveMeassageService; import org.springframework.beans.factory.annotation.Autowired; 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 188eb88..515e505 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,6 +1,6 @@ package com.flossom.miniProgram.service.impl; -import com.flossom.hzMapper.domain.SysRegion; +import com.flossom.common.core.domain.entity.SysRegion; import com.flossom.hzMapper.mapper.SysRegionMapper; import com.flossom.miniProgram.service.ISysRegionService; import org.springframework.beans.factory.annotation.Autowired; 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 1f66bad..ae1c013 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 @@ -1,7 +1,7 @@ package com.flossom.miniProgram.service.impl; +import com.flossom.common.core.domain.entity.WxSystemSetting; import com.flossom.hzMapper.Enums.SystemSettingKeyEnum; -import com.flossom.hzMapper.domain.WxSystemSetting; import com.flossom.hzMapper.mapper.WxSystemSettingMapper; import com.flossom.miniProgram.service.ISystemSettingService; import org.springframework.beans.factory.annotation.Autowired; 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 8fbab37..728067a 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 @@ -4,12 +4,14 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.flossom.common.core.constant.CacheConstants; import com.flossom.common.core.constant.UserConstants; +import com.flossom.common.core.domain.LoginBody; 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.web.domain.AjaxResult; import com.flossom.common.redis.service.RedisService; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.hzMapper.domain.WxUserMember; import com.flossom.hzMapper.mapper.WxUserMemberMapper; import com.flossom.miniProgram.domain.vo.LoginUserVo; import com.flossom.miniProgram.domain.vo.UserMemberUpdateVo; @@ -19,8 +21,6 @@ import com.flossom.miniProgram.service.IWxUserMemberService; import com.flossom.miniProgram.utils.MiniProgramUtils; import com.flossom.system.api.RemoteAuthService; import com.flossom.system.api.RemoteUserService; -import com.flossom.system.api.domain.LoginBody; -import com.flossom.system.api.domain.RegisterBody; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -61,7 +61,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { wxUserMemberMapper.insertTouristUser(wxUserMember); // 系统表注册 RegisterBody registerBody = new RegisterBody(); - registerBody.setUsername(UserConstants.WX_SYSTEM_USER_USERNAME + wxUserMember.getId()); +// registerBody.setUsername(UserConstants.WX_SYSTEM_USER_USERNAME + wxUserMember.getId()); registerBody.setPassword(UserConstants.WX_SYSTEM_USER_PASSWORD); R registerResult = remoteAuthService.register(registerBody); if (R.FAIL == registerResult.getCode()) { @@ -71,7 +71,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { // 获取token LoginBody loginBody = new LoginBody(); - loginBody.setUsername(UserConstants.WX_SYSTEM_USER_USERNAME + wxUserMember.getId()); +// loginBody.setUsername(UserConstants.WX_SYSTEM_USER_USERNAME + wxUserMember.getId()); loginBody.setPassword(UserConstants.WX_SYSTEM_USER_PASSWORD); R> loginResult = remoteAuthService.login(loginBody); if (loginResult.getCode() == R.FAIL) { @@ -131,7 +131,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { wxUserMemberMapper.insertWxUserMember(wxUserMember); // 3.3、系统表注册 RegisterBody registerBody = new RegisterBody(); - registerBody.setUsername(UserConstants.WX_SYSTEM_USER_USERNAME + wxUserMember.getId()); + registerBody.setUsername(wxUserMember.getOpenid()); registerBody.setPassword(UserConstants.WX_SYSTEM_USER_PASSWORD); R registerResult = remoteAuthService.register(registerBody); if (R.FAIL == registerResult.getCode()) { @@ -140,10 +140,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { } // 4、获取 token - LoginBody loginBody = new LoginBody(); - loginBody.setUsername(UserConstants.WX_SYSTEM_USER_USERNAME + wxUserMember.getId()); - loginBody.setPassword(UserConstants.WX_SYSTEM_USER_PASSWORD); - R> loginResult = remoteAuthService.login(loginBody); + R> loginResult = remoteAuthService.wxLogin(wxUserMember); if (loginResult.getCode() == R.FAIL) { throw new ServiceException(loginResult.getMsg()); } @@ -168,8 +165,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { logger.error("获取用户信息失败"); return AjaxResult.error("获取用户信息失败"); } - String id = username.replace(UserConstants.WX_SYSTEM_USER_USERNAME, ""); - wxUserMemberMapper.upgradeMember(wxCode2PhoneRet.getPhoneInfo().getPhoneNumber(), id); + wxUserMemberMapper.upgradeMember(wxCode2PhoneRet.getPhoneInfo().getPhoneNumber(), SecurityUtils.getWxUserId().intValue()); return AjaxResult.success(); } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java index a1d7ab5..a7b7d28 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java @@ -4,6 +4,7 @@ import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; +import com.flossom.common.core.domain.entity.CtLeaveMessage; import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.domain.AjaxResult; @@ -11,7 +12,6 @@ import com.flossom.common.core.web.page.TableDataInfo; import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; -import com.flossom.hzMapper.domain.CtLeaveMessage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/IntegralGlobalController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/IntegralGlobalController.java index 38ee33a..e4b27c2 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/IntegralGlobalController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/IntegralGlobalController.java @@ -4,6 +4,7 @@ import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; +import com.flossom.common.core.domain.entity.IntegralGlobal; import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.domain.AjaxResult; @@ -11,7 +12,6 @@ import com.flossom.common.core.web.page.TableDataInfo; import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; -import com.flossom.hzMapper.domain.IntegralGlobal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysConfigController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysConfigController.java index 3c7954d..5c1ac46 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysConfigController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysConfigController.java @@ -3,7 +3,7 @@ package com.flossom.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.flossom.hzMapper.domain.SysConfig; +import com.flossom.common.core.domain.entity.SysConfig; import com.flossom.system.service.ISysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDeptController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDeptController.java index 775b0df..a183fc6 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDeptController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDeptController.java @@ -1,6 +1,8 @@ package com.flossom.system.controller; import java.util.List; + +import com.flossom.common.core.domain.entity.SysDept; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -20,7 +22,6 @@ import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.system.api.domain.SysDept; import com.flossom.system.service.ISysDeptService; /** diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDictDataController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDictDataController.java index d01045f..0fd659e 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDictDataController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDictDataController.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.flossom.common.core.domain.entity.SysDictData; import com.flossom.system.service.ISysDictDataService; import com.flossom.system.service.ISysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +26,6 @@ import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.system.api.domain.SysDictData; /** * 数据字典信息 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDictTypeController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDictTypeController.java index 6252349..30f2b92 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDictTypeController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDictTypeController.java @@ -3,6 +3,7 @@ package com.flossom.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.flossom.common.core.domain.entity.SysDictType; import com.flossom.system.service.ISysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -22,7 +23,6 @@ import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.system.api.domain.SysDictType; /** * 数据字典信息 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysFiringInfoController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysFiringInfoController.java index f413fc4..e6f3b03 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysFiringInfoController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysFiringInfoController.java @@ -4,6 +4,7 @@ import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; +import com.flossom.common.core.domain.SysFiringInfo; import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.domain.AjaxResult; @@ -11,7 +12,6 @@ import com.flossom.common.core.web.page.TableDataInfo; import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; -import com.flossom.hzMapper.domain.SysFiringInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysLogininforController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysLogininforController.java index 24360bf..0b2f30f 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysLogininforController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysLogininforController.java @@ -3,6 +3,7 @@ package com.flossom.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.flossom.common.core.domain.entity.SysLogininfor; import com.flossom.system.service.ISysLogininforService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -22,7 +23,6 @@ import com.flossom.common.log.enums.BusinessType; import com.flossom.common.redis.service.RedisService; import com.flossom.common.security.annotation.InnerAuth; import com.flossom.common.security.annotation.RequiresPermissions; -import com.flossom.system.api.domain.SysLogininfor; /** * 系统访问记录 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysMenuController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysMenuController.java index b4d51f3..e937600 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysMenuController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysMenuController.java @@ -2,7 +2,7 @@ package com.flossom.system.controller; import java.util.List; -import com.flossom.hzMapper.domain.SysMenu; +import com.flossom.common.core.domain.entity.SysMenu; import com.flossom.system.service.ISysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysNoticeController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysNoticeController.java index 76642b8..bd33453 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysNoticeController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysNoticeController.java @@ -2,7 +2,7 @@ package com.flossom.system.controller; import java.util.List; -import com.flossom.hzMapper.domain.SysNotice; +import com.flossom.common.core.domain.entity.SysNotice; import com.flossom.system.service.ISysNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysOperlogController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysOperlogController.java index e3f31df..3f72839 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysOperlogController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysOperlogController.java @@ -3,6 +3,7 @@ package com.flossom.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.flossom.common.core.domain.entity.SysOperLog; import com.flossom.system.service.ISysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -20,7 +21,6 @@ import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.InnerAuth; import com.flossom.common.security.annotation.RequiresPermissions; -import com.flossom.system.api.domain.SysOperLog; /** * 操作日志记录 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysPostController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysPostController.java index 00db334..5b0e8f6 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysPostController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysPostController.java @@ -3,7 +3,7 @@ package com.flossom.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.flossom.hzMapper.domain.SysPost; +import com.flossom.common.core.domain.entity.SysPost; import com.flossom.system.service.ISysPostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysProfileController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysProfileController.java index d745e67..97839f9 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysProfileController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysProfileController.java @@ -2,6 +2,8 @@ package com.flossom.system.controller; import java.util.Arrays; +import com.flossom.common.core.domain.SysFile; +import com.flossom.common.core.domain.entity.SysUser; import com.flossom.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -23,8 +25,6 @@ import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.service.TokenService; import com.flossom.common.security.utils.SecurityUtils; import com.flossom.system.api.RemoteFileService; -import com.flossom.system.api.domain.SysFile; -import com.flossom.system.api.domain.SysUser; import com.flossom.system.api.model.LoginUser; /** diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRegionController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRegionController.java index 38857e7..1afaf2d 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRegionController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRegionController.java @@ -2,6 +2,7 @@ package com.flossom.system.controller; import javax.servlet.http.HttpServletResponse; +import com.flossom.common.core.domain.entity.SysRegion; import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.domain.AjaxResult; @@ -9,7 +10,6 @@ import com.flossom.common.core.web.page.TableDataInfo; import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; -import com.flossom.hzMapper.domain.SysRegion; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRoleController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRoleController.java index c4230fd..2bbd60d 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRoleController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRoleController.java @@ -3,7 +3,10 @@ package com.flossom.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.flossom.hzMapper.domain.SysUserRole; +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.entity.SysUserRole; import com.flossom.system.service.ISysDeptService; import com.flossom.system.service.ISysRoleService; import com.flossom.system.service.ISysUserService; @@ -25,9 +28,6 @@ import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.system.api.domain.SysDept; -import com.flossom.system.api.domain.SysRole; -import com.flossom.system.api.domain.SysUser; /** * 角色信息 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysUserController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysUserController.java index d2b1473..aef5d78 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysUserController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysUserController.java @@ -6,6 +6,9 @@ import java.util.Set; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; +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 org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -29,9 +32,6 @@ import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.InnerAuth; import com.flossom.common.security.annotation.RequiresPermissions; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.system.api.domain.SysDept; -import com.flossom.system.api.domain.SysRole; -import com.flossom.system.api.domain.SysUser; import com.flossom.system.api.model.LoginUser; import com.flossom.system.service.ISysConfigService; import com.flossom.system.service.ISysDeptService; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysUserOnlineController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysUserOnlineController.java index ffe73b7..6f1ebb8 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysUserOnlineController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysUserOnlineController.java @@ -5,7 +5,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import com.flossom.hzMapper.domain.SysUserOnline; +import com.flossom.common.core.domain.SysUserOnline; import com.flossom.system.service.ISysUserOnlineService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxSystemSettingController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxSystemSettingController.java index 4af8e2c..857c6ae 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxSystemSettingController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxSystemSettingController.java @@ -3,6 +3,7 @@ package com.flossom.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.flossom.common.core.domain.entity.WxSystemSetting; import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.domain.AjaxResult; @@ -10,7 +11,6 @@ import com.flossom.common.core.web.page.TableDataInfo; import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; -import com.flossom.hzMapper.domain.WxSystemSetting; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java index 3f9e79d..8c231a4 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java @@ -2,6 +2,7 @@ package com.flossom.system.controller; import javax.servlet.http.HttpServletResponse; +import com.flossom.common.core.domain.entity.WxUserMember; import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.domain.AjaxResult; @@ -9,7 +10,6 @@ import com.flossom.common.core.web.page.TableDataInfo; import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; -import com.flossom.hzMapper.domain.WxUserMember; import com.flossom.system.service.IWxUserMemberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ICtLeaveMessageService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ICtLeaveMessageService.java index e3319dc..9267e00 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ICtLeaveMessageService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ICtLeaveMessageService.java @@ -1,6 +1,7 @@ package com.flossom.system.service; -import com.flossom.hzMapper.domain.CtLeaveMessage; + +import com.flossom.common.core.domain.entity.CtLeaveMessage; import java.util.List; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IIntegralGlobalService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IIntegralGlobalService.java index 5643ac6..7589a2e 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IIntegralGlobalService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IIntegralGlobalService.java @@ -1,6 +1,7 @@ package com.flossom.system.service; -import com.flossom.hzMapper.domain.IntegralGlobal; + +import com.flossom.common.core.domain.entity.IntegralGlobal; import java.util.List; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysConfigService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysConfigService.java index 71cdea6..9fbfa3f 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysConfigService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysConfigService.java @@ -1,6 +1,7 @@ package com.flossom.system.service; -import com.flossom.hzMapper.domain.SysConfig; + +import com.flossom.common.core.domain.entity.SysConfig; import java.util.List; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysDeptService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysDeptService.java index 99570d6..9f4c9ad 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysDeptService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysDeptService.java @@ -1,9 +1,10 @@ package com.flossom.system.service; +import com.flossom.common.core.domain.entity.SysDept; +import com.flossom.common.core.domain.vo.TreeSelect; + import java.util.List; -import com.flossom.hzMapper.domain.vo.TreeSelect; -import com.flossom.system.api.domain.SysDept; /** * 部门管理 服务层 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysDictDataService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysDictDataService.java index e87b925..758fee4 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysDictDataService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysDictDataService.java @@ -1,7 +1,8 @@ package com.flossom.system.service; +import com.flossom.common.core.domain.entity.SysDictData; + import java.util.List; -import com.flossom.system.api.domain.SysDictData; /** * 字典 业务层 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysDictTypeService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysDictTypeService.java index ede4f5c..b2cf78f 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysDictTypeService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysDictTypeService.java @@ -1,8 +1,9 @@ package com.flossom.system.service; +import com.flossom.common.core.domain.entity.SysDictData; +import com.flossom.common.core.domain.entity.SysDictType; + import java.util.List; -import com.flossom.system.api.domain.SysDictData; -import com.flossom.system.api.domain.SysDictType; /** * 字典 业务层 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysFiringInfoService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysFiringInfoService.java index 917182e..2750041 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysFiringInfoService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysFiringInfoService.java @@ -1,6 +1,7 @@ package com.flossom.system.service; -import com.flossom.hzMapper.domain.SysFiringInfo; + +import com.flossom.common.core.domain.SysFiringInfo; import java.util.List; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysLogininforService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysLogininforService.java index d2f2327..ccb6e55 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysLogininforService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysLogininforService.java @@ -1,7 +1,8 @@ package com.flossom.system.service; +import com.flossom.common.core.domain.entity.SysLogininfor; + import java.util.List; -import com.flossom.system.api.domain.SysLogininfor; /** * 系统访问日志情况信息 服务层 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysMenuService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysMenuService.java index 2eb0fe8..2b220d7 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysMenuService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysMenuService.java @@ -1,8 +1,9 @@ package com.flossom.system.service; -import com.flossom.hzMapper.domain.SysMenu; -import com.flossom.hzMapper.domain.vo.RouterVo; -import com.flossom.hzMapper.domain.vo.TreeSelect; + +import com.flossom.common.core.domain.entity.SysMenu; +import com.flossom.common.core.domain.vo.RouterVo; +import com.flossom.common.core.domain.vo.TreeSelect; import java.util.List; import java.util.Set; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysNoticeService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysNoticeService.java index 2fd3a60..8f7290c 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysNoticeService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysNoticeService.java @@ -1,6 +1,7 @@ package com.flossom.system.service; -import com.flossom.hzMapper.domain.SysNotice; + +import com.flossom.common.core.domain.entity.SysNotice; import java.util.List; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysOperLogService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysOperLogService.java index 7099388..93c2601 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysOperLogService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysOperLogService.java @@ -1,7 +1,8 @@ package com.flossom.system.service; +import com.flossom.common.core.domain.entity.SysOperLog; + import java.util.List; -import com.flossom.system.api.domain.SysOperLog; /** * 操作日志 服务层 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysPermissionService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysPermissionService.java index f1e1611..c4ed83e 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysPermissionService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysPermissionService.java @@ -1,8 +1,9 @@ package com.flossom.system.service; +import com.flossom.common.core.domain.entity.SysUser; + import java.util.Set; -import com.flossom.system.api.domain.SysUser; /** * 权限信息 服务层 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysPostService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysPostService.java index 965fab9..3fd0d90 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysPostService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysPostService.java @@ -1,6 +1,7 @@ package com.flossom.system.service; -import com.flossom.hzMapper.domain.SysPost; + +import com.flossom.common.core.domain.entity.SysPost; import java.util.List; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRegionService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRegionService.java index 40b276a..31d7fef 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRegionService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRegionService.java @@ -1,6 +1,7 @@ package com.flossom.system.service; -import com.flossom.hzMapper.domain.SysRegion; + +import com.flossom.common.core.domain.entity.SysRegion; import java.util.List; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRoleService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRoleService.java index 3f34a03..4bcac78 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRoleService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRoleService.java @@ -1,10 +1,11 @@ package com.flossom.system.service; +import com.flossom.common.core.domain.entity.SysRole; +import com.flossom.common.core.domain.entity.SysUserRole; + import java.util.List; import java.util.Set; -import com.flossom.hzMapper.domain.SysUserRole; -import com.flossom.system.api.domain.SysRole; /** * 角色业务层 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysUserOnlineService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysUserOnlineService.java index 0ec4b9c..5ca8fa7 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysUserOnlineService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysUserOnlineService.java @@ -1,6 +1,6 @@ package com.flossom.system.service; -import com.flossom.hzMapper.domain.SysUserOnline; +import com.flossom.common.core.domain.SysUserOnline; import com.flossom.system.api.model.LoginUser; /** diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysUserService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysUserService.java index 25c7206..874340e 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysUserService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysUserService.java @@ -1,7 +1,8 @@ package com.flossom.system.service; +import com.flossom.common.core.domain.entity.SysUser; + import java.util.List; -import com.flossom.system.api.domain.SysUser; /** * 用户 业务层 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxSystemSettingService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxSystemSettingService.java index 8cdf0b4..6b5093f 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxSystemSettingService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxSystemSettingService.java @@ -1,6 +1,7 @@ package com.flossom.system.service; -import com.flossom.hzMapper.domain.WxSystemSetting; + +import com.flossom.common.core.domain.entity.WxSystemSetting; import java.util.List; diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java index bed1303..bac2020 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java @@ -1,6 +1,7 @@ package com.flossom.system.service; -import com.flossom.hzMapper.domain.WxUserMember; + +import com.flossom.common.core.domain.entity.WxUserMember; import java.util.List; 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 330426d..9ac5218 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 @@ -2,8 +2,8 @@ package com.flossom.system.service.impl; import java.util.List; +import com.flossom.common.core.domain.entity.CtLeaveMessage; import com.flossom.common.core.utils.DateUtils; -import com.flossom.hzMapper.domain.CtLeaveMessage; import com.flossom.hzMapper.mapper.CtLeaveMessageMapper; 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/IntegralGlobalServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/IntegralGlobalServiceImpl.java index 4b1ec5e..20ed8e6 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 @@ -2,9 +2,9 @@ package com.flossom.system.service.impl; import java.util.List; +import com.flossom.common.core.domain.entity.IntegralGlobal; import com.flossom.common.core.utils.DateUtils; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.hzMapper.domain.IntegralGlobal; import com.flossom.hzMapper.mapper.IntegralGlobalMapper; 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/SysConfigServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysConfigServiceImpl.java index d55582c..2163c75 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 @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.List; import javax.annotation.PostConstruct; -import com.flossom.hzMapper.domain.SysConfig; +import com.flossom.common.core.domain.entity.SysConfig; import com.flossom.hzMapper.mapper.SysConfigMapper; 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/SysDeptServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDeptServiceImpl.java index 30f52ef..4eec949 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 @@ -5,7 +5,10 @@ import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; -import com.flossom.hzMapper.domain.vo.TreeSelect; +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 org.springframework.beans.factory.annotation.Autowired; @@ -17,9 +20,6 @@ import com.flossom.common.core.utils.SpringUtils; import com.flossom.common.core.utils.StringUtils; import com.flossom.common.datascope.annotation.DataScope; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.system.api.domain.SysDept; -import com.flossom.system.api.domain.SysRole; -import com.flossom.system.api.domain.SysUser; import com.flossom.system.service.ISysDeptService; /** 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 d377c70..67dff3a 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 @@ -2,11 +2,11 @@ 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.common.security.utils.DictUtils; -import com.flossom.system.api.domain.SysDictData; import com.flossom.system.service.ISysDictDataService; /** 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 598acd2..7e15ee1 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 @@ -6,6 +6,8 @@ import java.util.Map; import java.util.stream.Collectors; 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 org.springframework.beans.factory.annotation.Autowired; @@ -15,8 +17,6 @@ import com.flossom.common.core.constant.UserConstants; import com.flossom.common.core.exception.ServiceException; import com.flossom.common.core.utils.StringUtils; import com.flossom.common.security.utils.DictUtils; -import com.flossom.system.api.domain.SysDictData; -import com.flossom.system.api.domain.SysDictType; import com.flossom.system.service.ISysDictTypeService; /** 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 4936c71..0399ced 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 @@ -2,9 +2,9 @@ package com.flossom.system.service.impl; import java.util.List; +import com.flossom.common.core.domain.SysFiringInfo; import com.flossom.common.core.utils.DateUtils; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.hzMapper.domain.SysFiringInfo; import com.flossom.hzMapper.mapper.SysFiringInfoMapper; import com.flossom.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; 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 2e92e1f..340abd4 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 @@ -2,10 +2,10 @@ 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.flossom.system.api.domain.SysLogininfor; 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 616ee1a..77b6afa 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 @@ -9,10 +9,12 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import com.flossom.hzMapper.domain.SysMenu; -import com.flossom.hzMapper.domain.vo.MetaVo; -import com.flossom.hzMapper.domain.vo.RouterVo; -import com.flossom.hzMapper.domain.vo.TreeSelect; +import com.flossom.common.core.domain.entity.SysMenu; +import com.flossom.common.core.domain.entity.SysRole; +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; @@ -22,8 +24,6 @@ import com.flossom.common.core.constant.Constants; import com.flossom.common.core.constant.UserConstants; import com.flossom.common.core.utils.StringUtils; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.system.api.domain.SysRole; -import com.flossom.system.api.domain.SysUser; import com.flossom.system.service.ISysMenuService; /** 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 22cb9c3..c4089c0 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 @@ -2,7 +2,7 @@ package com.flossom.system.service.impl; import java.util.List; -import com.flossom.hzMapper.domain.SysNotice; +import com.flossom.common.core.domain.entity.SysNotice; import com.flossom.hzMapper.mapper.SysNoticeMapper; 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/SysOperLogServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysOperLogServiceImpl.java index 1b292c3..4f8a842 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 @@ -2,11 +2,11 @@ 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.system.service.ISysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.flossom.system.api.domain.SysOperLog; /** * 操作日志 服务层处理 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysPermissionServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysPermissionServiceImpl.java index 9eb2efa..9d612e2 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysPermissionServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysPermissionServiceImpl.java @@ -4,12 +4,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import com.flossom.common.core.domain.entity.SysRole; +import com.flossom.common.core.domain.entity.SysUser; import com.flossom.system.service.ISysPermissionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.flossom.system.api.domain.SysRole; -import com.flossom.system.api.domain.SysUser; import com.flossom.system.service.ISysMenuService; import com.flossom.system.service.ISysRoleService; 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 fa5d350..b9d1903 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 @@ -2,7 +2,7 @@ package com.flossom.system.service.impl; import java.util.List; -import com.flossom.hzMapper.domain.SysPost; +import com.flossom.common.core.domain.entity.SysPost; import com.flossom.hzMapper.mapper.SysPostMapper; import com.flossom.hzMapper.mapper.SysUserPostMapper; import org.springframework.beans.factory.annotation.Autowired; 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 af48046..7f1d4e9 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 @@ -2,7 +2,7 @@ package com.flossom.system.service.impl; import java.util.List; -import com.flossom.hzMapper.domain.SysRegion; +import com.flossom.common.core.domain.entity.SysRegion; import com.flossom.hzMapper.mapper.SysRegionMapper; 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/SysRoleServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRoleServiceImpl.java index 658f3c9..2fc3d5f 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 @@ -6,9 +6,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import com.flossom.hzMapper.domain.SysRoleDept; -import com.flossom.hzMapper.domain.SysRoleMenu; -import com.flossom.hzMapper.domain.SysUserRole; +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; @@ -22,8 +20,6 @@ import com.flossom.common.core.utils.SpringUtils; import com.flossom.common.core.utils.StringUtils; import com.flossom.common.datascope.annotation.DataScope; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.system.api.domain.SysRole; -import com.flossom.system.api.domain.SysUser; import com.flossom.system.service.ISysRoleService; /** diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserOnlineServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserOnlineServiceImpl.java index 8a5e9c7..15777c3 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserOnlineServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,6 +1,6 @@ package com.flossom.system.service.impl; -import com.flossom.hzMapper.domain.SysUserOnline; +import com.flossom.common.core.domain.SysUserOnline; import org.springframework.stereotype.Service; import com.flossom.common.core.utils.StringUtils; import com.flossom.system.api.model.LoginUser; 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 4c64b2a..cf50061 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 @@ -5,9 +5,7 @@ import java.util.List; import java.util.stream.Collectors; import javax.validation.Validator; -import com.flossom.hzMapper.domain.SysPost; -import com.flossom.hzMapper.domain.SysUserPost; -import com.flossom.hzMapper.domain.SysUserRole; +import com.flossom.common.core.domain.entity.*; import com.flossom.hzMapper.mapper.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,8 +20,6 @@ import com.flossom.common.core.utils.StringUtils; import com.flossom.common.core.utils.bean.BeanValidators; import com.flossom.common.datascope.annotation.DataScope; import com.flossom.common.security.utils.SecurityUtils; -import com.flossom.system.api.domain.SysRole; -import com.flossom.system.api.domain.SysUser; import com.flossom.system.service.ISysConfigService; import com.flossom.system.service.ISysUserService; 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 70a46dc..9e0a852 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 @@ -2,8 +2,8 @@ package com.flossom.system.service.impl; import java.util.List; +import com.flossom.common.core.domain.entity.WxSystemSetting; import com.flossom.common.core.utils.DateUtils; -import com.flossom.hzMapper.domain.WxSystemSetting; import com.flossom.hzMapper.mapper.WxSystemSettingMapper; 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/WxUserMemberServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java index d76b58d..7b79bb3 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 @@ -2,8 +2,8 @@ package com.flossom.system.service.impl; import java.util.List; +import com.flossom.common.core.domain.entity.WxUserMember; import com.flossom.common.core.utils.DateUtils; -import com.flossom.hzMapper.domain.WxUserMember; import com.flossom.hzMapper.mapper.WxUserMemberMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service;