修改包名

manager/src/main/java/cn/reghao/devops/manager/rbac/controller/MenuController.java → manager/src/main/java/cn/reghao/devops/manager/account/controller/MenuController.java

@@ -1,10 +1,10 @@
-package cn.reghao.devops.manager.rbac.controller;
+package cn.reghao.devops.manager.account.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.devops.manager.rbac.db.query.MenuQuery;
-import cn.reghao.devops.manager.rbac.model.dto.MenuDTO;
-import cn.reghao.devops.manager.rbac.model.po.Menu;
-import cn.reghao.devops.manager.rbac.service.impl.MenuServiceImpl;
+import cn.reghao.devops.manager.account.db.query.MenuQuery;
+import cn.reghao.devops.manager.account.model.dto.MenuDTO;
+import cn.reghao.devops.manager.account.model.po.Menu;
+import cn.reghao.devops.manager.account.service.impl.MenuServiceImpl;
 import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

manager/src/main/java/cn/reghao/devops/manager/rbac/controller/RoleController.java → manager/src/main/java/cn/reghao/devops/manager/account/controller/RoleController.java

@@ -1,9 +1,9 @@
-package cn.reghao.devops.manager.rbac.controller;
+package cn.reghao.devops.manager.account.controller;
 
-import cn.reghao.devops.manager.rbac.db.query.MenuQuery;
-import cn.reghao.devops.manager.rbac.model.po.Menu;
-import cn.reghao.devops.manager.rbac.model.po.Role;
-import cn.reghao.devops.manager.rbac.service.RoleService;
+import cn.reghao.devops.manager.account.db.query.MenuQuery;
+import cn.reghao.devops.manager.account.model.po.Menu;
+import cn.reghao.devops.manager.account.model.po.Role;
+import cn.reghao.devops.manager.account.service.RoleService;
 import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

manager/src/main/java/cn/reghao/devops/manager/rbac/controller/UserController.java → manager/src/main/java/cn/reghao/devops/manager/account/controller/UserController.java

@@ -1,11 +1,11 @@
-package cn.reghao.devops.manager.rbac.controller;
+package cn.reghao.devops.manager.account.controller;
 
-import cn.reghao.devops.manager.rbac.model.dto.UpdatePasswordDto;
-import cn.reghao.devops.manager.rbac.model.dto.UserCreateDto;
+import cn.reghao.devops.manager.account.model.dto.UpdatePasswordDto;
+import cn.reghao.devops.manager.account.model.dto.UserCreateDto;
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.devops.manager.rbac.model.dto.UserInfo;
-import cn.reghao.devops.manager.rbac.model.dto.UserRole;
-import cn.reghao.devops.manager.rbac.service.UserService;
+import cn.reghao.devops.manager.account.model.dto.UserInfo;
+import cn.reghao.devops.manager.account.model.dto.UserRole;
+import cn.reghao.devops.manager.account.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

manager/src/main/java/cn/reghao/devops/manager/rbac/controller/page/MenuPageController.java → manager/src/main/java/cn/reghao/devops/manager/account/controller/page/MenuPageController.java

@@ -1,10 +1,10 @@
-package cn.reghao.devops.manager.rbac.controller.page;
+package cn.reghao.devops.manager.account.controller.page;
 
-import cn.reghao.devops.manager.rbac.db.query.MenuQuery;
-import cn.reghao.devops.manager.rbac.db.query.RoleQuery;
-import cn.reghao.devops.manager.rbac.model.dto.MenuDTO;
-import cn.reghao.devops.manager.rbac.model.po.Role;
-import cn.reghao.devops.manager.rbac.model.po.Menu;
+import cn.reghao.devops.manager.account.db.query.MenuQuery;
+import cn.reghao.devops.manager.account.db.query.RoleQuery;
+import cn.reghao.devops.manager.account.model.dto.MenuDTO;
+import cn.reghao.devops.manager.account.model.po.Role;
+import cn.reghao.devops.manager.account.model.po.Menu;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;

manager/src/main/java/cn/reghao/devops/manager/rbac/controller/page/RolePageController.java → manager/src/main/java/cn/reghao/devops/manager/account/controller/page/RolePageController.java

@@ -1,8 +1,8 @@
-package cn.reghao.devops.manager.rbac.controller.page;
+package cn.reghao.devops.manager.account.controller.page;
 
-import cn.reghao.devops.manager.rbac.db.query.RoleQuery;
-import cn.reghao.devops.manager.rbac.model.po.User;
-import cn.reghao.devops.manager.rbac.model.vo.RoleVO;
+import cn.reghao.devops.manager.account.db.query.RoleQuery;
+import cn.reghao.devops.manager.account.model.po.User;
+import cn.reghao.devops.manager.account.model.vo.RoleVO;
 import cn.reghao.devops.manager.util.db.PageList;
 import cn.reghao.devops.manager.util.db.PageSort;
 import io.swagger.annotations.Api;

manager/src/main/java/cn/reghao/devops/manager/rbac/controller/page/UserPageController.java → manager/src/main/java/cn/reghao/devops/manager/account/controller/page/UserPageController.java

@@ -1,10 +1,10 @@
-package cn.reghao.devops.manager.rbac.controller.page;
+package cn.reghao.devops.manager.account.controller.page;
 
-import cn.reghao.devops.manager.rbac.db.query.RoleQuery;
-import cn.reghao.devops.manager.rbac.db.query.UserQuery;
-import cn.reghao.devops.manager.rbac.model.po.Role;
-import cn.reghao.devops.manager.rbac.model.po.User;
-import cn.reghao.devops.manager.rbac.model.vo.UserVO;
+import cn.reghao.devops.manager.account.db.query.RoleQuery;
+import cn.reghao.devops.manager.account.db.query.UserQuery;
+import cn.reghao.devops.manager.account.model.po.Role;
+import cn.reghao.devops.manager.account.model.po.User;
+import cn.reghao.devops.manager.account.model.vo.UserVO;
 import cn.reghao.devops.manager.util.db.PageList;
 import cn.reghao.devops.manager.util.db.PageSort;
 import io.swagger.annotations.Api;

