system module

geekidea · Mar 24, 2020 · d89ced7 · d89ced7
1 parent 0e7cfa0
commit d89ced7
Show file tree

Hide file tree

Showing 98 changed files with 669 additions and 418 deletions.
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -45,6 +45,12 @@
             <groupId>io.geekidea.springbootplus</groupId>
             <artifactId>example</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.geekidea.springbootplus</groupId>
+            <artifactId>system</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/config/ShiroConfig.java b/bootstrap/src/main/java/io/geekidea/springbootplus/config/ShiroConfig.java
@@ -20,13 +20,12 @@
 import io.geekidea.springbootplus.config.properties.JwtProperties;
 import io.geekidea.springbootplus.config.properties.ShiroPermissionProperties;
 import io.geekidea.springbootplus.config.properties.ShiroProperties;
-import io.geekidea.springbootplus.config.properties.SpringBootPlusFilterProperties;
 import io.geekidea.springbootplus.framework.shiro.cache.LoginRedisService;
 import io.geekidea.springbootplus.framework.shiro.exception.ShiroConfigException;
 import io.geekidea.springbootplus.framework.shiro.jwt.JwtCredentialsMatcher;
 import io.geekidea.springbootplus.framework.shiro.jwt.JwtFilter;
 import io.geekidea.springbootplus.framework.shiro.jwt.JwtRealm;
