完成项目结构修改

api-app/src/main/java/io/geekidea/springbootplus/app/controller/AppHelloWorldController.java → api-app/src/main/java/com/jumeirah/api/app/controller/AppHelloWorldController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.app.controller;
+package com.jumeirah.api.app.controller;
 
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLog;

bootstrap/src/main/java/io/geekidea/springbootplus/SpringBootPlusApplication.java

@@ -38,8 +38,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableTransactionManagement
 @EnableConfigurationProperties
 @ServletComponentScan
-@MapperScan({"io.geekidea.springbootplus.**.mapper", "com.example.**.mapper"})
-@SpringBootApplication(scanBasePackages = {"io.geekidea.springbootplus", "com.example"})
+@MapperScan({"io.geekidea.springbootplus.**.mapper", "com.jumeirah.**.mapper"})
+@SpringBootApplication(scanBasePackages = {"io.geekidea.springbootplus", "com.jumeirah"})
 public class SpringBootPlusApplication {
 
     public static void main(String[] args) {

bootstrap/src/main/java/io/geekidea/springbootplus/aop/LogAop.java

@@ -48,7 +48,7 @@ public class LogAop extends BaseLogAop {
      */
     private static final String POINTCUT =
             "execution(public * io.geekidea.springbootplus..*.controller..*.*(..)) || " +
-                    "execution(public * com.example..*.controller..*.*(..))";
+                    "execution(public * com.jumeirah..*.controller..*.*(..))";
 
     @Around(POINTCUT)
     @Override

bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusWebMvcConfig.java

@@ -24,9 +24,9 @@ import io.geekidea.springbootplus.framework.core.filter.RequestDetailFilter;
 import io.geekidea.springbootplus.framework.core.interceptor.PermissionInterceptor;
 import io.geekidea.springbootplus.framework.core.xss.XssFilter;
 import io.geekidea.springbootplus.framework.util.IniUtil;
-import io.geekidea.springbootplus.system.interceptor.DownloadInterceptor;
-import io.geekidea.springbootplus.system.interceptor.ResourceInterceptor;
-import io.geekidea.springbootplus.system.interceptor.UploadInterceptor;
+import com.jumeirah.common.interceptor.DownloadInterceptor;
+import com.jumeirah.common.interceptor.ResourceInterceptor;
+import com.jumeirah.common.interceptor.UploadInterceptor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

bootstrap/src/main/java/io/geekidea/springbootplus/handler/GlobalExceptionHandler.java

@@ -25,8 +25,8 @@ import io.geekidea.springbootplus.framework.common.exception.DaoException;
 import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusException;
 import io.geekidea.springbootplus.framework.core.bean.RequestDetail;
 import io.geekidea.springbootplus.framework.core.util.RequestDetailThreadLocal;
-import io.geekidea.springbootplus.system.exception.SysLoginException;
-import io.geekidea.springbootplus.system.exception.VerificationCodeException;
+import com.jumeirah.common.exception.SysLoginException;
+import com.jumeirah.common.exception.VerificationCodeException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authz.UnauthenticatedException;

common/src/main/java/io/geekidea/springbootplus/system/controller/DownloadController.java → common/src/main/java/com/jumeirah/common/controller/DownloadController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.controller;
+package com.jumeirah.common.controller;
 
 import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;

common/src/main/java/io/geekidea/springbootplus/system/controller/HelloWorldController.java → common/src/main/java/com/jumeirah/common/controller/HelloWorldController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.controller;
+package com.jumeirah.common.controller;
 
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLog;

common/src/main/java/io/geekidea/springbootplus/system/controller/LoginController.java → common/src/main/java/com/jumeirah/common/controller/LoginController.java

@@ -14,18 +14,17 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.controller;
+package com.jumeirah.common.controller;
 
 import com.alibaba.fastjson.JSON;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.log.annotation.Module;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore;
-import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil;
-import io.geekidea.springbootplus.system.param.LoginParam;
-import io.geekidea.springbootplus.system.service.LoginService;
-import io.geekidea.springbootplus.system.service.SysUserService;
-import io.geekidea.springbootplus.system.vo.LoginSysUserTokenVo;
-import io.geekidea.springbootplus.system.vo.SysUserQueryVo;
+import com.jumeirah.common.param.LoginParam;
+import com.jumeirah.common.service.LoginService;
+import com.jumeirah.common.service.SysUserService;
+import com.jumeirah.common.vo.LoginSysUserTokenVo;
+import com.jumeirah.common.vo.SysUserQueryVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -65,7 +64,7 @@ public class LoginController {
 
     @PostMapping("/login")
     @OperationLogIgnore
-    @ApiOperation(value = "登录", notes = "系统用户登录", response = io.geekidea.springbootplus.system.vo.LoginSysUserTokenVo.class)
+    @ApiOperation(value = "登录", notes = "系统用户登录", response = LoginSysUserTokenVo.class)
     public ApiResult<LoginSysUserTokenVo> login(@Validated @RequestBody LoginParam loginParam, HttpServletResponse response, @RequestHeader(required = false) String language) throws Exception {
         return loginService.login(loginParam, response, language);
     }

common/src/main/java/io/geekidea/springbootplus/system/controller/RegisterController.java → common/src/main/java/com/jumeirah/common/controller/RegisterController.java

@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.controller;
+package com.jumeirah.common.controller;
 
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.log.annotation.Module;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore;
-import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil;
-import io.geekidea.springbootplus.system.param.RegisterParam;
-import io.geekidea.springbootplus.system.service.RegisterService;
-import io.geekidea.springbootplus.system.vo.LoginSysUserTokenVo;
+import com.jumeirah.common.param.RegisterParam;
+import com.jumeirah.common.service.RegisterService;
+import com.jumeirah.common.vo.LoginSysUserTokenVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

common/src/main/java/io/geekidea/springbootplus/system/controller/ResourceController.java → common/src/main/java/com/jumeirah/common/controller/ResourceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.controller;
+package com.jumeirah.common.controller;
 
 import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;

common/src/main/java/io/geekidea/springbootplus/system/controller/SysDepartmentController.java → common/src/main/java/com/jumeirah/common/controller/SysDepartmentController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.controller;
+package com.jumeirah.common.controller;
 
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
@@ -22,11 +22,11 @@ import io.geekidea.springbootplus.framework.core.pagination.Paging;
 import io.geekidea.springbootplus.framework.log.annotation.Module;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
 import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
-import io.geekidea.springbootplus.system.entity.SysDepartment;
-import io.geekidea.springbootplus.system.param.SysDepartmentPageParam;
-import io.geekidea.springbootplus.system.service.SysDepartmentService;
-import io.geekidea.springbootplus.system.vo.SysDepartmentQueryVo;
-import io.geekidea.springbootplus.system.vo.SysDepartmentTreeVo;
+import com.jumeirah.common.entity.SysDepartment;
+import com.jumeirah.common.param.SysDepartmentPageParam;
+import com.jumeirah.common.service.SysDepartmentService;
+import com.jumeirah.common.vo.SysDepartmentQueryVo;
+import com.jumeirah.common.vo.SysDepartmentTreeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

common/src/main/java/io/geekidea/springbootplus/system/controller/SysPermissionController.java → common/src/main/java/com/jumeirah/common/controller/SysPermissionController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.controller;
+package com.jumeirah.common.controller;
 
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
@@ -22,12 +22,12 @@ import io.geekidea.springbootplus.framework.core.pagination.Paging;
 import io.geekidea.springbootplus.framework.log.annotation.Module;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
 import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
-import io.geekidea.springbootplus.system.entity.SysPermission;
-import io.geekidea.springbootplus.system.param.SysPermissionPageParam;
-import io.geekidea.springbootplus.system.service.SysPermissionService;
-import io.geekidea.springbootplus.system.service.SysRolePermissionService;
-import io.geekidea.springbootplus.system.vo.SysPermissionQueryVo;
-import io.geekidea.springbootplus.system.vo.SysPermissionTreeVo;
+import com.jumeirah.common.entity.SysPermission;
+import com.jumeirah.common.param.SysPermissionPageParam;
+import com.jumeirah.common.service.SysPermissionService;
+import com.jumeirah.common.service.SysRolePermissionService;
+import com.jumeirah.common.vo.SysPermissionQueryVo;
+import com.jumeirah.common.vo.SysPermissionTreeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

common/src/main/java/io/geekidea/springbootplus/system/controller/SysRoleController.java → common/src/main/java/com/jumeirah/common/controller/SysRoleController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.controller;
+package com.jumeirah.common.controller;
 
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
@@ -24,10 +24,10 @@ import io.geekidea.springbootplus.framework.core.validator.groups.Update;
 import io.geekidea.springbootplus.framework.log.annotation.Module;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
 import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
-import io.geekidea.springbootplus.system.entity.SysRole;
-import io.geekidea.springbootplus.system.param.sysrole.SysRolePageParam;
-import io.geekidea.springbootplus.system.param.sysrole.UpdateSysRolePermissionParam;
-import io.geekidea.springbootplus.system.service.SysRoleService;
+import com.jumeirah.common.entity.SysRole;
+import com.jumeirah.common.param.sysrole.SysRolePageParam;
+import com.jumeirah.common.param.sysrole.UpdateSysRolePermissionParam;
+import com.jumeirah.common.service.SysRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

common/src/main/java/io/geekidea/springbootplus/system/controller/SysUserController.java → common/src/main/java/com/jumeirah/common/controller/SysUserController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.controller;
+package com.jumeirah.common.controller;
 
 import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
@@ -25,13 +25,13 @@ import io.geekidea.springbootplus.framework.core.validator.groups.Update;
 import io.geekidea.springbootplus.framework.log.annotation.Module;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
 import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
-import io.geekidea.springbootplus.system.entity.SysUser;
-import io.geekidea.springbootplus.system.param.sysuser.ResetPasswordParam;
-import io.geekidea.springbootplus.system.param.sysuser.SysUserPageParam;
-import io.geekidea.springbootplus.system.param.sysuser.UpdatePasswordParam;
-import io.geekidea.springbootplus.system.param.sysuser.UploadHeadParam;
-import io.geekidea.springbootplus.system.service.SysUserService;
-import io.geekidea.springbootplus.system.vo.SysUserQueryVo;
+import com.jumeirah.common.entity.SysUser;
+import com.jumeirah.common.param.sysuser.ResetPasswordParam;
+import com.jumeirah.common.param.sysuser.SysUserPageParam;
+import com.jumeirah.common.param.sysuser.UpdatePasswordParam;
+import com.jumeirah.common.param.sysuser.UploadHeadParam;
+import com.jumeirah.common.service.SysUserService;
+import com.jumeirah.common.vo.SysUserQueryVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

common/src/main/java/io/geekidea/springbootplus/system/controller/UploadController.java → common/src/main/java/com/jumeirah/common/controller/UploadController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.controller;
+package com.jumeirah.common.controller;
 
 import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;

common/src/main/java/io/geekidea/springbootplus/system/controller/VerificationCodeController.java → common/src/main/java/com/jumeirah/common/controller/VerificationCodeController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.controller;
+package com.jumeirah.common.controller;
 
 import io.geekidea.springbootplus.config.constant.CommonConstant;
 import io.geekidea.springbootplus.config.constant.CommonRedisKey;

common/src/main/java/io/geekidea/springbootplus/system/convert/SysDepartmentConvert.java → common/src/main/java/com/jumeirah/common/convert/SysDepartmentConvert.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.convert;
+package com.jumeirah.common.convert;
 
-import io.geekidea.springbootplus.system.entity.SysDepartment;
-import io.geekidea.springbootplus.system.vo.SysDepartmentTreeVo;
+import com.jumeirah.common.entity.SysDepartment;
+import com.jumeirah.common.vo.SysDepartmentTreeVo;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

common/src/main/java/io/geekidea/springbootplus/system/convert/SysPermissionConvert.java → common/src/main/java/com/jumeirah/common/convert/SysPermissionConvert.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.convert;
+package com.jumeirah.common.convert;
 
-import io.geekidea.springbootplus.system.entity.SysPermission;
-import io.geekidea.springbootplus.system.vo.SysPermissionTreeVo;
+import com.jumeirah.common.entity.SysPermission;
+import com.jumeirah.common.vo.SysPermissionTreeVo;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

common/src/main/java/io/geekidea/springbootplus/system/convert/SysRoleConvert.java → common/src/main/java/com/jumeirah/common/convert/SysRoleConvert.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.convert;
+package com.jumeirah.common.convert;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;

common/src/main/java/io/geekidea/springbootplus/system/convert/SysUserConvert.java → common/src/main/java/com/jumeirah/common/convert/SysUserConvert.java

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.convert;
+package com.jumeirah.common.convert;
 
+import com.jumeirah.common.entity.SysUser;
 import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserVo;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -37,6 +38,6 @@ public interface SysUserConvert {
      * @param sysUser
      * @return
      */
-    LoginSysUserVo sysUserToLoginSysUserVo(io.geekidea.springbootplus.system.entity.SysUser sysUser);
+    LoginSysUserVo sysUserToLoginSysUserVo(SysUser sysUser);
 
 }

common/src/main/java/io/geekidea/springbootplus/system/entity/SysDepartment.java → common/src/main/java/com/jumeirah/common/entity/SysDepartment.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.entity;
+package com.jumeirah.common.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

common/src/main/java/io/geekidea/springbootplus/system/entity/SysPermission.java → common/src/main/java/com/jumeirah/common/entity/SysPermission.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.entity;
+package com.jumeirah.common.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

common/src/main/java/io/geekidea/springbootplus/system/entity/SysRole.java → common/src/main/java/com/jumeirah/common/entity/SysRole.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.entity;
+package com.jumeirah.common.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

common/src/main/java/io/geekidea/springbootplus/system/entity/SysRolePermission.java → common/src/main/java/com/jumeirah/common/entity/SysRolePermission.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.entity;
+package com.jumeirah.common.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

common/src/main/java/io/geekidea/springbootplus/system/entity/SysUser.java → common/src/main/java/com/jumeirah/common/entity/SysUser.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.entity;
+package com.jumeirah.common.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

common/src/main/java/io/geekidea/springbootplus/system/enums/MenuLevelEnum.java → common/src/main/java/com/jumeirah/common/enums/MenuLevelEnum.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.enums;
+package com.jumeirah.common.enums;
 
 import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
 

common/src/main/java/io/geekidea/springbootplus/system/enums/StateEnum.java → common/src/main/java/com/jumeirah/common/enums/StateEnum.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.enums;
+package com.jumeirah.common.enums;
 
 import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
 import lombok.AllArgsConstructor;

common/src/main/java/io/geekidea/springbootplus/system/exception/SysLoginException.java → common/src/main/java/com/jumeirah/common/exception/SysLoginException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.exception;
+package com.jumeirah.common.exception;
 
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusException;

common/src/main/java/io/geekidea/springbootplus/system/exception/VerificationCodeException.java → common/src/main/java/com/jumeirah/common/exception/VerificationCodeException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.exception;
+package com.jumeirah.common.exception;
 
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusException;

common/src/main/java/io/geekidea/springbootplus/system/interceptor/DownloadInterceptor.java → common/src/main/java/com/jumeirah/common/interceptor/DownloadInterceptor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.interceptor;
+package com.jumeirah.common.interceptor;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

common/src/main/java/io/geekidea/springbootplus/system/interceptor/ResourceInterceptor.java → common/src/main/java/com/jumeirah/common/interceptor/ResourceInterceptor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.interceptor;
+package com.jumeirah.common.interceptor;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

common/src/main/java/io/geekidea/springbootplus/system/interceptor/UploadInterceptor.java → common/src/main/java/com/jumeirah/common/interceptor/UploadInterceptor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.interceptor;
+package com.jumeirah.common.interceptor;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

common/src/main/java/io/geekidea/springbootplus/system/mapper/SysDepartmentMapper.java → common/src/main/java/com/jumeirah/common/mapper/SysDepartmentMapper.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.mapper;
+package com.jumeirah.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.geekidea.springbootplus.system.entity.SysDepartment;
-import io.geekidea.springbootplus.system.param.SysDepartmentPageParam;
-import io.geekidea.springbootplus.system.vo.SysDepartmentQueryVo;
+import com.jumeirah.common.entity.SysDepartment;
+import com.jumeirah.common.param.SysDepartmentPageParam;
+import com.jumeirah.common.vo.SysDepartmentQueryVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

common/src/main/java/io/geekidea/springbootplus/system/mapper/SysPermissionMapper.java → common/src/main/java/com/jumeirah/common/mapper/SysPermissionMapper.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.mapper;
+package com.jumeirah.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.geekidea.springbootplus.system.entity.SysPermission;
-import io.geekidea.springbootplus.system.param.SysPermissionPageParam;
-import io.geekidea.springbootplus.system.vo.SysPermissionQueryVo;
+import com.jumeirah.common.param.SysPermissionPageParam;
+import com.jumeirah.common.vo.SysPermissionQueryVo;
+import com.jumeirah.common.entity.SysPermission;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

common/src/main/java/io/geekidea/springbootplus/system/mapper/SysRoleMapper.java → common/src/main/java/com/jumeirah/common/mapper/SysRoleMapper.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.mapper;
+package com.jumeirah.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.geekidea.springbootplus.system.entity.SysRole;
-import io.geekidea.springbootplus.system.param.sysrole.SysRolePageParam;
-import io.geekidea.springbootplus.system.vo.SysRoleQueryVo;
+import com.jumeirah.common.param.sysrole.SysRolePageParam;
+import com.jumeirah.common.vo.SysRoleQueryVo;
+import com.jumeirah.common.entity.SysRole;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

common/src/main/java/io/geekidea/springbootplus/system/mapper/SysRolePermissionMapper.java → common/src/main/java/com/jumeirah/common/mapper/SysRolePermissionMapper.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.mapper;
+package com.jumeirah.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.geekidea.springbootplus.system.entity.SysRolePermission;
-import io.geekidea.springbootplus.system.param.sysrole.SysRolePermissionPageParam;
-import io.geekidea.springbootplus.system.vo.SysRolePermissionQueryVo;
+import com.jumeirah.common.param.sysrole.SysRolePermissionPageParam;
+import com.jumeirah.common.vo.SysRolePermissionQueryVo;
+import com.jumeirah.common.entity.SysRolePermission;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

common/src/main/java/io/geekidea/springbootplus/system/mapper/SysUserMapper.java → common/src/main/java/com/jumeirah/common/mapper/SysUserMapper.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.mapper;
+package com.jumeirah.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.geekidea.springbootplus.system.entity.SysUser;
-import io.geekidea.springbootplus.system.param.sysuser.SysUserPageParam;
-import io.geekidea.springbootplus.system.vo.SysUserQueryVo;
+import com.jumeirah.common.entity.SysUser;
+import com.jumeirah.common.param.sysuser.SysUserPageParam;
+import com.jumeirah.common.vo.SysUserQueryVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

common/src/main/java/io/geekidea/springbootplus/system/param/LoginParam.java → common/src/main/java/com/jumeirah/common/param/LoginParam.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.param;
+package com.jumeirah.common.param;
 
 import io.geekidea.springbootplus.framework.shiro.service.LoginUsername;
 import io.swagger.annotations.ApiModel;

common/src/main/java/io/geekidea/springbootplus/system/param/RegisterParam.java → common/src/main/java/com/jumeirah/common/param/RegisterParam.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.param;
+package com.jumeirah.common.param;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/io/geekidea/springbootplus/system/param/SysDepartmentPageParam.java → common/src/main/java/com/jumeirah/common/param/SysDepartmentPageParam.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.param;
+package com.jumeirah.common.param;
 
 import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
 import io.swagger.annotations.ApiModel;

common/src/main/java/io/geekidea/springbootplus/system/param/SysPermissionPageParam.java → common/src/main/java/com/jumeirah/common/param/SysPermissionPageParam.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.param;
+package com.jumeirah.common.param;
 
 import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
 import io.swagger.annotations.ApiModel;

common/src/main/java/io/geekidea/springbootplus/system/param/sysrole/SysRolePageParam.java → common/src/main/java/com/jumeirah/common/param/sysrole/SysRolePageParam.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.param.sysrole;
+package com.jumeirah.common.param.sysrole;
 
 import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
 import io.swagger.annotations.ApiModel;

common/src/main/java/io/geekidea/springbootplus/system/param/sysrole/SysRolePermissionPageParam.java → common/src/main/java/com/jumeirah/common/param/sysrole/SysRolePermissionPageParam.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.param.sysrole;
+package com.jumeirah.common.param.sysrole;
 
 import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
 import io.swagger.annotations.ApiModel;

common/src/main/java/io/geekidea/springbootplus/system/param/sysrole/UpdateSysRolePermissionParam.java → common/src/main/java/com/jumeirah/common/param/sysrole/UpdateSysRolePermissionParam.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.param.sysrole;
+package com.jumeirah.common.param.sysrole;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/io/geekidea/springbootplus/system/param/sysuser/ResetPasswordParam.java → common/src/main/java/com/jumeirah/common/param/sysuser/ResetPasswordParam.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.param.sysuser;
+package com.jumeirah.common.param.sysuser;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/io/geekidea/springbootplus/system/param/sysuser/SysUserPageParam.java → common/src/main/java/com/jumeirah/common/param/sysuser/SysUserPageParam.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.param.sysuser;
+package com.jumeirah.common.param.sysuser;
 
 import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
 import io.swagger.annotations.ApiModel;

common/src/main/java/io/geekidea/springbootplus/system/param/sysuser/UpdatePasswordParam.java → common/src/main/java/com/jumeirah/common/param/sysuser/UpdatePasswordParam.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.param.sysuser;
+package com.jumeirah.common.param.sysuser;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/io/geekidea/springbootplus/system/param/sysuser/UploadHeadParam.java → common/src/main/java/com/jumeirah/common/param/sysuser/UploadHeadParam.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.param.sysuser;
+package com.jumeirah.common.param.sysuser;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/io/geekidea/springbootplus/system/service/LoginService.java → common/src/main/java/com/jumeirah/common/service/LoginService.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.service;
+package com.jumeirah.common.service;
 
+import com.jumeirah.common.entity.SysUser;
+import com.jumeirah.common.param.LoginParam;
+import com.jumeirah.common.vo.LoginSysUserTokenVo;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
-import io.geekidea.springbootplus.system.entity.SysUser;
-import io.geekidea.springbootplus.system.param.LoginParam;
-import io.geekidea.springbootplus.system.vo.LoginSysUserTokenVo;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

common/src/main/java/io/geekidea/springbootplus/system/service/RegisterService.java → common/src/main/java/com/jumeirah/common/service/RegisterService.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.service;
+package com.jumeirah.common.service;
 
+import com.jumeirah.common.param.RegisterParam;
+import com.jumeirah.common.vo.LoginSysUserTokenVo;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
-import io.geekidea.springbootplus.system.param.RegisterParam;
-import io.geekidea.springbootplus.system.vo.LoginSysUserTokenVo;
 
 import javax.servlet.http.HttpServletResponse;
 

common/src/main/java/io/geekidea/springbootplus/system/service/SysDepartmentService.java → common/src/main/java/com/jumeirah/common/service/SysDepartmentService.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.service;
+package com.jumeirah.common.service;
 
+import com.jumeirah.common.entity.SysDepartment;
+import com.jumeirah.common.param.SysDepartmentPageParam;
+import com.jumeirah.common.vo.SysDepartmentQueryVo;
+import com.jumeirah.common.vo.SysDepartmentTreeVo;
 import io.geekidea.springbootplus.framework.common.service.BaseService;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
-import io.geekidea.springbootplus.system.entity.SysDepartment;
-import io.geekidea.springbootplus.system.param.SysDepartmentPageParam;
-import io.geekidea.springbootplus.system.vo.SysDepartmentQueryVo;
-import io.geekidea.springbootplus.system.vo.SysDepartmentTreeVo;
 
 import java.io.Serializable;
 import java.util.List;

common/src/main/java/io/geekidea/springbootplus/system/service/SysPermissionService.java → common/src/main/java/com/jumeirah/common/service/SysPermissionService.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.service;
+package com.jumeirah.common.service;
 
+import com.jumeirah.common.entity.SysPermission;
+import com.jumeirah.common.param.SysPermissionPageParam;
+import com.jumeirah.common.vo.SysPermissionQueryVo;
+import com.jumeirah.common.vo.SysPermissionTreeVo;
 import io.geekidea.springbootplus.framework.common.service.BaseService;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
-import io.geekidea.springbootplus.system.entity.SysPermission;
-import io.geekidea.springbootplus.system.param.SysPermissionPageParam;
-import io.geekidea.springbootplus.system.vo.SysPermissionQueryVo;
-import io.geekidea.springbootplus.system.vo.SysPermissionTreeVo;
 
 import java.io.Serializable;
 import java.util.List;

common/src/main/java/io/geekidea/springbootplus/system/service/SysRolePermissionService.java → common/src/main/java/com/jumeirah/common/service/SysRolePermissionService.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.service;
+package com.jumeirah.common.service;
 
+import com.jumeirah.common.entity.SysRolePermission;
 import io.geekidea.springbootplus.framework.common.service.BaseService;
-import io.geekidea.springbootplus.system.entity.SysRolePermission;
 import org.apache.commons.collections4.SetUtils;
 
 import java.util.List;

common/src/main/java/io/geekidea/springbootplus/system/service/SysRoleService.java → common/src/main/java/com/jumeirah/common/service/SysRoleService.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.service;
+package com.jumeirah.common.service;
 
+import com.jumeirah.common.entity.SysRole;
+import com.jumeirah.common.param.sysrole.SysRolePageParam;
+import com.jumeirah.common.param.sysrole.UpdateSysRolePermissionParam;
+import com.jumeirah.common.vo.SysRoleQueryVo;
 import io.geekidea.springbootplus.framework.common.service.BaseService;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
-import io.geekidea.springbootplus.system.entity.SysRole;
-import io.geekidea.springbootplus.system.param.sysrole.SysRolePageParam;
-import io.geekidea.springbootplus.system.param.sysrole.UpdateSysRolePermissionParam;
-import io.geekidea.springbootplus.system.vo.SysRoleQueryVo;
 
 import java.io.Serializable;
 

common/src/main/java/io/geekidea/springbootplus/system/service/SysUserService.java → common/src/main/java/com/jumeirah/common/service/SysUserService.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.service;
+package com.jumeirah.common.service;
 
+import com.jumeirah.common.entity.SysUser;
+import com.jumeirah.common.param.sysuser.ResetPasswordParam;
+import com.jumeirah.common.param.sysuser.SysUserPageParam;
+import com.jumeirah.common.param.sysuser.UpdatePasswordParam;
+import com.jumeirah.common.vo.SysUserQueryVo;
 import io.geekidea.springbootplus.framework.common.service.BaseService;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
-import io.geekidea.springbootplus.system.entity.SysUser;
-import io.geekidea.springbootplus.system.param.sysuser.ResetPasswordParam;
-import io.geekidea.springbootplus.system.param.sysuser.SysUserPageParam;
-import io.geekidea.springbootplus.system.param.sysuser.UpdatePasswordParam;
-import io.geekidea.springbootplus.system.vo.SysUserQueryVo;
 
 import java.io.Serializable;
 

common/src/main/java/io/geekidea/springbootplus/system/service/impl/LoginServiceImpl.java → common/src/main/java/com/jumeirah/common/service/impl/LoginServiceImpl.java

@@ -14,9 +14,17 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.service.impl;
+package com.jumeirah.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jumeirah.common.convert.SysUserConvert;
+import com.jumeirah.common.entity.SysDepartment;
+import com.jumeirah.common.entity.SysRole;
+import com.jumeirah.common.entity.SysUser;
+import com.jumeirah.common.enums.StateEnum;
+import com.jumeirah.common.mapper.SysUserMapper;
+import com.jumeirah.common.param.LoginParam;
+import com.jumeirah.common.vo.LoginSysUserTokenVo;
 import io.geekidea.springbootplus.config.constant.CommonRedisKey;
 import io.geekidea.springbootplus.config.properties.JwtProperties;
 import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
@@ -29,19 +37,11 @@ import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
 import io.geekidea.springbootplus.framework.shiro.util.SaltUtil;
 import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserVo;
 import io.geekidea.springbootplus.framework.util.PasswordUtil;
-import io.geekidea.springbootplus.system.convert.SysUserConvert;
-import io.geekidea.springbootplus.system.entity.SysDepartment;
-import io.geekidea.springbootplus.system.entity.SysRole;
-import io.geekidea.springbootplus.system.entity.SysUser;
-import io.geekidea.springbootplus.system.enums.StateEnum;
-import io.geekidea.springbootplus.system.exception.VerificationCodeException;
-import io.geekidea.springbootplus.system.mapper.SysUserMapper;
-import io.geekidea.springbootplus.system.param.LoginParam;
-import io.geekidea.springbootplus.system.service.LoginService;
-import io.geekidea.springbootplus.system.service.SysDepartmentService;
-import io.geekidea.springbootplus.system.service.SysRolePermissionService;
-import io.geekidea.springbootplus.system.service.SysRoleService;
-import io.geekidea.springbootplus.system.vo.LoginSysUserTokenVo;
+import com.jumeirah.common.exception.VerificationCodeException;
+import com.jumeirah.common.service.LoginService;
+import com.jumeirah.common.service.SysDepartmentService;
+import com.jumeirah.common.service.SysRolePermissionService;
+import com.jumeirah.common.service.SysRoleService;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;

common/src/main/java/io/geekidea/springbootplus/system/service/impl/RegisterServiceImpl.java → common/src/main/java/com/jumeirah/common/service/impl/RegisterServiceImpl.java

-package io.geekidea.springbootplus.system.service.impl;
+package com.jumeirah.common.service.impl;
 
 import cn.hutool.core.util.RandomUtil;
+import com.jumeirah.common.entity.SysUser;
+import com.jumeirah.common.param.LoginParam;
+import com.jumeirah.common.param.RegisterParam;
+import com.jumeirah.common.service.RegisterService;
+import com.jumeirah.common.vo.LoginSysUserTokenVo;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
-import io.geekidea.springbootplus.system.entity.SysUser;
-import io.geekidea.springbootplus.system.param.LoginParam;
-import io.geekidea.springbootplus.system.param.RegisterParam;
-import io.geekidea.springbootplus.system.service.LoginService;
-import io.geekidea.springbootplus.system.service.RegisterService;
-import io.geekidea.springbootplus.system.service.SysUserService;
-import io.geekidea.springbootplus.system.vo.LoginSysUserTokenVo;
+import com.jumeirah.common.service.LoginService;
+import com.jumeirah.common.service.SysUserService;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

common/src/main/java/io/geekidea/springbootplus/system/service/impl/SysDepartmentServiceImpl.java → common/src/main/java/com/jumeirah/common/service/impl/SysDepartmentServiceImpl.java

@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.service.impl;
+package com.jumeirah.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jumeirah.common.convert.SysDepartmentConvert;
+import com.jumeirah.common.entity.SysDepartment;
+import com.jumeirah.common.enums.StateEnum;
+import com.jumeirah.common.mapper.SysDepartmentMapper;
+import com.jumeirah.common.param.SysDepartmentPageParam;
+import com.jumeirah.common.service.SysDepartmentService;
+import com.jumeirah.common.vo.SysDepartmentQueryVo;
+import com.jumeirah.common.vo.SysDepartmentTreeVo;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
 import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
-import io.geekidea.springbootplus.system.convert.SysDepartmentConvert;
-import io.geekidea.springbootplus.system.entity.SysDepartment;
-import io.geekidea.springbootplus.system.enums.StateEnum;
-import io.geekidea.springbootplus.system.mapper.SysDepartmentMapper;
-import io.geekidea.springbootplus.system.param.SysDepartmentPageParam;
-import io.geekidea.springbootplus.system.service.SysDepartmentService;
-import io.geekidea.springbootplus.system.vo.SysDepartmentQueryVo;
-import io.geekidea.springbootplus.system.vo.SysDepartmentTreeVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

common/src/main/java/io/geekidea/springbootplus/system/service/impl/SysPermissionServiceImpl.java → common/src/main/java/com/jumeirah/common/service/impl/SysPermissionServiceImpl.java

@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.service.impl;
+package com.jumeirah.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jumeirah.common.convert.SysPermissionConvert;
+import com.jumeirah.common.entity.SysPermission;
+import com.jumeirah.common.enums.MenuLevelEnum;
+import com.jumeirah.common.enums.StateEnum;
+import com.jumeirah.common.mapper.SysPermissionMapper;
+import com.jumeirah.common.param.SysPermissionPageParam;
+import com.jumeirah.common.service.SysPermissionService;
+import com.jumeirah.common.service.SysRolePermissionService;
+import com.jumeirah.common.vo.SysPermissionQueryVo;
+import com.jumeirah.common.vo.SysPermissionTreeVo;
 import io.geekidea.springbootplus.framework.common.exception.BusinessException;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
 import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
-import io.geekidea.springbootplus.system.convert.SysPermissionConvert;
-import io.geekidea.springbootplus.system.entity.SysPermission;
-import io.geekidea.springbootplus.system.enums.MenuLevelEnum;
-import io.geekidea.springbootplus.system.enums.StateEnum;
-import io.geekidea.springbootplus.system.mapper.SysPermissionMapper;
-import io.geekidea.springbootplus.system.param.SysPermissionPageParam;
-import io.geekidea.springbootplus.system.service.SysPermissionService;
-import io.geekidea.springbootplus.system.service.SysRolePermissionService;
-import io.geekidea.springbootplus.system.vo.SysPermissionQueryVo;
-import io.geekidea.springbootplus.system.vo.SysPermissionTreeVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

common/src/main/java/io/geekidea/springbootplus/system/service/impl/SysRolePermissionServiceImpl.java → common/src/main/java/com/jumeirah/common/service/impl/SysRolePermissionServiceImpl.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.service.impl;
+package com.jumeirah.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jumeirah.common.entity.SysRolePermission;
+import com.jumeirah.common.enums.StateEnum;
+import com.jumeirah.common.mapper.SysRoleMapper;
+import com.jumeirah.common.mapper.SysRolePermissionMapper;
+import com.jumeirah.common.service.SysRolePermissionService;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
-import io.geekidea.springbootplus.system.entity.SysRolePermission;
-import io.geekidea.springbootplus.system.enums.StateEnum;
-import io.geekidea.springbootplus.system.mapper.SysRoleMapper;
-import io.geekidea.springbootplus.system.mapper.SysRolePermissionMapper;
-import io.geekidea.springbootplus.system.service.SysRolePermissionService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.SetUtils;
 import org.springframework.beans.factory.annotation.Autowired;

common/src/main/java/io/geekidea/springbootplus/system/service/impl/SysRoleServiceImpl.java → common/src/main/java/com/jumeirah/common/service/impl/SysRoleServiceImpl.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.service.impl;
+package com.jumeirah.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -22,23 +22,23 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jumeirah.common.entity.SysRole;
+import com.jumeirah.common.entity.SysRolePermission;
+import com.jumeirah.common.enums.StateEnum;
+import com.jumeirah.common.mapper.SysRoleMapper;
+import com.jumeirah.common.param.sysrole.SysRolePageParam;
+import com.jumeirah.common.param.sysrole.UpdateSysRolePermissionParam;
+import com.jumeirah.common.service.SysPermissionService;
+import com.jumeirah.common.service.SysRolePermissionService;
+import com.jumeirah.common.service.SysRoleService;
+import com.jumeirah.common.service.SysUserService;
+import com.jumeirah.common.vo.SysRoleQueryVo;
 import io.geekidea.springbootplus.framework.common.exception.BusinessException;
 import io.geekidea.springbootplus.framework.common.exception.DaoException;
 import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusException;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
 import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
-import io.geekidea.springbootplus.system.entity.SysRole;
-import io.geekidea.springbootplus.system.entity.SysRolePermission;
-import io.geekidea.springbootplus.system.enums.StateEnum;
-import io.geekidea.springbootplus.system.mapper.SysRoleMapper;
-import io.geekidea.springbootplus.system.param.sysrole.SysRolePageParam;
-import io.geekidea.springbootplus.system.param.sysrole.UpdateSysRolePermissionParam;
-import io.geekidea.springbootplus.system.service.SysPermissionService;
-import io.geekidea.springbootplus.system.service.SysRolePermissionService;
-import io.geekidea.springbootplus.system.service.SysRoleService;
-import io.geekidea.springbootplus.system.service.SysUserService;
-import io.geekidea.springbootplus.system.vo.SysRoleQueryVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.SetUtils;

common/src/main/java/io/geekidea/springbootplus/system/service/impl/SysUserServiceImpl.java → common/src/main/java/com/jumeirah/common/service/impl/SysUserServiceImpl.java

@@ -14,12 +14,20 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.service.impl;
+package com.jumeirah.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jumeirah.common.entity.SysUser;
+import com.jumeirah.common.enums.StateEnum;
+import com.jumeirah.common.mapper.SysUserMapper;
+import com.jumeirah.common.param.sysuser.ResetPasswordParam;
+import com.jumeirah.common.param.sysuser.SysUserPageParam;
+import com.jumeirah.common.param.sysuser.UpdatePasswordParam;
+import com.jumeirah.common.service.SysUserService;
+import com.jumeirah.common.vo.SysUserQueryVo;
 import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
 import io.geekidea.springbootplus.framework.common.exception.BusinessException;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
@@ -28,16 +36,8 @@ import io.geekidea.springbootplus.framework.core.pagination.Paging;
 import io.geekidea.springbootplus.framework.shiro.util.SaltUtil;
 import io.geekidea.springbootplus.framework.util.PasswordUtil;
 import io.geekidea.springbootplus.framework.util.PhoneUtil;
-import io.geekidea.springbootplus.system.entity.SysUser;
-import io.geekidea.springbootplus.system.enums.StateEnum;
-import io.geekidea.springbootplus.system.mapper.SysUserMapper;
-import io.geekidea.springbootplus.system.param.sysuser.ResetPasswordParam;
-import io.geekidea.springbootplus.system.param.sysuser.SysUserPageParam;
-import io.geekidea.springbootplus.system.param.sysuser.UpdatePasswordParam;
-import io.geekidea.springbootplus.system.service.SysDepartmentService;
-import io.geekidea.springbootplus.system.service.SysRoleService;
-import io.geekidea.springbootplus.system.service.SysUserService;
-import io.geekidea.springbootplus.system.vo.SysUserQueryVo;
+import com.jumeirah.common.service.SysDepartmentService;
+import com.jumeirah.common.service.SysRoleService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

common/src/main/java/io/geekidea/springbootplus/system/vo/LoginSysUserTokenVo.java → common/src/main/java/com/jumeirah/common/vo/LoginSysUserTokenVo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.vo;
+package com.jumeirah.common.vo;
 
 import io.geekidea.springbootplus.framework.shiro.service.LoginToken;
 import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserVo;

common/src/main/java/io/geekidea/springbootplus/system/vo/SysDepartmentQueryVo.java → common/src/main/java/com/jumeirah/common/vo/SysDepartmentQueryVo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.vo;
+package com.jumeirah.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/io/geekidea/springbootplus/system/vo/SysDepartmentTreeVo.java → common/src/main/java/com/jumeirah/common/vo/SysDepartmentTreeVo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.vo;
+package com.jumeirah.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/io/geekidea/springbootplus/system/vo/SysPermissionQueryVo.java → common/src/main/java/com/jumeirah/common/vo/SysPermissionQueryVo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.vo;
+package com.jumeirah.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/io/geekidea/springbootplus/system/vo/SysPermissionTreeVo.java → common/src/main/java/com/jumeirah/common/vo/SysPermissionTreeVo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.vo;
+package com.jumeirah.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/io/geekidea/springbootplus/system/vo/SysRolePermissionQueryVo.java → common/src/main/java/com/jumeirah/common/vo/SysRolePermissionQueryVo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.vo;
+package com.jumeirah.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/io/geekidea/springbootplus/system/vo/SysRoleQueryVo.java → common/src/main/java/com/jumeirah/common/vo/SysRoleQueryVo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.vo;
+package com.jumeirah.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/io/geekidea/springbootplus/system/vo/SysUserQueryVo.java → common/src/main/java/com/jumeirah/common/vo/SysUserQueryVo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.system.vo;
+package com.jumeirah.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/resources/mapper/system/SysDepartmentMapper.xml

@@ -16,20 +16,20 @@
   -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.geekidea.springbootplus.system.mapper.SysDepartmentMapper">
+<mapper namespace="com.jumeirah.common.mapper.SysDepartmentMapper">
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, name, parent_id, state, sort, remark, version, create_time, update_time
     </sql>
 
-    <select id="getSysDepartmentById" resultType="io.geekidea.springbootplus.system.vo.SysDepartmentQueryVo">
+    <select id="getSysDepartmentById" resultType="com.jumeirah.common.vo.SysDepartmentQueryVo">
         select
         <include refid="Base_Column_List"/>
         from sys_department where id = #{id}
     </select>
 
-    <select id="getSysDepartmentPageList" resultType="io.geekidea.springbootplus.system.vo.SysDepartmentQueryVo">
+    <select id="getSysDepartmentPageList" resultType="com.jumeirah.common.vo.SysDepartmentQueryVo">
         select
         <include refid="Base_Column_List"/>
         from sys_department

common/src/main/resources/mapper/system/SysPermissionMapper.xml

@@ -16,20 +16,20 @@
   -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.geekidea.springbootplus.system.mapper.SysPermissionMapper">
+<mapper namespace="com.jumeirah.common.mapper.SysPermissionMapper">
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, name, parent_id, url, code, icon, type, level, state, sort, remark, version, create_time, update_time
     </sql>
 
-    <select id="getSysPermissionById" resultType="io.geekidea.springbootplus.system.vo.SysPermissionQueryVo">
+    <select id="getSysPermissionById" resultType="com.jumeirah.common.vo.SysPermissionQueryVo">
         select
         <include refid="Base_Column_List"/>
         from sys_permission where id = #{id}
     </select>
 
-    <select id="getSysPermissionPageList" resultType="io.geekidea.springbootplus.system.vo.SysPermissionQueryVo">
+    <select id="getSysPermissionPageList" resultType="com.jumeirah.common.vo.SysPermissionQueryVo">
         select
         <include refid="Base_Column_List"/>
         from sys_permission
@@ -52,7 +52,7 @@
           and u.id = #{userId};
     </select>
 
-    <select id="getMenuListByUserId" resultType="io.geekidea.springbootplus.system.entity.SysPermission">
+    <select id="getMenuListByUserId" resultType="com.jumeirah.common.entity.SysPermission">
         select p.*
         from sys_user u
                  inner join sys_role r

common/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -16,14 +16,14 @@
   -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.geekidea.springbootplus.system.mapper.SysRoleMapper">
+<mapper namespace="com.jumeirah.common.mapper.SysRoleMapper">
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, name, code, type, state, remark, version, create_time, update_time
     </sql>
 
-    <select id="getSysRoleById" resultType="io.geekidea.springbootplus.system.vo.SysRoleQueryVo">
+    <select id="getSysRoleById" resultType="com.jumeirah.common.vo.SysRoleQueryVo">
         select
         <include refid="Base_Column_List"/>
         from sys_role where id = #{id}

common/src/main/resources/mapper/system/SysRolePermissionMapper.xml

@@ -16,21 +16,21 @@
   -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.geekidea.springbootplus.system.mapper.SysRolePermissionMapper">
+<mapper namespace="com.jumeirah.common.mapper.SysRolePermissionMapper">
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, role_id, permission_id, state, remark, version, create_time, update_time
     </sql>
 
-    <select id="getSysRolePermissionById" resultType="io.geekidea.springbootplus.system.vo.SysRolePermissionQueryVo">
+    <select id="getSysRolePermissionById" resultType="com.jumeirah.common.vo.SysRolePermissionQueryVo">
         select
         <include refid="Base_Column_List"/>
         from sys_role_permission where id = #{id}
     </select>
 
     <select id="getSysRolePermissionPageList"
-            resultType="io.geekidea.springbootplus.system.vo.SysRolePermissionQueryVo">
+            resultType="com.jumeirah.common.vo.SysRolePermissionQueryVo">
         select
         <include refid="Base_Column_List"/>
         from sys_role_permission

common/src/main/resources/mapper/system/SysUserMapper.xml

@@ -16,7 +16,7 @@
   -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.geekidea.springbootplus.system.mapper.SysUserMapper">
+<mapper namespace="com.jumeirah.common.mapper.SysUserMapper">
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -35,12 +35,12 @@
         where u.deleted = 0
     </sql>
 
-    <select id="getSysUserById" resultType="io.geekidea.springbootplus.system.vo.SysUserQueryVo">
+    <select id="getSysUserById" resultType="com.jumeirah.common.vo.SysUserQueryVo">
         <include refid="BaseQuerySelect"/>
         and u.id = #{id}
     </select>
 
-    <select id="getSysUserPageList" resultType="io.geekidea.springbootplus.system.vo.SysUserQueryVo">
+    <select id="getSysUserPageList" resultType="com.jumeirah.common.vo.SysUserQueryVo">
         <include refid="BaseQuerySelect"/>
         <if test="param.departmentId != null">
             and u.department_id = #{param.departmentId}