manager/src/main/java/cn/reghao/devops/manager/rbac/db/query/MenuQuery.java → manager/src/main/java/cn/reghao/devops/manager/account/db/query/MenuQuery.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.rbac.db.query;
+package cn.reghao.devops.manager.account.db.query;
 
-import cn.reghao.devops.manager.rbac.model.po.Menu;
+import cn.reghao.devops.manager.account.model.po.Menu;
 import cn.reghao.jutil.jdk.db.BaseQuery;
 
 import java.util.*;

manager/src/main/java/cn/reghao/devops/manager/rbac/db/query/MenuQueryImpl.java → manager/src/main/java/cn/reghao/devops/manager/account/db/query/MenuQueryImpl.java

@@ -1,7 +1,7 @@
-package cn.reghao.devops.manager.rbac.db.query;
+package cn.reghao.devops.manager.account.db.query;
 
-import cn.reghao.devops.manager.rbac.db.repository.MenuRepository;
-import cn.reghao.devops.manager.rbac.model.po.Menu;
+import cn.reghao.devops.manager.account.db.repository.MenuRepository;
+import cn.reghao.devops.manager.account.model.po.Menu;
 import org.springframework.stereotype.Service;
 
 import java.util.*;

manager/src/main/java/cn/reghao/devops/manager/rbac/db/query/RoleQuery.java → manager/src/main/java/cn/reghao/devops/manager/account/db/query/RoleQuery.java

@@ -1,9 +1,8 @@
-package cn.reghao.devops.manager.rbac.db.query;
+package cn.reghao.devops.manager.account.db.query;
 
-import cn.reghao.devops.manager.rbac.model.po.Menu;
-import cn.reghao.devops.manager.rbac.model.po.Role;
-import cn.reghao.devops.manager.rbac.model.po.User;
-import cn.reghao.devops.manager.rbac.model.vo.RoleVO;
+import cn.reghao.devops.manager.account.model.po.Role;
+import cn.reghao.devops.manager.account.model.po.User;
+import cn.reghao.devops.manager.account.model.vo.RoleVO;
 import cn.reghao.jutil.jdk.db.BaseQuery;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

manager/src/main/java/cn/reghao/devops/manager/rbac/db/query/RoleQueryImpl.java → manager/src/main/java/cn/reghao/devops/manager/account/db/query/RoleQueryImpl.java

@@ -1,10 +1,10 @@
-package cn.reghao.devops.manager.rbac.db.query;
+package cn.reghao.devops.manager.account.db.query;
 
-import cn.reghao.devops.manager.rbac.db.repository.RoleRepository;
-import cn.reghao.devops.manager.rbac.db.repository.UserRepository;
-import cn.reghao.devops.manager.rbac.model.po.Role;
-import cn.reghao.devops.manager.rbac.model.po.User;
-import cn.reghao.devops.manager.rbac.model.vo.RoleVO;
+import cn.reghao.devops.manager.account.db.repository.RoleRepository;
+import cn.reghao.devops.manager.account.db.repository.UserRepository;
+import cn.reghao.devops.manager.account.model.po.Role;
+import cn.reghao.devops.manager.account.model.po.User;
+import cn.reghao.devops.manager.account.model.vo.RoleVO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;

manager/src/main/java/cn/reghao/devops/manager/rbac/db/query/UserQuery.java → manager/src/main/java/cn/reghao/devops/manager/account/db/query/UserQuery.java

@@ -1,8 +1,8 @@
-package cn.reghao.devops.manager.rbac.db.query;
+package cn.reghao.devops.manager.account.db.query;
 
-import cn.reghao.devops.manager.rbac.model.po.Role;
-import cn.reghao.devops.manager.rbac.model.po.User;
-import cn.reghao.devops.manager.rbac.model.vo.UserVO;
+import cn.reghao.devops.manager.account.model.po.Role;
+import cn.reghao.devops.manager.account.model.po.User;
+import cn.reghao.devops.manager.account.model.vo.UserVO;
 import cn.reghao.jutil.jdk.db.BaseQuery;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

manager/src/main/java/cn/reghao/devops/manager/rbac/db/query/UserQueryImpl.java → manager/src/main/java/cn/reghao/devops/manager/account/db/query/UserQueryImpl.java

@@ -1,15 +1,14 @@
-package cn.reghao.devops.manager.rbac.db.query;
+package cn.reghao.devops.manager.account.db.query;
 
-import cn.reghao.devops.manager.rbac.db.repository.RoleRepository;
-import cn.reghao.devops.manager.rbac.db.repository.UserRepository;
-import cn.reghao.devops.manager.rbac.model.po.Role;
-import cn.reghao.devops.manager.rbac.model.po.User;
-import cn.reghao.devops.manager.rbac.model.po.UserAuthority;
-import cn.reghao.devops.manager.rbac.model.vo.UserVO;
+import cn.reghao.devops.manager.account.db.repository.RoleRepository;
+import cn.reghao.devops.manager.account.db.repository.UserRepository;
+import cn.reghao.devops.manager.account.model.po.Role;
+import cn.reghao.devops.manager.account.model.po.User;
+import cn.reghao.devops.manager.account.model.po.UserAuthority;
+import cn.reghao.devops.manager.account.model.vo.UserVO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.security.core.GrantedAuthority;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.Predicate;

manager/src/main/java/cn/reghao/devops/manager/rbac/db/repository/MenuRepository.java → manager/src/main/java/cn/reghao/devops/manager/account/db/repository/MenuRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.rbac.db.repository;
+package cn.reghao.devops.manager.account.db.repository;
 