-import io.geekidea.springbootplus.framework.system.service.LoginService;
+import io.geekidea.springbootplus.framework.shiro.service.ShiroLoginService;
 import io.geekidea.springbootplus.framework.util.IniUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -147,13 +146,13 @@ public SecurityManager securityManager(LoginRedisService loginRedisService) {
      */
     @Bean(SHIRO_FILTER_NAME)
     public ShiroFilterFactoryBean shiroFilterFactoryBean(SecurityManager securityManager,
-                                                         LoginService loginService,
+                                                         ShiroLoginService shiroLoginService,
                                                          LoginRedisService loginRedisService,
                                                          ShiroProperties shiroProperties,
                                                          JwtProperties jwtProperties) {
         ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean();
         shiroFilterFactoryBean.setSecurityManager(securityManager);
-        Map<String, Filter> filterMap = getFilterMap(loginService, loginRedisService, jwtProperties);
+        Map<String, Filter> filterMap = getFilterMap(shiroLoginService, loginRedisService, jwtProperties);
         shiroFilterFactoryBean.setFilters(filterMap);
         Map<String, String> filterChainMap = getFilterChainDefinitionMap(shiroProperties);
         shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainMap);
@@ -166,11 +165,11 @@ public ShiroFilterFactoryBean shiroFilterFactoryBean(SecurityManager securityMan
      *
      * @return
      */
-    private Map<String, Filter> getFilterMap(LoginService loginService,
+    private Map<String, Filter> getFilterMap(ShiroLoginService shiroLoginService,
                                              LoginRedisService loginRedisService,
                                              JwtProperties jwtProperties) {
         Map<String, Filter> filterMap = new LinkedHashMap();
-        filterMap.put(JWT_FILTER_NAME, new JwtFilter(loginService, loginRedisService, jwtProperties));
+        filterMap.put(JWT_FILTER_NAME, new JwtFilter(shiroLoginService, loginRedisService, jwtProperties));
         return filterMap;
     }
 

diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusWebMvcConfig.java b/bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusWebMvcConfig.java
@@ -17,13 +17,13 @@
 package io.geekidea.springbootplus.config;
 
 import com.alibaba.fastjson.JSON;
-import io.geekidea.springbootplus.framework.core.interceptor.PermissionInterceptor;
-import io.geekidea.springbootplus.framework.util.IniUtil;
 import io.geekidea.springbootplus.config.properties.SpringBootPlusInterceptorProperties;
 import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
-import io.geekidea.springbootplus.framework.system.interceptor.DownloadInterceptor;
-import io.geekidea.springbootplus.framework.system.interceptor.ResourceInterceptor;
-import io.geekidea.springbootplus.framework.system.interceptor.UploadInterceptor;
+import io.geekidea.springbootplus.framework.core.interceptor.PermissionInterceptor;
+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 lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...mon/exception/GlobalExceptionHandler.java → ...tplus/handler/GlobalExceptionHandler.java b/...mon/exception/GlobalExceptionHandler.java → ...tplus/handler/GlobalExceptionHandler.java
@@ -14,14 +14,17 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.framework.common.exception;
+package io.geekidea.springbootplus.handler;
 
 import com.alibaba.fastjson.JSON;
 import com.auth0.jwt.exceptions.JWTDecodeException;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
-import io.geekidea.springbootplus.framework.system.exception.SysLoginException;
-import io.geekidea.springbootplus.framework.system.exception.VerificationCodeException;
+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.system.exception.SysLoginException;
+import io.geekidea.springbootplus.system.exception.VerificationCodeException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authz.UnauthenticatedException;

diff --git a/config/src/main/resources/config/application.yml b/config/src/main/resources/config/application.yml
@@ -58,7 +58,7 @@ spring-boot-plus:
   # 服务器IP地址
   server-ip: 127.0.0.1
   # 是否启用验证码
-  enable-verify-code: false
+  enable-verify-code: true
   # 默认新建用户登陆初始化密码
   login-init-salt: 666666
   login-init-password: admin

diff --git a/.../src/main/java/io/geekidea/springbootplus/framework/common/controller/EnumController.java b/.../src/main/java/io/geekidea/springbootplus/framework/common/controller/EnumController.java
@@ -49,7 +49,7 @@ public class EnumController {
 
     private static final List<String> FRAMEWORK_ENUM_PACKAGES = Arrays.asList(
             "io.geekidea.springbootplus.framework.common.enums",
-            "io.geekidea.springbootplus.framework.system.enums");
+            "io.geekidea.springbootplus.system.enums");
 
     /**
      * 枚举包路径

diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/enums/BaseEnum.java b/framework/src/main/java/io/geekidea/springbootplus/framework/common/enums/BaseEnum.java
@@ -16,11 +16,6 @@
 
 package io.geekidea.springbootplus.framework.common.enums;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import io.geekidea.springbootplus.framework.system.enums.StateEnum;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.Serializable;
 
 /**
  * 枚举类型父接口

diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/vo/EnumVo.java b/framework/src/main/java/io/geekidea/springbootplus/framework/common/vo/EnumVo.java
@@ -16,8 +16,6 @@
 
 package io.geekidea.springbootplus.framework.common.vo;
 
-import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
-import io.geekidea.springbootplus.framework.system.enums.StateEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

diff --git a/...work/src/main/java/io/geekidea/springbootplus/framework/core/pagination/OrderMapping.java b/...work/src/main/java/io/geekidea/springbootplus/framework/core/pagination/OrderMapping.java
@@ -16,18 +16,15 @@
 
 package io.geekidea.springbootplus.framework.core.pagination;
 
-import cn.hutool.db.sql.Order;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.google.common.base.CaseFormat;
-import io.geekidea.springbootplus.framework.system.entity.SysUser;
 import io.geekidea.springbootplus.framework.util.PropertyColumnUtil;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -44,11 +41,11 @@ public class OrderMapping {
 
     private boolean underLineMode;
 
-    public OrderMapping(){
+    public OrderMapping() {
 
     }
 
-    public OrderMapping(boolean underLineMode){
+    public OrderMapping(boolean underLineMode) {
         this.underLineMode = underLineMode;
     }
 
@@ -92,15 +89,15 @@ public void filterOrderItems(List<OrderItem> orderItems) {
             return;
         }
         // 如果集合不为空，则按照PropertyColumnUtil映射
-        if (MapUtils.isNotEmpty(map)){
+        if (MapUtils.isNotEmpty(map)) {
             orderItems.forEach(item -> {
                 item.setColumn(this.getMappingColumn(item.getColumn()));
             });
-        }else if (underLineMode){
+        } else if (underLineMode) {
             // 如果开启下划线模式，自动转换成下划线
             orderItems.forEach(item -> {
                 // 驼峰转换成下划线
-                String column = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE,item.getColumn());
+                String column = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, item.getColumn());
                 item.setColumn(column);
             });
         }

diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/PageUtil.java b/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/PageUtil.java
@@ -16,12 +16,9 @@
 
 package io.geekidea.springbootplus.framework.core.pagination;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.geekidea.springbootplus.framework.system.entity.SysUser;
-import io.geekidea.springbootplus.framework.util.LambdaColumn;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

diff --git a/...gbootplus/framework/system/entity/Ip.java → ...pringbootplus/framework/ip/entity/Ip.java b/...gbootplus/framework/system/entity/Ip.java → ...pringbootplus/framework/ip/entity/Ip.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.framework.system.entity;
+package io.geekidea.springbootplus.framework.ip.entity;
 
 import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;

diff --git a/...lus/framework/system/mapper/IpMapper.java → ...ootplus/framework/ip/mapper/IpMapper.java b/...lus/framework/system/mapper/IpMapper.java → ...ootplus/framework/ip/mapper/IpMapper.java
@@ -14,19 +14,15 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.framework.system.mapper;
+package io.geekidea.springbootplus.framework.ip.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import io.geekidea.springbootplus.framework.system.entity.Ip;
+import io.geekidea.springbootplus.framework.ip.entity.Ip;
 
 import org.springframework.stereotype.Repository;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
-import java.io.Serializable;
-
 /**
  * IP地址 Mapper 接口
  *

diff --git a/...s/framework/system/service/IpService.java → ...tplus/framework/ip/service/IpService.java b/...s/framework/system/service/IpService.java → ...tplus/framework/ip/service/IpService.java
@@ -14,15 +14,12 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.framework.system.service;
+package io.geekidea.springbootplus.framework.ip.service;
 
-import io.geekidea.springbootplus.framework.system.entity.Ip;
+import io.geekidea.springbootplus.framework.ip.entity.Ip;
 import io.geekidea.springbootplus.framework.common.service.BaseService;
-import io.geekidea.springbootplus.framework.core.pagination.Paging;
 import org.apache.ibatis.annotations.Param;
 
-import java.io.Serializable;
-
 /**
  * IP地址 服务类
  *

diff --git a/...rk/system/service/impl/IpServiceImpl.java → ...mework/ip/service/impl/IpServiceImpl.java b/...rk/system/service/impl/IpServiceImpl.java → ...mework/ip/service/impl/IpServiceImpl.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.geekidea.springbootplus.framework.system.service.impl;
+package io.geekidea.springbootplus.framework.ip.service.impl;
 
 import io.geekidea.springbootplus.config.constant.CommonConstant;
-import io.geekidea.springbootplus.framework.system.entity.Ip;
-import io.geekidea.springbootplus.framework.system.mapper.IpMapper;
-import io.geekidea.springbootplus.framework.system.service.IpService;
+import io.geekidea.springbootplus.framework.ip.entity.Ip;
+import io.geekidea.springbootplus.framework.ip.mapper.IpMapper;
+import io.geekidea.springbootplus.framework.ip.service.IpService;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/aop/BaseLogAop.java b/framework/src/main/java/io/geekidea/springbootplus/framework/log/aop/BaseLogAop.java
@@ -25,6 +25,8 @@
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.bean.ClientInfo;
 import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusException;
+import io.geekidea.springbootplus.framework.ip.entity.Ip;
+import io.geekidea.springbootplus.framework.ip.service.IpService;
 import io.geekidea.springbootplus.framework.log.annotation.Module;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore;
@@ -33,9 +35,6 @@
 import io.geekidea.springbootplus.framework.log.entity.SysOperationLog;
 import io.geekidea.springbootplus.framework.log.service.SysOperationLogService;
 import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil;
-import io.geekidea.springbootplus.framework.system.entity.Ip;
-import io.geekidea.springbootplus.framework.system.service.IpService;
-import io.geekidea.springbootplus.framework.system.util.LoginUtil;
 import io.geekidea.springbootplus.framework.util.*;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...ain/java/io/geekidea/springbootplus/framework/shiro/cache/impl/LoginRedisServiceImpl.java b/...ain/java/io/geekidea/springbootplus/framework/shiro/cache/impl/LoginRedisServiceImpl.java
@@ -17,17 +17,17 @@
 package io.geekidea.springbootplus.framework.shiro.cache.impl;
 
 import io.geekidea.springbootplus.config.constant.CommonRedisKey;
-import io.geekidea.springbootplus.framework.util.ClientInfoUtil;
-import io.geekidea.springbootplus.framework.util.HttpServletRequestUtil;
+import io.geekidea.springbootplus.config.properties.JwtProperties;
+import io.geekidea.springbootplus.framework.common.bean.ClientInfo;
 import io.geekidea.springbootplus.framework.shiro.cache.LoginRedisService;
+import io.geekidea.springbootplus.framework.shiro.convert.LoginSysUserVoConvert;
 import io.geekidea.springbootplus.framework.shiro.convert.ShiroMapstructConvert;
-import io.geekidea.springbootplus.config.properties.JwtProperties;
 import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
-import io.geekidea.springbootplus.framework.common.bean.ClientInfo;
 import io.geekidea.springbootplus.framework.shiro.vo.JwtTokenRedisVo;
 import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserRedisVo;
 import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserVo;
-import io.geekidea.springbootplus.framework.system.convert.SysUserConvert;
+import io.geekidea.springbootplus.framework.util.ClientInfoUtil;
+import io.geekidea.springbootplus.framework.util.HttpServletRequestUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -88,7 +88,7 @@ public void cacheLoginInfo(JwtToken jwtToken, LoginSysUserVo loginSysUserVo) {
 
         // Redis缓存登陆用户信息
         // 将LoginSysUserVo对象复制到LoginSysUserRedisVo，使用mapstruct进行对象属性复制
-        LoginSysUserRedisVo loginSysUserRedisVo = SysUserConvert.INSTANCE.loginSysUserVoToLoginSysUserRedisVo(loginSysUserVo);
+        LoginSysUserRedisVo loginSysUserRedisVo = LoginSysUserVoConvert.INSTANCE.voToRedisVo(loginSysUserVo);
         loginSysUserRedisVo.setSalt(salt);
         loginSysUserRedisVo.setClientInfo(clientInfo);
 

diff --git a/...c/main/java/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvert.java b/...c/main/java/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvert.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2019-2029 geekidea(https://github.com/geekidea)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.geekidea.springbootplus.framework.shiro.convert;
+
+import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserRedisVo;
+import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserVo;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 登陆系统用户VO对象属性复制转换器
+ *
+ * @author geekidea
+ * @date 2020/3/24
+ **/
+@Mapper
+public interface LoginSysUserVoConvert {
+
+    LoginSysUserVoConvert INSTANCE = Mappers.getMapper(LoginSysUserVoConvert.class);
+
+    /**
+     * LoginSysUserVo对象转换成LoginSysUserRedisVo
+     *
+     * @param loginSysUserVo
+     * @return
+     */
+    LoginSysUserRedisVo voToRedisVo(LoginSysUserVo loginSysUserVo);
+
+}