-import cn.reghao.devops.manager.rbac.model.po.Menu;
+import cn.reghao.devops.manager.account.model.po.Menu;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

manager/src/main/java/cn/reghao/devops/manager/rbac/db/repository/RoleRepository.java → manager/src/main/java/cn/reghao/devops/manager/account/db/repository/RoleRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.rbac.db.repository;
+package cn.reghao.devops.manager.account.db.repository;
 
-import cn.reghao.devops.manager.rbac.model.po.Role;
+import cn.reghao.devops.manager.account.model.po.Role;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/db/repository/UserRepository.java → manager/src/main/java/cn/reghao/devops/manager/account/db/repository/UserRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.rbac.db.repository;
+package cn.reghao.devops.manager.account.db.repository;
 
-import cn.reghao.devops.manager.rbac.model.po.User;
+import cn.reghao.devops.manager.account.model.po.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/model/constant/DataStatus.java → manager/src/main/java/cn/reghao/devops/manager/account/model/constant/DataStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.model.constant;
+package cn.reghao.devops.manager.account.model.constant;
 
 /**
  * @author reghao

manager/src/main/java/cn/reghao/devops/manager/rbac/model/constant/MenuType.java → manager/src/main/java/cn/reghao/devops/manager/account/model/constant/MenuType.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.model.constant;
+package cn.reghao.devops.manager.account.model.constant;
 
 /**
  * 菜单类型

manager/src/main/java/cn/reghao/devops/manager/rbac/model/constant/RoleType.java → manager/src/main/java/cn/reghao/devops/manager/account/model/constant/RoleType.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.model.constant;
+package cn.reghao.devops.manager.account.model.constant;
 
 /**
  * 角色类型

manager/src/main/java/cn/reghao/devops/manager/rbac/model/constant/UserGender.java → manager/src/main/java/cn/reghao/devops/manager/account/model/constant/UserGender.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.model.constant;
+package cn.reghao.devops.manager.account.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

manager/src/main/java/cn/reghao/devops/manager/rbac/model/dto/AccountLoginDto.java → manager/src/main/java/cn/reghao/devops/manager/account/model/dto/AccountLoginDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.model.dto;
+package cn.reghao.devops.manager.account.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

manager/src/main/java/cn/reghao/devops/manager/rbac/model/dto/MenuAddDTO.java → manager/src/main/java/cn/reghao/devops/manager/account/model/dto/MenuAddDTO.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.rbac.model.dto;
+package cn.reghao.devops.manager.account.model.dto;
 
-import cn.reghao.devops.manager.rbac.model.po.Menu;
+import cn.reghao.devops.manager.account.model.po.Menu;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/model/dto/MenuDTO.java → manager/src/main/java/cn/reghao/devops/manager/account/model/dto/MenuDTO.java

@@ -1,7 +1,7 @@
-package cn.reghao.devops.manager.rbac.model.dto;
+package cn.reghao.devops.manager.account.model.dto;
 
-import cn.reghao.devops.manager.rbac.model.po.Menu;
-import cn.reghao.devops.manager.rbac.model.po.Role;
+import cn.reghao.devops.manager.account.model.po.Menu;
+import cn.reghao.devops.manager.account.model.po.Role;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.NoArgsConstructor;

manager/src/main/java/cn/reghao/devops/manager/rbac/model/dto/MenuUpdateDTO.java → manager/src/main/java/cn/reghao/devops/manager/account/model/dto/MenuUpdateDTO.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.rbac.model.dto;
+package cn.reghao.devops.manager.account.model.dto;
 
-import cn.reghao.devops.manager.rbac.model.po.Menu;
+import cn.reghao.devops.manager.account.model.po.Menu;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/model/dto/RoleDTO.java → manager/src/main/java/cn/reghao/devops/manager/account/model/dto/RoleDTO.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.rbac.model.dto;
+package cn.reghao.devops.manager.account.model.dto;
 
-import cn.reghao.devops.manager.rbac.model.po.Role;
+import cn.reghao.devops.manager.account.model.po.Role;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Data;
 import lombok.NoArgsConstructor;

manager/src/main/java/cn/reghao/devops/manager/rbac/model/dto/UpdatePasswordDto.java → manager/src/main/java/cn/reghao/devops/manager/account/model/dto/UpdatePasswordDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.model.dto;
+package cn.reghao.devops.manager.account.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

manager/src/main/java/cn/reghao/devops/manager/rbac/model/dto/UserAddDTO.java → manager/src/main/java/cn/reghao/devops/manager/account/model/dto/UserAddDTO.java

@@ -1,6 +1,5 @@
-package cn.reghao.devops.manager.rbac.model.dto;
+package cn.reghao.devops.manager.account.model.dto;
 
-import cn.reghao.devops.manager.rbac.model.po.User;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

manager/src/main/java/cn/reghao/devops/manager/rbac/model/dto/UserCreateDto.java → manager/src/main/java/cn/reghao/devops/manager/account/model/dto/UserCreateDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.model.dto;
+package cn.reghao.devops.manager.account.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

manager/src/main/java/cn/reghao/devops/manager/rbac/model/dto/UserInfo.java → manager/src/main/java/cn/reghao/devops/manager/account/model/dto/UserInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.model.dto;
+package cn.reghao.devops.manager.account.model.dto;
 
 import lombok.Data;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/model/dto/UserRole.java → manager/src/main/java/cn/reghao/devops/manager/account/model/dto/UserRole.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.rbac.model.dto;
+package cn.reghao.devops.manager.account.model.dto;
 
-import cn.reghao.devops.manager.rbac.model.po.Role;
+import cn.reghao.devops.manager.account.model.po.Role;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;

manager/src/main/java/cn/reghao/devops/manager/rbac/model/dto/UserUpdateDTO.java → manager/src/main/java/cn/reghao/devops/manager/account/model/dto/UserUpdateDTO.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.model.dto;
+package cn.reghao.devops.manager.account.model.dto;
 
 import lombok.Data;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/model/po/Menu.java → manager/src/main/java/cn/reghao/devops/manager/account/model/po/Menu.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.model.po;
+package cn.reghao.devops.manager.account.model.po;
 
 import cn.reghao.devops.manager.util.db.BaseEntity;
 import lombok.*;

manager/src/main/java/cn/reghao/devops/manager/rbac/model/po/Role.java → manager/src/main/java/cn/reghao/devops/manager/account/model/po/Role.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.model.po;
+package cn.reghao.devops.manager.account.model.po;
 
 import cn.reghao.devops.manager.util.db.BaseEntity;
 import lombok.Data;

manager/src/main/java/cn/reghao/devops/manager/rbac/model/po/User.java → manager/src/main/java/cn/reghao/devops/manager/account/model/po/User.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.model.po;
+package cn.reghao.devops.manager.account.model.po;
 
 import cn.reghao.devops.manager.util.db.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;

manager/src/main/java/cn/reghao/devops/manager/rbac/model/po/UserAuthority.java → manager/src/main/java/cn/reghao/devops/manager/account/model/po/UserAuthority.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.model.po;
+package cn.reghao.devops.manager.account.model.po;
 
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityCoreVersion;

manager/src/main/java/cn/reghao/devops/manager/rbac/model/vo/MenuVO.java → manager/src/main/java/cn/reghao/devops/manager/account/model/vo/MenuVO.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.rbac.model.vo;
+package cn.reghao.devops.manager.account.model.vo;
 
-import cn.reghao.devops.manager.rbac.model.po.Menu;
+import cn.reghao.devops.manager.account.model.po.Menu;
 import lombok.Data;
 
 import java.io.Serializable;

manager/src/main/java/cn/reghao/devops/manager/rbac/model/vo/RoleVO.java → manager/src/main/java/cn/reghao/devops/manager/account/model/vo/RoleVO.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.rbac.model.vo;
+package cn.reghao.devops.manager.account.model.vo;
 
-import cn.reghao.devops.manager.rbac.model.po.Role;
+import cn.reghao.devops.manager.account.model.po.Role;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Data;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/model/vo/UserVO.java → manager/src/main/java/cn/reghao/devops/manager/account/model/vo/UserVO.java

@@ -1,7 +1,7 @@
-package cn.reghao.devops.manager.rbac.model.vo;
+package cn.reghao.devops.manager.account.model.vo;
 
-import cn.reghao.devops.manager.rbac.model.constant.UserGender;
-import cn.reghao.devops.manager.rbac.model.po.User;
+import cn.reghao.devops.manager.account.model.constant.UserGender;
+import cn.reghao.devops.manager.account.model.po.User;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Data;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/security/WebSecurityConfig.java → manager/src/main/java/cn/reghao/devops/manager/account/security/WebSecurityConfig.java

@@ -1,11 +1,11 @@
-package cn.reghao.devops.manager.rbac.security;
-
-import cn.reghao.devops.manager.rbac.security.filter.LoginRedirectFilter;
-import cn.reghao.devops.manager.rbac.security.form.AccountAuthFilter;
-import cn.reghao.devops.manager.rbac.security.form.AccountAuthProvider;
-import cn.reghao.devops.manager.rbac.security.handler.AuthFailHandlerImpl;
-import cn.reghao.devops.manager.rbac.security.handler.AuthSuccessHandlerImpl;
-import cn.reghao.devops.manager.rbac.service.AccountAuthService;
+package cn.reghao.devops.manager.account.security;
+
+import cn.reghao.devops.manager.account.security.filter.LoginRedirectFilter;
+import cn.reghao.devops.manager.account.security.form.AccountAuthFilter;
+import cn.reghao.devops.manager.account.security.form.AccountAuthProvider;
+import cn.reghao.devops.manager.account.security.handler.AuthFailHandlerImpl;
+import cn.reghao.devops.manager.account.security.handler.AuthSuccessHandlerImpl;
+import cn.reghao.devops.manager.account.service.AccountAuthService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.access.expression.SecurityExpressionHandler;

manager/src/main/java/cn/reghao/devops/manager/rbac/security/encoder/Md5PasswordEncoder.java → manager/src/main/java/cn/reghao/devops/manager/account/security/encoder/Md5PasswordEncoder.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.security.encoder;
+package cn.reghao.devops.manager.account.security.encoder;
 
 import cn.reghao.jutil.jdk.security.Md5Cryptor;
 import org.springframework.security.crypto.password.PasswordEncoder;

manager/src/main/java/cn/reghao/devops/manager/rbac/security/encoder/Sha256PasswordEncoder.java → manager/src/main/java/cn/reghao/devops/manager/account/security/encoder/Sha256PasswordEncoder.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.security.encoder;
+package cn.reghao.devops.manager.account.security.encoder;
 
 import cn.reghao.jutil.jdk.security.Sha256Cryptor;
 import org.springframework.security.crypto.password.PasswordEncoder;

manager/src/main/java/cn/reghao/devops/manager/rbac/security/exceptioin/AccountLoginException.java → manager/src/main/java/cn/reghao/devops/manager/account/security/exceptioin/AccountLoginException.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.security.exceptioin;
+package cn.reghao.devops.manager.account.security.exceptioin;
 
 import org.springframework.security.core.AuthenticationException;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/security/filter/LoginRedirectFilter.java → manager/src/main/java/cn/reghao/devops/manager/account/security/filter/LoginRedirectFilter.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.security.filter;
+package cn.reghao.devops.manager.account.security.filter;
 
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;

manager/src/main/java/cn/reghao/devops/manager/rbac/security/form/AccountAuthFilter.java → manager/src/main/java/cn/reghao/devops/manager/account/security/form/AccountAuthFilter.java

@@ -1,7 +1,7 @@
-package cn.reghao.devops.manager.rbac.security.form;
+package cn.reghao.devops.manager.account.security.form;
 
-import cn.reghao.devops.manager.rbac.model.dto.AccountLoginDto;
-import cn.reghao.devops.manager.rbac.service.AccountAuthService;
+import cn.reghao.devops.manager.account.model.dto.AccountLoginDto;
+import cn.reghao.devops.manager.account.service.AccountAuthService;
 import cn.reghao.jutil.web.ServletUtil;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;

manager/src/main/java/cn/reghao/devops/manager/rbac/security/form/AccountAuthProvider.java → manager/src/main/java/cn/reghao/devops/manager/account/security/form/AccountAuthProvider.java

@@ -1,8 +1,7 @@
-package cn.reghao.devops.manager.rbac.security.form;
+package cn.reghao.devops.manager.account.security.form;
 
-import cn.reghao.devops.manager.rbac.service.AccountAuthService;
+import cn.reghao.devops.manager.account.service.AccountAuthService;
 import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.stereotype.Component;

manager/src/main/java/cn/reghao/devops/manager/rbac/security/form/AccountAuthToken.java → manager/src/main/java/cn/reghao/devops/manager/account/security/form/AccountAuthToken.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.rbac.security.form;
+package cn.reghao.devops.manager.account.security.form;
 
-import cn.reghao.devops.manager.rbac.model.po.User;
+import cn.reghao.devops.manager.account.model.po.User;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.SpringSecurityCoreVersion;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/security/handler/AuthFailHandlerImpl.java → manager/src/main/java/cn/reghao/devops/manager/account/security/handler/AuthFailHandlerImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.security.handler;
+package cn.reghao.devops.manager.account.security.handler;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.AuthenticationException;

manager/src/main/java/cn/reghao/devops/manager/rbac/security/handler/AuthSuccessHandlerImpl.java → manager/src/main/java/cn/reghao/devops/manager/account/security/handler/AuthSuccessHandlerImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.security.handler;
+package cn.reghao.devops.manager.account.security.handler;
 
 import cn.reghao.jutil.jdk.result.WebResult;
 import org.springframework.security.core.Authentication;

manager/src/main/java/cn/reghao/devops/manager/rbac/security/session/MySessionAuthenticationStrategy.java → manager/src/main/java/cn/reghao/devops/manager/account/security/session/MySessionAuthenticationStrategy.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.security.session;
+package cn.reghao.devops.manager.account.security.session;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.session.SessionRegistry;

manager/src/main/java/cn/reghao/devops/manager/rbac/service/AccountAuthService.java → manager/src/main/java/cn/reghao/devops/manager/account/service/AccountAuthService.java

@@ -1,7 +1,7 @@
-package cn.reghao.devops.manager.rbac.service;
+package cn.reghao.devops.manager.account.service;
 
-import cn.reghao.devops.manager.rbac.model.dto.AccountLoginDto;
-import cn.reghao.devops.manager.rbac.security.form.AccountAuthToken;
+import cn.reghao.devops.manager.account.model.dto.AccountLoginDto;
+import cn.reghao.devops.manager.account.security.form.AccountAuthToken;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.validation.annotation.Validated;

manager/src/main/java/cn/reghao/devops/manager/rbac/service/MenuService.java → manager/src/main/java/cn/reghao/devops/manager/account/service/MenuService.java

@@ -1,8 +1,8 @@
-package cn.reghao.devops.manager.rbac.service;
+package cn.reghao.devops.manager.account.service;
 
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.devops.manager.rbac.model.dto.MenuDTO;
-import cn.reghao.devops.manager.rbac.model.po.Menu;
+import cn.reghao.devops.manager.account.model.dto.MenuDTO;
+import cn.reghao.devops.manager.account.model.po.Menu;
 
 /**
  * @author reghao

manager/src/main/java/cn/reghao/devops/manager/rbac/service/RoleService.java → manager/src/main/java/cn/reghao/devops/manager/account/service/RoleService.java

@@ -1,7 +1,7 @@
-package cn.reghao.devops.manager.rbac.service;
+package cn.reghao.devops.manager.account.service;
 
-import cn.reghao.devops.manager.rbac.model.po.Menu;
-import cn.reghao.devops.manager.rbac.model.po.Role;
+import cn.reghao.devops.manager.account.model.po.Menu;
+import cn.reghao.devops.manager.account.model.po.Role;
 
 import java.util.Set;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/service/UserService.java → manager/src/main/java/cn/reghao/devops/manager/account/service/UserService.java

@@ -1,9 +1,9 @@
-package cn.reghao.devops.manager.rbac.service;
+package cn.reghao.devops.manager.account.service;
 
-import cn.reghao.devops.manager.rbac.model.dto.UserCreateDto;
-import cn.reghao.devops.manager.rbac.model.po.User;
-import cn.reghao.devops.manager.rbac.model.dto.UserInfo;
-import cn.reghao.devops.manager.rbac.model.dto.UserRole;
+import cn.reghao.devops.manager.account.model.dto.UserCreateDto;
+import cn.reghao.devops.manager.account.model.po.User;
+import cn.reghao.devops.manager.account.model.dto.UserInfo;
+import cn.reghao.devops.manager.account.model.dto.UserRole;
 
 /**
  * @author reghao

manager/src/main/java/cn/reghao/devops/manager/rbac/service/impl/AccountAuthServiceImpl.java → manager/src/main/java/cn/reghao/devops/manager/account/service/impl/AccountAuthServiceImpl.java

@@ -1,11 +1,11 @@
-package cn.reghao.devops.manager.rbac.service.impl;
+package cn.reghao.devops.manager.account.service.impl;
 
-import cn.reghao.devops.manager.rbac.model.dto.AccountLoginDto;
-import cn.reghao.devops.manager.rbac.model.po.User;
-import cn.reghao.devops.manager.rbac.security.exceptioin.AccountLoginException;
-import cn.reghao.devops.manager.rbac.security.form.AccountAuthToken;
-import cn.reghao.devops.manager.rbac.service.AccountAuthService;
-import cn.reghao.devops.manager.rbac.service.UserService;
+import cn.reghao.devops.manager.account.model.dto.AccountLoginDto;
+import cn.reghao.devops.manager.account.model.po.User;
+import cn.reghao.devops.manager.account.security.exceptioin.AccountLoginException;
+import cn.reghao.devops.manager.account.security.form.AccountAuthToken;
+import cn.reghao.devops.manager.account.service.AccountAuthService;
+import cn.reghao.devops.manager.account.service.UserService;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;

manager/src/main/java/cn/reghao/devops/manager/rbac/service/impl/MenuServiceImpl.java → manager/src/main/java/cn/reghao/devops/manager/account/service/impl/MenuServiceImpl.java

@@ -1,14 +1,14 @@
-package cn.reghao.devops.manager.rbac.service.impl;
+package cn.reghao.devops.manager.account.service.impl;
 
-import cn.reghao.devops.manager.rbac.db.repository.MenuRepository;
-import cn.reghao.devops.manager.rbac.db.repository.RoleRepository;
-import cn.reghao.devops.manager.rbac.model.constant.MenuType;
-import cn.reghao.devops.manager.rbac.service.MenuService;
+import cn.reghao.devops.manager.account.db.repository.MenuRepository;
+import cn.reghao.devops.manager.account.db.repository.RoleRepository;
+import cn.reghao.devops.manager.account.model.constant.MenuType;
+import cn.reghao.devops.manager.account.service.MenuService;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
-import cn.reghao.devops.manager.rbac.model.dto.MenuDTO;
-import cn.reghao.devops.manager.rbac.model.po.Menu;
-import cn.reghao.devops.manager.rbac.model.po.Role;
+import cn.reghao.devops.manager.account.model.dto.MenuDTO;
+import cn.reghao.devops.manager.account.model.po.Menu;
+import cn.reghao.devops.manager.account.model.po.Role;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/service/impl/RoleServiceImpl.java → manager/src/main/java/cn/reghao/devops/manager/account/service/impl/RoleServiceImpl.java

@@ -1,11 +1,11 @@
-package cn.reghao.devops.manager.rbac.service.impl;
-
-import cn.reghao.devops.manager.rbac.db.query.RoleQuery;
-import cn.reghao.devops.manager.rbac.db.repository.RoleRepository;
-import cn.reghao.devops.manager.rbac.model.po.Menu;
-import cn.reghao.devops.manager.rbac.model.po.Role;
-import cn.reghao.devops.manager.rbac.model.po.User;
-import cn.reghao.devops.manager.rbac.service.RoleService;
+package cn.reghao.devops.manager.account.service.impl;
+
+import cn.reghao.devops.manager.account.db.query.RoleQuery;
+import cn.reghao.devops.manager.account.db.repository.RoleRepository;
+import cn.reghao.devops.manager.account.model.po.Menu;
+import cn.reghao.devops.manager.account.model.po.Role;
+import cn.reghao.devops.manager.account.model.po.User;
+import cn.reghao.devops.manager.account.service.RoleService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/service/impl/UserServiceImpl.java → manager/src/main/java/cn/reghao/devops/manager/account/service/impl/UserServiceImpl.java

@@ -1,16 +1,16 @@
-package cn.reghao.devops.manager.rbac.service.impl;
+package cn.reghao.devops.manager.account.service.impl;
 
-import cn.reghao.devops.manager.rbac.db.repository.RoleRepository;
-import cn.reghao.devops.manager.rbac.db.repository.UserRepository;
-import cn.reghao.devops.manager.rbac.model.dto.UserCreateDto;
-import cn.reghao.devops.manager.rbac.model.po.Role;
-import cn.reghao.devops.manager.rbac.service.UserService;
+import cn.reghao.devops.manager.account.db.repository.RoleRepository;
+import cn.reghao.devops.manager.account.db.repository.UserRepository;
+import cn.reghao.devops.manager.account.model.dto.UserCreateDto;
+import cn.reghao.devops.manager.account.model.po.Role;
+import cn.reghao.devops.manager.account.service.UserService;
 import cn.reghao.jutil.jdk.security.Cryptor;
 import cn.reghao.jutil.jdk.security.Md5Cryptor;
 import cn.reghao.jutil.jdk.security.RandomString;
-import cn.reghao.devops.manager.rbac.model.dto.UserInfo;
-import cn.reghao.devops.manager.rbac.model.dto.UserRole;
-import cn.reghao.devops.manager.rbac.model.po.User;
+import cn.reghao.devops.manager.account.model.dto.UserInfo;
+import cn.reghao.devops.manager.account.model.dto.UserRole;
+import cn.reghao.devops.manager.account.model.po.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/impl/AppStatImpl.java

@@ -8,8 +8,8 @@ import cn.reghao.devops.manager.app.model.po.config.AppConfig;
 import cn.reghao.devops.manager.app.service.bd.AppStat;
 import cn.reghao.devops.manager.ws.MessageSenders;
 import cn.reghao.devops.manager.machine.service.MachineService;
-import cn.reghao.devops.manager.rbac.model.constant.RoleType;
-import cn.reghao.devops.manager.rbac.model.po.UserAuthority;
+import cn.reghao.devops.manager.account.model.constant.RoleType;
+import cn.reghao.devops.manager.account.model.po.UserAuthority;
 import cn.reghao.jutil.jdk.event.message.EventMessage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.Authentication;

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/impl/BuildAppImpl.java

@@ -13,9 +13,9 @@ import cn.reghao.devops.common.build.chain.impl.BuildChainResult;
 import cn.reghao.devops.common.build.chain.BuildTools;
 import cn.reghao.devops.common.build.chain.Bootstrap;
 import cn.reghao.devops.common.build.chain.Handler;
-import cn.reghao.devops.manager.rbac.model.constant.RoleType;
-import cn.reghao.devops.manager.rbac.model.po.User;
-import cn.reghao.devops.manager.rbac.model.po.UserAuthority;
+import cn.reghao.devops.manager.account.model.constant.RoleType;
+import cn.reghao.devops.manager.account.model.po.User;
+import cn.reghao.devops.manager.account.model.po.UserAuthority;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;

manager/src/main/java/cn/reghao/devops/manager/config/spring/AppLifecycle.java

@@ -7,9 +7,9 @@ import cn.reghao.devops.manager.app.service.config.BuildDirService;
 import cn.reghao.devops.manager.log.Appenders;
 import cn.reghao.devops.manager.log.LoggerConfig;
 import cn.reghao.devops.manager.machine.service.MachineService;
-import cn.reghao.devops.manager.rbac.db.repository.RoleRepository;
-import cn.reghao.devops.manager.rbac.model.constant.RoleType;
-import cn.reghao.devops.manager.rbac.model.po.Role;
+import cn.reghao.devops.manager.account.db.repository.RoleRepository;
+import cn.reghao.devops.manager.account.model.constant.RoleType;
+import cn.reghao.devops.manager.account.model.po.Role;
 import cn.reghao.devops.manager.ws.handler.LogHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.DisposableBean;

manager/src/main/java/cn/reghao/devops/manager/home/controller/page/HomePageController.java

@@ -5,8 +5,8 @@ import cn.reghao.devops.common.util.jvm.JVM;
 import cn.reghao.devops.common.util.jvm.po.JvmInfo;
 import cn.reghao.devops.common.util.jvm.po.JvmStat;
 import cn.reghao.devops.manager.home.service.HomeService;
-import cn.reghao.devops.manager.rbac.model.po.Menu;
-import cn.reghao.devops.manager.rbac.model.po.User;
+import cn.reghao.devops.manager.account.model.po.Menu;
+import cn.reghao.devops.manager.account.model.po.User;
 import cn.reghao.devops.manager.util.UserContext;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

manager/src/main/java/cn/reghao/devops/manager/home/service/HomeService.java

@@ -1,8 +1,8 @@
 package cn.reghao.devops.manager.home.service;
 
-import cn.reghao.devops.manager.rbac.db.query.RoleQuery;
-import cn.reghao.devops.manager.rbac.model.po.Menu;
-import cn.reghao.devops.manager.rbac.model.po.Role;
+import cn.reghao.devops.manager.account.db.query.RoleQuery;
+import cn.reghao.devops.manager.account.model.po.Menu;
+import cn.reghao.devops.manager.account.model.po.Role;
 import org.springframework.stereotype.Service;
 
 import java.util.*;

manager/src/main/java/cn/reghao/devops/manager/thymeleaf/TimoDialect.java → manager/src/main/java/cn/reghao/devops/manager/template/TimoDialect.java

@@ -1,7 +1,7 @@
-package cn.reghao.devops.manager.thymeleaf;
+package cn.reghao.devops.manager.template;
 
-import cn.reghao.devops.manager.thymeleaf.attribute.SelectDictAttrProcessor;
-import cn.reghao.devops.manager.thymeleaf.attribute.SelectListAttrProcessor;
+import cn.reghao.devops.manager.template.attribute.SelectDictAttrProcessor;
+import cn.reghao.devops.manager.template.attribute.SelectListAttrProcessor;
 import org.thymeleaf.dialect.AbstractProcessorDialect;
 import org.thymeleaf.dialect.IExpressionObjectDialect;
 import org.thymeleaf.expression.IExpressionObjectFactory;

manager/src/main/java/cn/reghao/devops/manager/thymeleaf/TimoExpressionObjectFactory.java → manager/src/main/java/cn/reghao/devops/manager/template/TimoExpressionObjectFactory.java

@@ -1,8 +1,8 @@
-package cn.reghao.devops.manager.thymeleaf;
+package cn.reghao.devops.manager.template;
 
-import cn.reghao.devops.manager.thymeleaf.utility.DictUtil;
-import cn.reghao.devops.manager.thymeleaf.utility.LogUtil;
-import cn.reghao.devops.manager.thymeleaf.utility.PageUtil;
+import cn.reghao.devops.manager.template.utility.DictUtil;
+import cn.reghao.devops.manager.template.utility.LogUtil;
+import cn.reghao.devops.manager.template.utility.PageUtil;
 import org.thymeleaf.context.IExpressionContext;
 import org.thymeleaf.expression.IExpressionObjectFactory;
 

manager/src/main/java/cn/reghao/devops/manager/thymeleaf/attribute/SelectDictAttrProcessor.java → manager/src/main/java/cn/reghao/devops/manager/template/attribute/SelectDictAttrProcessor.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.thymeleaf.attribute;
+package cn.reghao.devops.manager.template.attribute;
 
-import cn.reghao.devops.manager.rbac.model.constant.MenuType;
+import cn.reghao.devops.manager.account.model.constant.MenuType;
 import cn.reghao.devops.manager.util.DefaultSetting;
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.context.ITemplateContext;

manager/src/main/java/cn/reghao/devops/manager/thymeleaf/attribute/SelectListAttrProcessor.java → manager/src/main/java/cn/reghao/devops/manager/template/attribute/SelectListAttrProcessor.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.thymeleaf.attribute;
+package cn.reghao.devops.manager.template.attribute;
 
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.context.ITemplateContext;

manager/src/main/java/cn/reghao/devops/manager/thymeleaf/config/ThymeleafAutoConfig.java → manager/src/main/java/cn/reghao/devops/manager/template/config/ThymeleafAutoConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.thymeleaf.config;
+package cn.reghao.devops.manager.template.config;
 
 import org.springframework.context.annotation.ComponentScan;
 

manager/src/main/java/cn/reghao/devops/manager/thymeleaf/config/ThymeleafConfig.java → manager/src/main/java/cn/reghao/devops/manager/template/config/ThymeleafConfig.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.thymeleaf.config;
+package cn.reghao.devops.manager.template.config;
 
-import cn.reghao.devops.manager.thymeleaf.TimoDialect;
+import cn.reghao.devops.manager.template.TimoDialect;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

manager/src/main/java/cn/reghao/devops/manager/thymeleaf/utility/DictUtil.java → manager/src/main/java/cn/reghao/devops/manager/template/utility/DictUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.thymeleaf.utility;
+package cn.reghao.devops.manager.template.utility;
 
 /*import com.linln.common.utils.EhCacheUtil;
 import com.linln.modules.system.domain.Dict;

manager/src/main/java/cn/reghao/devops/manager/thymeleaf/utility/LogUtil.java → manager/src/main/java/cn/reghao/devops/manager/template/utility/LogUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.thymeleaf.utility;
+package cn.reghao.devops.manager.template.utility;
 
 /*import com.linln.common.utils.EntityBeanUtil;
 import com.linln.common.utils.SpringContextUtil;

manager/src/main/java/cn/reghao/devops/manager/thymeleaf/utility/PageUtil.java → manager/src/main/java/cn/reghao/devops/manager/template/utility/PageUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.thymeleaf.utility;
+package cn.reghao.devops.manager.template.utility;
 
 import org.springframework.data.domain.Page;
 

manager/src/main/java/cn/reghao/devops/manager/thymeleaf/xml/Timo-Dialect.xml → manager/src/main/java/cn/reghao/devops/manager/template/xml/Timo-Dialect.xml

@@ -23,11 +23,11 @@
         xmlns="http://www.thymeleaf.org/extras/dialect"
         prefix="mo"
         namespace-uri="https://gitee.com/aun/Timo"
-        class="cn.reghao.devops.manager.thymeleaf.TimoDialect">
+        class="cn.reghao.devops.manager.template.TimoDialect">
 
     <!-- 自定义属性标签 -->
     <attribute-processor name="list"
-                         class="cn.reghao.devops.manager.thymeleaf.attribute.SelectListAttrProcessor">
+                         class="cn.reghao.devops.manager.template.attribute.SelectListAttrProcessor">
         <documentation><![CDATA[
 		自定义下拉列表生成标签，值可以为数组和集合！
 		mo-selected属性：默认选择的值
@@ -35,7 +35,7 @@
 		]]></documentation>
     </attribute-processor>
     <attribute-processor name="dict"
-                         class="cn.reghao.devops.manager.thymeleaf.attribute.SelectDictAttrProcessor">
+                         class="cn.reghao.devops.manager.template.attribute.SelectDictAttrProcessor">
         <documentation><![CDATA[
 		根据字典标识生成下拉列表，值可以为数组和集合！
 		mo-selected属性：默认选择的值
@@ -44,8 +44,8 @@
     </attribute-processor>
 
     <!-- 自定义对象工具 -->
-    <expression-object name="pageUtil" class="cn.reghao.devops.manager.thymeleaf.utility.PageUtil"/>
-    <expression-object name="dicts" class="cn.reghao.devops.manager.thymeleaf.utility.DictUtil"/>
+    <expression-object name="pageUtil" class="cn.reghao.devops.manager.template.utility.PageUtil"/>
+    <expression-object name="dicts" class="cn.reghao.devops.manager.template.utility.DictUtil"/>
 
 
 </dialect>

manager/src/main/java/cn/reghao/devops/manager/util/DefaultSetting.java

@@ -3,7 +3,7 @@ package cn.reghao.devops.manager.util;
 import cn.reghao.devops.common.build.model.constant.EnvType;
 import cn.reghao.devops.manager.app.model.constant.AppType;
 import cn.reghao.devops.manager.app.model.vo.KeyValue;
-import cn.reghao.devops.manager.rbac.model.constant.RoleType;
+import cn.reghao.devops.manager.account.model.constant.RoleType;
 
 import java.util.ArrayList;
 import java.util.List;

manager/src/main/java/cn/reghao/devops/manager/util/UserContext.java

@@ -1,7 +1,7 @@
 package cn.reghao.devops.manager.util;
 
-import cn.reghao.devops.manager.rbac.model.po.User;
-import cn.reghao.devops.manager.rbac.security.form.AccountAuthToken;
+import cn.reghao.devops.manager.account.model.po.User;
+import cn.reghao.devops.manager.account.security.form.AccountAuthToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 

manager/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-cn.reghao.devops.manager.thymeleaf.config.ThymeleafAutoConfig
+cn.reghao.devops.manager.template.config.ThymeleafAutoConfig

manager/src/test/java/AccountTest.java

@@ -1,6 +1,6 @@
 import cn.reghao.devops.manager.ManagerApplication;
-import cn.reghao.devops.manager.rbac.model.dto.UserCreateDto;
-import cn.reghao.devops.manager.rbac.service.UserService;
+import cn.reghao.devops.manager.account.model.dto.UserCreateDto;
+import cn.reghao.devops.manager.account.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;