分批次提交

framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiCode.java

@@ -0,0 +1,132 @@
+/*
+ * 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.common.api;
+
+/**
+ * <p>
+ * REST API 响应码
+ * </p>
+ *
+ * @author geekidea
+ * @since 2018-11-08
+ */
+public enum ApiCode {
+
+    /**
+     * 操作成功
+     **/
+    SUCCESS(200, "操作成功"),
+    /**
+     * 非法访问
+     **/
+    UNAUTHORIZED(401, "非法访问"),
+    /**
+     * 没有权限
+     **/
+    NOT_PERMISSION(403, "没有权限"),
+    /**
+     * 你请求的资源不存在
+     **/
+    NOT_FOUND(404, "你请求的资源不存在"),
+    /**
+     * 操作失败
+     **/
+    FAIL(500, "操作失败"),
+    /**
+     * 登录失败
+     **/
+    LOGIN_EXCEPTION(4000, "登录失败"),
+    /**
+     * 系统异常
+     **/
+    SYSTEM_EXCEPTION(5000, "系统异常"),
+    /**
+     * 请求参数校验异常
+     **/
+    PARAMETER_EXCEPTION(5001, "请求参数校验异常"),
+    /**
+     * 请求参数解析异常
+     **/
+    PARAMETER_PARSE_EXCEPTION(5002, "请求参数解析异常"),
+    /**
+     * HTTP内容类型异常
+     **/
+    HTTP_MEDIA_TYPE_EXCEPTION(5003, "HTTP内容类型异常"),
+    /**
+     * 系统处理异常
+     **/
+    SPRING_BOOT_PLUS_EXCEPTION(5100, "系统处理异常"),
+    /**
+     * 业务处理异常
+     **/
+    BUSINESS_EXCEPTION(5101, "业务处理异常"),
+    /**
+     * 数据库处理异常
+     **/
+    DAO_EXCEPTION(5102, "数据库处理异常"),
+    /**
+     * 验证码校验异常
+     **/
+    VERIFICATION_CODE_EXCEPTION(5103, "验证码校验异常"),
+    /**
+     * 登录授权异常
+     **/
+    AUTHENTICATION_EXCEPTION(5104, "登录授权异常"),
+    /**
+     * 没有访问权限
+     **/
+    UNAUTHENTICATED_EXCEPTION(5105, "没有访问权限"),
+    /**
+     * 没有访问权限
+     **/
+    UNAUTHORIZED_EXCEPTION(5106, "没有访问权限"),
+    /**
+     * JWT Token解析异常
+     **/
+    JWTDECODE_EXCEPTION(5107, "Token解析异常"),
+
+    HTTP_REQUEST_METHOD_NOT_SUPPORTED_EXCEPTION(5108, "METHOD NOT SUPPORTED"),
+
+    ;
+
+    private final int code;
+    private final String message;
+
+    ApiCode(final int code, final String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public static ApiCode getApiCode(int code) {
+        ApiCode[] ecs = ApiCode.values();
+        for (ApiCode ec : ecs) {
+            if (ec.getCode() == code) {
+                return ec;
+            }
+        }
+        return SUCCESS;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiResult.java

@@ -0,0 +1,162 @@
+/*
+ * 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.common.api;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * REST API 返回结果
+ * </p>
+ *
+ * @author geekidea
+ * @since 2018-11-08
+ */
+@Data
+@Accessors(chain = true)
+@Builder
+@AllArgsConstructor
+public class ApiResult<T> implements Serializable {
+	private static final long serialVersionUID = 8004487252556526569L;
+
+	/**
+     * 响应码
+     */
+    private int code;
+
+    /**
+     * 是否成功
+     */
+    private boolean success;
+
+    /**
+     * 响应消息
+     */
+    private String message;
+
+    /**
+     * 响应数据
+     */
+    private T data;
+
+    /**
+     * 响应时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date time;
+
+    public ApiResult() {
+        time  = new Date();
+    }
+
+    public static ApiResult<Boolean> result(boolean flag){
+        if (flag){
+            return ok();
+        }
+        return fail();
+    }
+
+    public static ApiResult<Boolean> result(ApiCode apiCode){
+        return result(apiCode,null);
+    }
+
+    public static <T> ApiResult<T> result(ApiCode apiCode,T data){
+        return result(apiCode,null,data);
+    }
+
+    public static <T> ApiResult<T> result(ApiCode apiCode,String message,T data){
+        boolean success = false;
+        if (apiCode.getCode() == ApiCode.SUCCESS.getCode()){
+            success = true;
+        }
+        String apiMessage = apiCode.getMessage();
+        if (StringUtils.isNotBlank(apiMessage)){
+            message = apiMessage;
+        }
+        return (ApiResult<T>) ApiResult.builder()
+                .code(apiCode.getCode())
+                .message(message)
+                .data(data)
+                .success(success)
+                .time(new Date())
+                .build();
+    }
+
+    public static ApiResult<Boolean> ok(){
+        return ok(null);
+    }
+
+    public static <T> ApiResult<T> ok(T data){
+        return result(ApiCode.SUCCESS,data);
+    }
+
+    public static <T> ApiResult<T> ok(T data,String message){
+        return result(ApiCode.SUCCESS,message,data);
+    }
+
+    public static ApiResult<Map<String,Object>> okMap(String key,Object value){
+        Map<String,Object> map = new HashMap<>(1);
+        map.put(key,value);
+        return ok(map);
+    }
+
+    public static ApiResult<Boolean> fail(ApiCode apiCode){
+        return result(apiCode,null);
+    }
+
+    public static ApiResult<String> fail(String message){
+        return result(ApiCode.FAIL,message,null);
+
+    }
+
+    public static <T> ApiResult<T> fail(ApiCode apiCode,T data){
+        if (ApiCode.SUCCESS == apiCode){
+            throw new RuntimeException("失败结果状态码不能为" + ApiCode.SUCCESS.getCode());
+        }
+        return result(apiCode,data);
+
+    }
+
+    public static  ApiResult<String> fail(Integer errorCode,String message){
+        return new ApiResult<String>()
+                .setSuccess(false)
+                .setCode(errorCode)
+                .setMessage(message);
+    }
+
+    public static ApiResult<Map<String,Object>> fail(String key,Object value){
+        Map<String,Object> map = new HashMap<>(1);
+        map.put(key,value);
+        return result(ApiCode.FAIL,map);
+    }
+
+    public static ApiResult<Boolean> fail() {
+        return fail(ApiCode.FAIL);
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/bean/ClientInfo.java

@@ -0,0 +1,91 @@
+/*
+ * 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.common.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户客户端信息对象
+ * </p>
+ *
+ * @author geekidea
+ * @date 2019-05-23
+ **/
+@Data
+public class ClientInfo implements Serializable {
+
+    private static final long serialVersionUID = -5549531244606897514L;
+
+    /**
+     * ip
+     */
+    private String ip;
+
+    /**
+     * ip对应的地址
+     */
+    private String addree;
+
+    /**
+     * 浏览器名称
+     */
+    private String browserName;
+
+    /**
+     * 浏览器版本
+     */
+    private String browserversion;
+
+    /**
+     * 浏览器引擎名称
+     */
+    private String engineName;
+
+    /**
+     * 浏览器引擎版本
+     */
+    private String engineVersion;
+
+    /**
+     * 系统名称
+     */
+    private String osName;
+
+    /**
+     * 平台名称
+     */
+    private String platformName;
+
+    /**
+     * 是否是手机
+     */
+    private boolean mobile;
+
+    /**
+     * 移动端设备型号
+     */
+    private String deviceName;
+
+    /**
+     * 移动端设备型号
+     */
+    private String deviceModel;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/bean/DeviceInfo.java

@@ -0,0 +1,44 @@
+/*
+ * 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.common.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 设备信息
+ * </p>
+ *
+ * @author geekidea
+ * @date 2019-05-24
+ **/
+@Data
+public class DeviceInfo implements Serializable {
+    private static final long serialVersionUID = -5912785220335057555L;
+
+    /**
+     * 设备名称
+     */
+    private String name;
+
+    /**
+     * 设备型号
+     */
+    private String model;
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/BaseController.java

@@ -0,0 +1,30 @@
+/*
+ * 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.common.controller;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Controller父类
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+@Slf4j
+public abstract class BaseController {
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/CsrfController.java

@@ -0,0 +1,42 @@
+/*
+ * 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.common.controller;
+
+import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore;
+import io.geekidea.springbootplus.framework.util.UUIDUtil;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * CSRF 供swagger调用
+ *
+ * @author geekidea
+ * @date 2019/12/10
+ **/
+@ApiIgnore
+@OperationLogIgnore
+@RestController
+public class CsrfController {
+
+    @RequestMapping(value = "/csrf", method = {RequestMethod.GET, RequestMethod.POST})
+    public String csrf() {
+        return UUIDUtil.getUuid();
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/EnumController.java

@@ -0,0 +1,103 @@
+/*
+ * 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.common.controller;
+
+import io.geekidea.springbootplus.framework.common.api.ApiResult;
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import io.geekidea.springbootplus.framework.common.vo.EnumVo;
+import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore;
+import io.geekidea.springbootplus.framework.util.BaseEnumUtil;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.reflections.Reflections;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.PostConstruct;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * <p>
+ * 展示实现BaseEnum接口的所有枚举值
+ * </p>
+ *
+ * @author geekidea
+ * @date 2018/11/02
+ */
+@RestController
+@Slf4j
+@OperationLogIgnore
+@Api(value = "枚举字典", tags = {"枚举字典"})
+public class EnumController {
+
+    private static final List<String> FRAMEWORK_ENUM_PACKAGES = Arrays.asList(
+            "io.geekidea.springbootplus.framework.common.enums",
+            "io.geekidea.springbootplus.system.enums");
+
+    /**
+     * 枚举包路径
+     */
+    @Value("${spring-boot-plus.enum-packages}")
+    private List<String> enumPackages;
+
+    @GetMapping("/enum")
+    public ApiResult<Map<String, Map<Integer, EnumVo<? extends BaseEnum>>>> enumList() {
+        log.debug("enumList...");
+        return ApiResult.ok(BaseEnumUtil.getEnumMap());
+    }
+
+    @PostConstruct
+    public void init() {
+        try {
+            if (enumPackages == null) {
+                enumPackages = new ArrayList<>();
+            }
+            enumPackages.addAll(FRAMEWORK_ENUM_PACKAGES);
+
+            // 获取BaseEnum接口的所有实现
+            log.debug("enumPackages:" + enumPackages);
+            Reflections reflections = new Reflections(enumPackages);
+            Set<Class<? extends BaseEnum>> set = reflections.getSubTypesOf(BaseEnum.class);
+            if (CollectionUtils.isEmpty(set)) {
+                return;
+            }
+            // 循环获取BaseEnum枚举
+            for (Class<? extends BaseEnum> clazz : set) {
+                BaseEnum[] enumConstants = clazz.getEnumConstants();
+                Map<Integer, EnumVo<? extends BaseEnum>> enumVoMap = new ConcurrentHashMap<>(enumConstants.length);
+                for (BaseEnum baseEnum : enumConstants) {
+                    Integer code = baseEnum.getCode();
+                    String desc = baseEnum.getDesc();
+                    EnumVo<BaseEnum> enumVo = new EnumVo<BaseEnum>()
+                            .setCode(code)
+                            .setDesc(desc)
+                            .setBaseEnum(baseEnum);
+                    enumVoMap.put(code, enumVo);
+                }
+                // 设置map
+                BaseEnumUtil.getEnumMap().put(clazz.getName(), enumVoMap);
+            }
+            log.debug("enumMap:{}", BaseEnumUtil.getEnumMap());
+        } catch (Exception e) {
+            log.error("获取BaseEnum枚举map异常", e);
+        }
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/IndexController.java

@@ -0,0 +1,52 @@
+/*
+ * 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.common.controller;
+
+import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * <p>
+ * 项目根路径提示信息
+ * </p>
+ *
+ * @author geekidea
+ * @date 2018/11/12
+ */
+@Slf4j
+@Controller
+@OperationLogIgnore
+@Api(value = "Index API", tags = {"Index"})
+public class IndexController {
+
+    @GetMapping("/")
+    public String home() {
+        return "redirect:/index.html";
+    }
+
+    /**
+     * SwaggerUI
+     */
+    @GetMapping("/docs")
+    public String swagger() {
+        return "redirect:/swagger-ui.html";
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/entity/BaseEntity.java

@@ -0,0 +1,32 @@
+/*
+ * 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.common.entity;
+
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+
+/**
+ * 实体父类
+ * @author geekidea
+ * @date 2018-11-08
+ */
+@ApiModel("BaseEntity")
+public abstract class BaseEntity implements Serializable{
+	private static final long serialVersionUID = -7176390653391227433L;
+	
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/enums/BaseEnum.java

@@ -0,0 +1,66 @@
+/*
+ * 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.common.enums;
+
+
+/**
+ * 枚举类型父接口
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public interface BaseEnum {
+
+    /**
+     * 获取枚举标识
+     *
+     * @return
+     */
+    Integer getCode();
+
+    /**
+     * 获取枚举描述
+     *
+     * @return
+     */
+    String getDesc();
+
+    /**
+     * 通过枚举类型和code值获取对应的枚举类型
+     * @param enumType
+     * @param code
+     * @param <T>
+     * @return
+     */
+    static <T extends BaseEnum> T valueOf(Class<? extends BaseEnum> enumType, Integer code) {
+        if (enumType == null || code == null) {
+            return null;
+        }
+        T[] enumConstants = (T[]) enumType.getEnumConstants();
+        if (enumConstants == null) {
+            return null;
+        }
+        for (T enumConstant : enumConstants) {
+            int enumCode = enumConstant.getCode();
+            if (code.equals(enumCode)) {
+                return enumConstant;
+            }
+        }
+        return null;
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/BusinessException.java

@@ -0,0 +1,42 @@
+/*
+ * 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.common.exception;
+
+import io.geekidea.springbootplus.framework.common.api.ApiCode;
+
+/**
+ * 业务异常
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class BusinessException extends SpringBootPlusException {
+	private static final long serialVersionUID = -2303357122330162359L;
+
+	public BusinessException(String message) {
+        super(message);
+    }
+
+    public BusinessException(Integer errorCode, String message) {
+        super(errorCode, message);
+    }
+
+    public BusinessException(ApiCode apiCode) {
+        super(apiCode);
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/DaoException.java

@@ -0,0 +1,41 @@
+/*
+ * 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.common.exception;
+
+import io.geekidea.springbootplus.framework.common.api.ApiCode;
+
+/**
+ * DAO异常
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class DaoException extends SpringBootPlusException {
+	private static final long serialVersionUID = -6912618737345878854L;
+
+	public DaoException(String message) {
+        super(message);
+    }
+
+    public DaoException(Integer errorCode, String message) {
+        super(errorCode, message);
+    }
+
+    public DaoException(ApiCode apiCode) {
+        super(apiCode);
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/GlobalErrorController.java

@@ -0,0 +1,64 @@
+/*
+ * 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.common.exception;
+
+import io.geekidea.springbootplus.framework.common.api.ApiCode;
+import io.geekidea.springbootplus.framework.common.api.ApiResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.web.servlet.error.ErrorController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * 全局Error/404处理
+ * @author geekidea
+ * @date 2018-11-08
+ */
+@ApiIgnore
+@RestController
+@Slf4j
+public class GlobalErrorController implements ErrorController {
+
+    private static final String ERROR_PATH = "/error";
+
+    @RequestMapping(ERROR_PATH)
+    public ApiResult<?> handleError(HttpServletRequest request,HttpServletResponse response){
+        int status = response.getStatus();
+        switch (status){
+            case HttpServletResponse.SC_UNAUTHORIZED:
+                return ApiResult.fail(ApiCode.UNAUTHORIZED);
+            case HttpServletResponse.SC_FORBIDDEN:
+                return ApiResult.fail(ApiCode.NOT_PERMISSION);
+            case HttpServletResponse.SC_NOT_FOUND:
+                return ApiResult.fail(ApiCode.NOT_FOUND);
+            default:
+                break;
+        }
+        return ApiResult.fail(ApiCode.FAIL);
+    }
+
+    @Override
+    public String getErrorPath() {
+        log.error("errorPath....");
+        return ERROR_PATH;
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/SpringBootPlusConfigException.java

@@ -0,0 +1,67 @@
+/*
+ * 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.common.exception;
+
+import io.geekidea.springbootplus.framework.common.api.ApiCode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * spring-boot-plus配置异常
+ *
+ * @author geekidea
+ * @date 2020/3/21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SpringBootPlusConfigException extends SpringBootPlusException {
+
+    private static final long serialVersionUID = 8952028631871769425L;
+
+    private Integer errorCode;
+    private String message;
+
+    public SpringBootPlusConfigException() {
+        super();
+    }
+
+    public SpringBootPlusConfigException(String message) {
+        super(message);
+        this.message = message;
+    }
+
+    public SpringBootPlusConfigException(Integer errorCode, String message) {
+        super(message);
+        this.errorCode = errorCode;
+        this.message = message;
+    }
+
+    public SpringBootPlusConfigException(ApiCode apiCode) {
+        super(apiCode.getMessage());
+        this.errorCode = apiCode.getCode();
+        this.message = apiCode.getMessage();
+    }
+
+    public SpringBootPlusConfigException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public SpringBootPlusConfigException(Throwable cause) {
+        super(cause);
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/SpringBootPlusException.java

@@ -0,0 +1,66 @@
+/*
+ * 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.common.exception;
+
+import io.geekidea.springbootplus.framework.common.api.ApiCode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 自定义异常
+ * @author geekidea
+ * @date 2018-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SpringBootPlusException extends RuntimeException{
+
+    private static final long serialVersionUID = -2470461654663264392L;
+
+    private Integer errorCode;
+    private String message;
+
+    public SpringBootPlusException() {
+        super();
+    }
+
+    public SpringBootPlusException(String message) {
+        super(message);
+        this.message = message;
+    }
+
+    public SpringBootPlusException(Integer errorCode, String message) {
+        super(message);
+        this.errorCode = errorCode;
+        this.message = message;
+    }
+
+    public SpringBootPlusException(ApiCode apiCode) {
+        super(apiCode.getMessage());
+        this.errorCode = apiCode.getCode();
+        this.message = apiCode.getMessage();
+    }
+
+    public SpringBootPlusException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public SpringBootPlusException(Throwable cause) {
+        super(cause);
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/param/IdParam.java

@@ -0,0 +1,39 @@
+/*
+ * 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.common.param;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * ID参数
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+@Data
+@ApiModel("ID参数")
+public class IdParam implements Serializable {
+    private static final long serialVersionUID = -5353973980674510450L;
+
+    @NotNull(message = "ID不能为空")
+    private Long id;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/service/BaseService.java

@@ -0,0 +1,29 @@
+/*
+ * 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.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 公共Service接口
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public interface BaseService<T> extends IService<T> {
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/service/impl/BaseServiceImpl.java

@@ -0,0 +1,61 @@
+/*
+ * 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.common.service.impl;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.geekidea.springbootplus.framework.common.service.BaseService;
+import io.geekidea.springbootplus.framework.util.LambdaColumn;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+/**
+ * 公共Service父类
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> implements BaseService<T> {
+
+    /**
+     * 实体类型
+     */
+    private Class<?> entityClass;
+
+    {
+        Class<?> clazz = this.getClass();
+        Type type = clazz.getGenericSuperclass();
+        if (type instanceof ParameterizedType) {
+            Type[] p = ((ParameterizedType) type).getActualTypeArguments();
+            this.entityClass = (Class<T>) p[1];
+        }
+    }
+
+    /**
+     * 获取对应字段的数据表列名称
+     *
+     * @param func
+     * @return
+     */
+    public String getLambdaColumn(SFunction<T, ?> func) {
+        return new LambdaColumn<T>().get(func);
+    }
+
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/common/vo/EnumVo.java

@@ -0,0 +1,47 @@
+/*
+ * 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.common.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 枚举类型VO
+ *
+ * @author geekidea
+ * @date 2019-11-02
+ **/
+@Data
+@Accessors(chain = true)
+public class EnumVo<T> {
+
+    /**
+     * 枚举code
+     */
+    private Integer code;
+
+    /**
+     * 枚举描述
+     */
+    private String desc;
+
+    /**
+     * 枚举类型
+     */
+    private T baseEnum;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/ConverterConfig.java

@@ -0,0 +1,48 @@
+/*
+ * 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.config.converter;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+
+import java.util.Date;
+
+/**
+ * 转换器配置
+ * @author geekidea
+ * @date 2018-11-08
+ */
+@Configuration
+public class ConverterConfig {
+
+    @Bean
+    public Converter<String, Date> stringToDateConverter() {
+        return new StringToDateConverter();
+    }
+
+    @Bean
+    public Converter<String, Integer> stringToIntegerConverter() {
+        return new StringToIntegerConverter();
+    }
+
+    @Bean
+    public Converter<String, Double> stringToDoubleConverter() {
+        return new StringToDoubleConverter();
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDateConverter.java

@@ -0,0 +1,36 @@
+/*
+ * 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.config.converter;
+
+import org.springframework.core.convert.converter.Converter;
+
+import java.util.Date;
+
+/**
+ * <code>
+ * 日期转换器,将请求参数的日期字符串转换成java.util.Date类型
+ * </code>
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class StringToDateConverter implements Converter<String, Date> {
+
+	@Override
+	public Date convert(String source) {
+		return StringToDateUtil.convert(source);
+	}
+}

framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDateUtil.java

@@ -0,0 +1,109 @@
+/*
+ * 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.config.converter;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * <code>
+ * <pre>
+ * 日期转换器,将请求参数的日期字符串转换成java.util.Date类型
+ * 日期格式顺序:
+ * 	1.yyyy-MM-dd HH:mm:ss:S
+ * 	2.yyyy-MM-dd HH:mm:ss
+ * 	3.yyyy-MM-dd HH:mm
+ * 	4.yyyy-MM-dd HH
+ * 	5.yyyy-MM-dd
+ * </pre>
+ * </code>
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class StringToDateUtil {
+
+    /**
+     * 时间戳字符长度，不包含毫秒
+     */
+    private static final Integer TIMESTAMP_LENGTH = 10;
+
+    /**
+     * 日期格式化数组
+     */
+    private static DateFormat[] dateFormats = {
+            new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:S"),
+            new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"),
+            new SimpleDateFormat("yyyy-MM-dd HH:mm"),
+            new SimpleDateFormat("yyyy-MM-dd HH"),
+            new SimpleDateFormat("yyyy-MM-dd"),
+            new SimpleDateFormat("yyyy-MM")
+    };
+
+    /**
+     * <code>
+     * <pre>
+     * 1.如果日期字符串为空,则直接返回空
+     * 2.使用格式化组进行格式化,如果解析成功,则直接返回
+     * 4.否则,抛出非法参数异常
+     * @param source 请求的日期参数
+     * @return 解析后的日期类型:java.util.Date
+     * @exception IllegalArgumentException 非法参数异常
+     * </pre>
+     * </code>
+     */
+    public static Date convert(String source) {
+        if (StringUtils.isBlank(source)) {
+            return null;
+        }
+        source = source.trim();
+
+        try {
+            int timeLength = source.length();
+            Long time = Long.parseLong(source);
+            if (timeLength == TIMESTAMP_LENGTH) {
+                time = time * 1000;
+            }
+            Date date = new Date(time);
+            return date;
+        } catch (Exception e) {
+
+        }
+
+        Date date = null;
+        boolean flag = false;
+        for (DateFormat dateFormat : dateFormats) {
+            try {
+                date = dateFormat.parse(source);
+                flag = true;
+                break;
+            } catch (ParseException e) {
+            }
+        }
+
+        if (flag) {
+            return date;
+        } else {
+            throw new IllegalArgumentException("不能解析日期:" + source);
+        }
+
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDoubleConverter.java

@@ -0,0 +1,34 @@
+/*
+ * 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.config.converter;
+
+import org.springframework.core.convert.converter.Converter;
+
+/**
+ * <code>
+ *
+ * </code>
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class StringToDoubleConverter implements Converter<String, Double> {
+
+	@Override
+	public Double convert(String source) {
+		return StringToDoubleUtil.convert(source);
+	}
+}

framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDoubleUtil.java

@@ -0,0 +1,41 @@
+/*
+ * 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.config.converter;
+
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * <code>
+ * <pre>
+ * 空字符串("")转换成Double的null
+ *
+ * </pre>
+ * </code>
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class StringToDoubleUtil {
+
+	public static Double convert(String source) {
+		if (StringUtils.isBlank(source)){
+			return null;
+		}
+		Double d = Double.parseDouble(source);
+		return d;
+	}
+}

framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToIntegerConverter.java

@@ -0,0 +1,34 @@
+/*
+ * 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.config.converter;
+
+import org.springframework.core.convert.converter.Converter;
+
+/**
+ * <code>
+ *
+ * </code>
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class StringToIntegerConverter implements Converter<String, Integer> {
+
+	@Override
+	public Integer convert(String source) {
+		return StringToIntegerUtil.convert(source);
+	}
+}

framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToIntegerUtil.java

@@ -0,0 +1,40 @@
+/*
+ * 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.config.converter;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * <code>
+ * <pre>
+ * 空字符串("")转换成Integer的null
+ *
+ * </pre>
+ * </code>
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class StringToIntegerUtil {
+
+	public static Integer convert(String source) {
+		if (StringUtils.isBlank(source)){
+			return null;
+		}
+		Integer i = Integer.parseInt(source);
+		return i;
+	}
+}

framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonDateDeserializer.java

@@ -0,0 +1,42 @@
+/*
+ * 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.config.jackson.deserializer;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import io.geekidea.springbootplus.framework.config.converter.StringToDateUtil;
+
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * <p>
+ *     Jackson Date序列化器
+ * </p>
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class JacksonDateDeserializer extends JsonDeserializer<Date> {
+    @Override
+    public Date deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+        String date = jp.getText();
+        return StringToDateUtil.convert(date);
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonDoubleDeserializer.java

@@ -0,0 +1,38 @@
+/*
+ * 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.config.jackson.deserializer;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import io.geekidea.springbootplus.framework.config.converter.StringToDoubleUtil;
+
+import java.io.IOException;
+
+/**
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class JacksonDoubleDeserializer extends JsonDeserializer<Double> {
+
+    @Override
+    public Double deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        String string = jsonParser.getText();
+        return StringToDoubleUtil.convert(string);
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonLocalDateTimeDeserializer.java

@@ -0,0 +1,47 @@
+/*
+ * 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.config.jackson.deserializer;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import io.geekidea.springbootplus.config.constant.DatePattern;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * <p>
+ *     Jackson LocaDateTime反序列化器
+ * </p>
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class JacksonLocalDateTimeDeserializer extends JsonDeserializer<LocalDateTime> {
+
+    @Override
+    public LocalDateTime deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
+        String string = jp.getText();
+        if (StringUtils.isBlank(string)){
+            return null;
+        }
+        return LocalDateTime.parse(string, DateTimeFormatter.ofPattern(DatePattern.YYYY_MM_DD_HH_MM_SS));
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonDateSerializer.java

@@ -0,0 +1,45 @@
+/*
+ * 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.config.jackson.serializer;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import io.geekidea.springbootplus.framework.util.DateUtil;
+
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * <p>
+ * Jackson Date反序列化器
+ * </p>
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class JacksonDateSerializer extends JsonSerializer<Date> {
+    @Override
+    public void serialize(Date date, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+        String string = null;
+        if (date != null) {
+            string = DateUtil.getDateTimeString(date);
+        }
+        jsonGenerator.writeString(string);
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonIntegerDeserializer.java

@@ -0,0 +1,38 @@
+/*
+ * 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.config.jackson.serializer;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import io.geekidea.springbootplus.framework.config.converter.StringToIntegerUtil;
+
+import java.io.IOException;
+
+/**
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class JacksonIntegerDeserializer extends JsonDeserializer<Integer> {
+
+    @Override
+    public Integer deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        String string = jsonParser.getText();
+        return StringToIntegerUtil.convert(string);
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonLocalDateTimeSerializer.java

@@ -0,0 +1,48 @@
+/*
+ * 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.config.jackson.serializer;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import io.geekidea.springbootplus.config.constant.DatePattern;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * <p>
+ * Jackson LocalDateTime 自定义序列化器
+ * </p>
+ *
+ * @author geekidea
+ * @date 2018/11/8
+ */
+public class JacksonLocalDateTimeSerializer extends JsonSerializer<LocalDateTime> {
+
+    @Override
+    public void serialize(LocalDateTime localDateTime, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+        String string = null;
+        if (localDateTime != null) {
+            string = localDateTime.format(DateTimeFormatter.ofPattern(DatePattern.YYYY_MM_DD_HH_MM_SS));
+        }
+        jsonGenerator.writeString(string);
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/bean/RequestDetail.java

@@ -0,0 +1,45 @@
+/*
+ * 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.core.bean;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * Filter请求详情信息
+ *
+ * @author geekidea
+ * @date 2020/3/26
+ **/
+@Data
+@Accessors(chain = true)
+public class RequestDetail implements Serializable {
+	private static final long serialVersionUID = 2543641512850125440L;
+
+	/**
+     * 请求ip地址
+     */
+    private String ip;
+
+    /**
+     * 请求路径
+     */
+    private String path;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/filter/RequestDetailFilter.java

@@ -0,0 +1,64 @@
+/*
+ * 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.core.filter;
+
+import io.geekidea.springbootplus.framework.core.bean.RequestDetail;
+import io.geekidea.springbootplus.framework.core.util.RequestDetailThreadLocal;
+import io.geekidea.springbootplus.framework.util.IpUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * 请求详情信息Filter
+ *
+ * @author geekidea
+ * @date 2020/3/25
+ **/
+@Slf4j
+public class RequestDetailFilter implements Filter {
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+        log.info("RequestDetailFilter init");
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        // 设置请求详情信息
+        HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+        // 请求IP
+        String ip = IpUtil.getRequestIp(httpServletRequest);
+        // 请求路径
+        String path = httpServletRequest.getRequestURI();
+        RequestDetail requestDetail = new RequestDetail()
+                .setIp(ip)
+                .setPath(path);
+        // 设置请求详情信息
+        RequestDetailThreadLocal.setRequestDetail(requestDetail);
+        chain.doFilter(request, response);
+        // 释放
+        RequestDetailThreadLocal.remove();
+    }
+
+    @Override
+    public void destroy() {
+        log.info("RequestDetailFilter destroy");
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/interceptor/PermissionInterceptor.java

@@ -0,0 +1,48 @@
+/*
+ * 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.core.interceptor;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 自定义权限拦截器
+ *
+ * @author geekidea
+ * @since 2018-11-08
+ */
+@Slf4j
+@ConditionalOnProperty(value = {"spring-boot-plus.interceptor.permission.enable"}, matchIfMissing = true)
+public class PermissionInterceptor extends HandlerInterceptorAdapter {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
+            throws Exception {
+        return true;
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/BasePageOrderParam.java

@@ -0,0 +1,55 @@
+/*
+ * 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.core.pagination;
+
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 可排序查询参数对象
+ *
+ * @author geekidea
+ * @since 2019-08-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("可排序查询参数对象")
+public abstract class BasePageOrderParam extends BasePageParam {
+    private static final long serialVersionUID = 57714391204790143L;
+
+    @ApiModelProperty("排序")
+    private List<OrderItem> pageSorts;
+
+    public void defaultPageSort(OrderItem orderItem) {
+        this.defaultPageSorts(Arrays.asList(orderItem));
+    }
+
+    public void defaultPageSorts(List<OrderItem> pageSorts) {
+        if (CollectionUtils.isEmpty(pageSorts)) {
+            return;
+        }
+        this.pageSorts = pageSorts;
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/BasePageParam.java

@@ -0,0 +1,62 @@
+/*
+ * 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.core.pagination;
+
+import io.geekidea.springbootplus.config.constant.CommonConstant;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 查询参数
+ *
+ * @author geekidea
+ * @since 2018-11-08
+ */
+@Data
+@ApiModel("查询参数对象")
+public abstract class BasePageParam implements Serializable {
+    private static final long serialVersionUID = -3263921252635611410L;
+
+    @ApiModelProperty(value = "页码,默认为1", example = "1")
+    private Long pageIndex = CommonConstant.DEFAULT_PAGE_INDEX;
+
+    @ApiModelProperty(value = "页大小,默认为10", example = "10")
+    private Long pageSize = CommonConstant.DEFAULT_PAGE_SIZE;
+
+    @ApiModelProperty(value = "搜索字符串", example = "")
+    private String keyword;
+
+    public void setPageIndex(Long pageIndex) {
+        if (pageIndex == null || pageIndex <= 0) {
+            this.pageIndex = CommonConstant.DEFAULT_PAGE_INDEX;
+        } else {
+            this.pageIndex = pageIndex;
+        }
+    }
+
+    public void setPageSize(Long pageSize) {
+        if (pageSize == null || pageSize <= 0) {
+            this.pageSize = CommonConstant.DEFAULT_PAGE_SIZE;
+        } else {
+            this.pageSize = pageSize;
+        }
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/OrderMapping.java

@@ -0,0 +1,108 @@
+/*
+ * 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.core.pagination;
+
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.google.common.base.CaseFormat;
+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.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 排序列映射
+ *
+ * @author geekidea
+ * @date 2020/3/14
+ **/
+@Data
+@Accessors(chain = true)
+public class OrderMapping {
+
+    private boolean underLineMode;
+
+    public OrderMapping() {
+
+    }
+
+    public OrderMapping(boolean underLineMode) {
+        this.underLineMode = underLineMode;
+    }
+
+    private Map<String, String> map = new ConcurrentHashMap<>();
+
+    public OrderMapping mapping(String property, String column) {
+        map.put(property, column);
+        return this;
+    }
+
+    public OrderMapping mapping(String property, String tablePrefix, String column) {
+        if (StringUtils.isNotBlank(tablePrefix)) {
+            column = tablePrefix + "." + column;
+        }
+        map.put(property, column);
+        return this;
+    }
+
+
+    public OrderMapping mapping(String property, Class<?> clazz) {
+        String column = PropertyColumnUtil.getColumn(clazz, property);
+        map.put(property, column);
+        return this;
+    }
+
+    public OrderMapping mapping(String property, String tablePrefix, Class<?> clazz) {
+        String column = PropertyColumnUtil.getColumn(clazz, property);
+        mapping(property, tablePrefix, column);
+        return this;
+    }
+
+    public String getMappingColumn(String property) {
+        if (StringUtils.isBlank(property)) {
+            return null;
+        }
+        return map.get(property);
+    }
+
+    public void filterOrderItems(List<OrderItem> orderItems) {
+        if (CollectionUtils.isEmpty(orderItems)) {
+            return;
+        }
+        // 如果集合不为空，则按照PropertyColumnUtil映射
+        if (MapUtils.isNotEmpty(map)) {
+            orderItems.forEach(item -> {
+                item.setColumn(this.getMappingColumn(item.getColumn()));
+            });
+        } else if (underLineMode) {
+            // 如果开启下划线模式，自动转换成下划线
+            orderItems.forEach(item -> {
+                String column = item.getColumn();
+                if (StringUtils.isNotBlank(column)) {
+                    // 驼峰转换成下划线
+                    item.setColumn(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, column));
+                }
+            });
+        }
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/PageInfo.java

@@ -0,0 +1,165 @@
+/*
+ * 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.core.pagination;
+
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 自定义分页参数
+ *
+ * @author geekidea
+ * @date 2020/3/27
+ **/
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class PageInfo<T> extends Page<T> {
+	private static final long serialVersionUID = -2211095086394170578L;
+
+	/**
+     * 分页参数
+     */
+    private BasePageParam pageParam;
+
+    /**
+     * 默认排序字段信息
+     */
+    private OrderItem defaultOrderItem;
+
+    /**
+     * 排序字段映射
+     */
+    private OrderMapping orderMapping;
+
+
+    public PageInfo() {
+
+    }
+
+    /**
+     * 传入分页参数
+     *
+     * @param pageParam
+     */
+    public PageInfo(BasePageParam pageParam) {
+        this(pageParam, null, null);
+    }
+
+    /**
+     * 传入分页参数，默认排序
+     *
+     * @param basePageParam
+     * @param defaultOrderItem
+     */
+    public PageInfo(BasePageParam basePageParam, OrderItem defaultOrderItem) {
+        this(basePageParam, defaultOrderItem, null);
+    }
+
+    /**
+     * 传入分页参数，排序字段映射
+     *
+     * @param pageParam
+     * @param orderMapping
+     */
+    public PageInfo(BasePageParam pageParam, OrderMapping orderMapping) {
+        this(pageParam, null, orderMapping);
+    }
+
+    /**
+     * 传入分页参数，默认排序，排序字段映射
+     *
+     * @param pageParam
+     * @param defaultOrderItem
+     * @param orderMapping
+     */
+    public PageInfo(BasePageParam pageParam, OrderItem defaultOrderItem, OrderMapping orderMapping) {
+        this.pageParam = pageParam;
+        this.defaultOrderItem = defaultOrderItem;
+        this.orderMapping = orderMapping;
+        this.handle();
+    }
+
+    /**
+     * 分页构造函数
+     *
+     * @param current 当前页
+     * @param size    每页显示条数
+     */
+    public PageInfo(long current, long size) {
+        super(current, size, 0);
+    }
+
+    public PageInfo(long current, long size, long total) {
+        super(current, size, total, true);
+    }
+
+    public PageInfo(long current, long size, boolean isSearchCount) {
+        super(current, size, isSearchCount);
+    }
+
+    public PageInfo(long current, long size, long total, boolean isSearchCount) {
+        super(current, size, total, isSearchCount);
+    }
+
+    /**
+     * 如果是pageParam是OrderPageParam，并且不为空，则使用前端排序
+     * 否则使用默认排序
+     */
+    private void handle() {
+        if (pageParam == null) {
+            return;
+        }
+        // 设置pageIndex/pageSize
+        super.setCurrent(pageParam.getPageIndex());
+        super.setSize(pageParam.getPageSize());
+        // 排序字段处理
+        BasePageOrderParam basePageOrderParam = (BasePageOrderParam) pageParam;
+        List<OrderItem> orderItems = basePageOrderParam.getPageSorts();
+        if (CollectionUtils.isEmpty(orderItems)) {
+            setDefaultOrder(defaultOrderItem);
+            return;
+        }
+        if (orderMapping == null) {
+            orderMapping = new OrderMapping(true);
+        }
+        orderMapping.filterOrderItems(orderItems);
+        super.setOrders(orderItems);
+    }
+
+    /**
+     * 设置默认排序
+     *
+     * @param defaultOrderItem
+     * @return
+     */
+    public PageInfo<T> setDefaultOrder(OrderItem defaultOrderItem) {
+        if (defaultOrderItem != null) {
+            this.defaultOrderItem = defaultOrderItem;
+            super.setOrders(Arrays.asList(defaultOrderItem));
+        }
+        return this;
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/Paging.java

@@ -0,0 +1,76 @@
+/*
+ * 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.core.pagination;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.geekidea.springbootplus.config.constant.CommonConstant;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 分页结果对象
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+
+@Slf4j
+@Data
+@ApiModel("分页结果对象")
+public class Paging<T> implements Serializable {
+    private static final long serialVersionUID = 4784961132604516495L;
+
+    @ApiModelProperty("总行数")
+    @JSONField(name = CommonConstant.PAGE_TOTAL_NAME)
+    @JsonProperty(CommonConstant.PAGE_TOTAL_NAME)
+    private long total = 0;
+
+    @ApiModelProperty("数据列表")
+    @JSONField(name = CommonConstant.PAGE_RECORDS_NAME)
+    @JsonProperty(CommonConstant.PAGE_RECORDS_NAME)
+    private List<T> records = Collections.emptyList();
+
+    @ApiModelProperty(value = "页码")
+    @JSONField(name = CommonConstant.PAGE_INDEX_NAME)
+    @JsonProperty(CommonConstant.PAGE_INDEX_NAME)
+    private Long pageIndex;
+
+    @ApiModelProperty(value = "页大小")
+    @JSONField(name = CommonConstant.PAGE_SIZE_NAME)
+    @JsonProperty(CommonConstant.PAGE_SIZE_NAME)
+    private Long pageSize;
+
+    public Paging() {
+
+    }
+
+    public Paging(IPage<T> page) {
+        this.total = page.getTotal();
+        this.records = page.getRecords();
+        this.pageIndex = page.getCurrent();
+        this.pageSize = page.getSize();
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/util/RequestDetailThreadLocal.java

@@ -0,0 +1,54 @@
+/*
+ * 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.core.util;
+
+import io.geekidea.springbootplus.framework.core.bean.RequestDetail;
+
+/**
+ * 记录请求详情信息到当前线程中，可在任何地方获取
+ *
+ * @author geekidea
+ * @date 2020/3/26
+ **/
+public class RequestDetailThreadLocal {
+
+    private static ThreadLocal<RequestDetail> threadLocal = new ThreadLocal<>();
+
+    /**
+     * 设置请求信息到当前线程中
+     *
+     * @param requestDetail
+     */
+    public static void setRequestDetail(RequestDetail requestDetail) {
+        threadLocal.set(requestDetail);
+    }
+
+    /**
+     * 从当前线程中获取请求信息
+     */
+    public static RequestDetail getRequestDetail() {
+        return threadLocal.get();
+    }
+
+    /**
+     * 销毁
+     */
+    public static void remove() {
+        threadLocal.remove();
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/EnumTypeValidator.java

@@ -0,0 +1,52 @@
+/*
+ * 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.core.validator;
+
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import io.geekidea.springbootplus.framework.common.exception.BusinessException;
+import io.geekidea.springbootplus.framework.core.validator.constraints.EnumType;
+import io.geekidea.springbootplus.framework.util.BaseEnumUtil;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+/**
+ * 自定义系统内的枚举验证注解实现类
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class EnumTypeValidator implements ConstraintValidator<EnumType, Integer> {
+
+    private Class<? extends BaseEnum> baseEnum;
+
+    @Override
+    public void initialize(EnumType parameters) {
+        baseEnum = parameters.type();
+        if (baseEnum == null) {
+            throw new BusinessException("请传入枚举类型类");
+        }
+    }
+
+    @Override
+    public boolean isValid(Integer value, ConstraintValidatorContext constraintValidatorContext) {
+        if (value == null) {
+            return true;
+        }
+        return BaseEnumUtil.exists(baseEnum, value);
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/IdCardValidator.java

@@ -0,0 +1,45 @@
+/*
+ * 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.core.validator;
+
+import io.geekidea.springbootplus.framework.core.validator.constraints.IdCard;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import java.util.regex.Pattern;
+
+/**
+ * 自定义身份证号码验证注解实现类
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class IdCardValidator implements ConstraintValidator<IdCard, String> {
+	private static final String REG_EX = "(^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{2}[0-9Xx]$)|(^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}[0-9Xx]$)";
+	private static final Pattern PATTERN = Pattern.compile(REG_EX);
+
+	@Override
+	public void initialize(IdCard parameters) {
+	}
+
+	@Override
+	public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
+		if (value ==null){
+			return true;
+		}
+		return PATTERN.matcher(value).matches();
+	}
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/PhoneValidator.java

@@ -0,0 +1,46 @@
+/*
+ * 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.core.validator;
+
+import io.geekidea.springbootplus.framework.core.validator.constraints.Phone;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import java.util.regex.Pattern;
+
+/**
+ * 自定义手机号码验证注解实现类
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class PhoneValidator implements ConstraintValidator<Phone, String> {
+
+	private static final String REG_EX = "^1[3,4,5,6,7,8,9]\\d{9}$";
+	private static final Pattern PATTERN = Pattern.compile(REG_EX);
+
+	@Override
+	public void initialize(Phone parameters) {
+	}
+
+	@Override
+	public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
+		if (value ==null){
+			return true;
+		}
+		return PATTERN.matcher(value).matches();
+	}
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/EnumType.java

@@ -0,0 +1,49 @@
+/*
+ * 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.core.validator.constraints;
+
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import io.geekidea.springbootplus.framework.core.validator.EnumTypeValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 枚举类型注解
+ * @author geekidea
+ * @date 2018-11-08
+ */
+@Documented
+@Constraint(validatedBy = { EnumTypeValidator.class })
+@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER })
+@Retention(RUNTIME)
+public @interface EnumType {
+	String message() default "请输入正确的类型值";
+
+	Class<? extends BaseEnum> type();
+
+	Class<?>[] groups() default { };
+
+	Class<? extends Payload>[] payload() default { };
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/IdCard.java

@@ -0,0 +1,46 @@
+/*
+ * 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.core.validator.constraints;
+
+import io.geekidea.springbootplus.framework.core.validator.IdCardValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 自定义身份证号码正则验证注解
+ * @author geekidea
+ * @date 2018-11-08
+ */
+@Documented
+@Constraint(validatedBy = { IdCardValidator.class })
+@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER })
+@Retention(RUNTIME)
+public @interface IdCard {
+	String message() default "请输入有效的身份证号码";
+
+	Class<?>[] groups() default { };
+
+	Class<? extends Payload>[] payload() default { };
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/Phone.java

@@ -0,0 +1,46 @@
+/*
+ * 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.core.validator.constraints;
+
+import io.geekidea.springbootplus.framework.core.validator.PhoneValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 自定义手机号码正则验证注解
+ * @author geekidea
+ * @date 2018-11-08
+ */
+@Documented
+@Constraint(validatedBy = { PhoneValidator.class })
+@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER })
+@Retention(RUNTIME)
+public @interface Phone {
+	String message() default "请输入有效的手机号码";
+
+	Class<?>[] groups() default { };
+
+	Class<? extends Payload>[] payload() default { };
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/groups/Add.java

@@ -0,0 +1,28 @@
+/*
+ * 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.core.validator.groups;
+
+import javax.validation.groups.Default;
+
+/**
+ * Validator分组验证：添加
+ *
+ * @author geekidea
+ * @date 2020/3/8
+ **/
+public interface Add extends Default {
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/groups/Update.java

@@ -0,0 +1,28 @@
+/*
+ * 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.core.validator.groups;
+
+import javax.validation.groups.Default;
+
+/**
+ * Validator分组验证：修改
+ *
+ * @author geekidea
+ * @date 2020/3/8
+ **/
+public interface Update extends Default {
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssFilter.java

@@ -0,0 +1,50 @@
+/*
+ * 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.core.xss;
+
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * Xss过滤器
+ *
+ * @author geekidea
+ * @date 2019-10-10
+ * @since 1.3.1.RELEASE
+ **/
+@Slf4j
+public class XssFilter implements Filter {
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+        log.info("XssFilter init");
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        XssHttpServletRequestWrapper xssHttpServletRequestWrapper = new XssHttpServletRequestWrapper(request);
+        filterChain.doFilter(xssHttpServletRequestWrapper, servletResponse);
+    }
+
+    @Override
+    public void destroy() {
+        log.info("XssFilter destroy");
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssHttpServletRequestWrapper.java

@@ -0,0 +1,62 @@
+/*
+ * 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.core.xss;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.text.StringEscapeUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+/**
+ * XSS 跨站脚本攻击(Cross Site Scripting) 处理
+ *
+ * @author geekidea
+ * @date 2019-10-10
+ * @since 1.3.1.RELEASE
+ **/
+public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
+
+    public XssHttpServletRequestWrapper(HttpServletRequest request) {
+        super(request);
+    }
+
+    @Override
+    public String getQueryString() {
+        return StringEscapeUtils.escapeHtml4(super.getQueryString());
+    }
+
+    @Override
+    public String getParameter(String name) {
+        return StringEscapeUtils.escapeHtml4(super.getParameter(name));
+    }
+
+    @Override
+    public String[] getParameterValues(String name) {
+        String[] values = super.getParameterValues(name);
+        if (ArrayUtils.isEmpty(values)) {
+            return values;
+        }
+        int length = values.length;
+        String[] escapeValues = new String[length];
+        for (int i = 0; i < length; i++) {
+            escapeValues[i] = StringEscapeUtils.escapeHtml4(values[i]);
+        }
+        return escapeValues;
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssJacksonDeserializer.java

@@ -0,0 +1,41 @@
+/*
+ * 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.core.xss;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import org.apache.commons.text.StringEscapeUtils;
+
+import java.io.IOException;
+
+/**
+ * Jackson请求参数字符串转义处理
+ *
+ * @author geekidea
+ * @date 2019-10-10
+ * @since 1.3.1.RELEASE
+ **/
+public class XssJacksonDeserializer extends JsonDeserializer<String> {
+
+    @Override
+    public String deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        return StringEscapeUtils.escapeHtml4(jsonParser.getText());
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssJacksonSerializer.java

@@ -0,0 +1,42 @@
+/*
+ * 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.core.xss;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.text.StringEscapeUtils;
+
+import java.io.IOException;
+
+/**
+ * Jackson响应参数字符串转义处理
+ *
+ * @author geekidea
+ * @date 2019-10-10
+ * @since 1.3.1.RELEASE
+ **/
+@Slf4j
+public class XssJacksonSerializer extends JsonSerializer<String> {
+
+    @Override
+    public void serialize(String s, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+        jsonGenerator.writeString(StringEscapeUtils.escapeHtml4(s));
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/ip/entity/IpAddress.java

@@ -0,0 +1,58 @@
+/*
+ * 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.ip.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * IP地址
+ *
+ * @author geekidea
+ * @since 2020-03-25
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "IpAddress对象")
+public class IpAddress extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private String ipStart;
+
+    private String ipEnd;
+
+    @ApiModelProperty("区域")
+    private String area;
+
+    @ApiModelProperty("运营商")
+    private String operator;
+
+    private Long ipStartNum;
+
+    private Long ipEndNum;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/ip/mapper/IpAddressMapper.java

@@ -0,0 +1,41 @@
+/*
+ * 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.ip.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.geekidea.springbootplus.framework.ip.entity.IpAddress;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * IP地址 Mapper 接口
+ *
+ * @author geekidea
+ * @since 2020-03-25
+ */
+@Repository
+public interface IpAddressMapper extends BaseMapper<IpAddress> {
+
+    /**
+     * 通过ip地址获取IP对象
+     *
+     * @param ip
+     * @return
+     */
+    IpAddress getByIp(@Param("ip") String ip);
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/ip/service/IpAddressService.java

@@ -0,0 +1,54 @@
+/*
+ * 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.ip.service;
+
+import io.geekidea.springbootplus.framework.common.service.BaseService;
+import io.geekidea.springbootplus.framework.ip.entity.IpAddress;
+
+/**
+ * IP地址 服务类
+ *
+ * @author geekidea
+ * @since 2020-03-25
+ */
+public interface IpAddressService extends BaseService<IpAddress> {
+
+    /**
+     * 通过ip地址获取IP对象
+     *
+     * @param ip
+     * @return
+     */
+    IpAddress getByIp(String ip);
+
+    /**
+     * 通过ip地址获取区域
+     *
+     * @param ip
+     * @return
+     */
+    String getAreaByIp(String ip);
+
+    /**
+     * 通过ip地址获取运营商
+     *
+     * @param ip
+     * @return
+     */
+    String getOperatorByIp(String ip);
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/ip/service/impl/IpAddressServiceImpl.java

@@ -0,0 +1,74 @@
+/*
+ * 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.ip.service.impl;
+
+import io.geekidea.springbootplus.config.constant.CommonConstant;
+import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
+import io.geekidea.springbootplus.framework.ip.entity.IpAddress;
+import io.geekidea.springbootplus.framework.ip.mapper.IpAddressMapper;
+import io.geekidea.springbootplus.framework.ip.service.IpAddressService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * IP地址 服务实现类
+ *
+ * @author geekidea
+ * @since 2020-03-25
+ */
+@Slf4j
+@Service
+public class IpAddressServiceImpl extends BaseServiceImpl<IpAddressMapper, IpAddress> implements IpAddressService {
+
+    @Autowired
+    private IpAddressMapper ipAddressMapper;
+
+
+    @Override
+    public IpAddress getByIp(String ip) {
+        if (StringUtils.isBlank(ip)) {
+            return null;
+        }
+        if (CommonConstant.LOCALHOST_IP.equals(ip)) {
+            return new IpAddress().setArea(CommonConstant.LOCALHOST_IP_NAME);
+        }
+        if (CommonConstant.LAN_IP.equals(ip)) {
+            return new IpAddress().setArea(CommonConstant.LAN_IP_NAME);
+        }
+        return ipAddressMapper.getByIp(ip);
+    }
+
+    @Override
+    public String getAreaByIp(String ip) {
+        IpAddress ipAddress = getByIp(ip);
+        if (ipAddress != null) {
+            return ipAddress.getArea();
+        }
+        return null;
+    }
+
+    @Override
+    public String getOperatorByIp(String ip) {
+        IpAddress ipAddress = getByIp(ip);
+        if (ipAddress != null) {
+            return ipAddress.getOperator();
+        }
+        return null;
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/Module.java

@@ -0,0 +1,49 @@
+/*
+ * 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.log.annotation;
+
+import org.springframework.core.annotation.AliasFor;
+
+import java.lang.annotation.*;
+
+/**
+ * 模块名称注解
+ *
+ * @author geekidea
+ * @date 2020/3/19
+ **/
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Module {
+
+    /**
+     * 模块名称
+     *
+     * @return
+     */
+    String name() default "";
+
+    /**
+     * 模块名称
+     *
+     * @return
+     */
+    @AliasFor("name")
+    String value() default "";
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/OperationLog.java

@@ -0,0 +1,64 @@
+/*
+ * 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.log.annotation;
+
+import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
+import org.springframework.core.annotation.AliasFor;
+
+import java.lang.annotation.*;
+
+/**
+ * 操作日志注解
+ * 记录：日志名称，日志类型，日志备注
+ *
+ * @author geekidea
+ * @date 2020/3/19
+ **/
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface OperationLog {
+
+    /**
+     * 日志名称
+     *
+     * @return
+     */
+    String name() default "";
+
+    /**
+     * 日志名称
+     *
+     * @return
+     */
+    @AliasFor("name")
+    String value() default "";
+
+    /**
+     * 日志类型
+     *
+     * @return
+     */
+    OperationLogType type() default OperationLogType.OTHER;
+
+    /**
+     * 日志备注
+     *
+     * @return
+     */
+    String remark() default "";
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/OperationLogIgnore.java

@@ -0,0 +1,34 @@
+/*
+ * 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.log.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 忽略操作日志记录注解
+ * 在controller上标注该方法后，将不会记录操作日志
+ * 可以标注在类和方法上，如果标记在类上，则会忽略controller中的所有方法
+ *
+ * @author geekidea
+ * @date 2020/3/19
+ **/
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface OperationLogIgnore {
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/aop/BaseLogAop.java

@@ -0,0 +1,990 @@
+/*
+ * 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.log.aop;
+
+import com.alibaba.fastjson.JSONObject;
+import com.auth0.jwt.exceptions.JWTDecodeException;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import io.geekidea.springbootplus.config.constant.CommonConstant;
+import io.geekidea.springbootplus.config.properties.SpringBootPlusAopProperties;
+import io.geekidea.springbootplus.framework.common.api.ApiCode;
+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.IpAddress;
+import io.geekidea.springbootplus.framework.ip.service.IpAddressService;
+import io.geekidea.springbootplus.framework.log.annotation.Module;
+import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
+import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore;
+import io.geekidea.springbootplus.framework.log.bean.OperationLogInfo;
+import io.geekidea.springbootplus.framework.log.bean.RequestInfo;
+import io.geekidea.springbootplus.framework.log.entity.SysLoginLog;
+import io.geekidea.springbootplus.framework.log.entity.SysOperationLog;
+import io.geekidea.springbootplus.framework.log.service.SysLoginLogService;
+import io.geekidea.springbootplus.framework.log.service.SysOperationLogService;
+import io.geekidea.springbootplus.framework.shiro.service.LoginToken;
+import io.geekidea.springbootplus.framework.shiro.service.LoginUsername;
+import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil;
+import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
+import io.geekidea.springbootplus.framework.util.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.*;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.fusesource.jansi.Ansi;
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedType;
+import java.lang.reflect.Method;
+import java.util.*;
+
+/**
+ * <p>
+ * Controller Aop 抽象类
+ * 获取响应结果信息
+ * <p>
+ * 日志输出类型：print-type
+ * 1. 请求和响应分开，按照执行顺序打印
+ * 2. ThreadLocal线程绑定，方法执行结束时，连续打印请求和响应日志
+ * 3. ThreadLocal线程绑定，方法执行结束时，同时打印请求和响应日志
+ * </p>
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+@Slf4j
+public abstract class BaseLogAop {
+
+    @Autowired
+    protected SysOperationLogService sysOperationLogService;
+
+    @Autowired
+    private IpAddressService ipAddressService;
+
+    @Autowired
+    private SysLoginLogService sysLoginLogService;
+
+    /**
+     * 本地线程变量，保存请求参数信息到当前线程中
+     */
+    protected static ThreadLocal<String> threadLocal = new ThreadLocal<>();
+    protected static ThreadLocal<RequestInfo> requestInfoThreadLocal = new ThreadLocal<>();
+    protected static ThreadLocal<OperationLogInfo> operationLogThreadLocal = new ThreadLocal<>();
+
+    /**
+     * 请求ID
+     */
+    private static final String REQUEST_ID = "requestId";
+    /**
+     * 零
+     */
+    private static final int ZERO = 0;
+    /**
+     * 截取字符串的最多长度
+     */
+    private static final int MAX_LENGTH = 300;
+    /**
+     * 登录日志：登录类型
+     */
+    private static final int LOGIN_TYPE = 1;
+    /**
+     * 登录日志：登出类型
+     */
+    private static final int LOGOUT_TYPE = 2;
+
+    /**
+     * 项目上下文路径
+     */
+    @Value("${server.servlet.context-path}")
+    private String contextPath;
+
+    /**
+     * Aop日志配置
+     */
+    protected SpringBootPlusAopProperties.LogAopConfig logAopConfig;
+
+    /**
+     * 日志打印类型
+     */
+    protected SpringBootPlusAopProperties.LogPrintType logPrintType;
+
+    /**
+     * 是否启用请求ID
+     */
+    protected boolean enableRequestId;
+
+    /**
+     * requestId生成类型
+     */
+    protected SpringBootPlusAopProperties.RequestIdType requestIdType;
+
+    /**
+     * Aop操作日志配置
+     */
+    protected SpringBootPlusAopProperties.OperationLogConfig operationLogConfig;
+
+    /**
+     * Aop登录日志配置
+     */
+    protected SpringBootPlusAopProperties.LoginLogConfig loginLogConfig;
+
+    @Autowired
+    public void setSpringBootPlusAopProperties(SpringBootPlusAopProperties springBootPlusAopProperties) {
+        logAopConfig = springBootPlusAopProperties.getLog();
+        logPrintType = logAopConfig.getLogPrintType();
+        enableRequestId = logAopConfig.isEnableRequestId();
+        requestIdType = logAopConfig.getRequestIdType();
+        operationLogConfig = springBootPlusAopProperties.getOperationLog();
+        loginLogConfig = springBootPlusAopProperties.getLoginLog();
+        log.debug("logAopConfig = " + logAopConfig);
+        log.debug("logPrintType = " + logPrintType);
+        log.debug("enableRequestId = " + enableRequestId);
+        log.debug("requestIdType = " + requestIdType);
+        log.debug("operationLogConfig = " + operationLogConfig);
+        log.debug("loginLogConfig = " + loginLogConfig);
+        log.debug("contextPath = " + contextPath);
+    }
+
+    /**
+     * 环绕通知
+     * 方法执行前打印请求参数信息
+     * 方法执行后打印响应结果信息
+     *
+     * @param joinPoint
+     * @return
+     * @throws Throwable
+     */
+    public abstract Object doAround(ProceedingJoinPoint joinPoint) throws Throwable;
+
+    /**
+     * 异常通知方法
+     *
+     * @param joinPoint
+     * @param exception
+     */
+    public abstract void afterThrowing(JoinPoint joinPoint, Exception exception);
+
+    /**
+     * 设置请求ID
+     *
+     * @param requestInfo
+     */
+    protected abstract void setRequestId(RequestInfo requestInfo);
+
+    /**
+     * 获取请求信息对象
+     *
+     * @param requestInfo
+     */
+    protected abstract void getRequestInfo(RequestInfo requestInfo);
+
+    /**
+     * 获取响应结果对象
+     *
+     * @param apiResult
+     */
+    protected abstract void getResponseResult(Object result);
+
+    /**
+     * 请求响应处理完成之后的回调方法
+     *
+     * @param requestInfo
+     * @param operationLogInfo
+     * @param result
+     * @param exception
+     */
+    protected abstract void finish(RequestInfo requestInfo, OperationLogInfo operationLogInfo, Object result, Exception exception);
+
+    /**
+     * 处理
+     *
+     * @param joinPoint
+     * @return
+     * @throws Throwable
+     */
+    public Object handle(ProceedingJoinPoint joinPoint) throws Throwable {
+        // 获取请求相关信息
+        try {
+            // 获取当前的HttpServletRequest对象
+            ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            HttpServletRequest request = attributes.getRequest();
+
+            // HTTP请求信息对象
+            RequestInfo requestInfo = new RequestInfo();
+
+            // 请求路径 /api/foobar/add
+            String path = request.getRequestURI();
+            requestInfo.setPath(path);
+            // 获取实际路径 /foobar/add
+            String realPath = getRealPath(path);
+            requestInfo.setRealPath(realPath);
+
+            // 排除路径
+            Set<String> excludePaths = logAopConfig.getExcludePaths();
+            // 请求路径
+            if (handleExcludePaths(excludePaths, realPath)) {
+                return joinPoint.proceed();
+            }
+
+            // 获取请求类名和方法名称
+            Signature signature = joinPoint.getSignature();
+
+            // 获取真实的方法对象
+            MethodSignature methodSignature = (MethodSignature) signature;
+            Method method = methodSignature.getMethod();
+
+            // 处理操作日志信息
+            handleOperationLogInfo(method);
+
+            // IP地址
+            String ip = IpUtil.getRequestIp();
+            requestInfo.setIp(ip);
+
+            // 获取请求方式
+            String requestMethod = request.getMethod();
+            requestInfo.setRequestMethod(requestMethod);
+
+            // 获取请求内容类型
+            String contentType = request.getContentType();
+            requestInfo.setContentType(contentType);
+
+            // 判断控制器方法参数中是否有RequestBody注解
+            Annotation[][] annotations = method.getParameterAnnotations();
+            boolean isRequestBody = isRequestBody(annotations);
+            requestInfo.setRequestBody(isRequestBody);
+
+            AnnotatedType[] annotatedTypes = method.getAnnotatedParameterTypes();
+
+            // 获取Shiro注解值，并记录到map中
+            handleShiroAnnotationValue(requestInfo, method);
+
+            // 设置请求参数
+            Object requestParamObject = getRequestParamObject(joinPoint, request, requestMethod, contentType, isRequestBody);
+            requestInfo.setParam(requestParamObject);
+            requestInfo.setTime(DateUtil.getDateTimeString(new Date()));
+
+            // 获取请求头token
+            String token = request.getHeader(JwtTokenUtil.getTokenName());
+            requestInfo.setToken(token);
+            if (StringUtils.isNotBlank(token)) {
+                requestInfo.setTokenMd5(DigestUtils.md5Hex(token));
+            }
+
+            // 用户浏览器代理字符串
+            requestInfo.setUserAgent(request.getHeader(CommonConstant.USER_AGENT));
+
+            // 记录请求ID
+            setRequestId(requestInfo);
+
+            // 调用子类重写方法，控制请求信息日志处理
+            getRequestInfo(requestInfo);
+        } catch (Exception e) {
+            log.error("请求日志AOP处理异常", e);
+        }
+
+        // 执行目标方法,获得返回值
+        // 方法异常时，会调用子类的@AfterThrowing注解的方法，不会调用下面的代码，异常单独处理
+        Object result = joinPoint.proceed();
+        try {
+            // 调用子类重写方法，控制响应结果日志处理
+            getResponseResult(result);
+        } catch (Exception e) {
+            log.error("处理响应结果异常", e);
+        } finally {
+            handleAfterReturn(result, null);
+        }
+        return result;
+    }
+
+    /**
+     * 正常调用返回或者异常结束后调用此方法
+     *
+     * @param result
+     * @param exception
+     */
+    protected void handleAfterReturn(Object result, Exception exception) {
+        // 获取RequestInfo
+        RequestInfo requestInfo = requestInfoThreadLocal.get();
+        // 获取OperationLogInfo
+        OperationLogInfo operationLogInfo = operationLogThreadLocal.get();
+        // 调用抽象方法，是否保存日志操作，需要子类重写该方法，手动调用saveSysOperationLog
+        finish(requestInfo, operationLogInfo, result, null);
+        // 释放资源
+        remove();
+    }
+
+    /**
+     * 处理异常
+     *
+     * @param exception
+     */
+    public void handleAfterThrowing(Exception exception) {
+        // 获取RequestInfo
+        RequestInfo requestInfo = requestInfoThreadLocal.get();
+        // 获取OperationLogInfo
+        OperationLogInfo operationLogInfo = operationLogThreadLocal.get();
+        // 调用抽象方法，是否保存日志操作，需要子类重写该方法，手动调用saveSysOperationLog
+        finish(requestInfo, operationLogInfo, null, exception);
+        // 释放资源
+        remove();
+    }
+
+
+    private void handleOperationLogInfo(Method method) {
+        // 设置控制器类名称和方法名称
+        OperationLogInfo operationLogInfo = new OperationLogInfo()
+                .setControllerClassName(method.getDeclaringClass().getName())
+                .setControllerMethodName(method.getName());
+
+        // 获取Module类注解
+        Class<?> controllerClass = method.getDeclaringClass();
+        Module module = controllerClass.getAnnotation(Module.class);
+        if (module != null) {
+            String moduleName = module.name();
+            String moduleValue = module.value();
+            if (StringUtils.isNotBlank(moduleValue)) {
+                operationLogInfo.setModule(moduleValue);
+            }
+            if (StringUtils.isNotBlank(moduleName)) {
+                operationLogInfo.setModule(moduleName);
+            }
+        }
+        // 获取OperationLogIgnore注解
+        OperationLogIgnore classOperationLogIgnore = controllerClass.getAnnotation(OperationLogIgnore.class);
+        if (classOperationLogIgnore != null) {
+            // 不记录日志
+            operationLogInfo.setIgnore(true);
+        }
+        // 判断方法是否要过滤
+        OperationLogIgnore operationLogIgnore = method.getAnnotation(OperationLogIgnore.class);
+        if (operationLogIgnore != null) {
+            operationLogInfo.setIgnore(true);
+        }
+        // 从方法上获取OperationLog注解
+        OperationLog operationLog = method.getAnnotation(OperationLog.class);
+        if (operationLog != null) {
+            String operationLogName = operationLog.name();
+            String operationLogValue = operationLog.value();
+            if (StringUtils.isNotBlank(operationLogValue)) {
+                operationLogInfo.setName(operationLogValue);
+            }
+            if (StringUtils.isNotBlank(operationLogName)) {
+                operationLogInfo.setName(operationLogName);
+            }
+            operationLogInfo.setType(operationLog.type().getCode()).setRemark(operationLog.remark());
+        }
+        operationLogThreadLocal.set(operationLogInfo);
+    }
+
+    /**
+     * 获取Shiro注解值，并记录到map中
+     *
+     * @param map
+     * @param method
+     */
+    protected void handleShiroAnnotationValue(RequestInfo requestInfo, Method method) {
+        RequiresRoles requiresRoles = method.getAnnotation(RequiresRoles.class);
+        if (requiresRoles != null) {
+            String[] requiresRolesValues = requiresRoles.value();
+            if (ArrayUtils.isNotEmpty(requiresRolesValues)) {
+                String requiresRolesString = Arrays.toString(requiresRolesValues);
+                requestInfo.setRequiresRoles(requiresRolesString);
+            }
+        }
+
+        RequiresPermissions requiresPermissions = method.getAnnotation(RequiresPermissions.class);
+        if (requiresPermissions != null) {
+            String[] requiresPermissionsValues = requiresPermissions.value();
+            if (ArrayUtils.isNotEmpty(requiresPermissionsValues)) {
+                String requiresPermissionsString = Arrays.toString(requiresPermissionsValues);
+                requestInfo.setRequiresPermissions(requiresPermissionsString);
+            }
+        }
+
+        RequiresAuthentication requiresAuthentication = method.getAnnotation(RequiresAuthentication.class);
+        if (requiresAuthentication != null) {
+            requestInfo.setRequiresAuthentication(true);
+        }
+
+        RequiresUser requiresUser = method.getAnnotation(RequiresUser.class);
+        if (requiresUser != null) {
+            requestInfo.setRequiresUser(true);
+        }
+
+        RequiresGuest requiresGuest = method.getAnnotation(RequiresGuest.class);
+        if (requiresGuest != null) {
+            requestInfo.setRequiresGuest(true);
+        }
+
+    }
+
+    /**
+     * 处理请求ID
+     *
+     * @param requestInfo
+     */
+    protected void handleRequestId(RequestInfo requestInfo) {
+        if (!enableRequestId) {
+            return;
+        }
+        String requestId = null;
+        if (SpringBootPlusAopProperties.RequestIdType.IDWORK == requestIdType) {
+            requestId = IdWorker.getIdStr();
+        } else if (SpringBootPlusAopProperties.RequestIdType.UUID == requestIdType) {
+            requestId = UUIDUtil.getUuid();
+        }
+        // 设置请求ID
+        MDC.put(REQUEST_ID, requestId);
+        requestInfo.setRequestId(requestId);
+    }
+
+    /**
+     * 处理请求参数
+     *
+     * @param requestInfo
+     */
+    protected void handleRequestInfo(RequestInfo requestInfo) {
+        requestInfoThreadLocal.set(requestInfo);
+        if (SpringBootPlusAopProperties.LogPrintType.NONE == logPrintType) {
+            return;
+        }
+        // 获取请求信息
+        String requestInfoString = formatRequestInfo(requestInfo);
+        // 如果打印方式为顺序打印，则直接打印，否则，保存的threadLocal中
+        if (SpringBootPlusAopProperties.LogPrintType.ORDER == logPrintType) {
+            printRequestInfoString(requestInfoString);
+        } else {
+            threadLocal.set(requestInfoString);
+        }
+    }
+
+    /**
+     * 处理响应结果
+     *
+     * @param result
+     */
+    protected void handleResponseResult(Object result) {
+        if (SpringBootPlusAopProperties.LogPrintType.NONE == logPrintType) {
+            return;
+        }
+        if (result != null && result instanceof ApiResult) {
+            ApiResult<?> apiResult = (ApiResult<?>) result;
+            int code = apiResult.getCode();
+            // 获取格式化后的响应结果
+            String responseResultString = formatResponseResult(apiResult);
+            if (SpringBootPlusAopProperties.LogPrintType.ORDER == logPrintType) {
+                printResponseResult(code, responseResultString);
+            } else {
+                // 从threadLocal中获取线程请求信息
+                String requestInfoString = threadLocal.get();
+                // 如果是连续打印，则先打印请求参数，再打印响应结果
+                if (SpringBootPlusAopProperties.LogPrintType.LINE == logPrintType) {
+                    printRequestInfoString(requestInfoString);
+                    printResponseResult(code, responseResultString);
+                } else if (SpringBootPlusAopProperties.LogPrintType.MERGE == logPrintType) {
+                    printRequestResponseString(code, requestInfoString, responseResultString);
+                }
+            }
+        }
+    }
+
+    /**
+     * 同时打印请求和响应信息
+     *
+     * @param code
+     * @param requestInfoString
+     * @param responseResultString
+     */
+    protected void printRequestResponseString(int code, String requestInfoString, String responseResultString) {
+        if (code == ApiCode.SUCCESS.getCode()) {
+            log.info(requestInfoString + "\n" + responseResultString);
+        } else {
+            log.error(requestInfoString + "\n" + responseResultString);
+        }
+    }
+
+
+    /**
+     * 格式化请求信息
+     *
+     * @param requestInfo
+     * @return
+     */
+    protected String formatRequestInfo(RequestInfo requestInfo) {
+        String requestInfoString = null;
+        try {
+            if (logAopConfig.isRequestLogFormat()) {
+                requestInfoString = "\n" + Jackson.toJsonStringNonNull(requestInfo, true);
+            } else {
+                requestInfoString = Jackson.toJsonStringNonNull(requestInfo);
+            }
+        } catch (Exception e) {
+            log.error("格式化请求信息日志异常", e);
+        }
+        return AnsiUtil.getAnsi(Ansi.Color.GREEN, "requestInfo:" + requestInfoString);
+    }
+
+    /**
+     * 打印请求信息
+     *
+     * @param requestInfoString
+     */
+    protected void printRequestInfoString(String requestInfoString) {
+        log.info(requestInfoString);
+    }
+
+    /**
+     * 格式化响应信息
+     *
+     * @param apiResult
+     * @return
+     */
+    protected String formatResponseResult(ApiResult<?> apiResult) {
+        String responseResultString = "responseResult:";
+        try {
+            if (logAopConfig.isResponseLogFormat()) {
+                responseResultString += "\n" + Jackson.toJsonString(apiResult, true);
+            } else {
+                responseResultString += Jackson.toJsonString(apiResult);
+            }
+            int code = apiResult.getCode();
+            if (code == ApiCode.SUCCESS.getCode()) {
+                return AnsiUtil.getAnsi(Ansi.Color.BLUE, responseResultString);
+            } else {
+                return AnsiUtil.getAnsi(Ansi.Color.RED, responseResultString);
+            }
+        } catch (Exception e) {
+            log.error("格式化响应日志异常", e);
+        }
+        return responseResultString;
+    }
+
+    /**
+     * 打印响应信息
+     *
+     * @param code
+     * @param responseResultString
+     */
+    protected void printResponseResult(int code, String responseResultString) {
+        if (code == ApiCode.SUCCESS.getCode()) {
+            log.info(responseResultString);
+        } else {
+            log.error(responseResultString);
+        }
+    }
+
+    /**
+     * 获取请求参数JSON字符串
+     *
+     * @param joinPoint
+     * @param request
+     * @param requestMethod
+     * @param contentType
+     * @param isRequestBody
+     */
+    protected Object getRequestParamObject(ProceedingJoinPoint joinPoint, HttpServletRequest request, String requestMethod, String contentType, boolean isRequestBody) {
+        Object paramObject = null;
+        if (isRequestBody) {
+            // POST,application/json,RequestBody的类型,简单判断,然后序列化成JSON字符串
+            Object[] args = joinPoint.getArgs();
+            paramObject = getArgsObject(args);
+        } else {
+            // 获取getParameterMap中所有的值,处理后序列化成JSON字符串
+            Map<String, String[]> paramsMap = request.getParameterMap();
+            paramObject = getParamJSONObject(paramsMap);
+        }
+        return paramObject;
+    }
+
+    /**
+     * 判断控制器方法参数中是否有RequestBody注解
+     *
+     * @param annotations
+     * @return
+     */
+    protected boolean isRequestBody(Annotation[][] annotations) {
+        boolean isRequestBody = false;
+        for (Annotation[] annotationArray : annotations) {
+            for (Annotation annotation : annotationArray) {
+                if (annotation instanceof RequestBody) {
+                    isRequestBody = true;
+                }
+            }
+        }
+        return isRequestBody;
+    }
+
+    /**
+     * 请求参数拼装
+     *
+     * @param args
+     * @return
+     */
+    protected Object getArgsObject(Object[] args) {
+        if (args == null) {
+            return null;
+        }
+        // 去掉HttpServletRequest和HttpServletResponse
+        List<Object> realArgs = new ArrayList<>();
+        for (Object arg : args) {
+            if (arg instanceof HttpServletRequest) {
+                continue;
+            }
+            if (arg instanceof HttpServletResponse) {
+                continue;
+            }
+            if (arg instanceof MultipartFile) {
+                continue;
+            }
+            if (arg instanceof ModelAndView) {
+                continue;
+            }
+            realArgs.add(arg);
+        }
+        if (realArgs.size() == 1) {
+            return realArgs.get(0);
+        } else {
+            return realArgs;
+        }
+    }
+
+
+    /**
+     * 获取参数Map的JSON字符串
+     *
+     * @param paramsMap
+     * @return
+     */
+    protected JSONObject getParamJSONObject(Map<String, String[]> paramsMap) {
+        if (MapUtils.isEmpty(paramsMap)) {
+            return null;
+        }
+        JSONObject jsonObject = new JSONObject();
+        for (Map.Entry<String, String[]> kv : paramsMap.entrySet()) {
+            String key = kv.getKey();
+            String[] values = kv.getValue();
+            // 没有值
+            if (values == null) {
+                jsonObject.put(key, null);
+            } else if (values.length == 1) {
+                // 一个值
+                jsonObject.put(key, values[0]);
+            } else {
+                // 多个值
+                jsonObject.put(key, values);
+            }
+        }
+        return jsonObject;
+    }
+
+    /**
+     * 处理排除路径，匹配返回true，否则返回false
+     *
+     * @param excludePaths 排除路径
+     * @param realPath     请求实际路径
+     * @return
+     */
+    protected boolean handleExcludePaths(Set<String> excludePaths, String realPath) {
+        if (CollectionUtils.isEmpty(excludePaths) || StringUtils.isBlank(realPath)) {
+            return false;
+        }
+        // 如果是排除路径，则跳过
+        if (excludePaths.contains(realPath)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 获取实际路径
+     *
+     * @param requestPath
+     * @return
+     */
+    private String getRealPath(String requestPath) {
+        // 如果项目路径不为空，则去掉项目路径，获取实际访问路径
+        if (StringUtils.isNotBlank(contextPath)) {
+            return requestPath.substring(contextPath.length());
+        }
+        return requestPath;
+    }
+
+    /**
+     * 异步保存系统操作日志
+     *
+     * @param requestInfo
+     * @param operationLogInfo
+     * @param result
+     * @param exception
+     */
+    @Async
+    protected void saveSysOperationLog(RequestInfo requestInfo, OperationLogInfo operationLogInfo, Object result, Exception exception) {
+        try {
+            // 如果不记录操作日志，则跳过
+            if (!operationLogConfig.isEnable()) {
+                return;
+            }
+            // 排除路径
+            Set<String> excludePaths = operationLogConfig.getExcludePaths();
+            // 请求路径
+            if (handleExcludePaths(excludePaths, requestInfo.getRealPath())) {
+                return;
+            }
+
+            // 操作日志
+            SysOperationLog sysOperationLog = new SysOperationLog();
+            // 设置操作日志信息
+            if (operationLogInfo != null) {
+                // 如果类或方法上标注有OperationLogIgnore，则跳过
+                if (operationLogInfo.isIgnore()) {
+                    return;
+                }
+                sysOperationLog.setModule(operationLogInfo.getModule())
+                        .setName(operationLogInfo.getName())
+                        .setType(operationLogInfo.getType())
+                        .setRemark(operationLogInfo.getRemark())
+                        .setClassName(operationLogInfo.getControllerClassName())
+                        .setMethodName(operationLogInfo.getControllerMethodName());
+            }
+            // 设置请求参数信息
+            if (requestInfo != null) {
+                sysOperationLog.setIp(requestInfo.getIp())
+                        .setPath(requestInfo.getPath())
+                        .setRequestId(requestInfo.getRequestId())
+                        .setRequestMethod(requestInfo.getRequestMethod())
+                        .setContentType(requestInfo.getContentType())
+                        .setRequestBody(requestInfo.getRequestBody())
+                        .setToken(requestInfo.getTokenMd5());
+
+                // 设置参数字符串
+                sysOperationLog.setParam(Jackson.toJsonStringNonNull(requestInfo.getParam()));
+                // User-Agent
+                ClientInfo clientInfo = ClientInfoUtil.get(requestInfo.getUserAgent());
+                if (clientInfo != null) {
+                    sysOperationLog.setBrowserName(clientInfo.getBrowserName())
+                            .setBrowserVersion(clientInfo.getBrowserversion())
+                            .setEngineName(clientInfo.getEngineName())
+                            .setEngineVersion(clientInfo.getEngineVersion())
+                            .setOsName(clientInfo.getOsName())
+                            .setPlatformName(clientInfo.getPlatformName())
+                            .setMobile(clientInfo.isMobile())
+                            .setDeviceName(clientInfo.getDeviceName())
+                            .setDeviceModel(clientInfo.getDeviceModel());
+                }
+                // 设置IP区域
+                IpAddress ipAddress = ipAddressService.getByIp(requestInfo.getIp());
+                if (ipAddress != null) {
+                    requestInfo.setIpAddress(ipAddress);
+                    sysOperationLog.setArea(ipAddress.getArea()).setOperator(ipAddress.getOperator());
+                }
+            }
+
+            // 设置响应结果
+            if (result != null && result instanceof ApiResult) {
+                ApiResult<?> apiResult = (ApiResult<?>) result;
+                apiResult.getCode();
+                sysOperationLog.setSuccess(apiResult.isSuccess())
+                        .setCode(apiResult.getCode())
+                        .setMessage(apiResult.getMessage());
+            }
+
+            // 设置当前登录信息
+            sysOperationLog.setUserId(LoginUtil.getUserId()).setUserName(LoginUtil.getUsername());
+
+            // 设置异常信息
+            if (exception != null) {
+                Integer errorCode = null;
+                String exceptionMessage = exception.getMessage();
+                if (StringUtils.isNotBlank(exceptionMessage)) {
+                    exceptionMessage = StringUtils.substring(exceptionMessage, ZERO, MAX_LENGTH);
+                }
+                if (exception instanceof SpringBootPlusException) {
+                    SpringBootPlusException springBootPlusException = (SpringBootPlusException) exception;
+                    errorCode = springBootPlusException.getErrorCode();
+                }
+                // 异常字符串长度截取
+                sysOperationLog.setSuccess(false)
+                        .setCode(errorCode)
+                        .setExceptionMessage(exceptionMessage)
+                        .setExceptionName(exception.getClass().getName());
+            }
+            // 保存日志到数据库
+            sysOperationLogService.saveSysOperationLog(sysOperationLog);
+
+
+        } catch (Exception e) {
+            if (e instanceof JWTDecodeException) {
+                JWTDecodeException jwtDecodeException = (JWTDecodeException) e;
+                throw jwtDecodeException;
+            }
+            log.error("保存系统操作日志失败", e);
+        }
+    }
+
+    /**
+     * 异步保存系统登录日志
+     *
+     * @param requestInfo
+     * @param operationLogInfo
+     * @param result
+     * @param exception
+     */
+    @Async
+    protected void saveSysLoginLog(RequestInfo requestInfo, OperationLogInfo operationLogInfo, Object result, Exception exception) {
+        try {
+            // 如果不记录登录日志，则跳过
+            if (!loginLogConfig.isEnable()) {
+                return;
+            }
+            String realPath = requestInfo.getRealPath();
+            if (StringUtils.isBlank(realPath)) {
+                return;
+            }
+
+            boolean flag = false;
+            Integer type = null;
+            // 判断是否是登录路径
+            if (realPath.equals(loginLogConfig.getLoginPath())) {
+                flag = true;
+                type = LOGIN_TYPE;
+            } else if (realPath.equals(loginLogConfig.getLogoutPath())) {
+                flag = true;
+                type = LOGOUT_TYPE;
+            }
+
+            // 保存登录登出日志
+            if (flag) {
+                SysLoginLog sysLoginLog = new SysLoginLog();
+                sysLoginLog.setType(type);
+                // 设置异常信息
+                if (exception != null) {
+                    Integer errorCode = null;
+                    String exceptionMessage = exception.getMessage();
+                    if (StringUtils.isNotBlank(exceptionMessage)) {
+                        exceptionMessage = StringUtils.substring(exceptionMessage, ZERO, MAX_LENGTH);
+                    }
+                    if (exception instanceof SpringBootPlusException) {
+                        SpringBootPlusException springBootPlusException = (SpringBootPlusException) exception;
+                        errorCode = springBootPlusException.getErrorCode();
+                    }
+                    // 异常字符串长度截取
+                    sysLoginLog.setCode(errorCode).setExceptionMessage(exceptionMessage);
+                }
+
+                // 判断登录登出结果
+                if (result != null && result instanceof ApiResult) {
+                    ApiResult<?> apiResult = (ApiResult<?>) result;
+                    sysLoginLog.setSuccess(apiResult.isSuccess()).setCode(apiResult.getCode());
+                    if (apiResult.isSuccess()) {
+                        if (LOGIN_TYPE == type) {
+                            Object object = apiResult.getData();
+                            if (object != null && object instanceof LoginToken) {
+                                LoginToken loginToken = (LoginToken) object;
+                                String token = loginToken.getToken();
+                                if (StringUtils.isNotBlank(token)) {
+                                    // 设置登录token
+                                    String tokenMd5 = DigestUtils.md5Hex(token);
+                                    sysLoginLog.setToken(tokenMd5);
+                                }
+                            }
+                        }
+                    } else {
+                        sysLoginLog.setExceptionMessage(apiResult.getMessage());
+                    }
+                }
+
+                // 设置请求参数信息
+                if (requestInfo != null) {
+                    sysLoginLog.setIp(requestInfo.getIp()).setRequestId(requestInfo.getRequestId());
+                    // 设置登录用户名
+                    if (LOGIN_TYPE == type) {
+                        Object paramObject = requestInfo.getParam();
+                        if (paramObject != null && paramObject instanceof LoginUsername) {
+                            LoginUsername loginUsername = (LoginUsername) paramObject;
+                            String username = loginUsername.getUsername();
+                            sysLoginLog.setUsername(username);
+                        }
+                    } else if (LOGOUT_TYPE == type) {
+                        String username = JwtUtil.getUsername(requestInfo.getToken());
+                        sysLoginLog.setUsername(username);
+                        // 设置登出token
+                        sysLoginLog.setToken(requestInfo.getTokenMd5());
+                    }
+
+                    // User-Agent
+                    String userAgent = requestInfo.getUserAgent();
+                    if (StringUtils.isNotBlank(userAgent)) {
+                        sysLoginLog.setUserAgent(StringUtils.substring(userAgent, ZERO, MAX_LENGTH));
+                    }
+                    ClientInfo clientInfo = ClientInfoUtil.get(userAgent);
+                    if (clientInfo != null) {
+                        sysLoginLog.setBrowserName(clientInfo.getBrowserName())
+                                .setBrowserVersion(clientInfo.getBrowserversion())
+                                .setEngineName(clientInfo.getEngineName())
+                                .setEngineVersion(clientInfo.getEngineVersion())
+                                .setOsName(clientInfo.getOsName())
+                                .setPlatformName(clientInfo.getPlatformName())
+                                .setMobile(clientInfo.isMobile())
+                                .setDeviceName(clientInfo.getDeviceName())
+                                .setDeviceModel(clientInfo.getDeviceModel());
+                    }
+                    IpAddress ipAddress = requestInfo.getIpAddress();
+                    if (ipAddress == null) {
+                        ipAddress = ipAddressService.getByIp(requestInfo.getIp());
+                    }
+                    if (ipAddress != null) {
+                        sysLoginLog.setArea(ipAddress.getArea()).setOperator(ipAddress.getOperator());
+                    }
+                    // 保存登录日志
+                    sysLoginLogService.saveSysLoginLog(sysLoginLog);
+                }
+            }
+        } catch (Exception e) {
+            log.error("保存系统登录日志失败", e);
+        }
+    }
+
+
+    /**
+     * 释放资源
+     */
+    protected void remove() {
+        threadLocal.remove();
+        requestInfoThreadLocal.remove();
+        operationLogThreadLocal.remove();
+        MDC.clear();
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/bean/OperationLogInfo.java

@@ -0,0 +1,67 @@
+/*
+ * 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.log.bean;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 操作日志信息
+ *
+ * @author geekidea
+ * @date 2020/3/19
+ **/
+@Data
+@Accessors(chain = true)
+public class OperationLogInfo {
+
+    /**
+     * 是否忽略
+     */
+    private boolean ignore;
+
+    /**
+     * 模块名称
+     */
+    private String module;
+
+    /**
+     * 日志名称
+     */
+    private String name;
+
+    /**
+     * 日志类型
+     */
+    private Integer type;
+
+    /**
+     * 日志备注
+     */
+    private String remark;
+
+    /**
+     * controller类名称
+     */
+    private String controllerClassName;
+
+    /**
+     * controller目标方法名称
+     */
+    private String controllerMethodName;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/bean/RequestInfo.java

@@ -0,0 +1,140 @@
+/*
+ * 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.log.bean;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.geekidea.springbootplus.framework.ip.entity.IpAddress;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * HTTP请求信息对象
+ *
+ * @author geekidea
+ * @date 2020/3/18
+ **/
+@Data
+@Accessors(chain = true)
+public class RequestInfo implements Serializable {
+    private static final long serialVersionUID = 1421424612944015973L;
+
+    /**
+     * 请求路径
+     * /api/foobar/add
+     */
+    private String path;
+
+    /**
+     * 请求ID
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    private String requestId;
+
+    /**
+     * 请求实际路径
+     * /foobar/add
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    private String realPath;
+
+    /**
+     * 请求IP地址
+     */
+    private String ip;
+
+    /**
+     * 请求IP对象
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    private IpAddress ipAddress;
+
+    /**
+     * 请求方式，GET/POST
+     */
+    private String requestMethod;
+
+    /**
+     * 请求内容类型
+     */
+    private String contentType;
+
+    /**
+     * 判断控制器方法参数中是否有RequestBody注解
+     */
+    private Boolean requestBody;
+
+    /**
+     * 请求参数对象
+     */
+    private Object param;
+
+    /**
+     * 请求时间字符串
+     */
+    private String time;
+
+    /**
+     * 请求token
+     */
+    private String token;
+
+    /**
+     * 请求token MD5值
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    private String tokenMd5;
+
+    /**
+     * 用户代理字符串
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    private String userAgent;
+
+    /**
+     * requiresRoles值
+     */
+    private String requiresRoles;
+
+    /**
+     * requiresPermissions值
+     */
+    private String requiresPermissions;
+
+    /**
+     * requiresAuthentication
+     */
+    private Boolean requiresAuthentication;
+
+    /**
+     * requiresUser
+     */
+    private Boolean requiresUser;
+
+    /**
+     * requiresGuest
+     */
+    private Boolean requiresGuest;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysLoginLogController.java

@@ -0,0 +1,68 @@
+/*
+ * 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.log.controller;
+
+import io.geekidea.springbootplus.framework.common.api.ApiResult;
+import io.geekidea.springbootplus.framework.common.controller.BaseController;
+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.entity.SysLoginLog;
+import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
+import io.geekidea.springbootplus.framework.log.param.SysLoginLogPageParam;
+import io.geekidea.springbootplus.framework.log.service.SysLoginLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 系统登录日志 控制器
+ *
+ * @author geekidea
+ * @since 2020-03-24
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sysLoginLog")
+@Module("log")
+@Api(value = "系统登录日志API", tags = {"系统登录日志"})
+public class SysLoginLogController extends BaseController {
+
+    @Autowired
+    private SysLoginLogService sysLoginLogService;
+
+    /**
+     * 系统登录日志分页列表
+     */
+    @PostMapping("/getPageList")
+    @RequiresPermissions("sys:login:log:page")
+    @OperationLog(name = "系统登录日志分页列表", type = OperationLogType.PAGE)
+    @ApiOperation(value = "系统登录日志分页列表", response = SysLoginLog.class)
+    public ApiResult<Paging<SysLoginLog>> getSysLoginLogPageList(@Validated @RequestBody SysLoginLogPageParam sysLoginLogPageParam) throws Exception {
+        Paging<SysLoginLog> paging = sysLoginLogService.getSysLoginLogPageList(sysLoginLogPageParam);
+        return ApiResult.ok(paging);
+    }
+
+}
+

framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysOperationLogController.java

@@ -0,0 +1,63 @@
+/*
+ * 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.log.controller;
+
+import io.geekidea.springbootplus.framework.common.api.ApiResult;
+import io.geekidea.springbootplus.framework.common.controller.BaseController;
+import io.geekidea.springbootplus.framework.core.pagination.Paging;
+import io.geekidea.springbootplus.framework.log.entity.SysOperationLog;
+import io.geekidea.springbootplus.framework.log.param.SysOperationLogPageParam;
+import io.geekidea.springbootplus.framework.log.service.SysOperationLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 系统操作日志 控制器
+ *
+ * @author geekidea
+ * @since 2020-03-19
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sysOperationLog")
+@Api(value = "系统操作日志API", tags = {"系统操作日志"})
+public class SysOperationLogController extends BaseController {
+
+    @Autowired
+    private SysOperationLogService sysOperationLogService;
+
+    /**
+     * 系统操作日志分页列表
+     */
+    @PostMapping("/getPageList")
+    @RequiresPermissions("sys:operation:log:page")
+    @ApiOperation(value = "系统操作日志分页列表", response = SysOperationLog.class)
+    public ApiResult<Paging<SysOperationLog>> getSysOperationLogPageList(@Validated @RequestBody SysOperationLogPageParam sysOperationLogPageParam) throws Exception {
+        Paging<SysOperationLog> paging = sysOperationLogService.getSysOperationLogPageList(sysOperationLogPageParam);
+        return ApiResult.ok(paging);
+    }
+
+}
+

framework/src/main/java/io/geekidea/springbootplus/framework/log/entity/SysLoginLog.java

@@ -0,0 +1,119 @@
+/*
+ * 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.log.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
+import io.geekidea.springbootplus.framework.core.validator.groups.Update;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * 系统登录日志
+ *
+ * @author geekidea
+ * @since 2020-03-24
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "SysLoginLog对象")
+public class SysLoginLog extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @NotNull(message = "id不能为空", groups = {Update.class})
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("请求ID")
+    private String requestId;
+
+    @ApiModelProperty("用户名称")
+    private String username;
+
+    @ApiModelProperty("IP")
+    private String ip;
+
+    @ApiModelProperty("区域")
+    private String area;
+
+    @ApiModelProperty("运营商")
+    private String operator;
+
+    @ApiModelProperty("tokenMd5值")
+    private String token;
+
+    @ApiModelProperty("1:登录，2：登出")
+    private Integer type;
+
+    @ApiModelProperty("是否成功 true:成功/false:失败")
+    private Boolean success;
+
+    @ApiModelProperty("响应码")
+    private Integer code;
+
+    @ApiModelProperty("失败消息记录")
+    private String exceptionMessage;
+
+    @ApiModelProperty("浏览器名称")
+    private String userAgent;
+
+    @ApiModelProperty("浏览器名称")
+    private String browserName;
+
+    @ApiModelProperty("浏览器版本")
+    private String browserVersion;
+
+    @ApiModelProperty("浏览器引擎名称")
+    private String engineName;
+
+    @ApiModelProperty("浏览器引擎版本")
+    private String engineVersion;
+
+    @ApiModelProperty("系统名称")
+    private String osName;
+
+    @ApiModelProperty("平台名称")
+    private String platformName;
+
+    @ApiModelProperty("是否是手机,0:否,1:是")
+    private Boolean mobile;
+
+    @ApiModelProperty("移动端设备名称")
+    private String deviceName;
+
+    @ApiModelProperty("移动端设备型号")
+    private String deviceModel;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/entity/SysOperationLog.java

@@ -0,0 +1,152 @@
+/*
+ * 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.log.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
+import io.geekidea.springbootplus.framework.core.validator.groups.Update;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * 系统操作日志
+ *
+ * @author geekidea
+ * @since 2020-03-19
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "SysOperationLog对象")
+public class SysOperationLog extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    @NotNull(message = "id不能为空", groups = {Update.class})
+    private Long id;
+
+    @ApiModelProperty("请求ID")
+    private String requestId;
+
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    @ApiModelProperty("用户名称")
+    private String userName;
+
+    @ApiModelProperty("日志名称")
+    private String name;
+
+    @ApiModelProperty("IP")
+    private String ip;
+
+    @ApiModelProperty("区域")
+    private String area;
+
+    @ApiModelProperty("运营商")
+    private String operator;
+
+    @ApiModelProperty("全路径")
+    private String path;
+
+    @ApiModelProperty("模块名称")
+    private String module;
+
+    @ApiModelProperty("类名")
+    private String className;
+
+    @ApiModelProperty("方法名称")
+    private String methodName;
+
+    @ApiModelProperty("请求方式，GET/POST")
+    private String requestMethod;
+
+    @ApiModelProperty("内容类型")
+    private String contentType;
+
+    @ApiModelProperty("是否是JSON请求映射参数")
+    private Boolean requestBody;
+
+    @ApiModelProperty("请求参数")
+    private String param;
+
+    @ApiModelProperty("tokenMd5值")
+    private String token;
+
+    @ApiModelProperty("0:其它,1:新增,2:修改,3:删除,4:详情查询,5:所有列表,6:分页列表,7:其它查询,8:上传文件")
+    private Integer type;
+
+    @ApiModelProperty("0:失败,1:成功")
+    private Boolean success;
+
+    @ApiModelProperty("响应结果状态码")
+    private Integer code;
+
+    @ApiModelProperty("响应结果消息")
+    private String message;
+
+    @ApiModelProperty("异常类名称")
+    private String exceptionName;
+
+    @ApiModelProperty("异常信息")
+    private String exceptionMessage;
+
+    @ApiModelProperty("浏览器名称")
+    private String browserName;
+
+    @ApiModelProperty("浏览器版本")
+    private String browserVersion;
+
+    @ApiModelProperty("浏览器引擎名称")
+    private String engineName;
+
+    @ApiModelProperty("浏览器引擎版本")
+    private String engineVersion;
+
+    @ApiModelProperty("系统名称")
+    private String osName;
+
+    @ApiModelProperty("平台名称")
+    private String platformName;
+
+    @ApiModelProperty("是否是手机,0:否,1:是")
+    private Boolean mobile;
+
+    @ApiModelProperty("移动端设备名称")
+    private String deviceName;
+
+    @ApiModelProperty("移动端设备型号")
+    private String deviceModel;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/enums/OperationLogType.java

@@ -0,0 +1,88 @@
+/*
+ * 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.log.enums;
+
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 操作日志类型枚举
+ *
+ * @author geekidea
+ * @date 2020/3/19
+ **/
+@Getter
+@AllArgsConstructor
+public enum OperationLogType implements BaseEnum {
+    /**
+     * 其它
+     **/
+    OTHER(0, "其它"),
+    /**
+     * 添加
+     **/
+    ADD(1, "添加"),
+    /**
+     * 修改
+     **/
+    UPDATE(2, "修改"),
+    /**
+     * 删除
+     **/
+    DELETE(3, "删除"),
+    /**
+     * 查询
+     **/
+    query(4, "详情查询"),
+    /**
+     * 详情查询
+     **/
+    INFO(5, "详情查询"),
+    /**
+     * 列表查询
+     **/
+    LIST(6, "列表查询"),
+    /**
+     * 分页列表
+     **/
+    PAGE(7, "分页列表"),
+    /**
+     * 其它查询
+     **/
+    OTHER_QUERY(8, "其它查询"),
+    /**
+     * 文件上传
+     **/
+    UPLOAD(9, "文件上传"),
+    /**
+     * 文件下载
+     **/
+    download(10, "文件下载"),
+    /**
+     * Excel导入
+     **/
+    excel_import(11, "Excel导入"),
+    /**
+     * Excel导出
+     **/
+    EXCEL_EXPORT(12, "Excel导出");
+
+    private Integer code;
+    private String desc;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/mapper/SysLoginLogMapper.java

@@ -0,0 +1,33 @@
+/*
+ * 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.log.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.geekidea.springbootplus.framework.log.entity.SysLoginLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 系统登录日志 Mapper 接口
+ *
+ * @author geekidea
+ * @since 2020-03-24
+ */
+@Repository
+public interface SysLoginLogMapper extends BaseMapper<SysLoginLog> {
+
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/mapper/SysOperationLogMapper.java

@@ -0,0 +1,33 @@
+/*
+ * 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.log.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.geekidea.springbootplus.framework.log.entity.SysOperationLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 系统操作日志 Mapper 接口
+ *
+ * @author geekidea
+ * @since 2020-03-19
+ */
+@Repository
+public interface SysOperationLogMapper extends BaseMapper<SysOperationLog> {
+
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/param/SysLoginLogPageParam.java

@@ -0,0 +1,39 @@
+/*
+ * 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.log.param;
+
+import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <pre>
+ * 系统登录日志 分页参数对象
+ * </pre>
+ *
+ * @author geekidea
+ * @date 2020-03-24
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "系统登录日志分页参数")
+public class SysLoginLogPageParam extends BasePageOrderParam {
+    private static final long serialVersionUID = 1L;
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/param/SysOperationLogPageParam.java

@@ -0,0 +1,39 @@
+/*
+ * 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.log.param;
+
+import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <pre>
+ * 系统操作日志 分页参数对象
+ * </pre>
+ *
+ * @author geekidea
+ * @date 2020-03-19
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "系统操作日志分页参数")
+public class SysOperationLogPageParam extends BasePageOrderParam {
+    private static final long serialVersionUID = 1L;
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/service/SysLoginLogService.java

@@ -0,0 +1,69 @@
+/*
+ * 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.log.service;
+
+import io.geekidea.springbootplus.framework.common.service.BaseService;
+import io.geekidea.springbootplus.framework.core.pagination.Paging;
+import io.geekidea.springbootplus.framework.log.entity.SysLoginLog;
+import io.geekidea.springbootplus.framework.log.param.SysLoginLogPageParam;
+
+/**
+ * 系统登录日志 服务类
+ *
+ * @author geekidea
+ * @since 2020-03-24
+ */
+public interface SysLoginLogService extends BaseService<SysLoginLog> {
+
+    /**
+     * 保存
+     *
+     * @param sysLoginLog
+     * @return
+     * @throws Exception
+     */
+    boolean saveSysLoginLog(SysLoginLog sysLoginLog) throws Exception;
+
+    /**
+     * 修改
+     *
+     * @param sysLoginLog
+     * @return
+     * @throws Exception
+     */
+    boolean updateSysLoginLog(SysLoginLog sysLoginLog) throws Exception;
+
+    /**
+     * 删除
+     *
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    boolean deleteSysLoginLog(Long id) throws Exception;
+
+
+    /**
+     * 获取分页对象
+     *
+     * @param sysLoginLogQueryParam
+     * @return
+     * @throws Exception
+     */
+    Paging<SysLoginLog> getSysLoginLogPageList(SysLoginLogPageParam sysLoginLogPageParam) throws Exception;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/service/SysOperationLogService.java

@@ -0,0 +1,69 @@
+/*
+ * 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.log.service;
+
+import io.geekidea.springbootplus.framework.common.service.BaseService;
+import io.geekidea.springbootplus.framework.core.pagination.Paging;
+import io.geekidea.springbootplus.framework.log.entity.SysOperationLog;
+import io.geekidea.springbootplus.framework.log.param.SysOperationLogPageParam;
+
+/**
+ * 系统操作日志 服务类
+ *
+ * @author geekidea
+ * @since 2020-03-19
+ */
+public interface SysOperationLogService extends BaseService<SysOperationLog> {
+
+    /**
+     * 保存
+     *
+     * @param sysOperationLog
+     * @return
+     * @throws Exception
+     */
+    boolean saveSysOperationLog(SysOperationLog sysOperationLog) throws Exception;
+
+    /**
+     * 修改
+     *
+     * @param sysOperationLog
+     * @return
+     * @throws Exception
+     */
+    boolean updateSysOperationLog(SysOperationLog sysOperationLog) throws Exception;
+
+    /**
+     * 删除
+     *
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    boolean deleteSysOperationLog(Long id) throws Exception;
+
+
+    /**
+     * 获取分页对象
+     *
+     * @param sysOperationLogQueryParam
+     * @return
+     * @throws Exception
+     */
+    Paging<SysOperationLog> getSysOperationLogPageList(SysOperationLogPageParam sysOperationLogPageParam) throws Exception;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/service/impl/SysLoginLogServiceImpl.java

@@ -0,0 +1,74 @@
+/*
+ * 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.log.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.common.service.impl.BaseServiceImpl;
+import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
+import io.geekidea.springbootplus.framework.core.pagination.Paging;
+import io.geekidea.springbootplus.framework.log.entity.SysLoginLog;
+import io.geekidea.springbootplus.framework.log.mapper.SysLoginLogMapper;
+import io.geekidea.springbootplus.framework.log.param.SysLoginLogPageParam;
+import io.geekidea.springbootplus.framework.log.service.SysLoginLogService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 系统登录日志 服务实现类
+ *
+ * @author geekidea
+ * @since 2020-03-24
+ */
+@Slf4j
+@Service
+public class SysLoginLogServiceImpl extends BaseServiceImpl<SysLoginLogMapper, SysLoginLog> implements SysLoginLogService {
+
+    @Autowired
+    private SysLoginLogMapper sysLoginLogMapper;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean saveSysLoginLog(SysLoginLog sysLoginLog) throws Exception {
+        return super.save(sysLoginLog);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean updateSysLoginLog(SysLoginLog sysLoginLog) throws Exception {
+        return super.updateById(sysLoginLog);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean deleteSysLoginLog(Long id) throws Exception {
+        return super.removeById(id);
+    }
+
+    @Override
+    public Paging<SysLoginLog> getSysLoginLogPageList(SysLoginLogPageParam sysLoginLogPageParam) throws Exception {
+        Page<SysLoginLog> page = new PageInfo<>(sysLoginLogPageParam,OrderItem.desc(getLambdaColumn(SysLoginLog::getCreateTime)));
+        LambdaQueryWrapper<SysLoginLog> wrapper = new LambdaQueryWrapper<>();
+        IPage<SysLoginLog> iPage = sysLoginLogMapper.selectPage(page, wrapper);
+        return new Paging<SysLoginLog>(iPage);
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/log/service/impl/SysOperationLogServiceImpl.java

@@ -0,0 +1,74 @@
+/*
+ * 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.log.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.common.service.impl.BaseServiceImpl;
+import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
+import io.geekidea.springbootplus.framework.core.pagination.Paging;
+import io.geekidea.springbootplus.framework.log.entity.SysOperationLog;
+import io.geekidea.springbootplus.framework.log.mapper.SysOperationLogMapper;
+import io.geekidea.springbootplus.framework.log.param.SysOperationLogPageParam;
+import io.geekidea.springbootplus.framework.log.service.SysOperationLogService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 系统操作日志 服务实现类
+ *
+ * @author geekidea
+ * @since 2020-03-19
+ */
+@Slf4j
+@Service
+public class SysOperationLogServiceImpl extends BaseServiceImpl<SysOperationLogMapper, SysOperationLog> implements SysOperationLogService {
+
+    @Autowired
+    private SysOperationLogMapper sysOperationLogMapper;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean saveSysOperationLog(SysOperationLog sysOperationLog) throws Exception {
+        return super.save(sysOperationLog);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean updateSysOperationLog(SysOperationLog sysOperationLog) throws Exception {
+        return super.updateById(sysOperationLog);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean deleteSysOperationLog(Long id) throws Exception {
+        return super.removeById(id);
+    }
+
+    @Override
+    public Paging<SysOperationLog> getSysOperationLogPageList(SysOperationLogPageParam sysOperationLogPageParam) throws Exception {
+        Page<SysOperationLog> page = new PageInfo<>(sysOperationLogPageParam,OrderItem.desc(getLambdaColumn(SysOperationLog::getCreateTime)));
+        LambdaQueryWrapper<SysOperationLog> wrapper = new LambdaQueryWrapper<>();
+        IPage<SysOperationLog> iPage = sysOperationLogMapper.selectPage(page, wrapper);
+        return new Paging<SysOperationLog>(iPage);
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/cache/LoginRedisService.java

@@ -0,0 +1,98 @@
+/*
+ * 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.cache;
+
+
+import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
+import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserRedisVo;
+import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserVo;
+
+/**
+ * 登录信息Redis缓存操作服务
+ *
+ * @author geekidea
+ * @date 2019-09-30
+ * @since 1.3.0.RELEASE
+ **/
+public interface LoginRedisService {
+
+    /**
+     * 缓存登录信息
+     *
+     * @param jwtToken
+     * @param loginSysUserVo
+     */
+    void cacheLoginInfo(JwtToken jwtToken, LoginSysUserVo loginSysUserVo);
+
+
+    /**
+     * 刷新登录信息
+     *
+     * @param oldToken
+     * @param username
+     * @param newJwtToken
+     */
+    void refreshLoginInfo(String oldToken, String username, JwtToken newJwtToken);
+
+    /**
+     * 通过用户名，从缓存中获取登录用户LoginSysUserRedisVo
+     *
+     * @param username
+     * @return
+     */
+    LoginSysUserRedisVo getLoginSysUserRedisVo(String username);
+
+    /**
+     * 获取登录用户对象
+     *
+     * @param username
+     * @return
+     */
+    LoginSysUserVo getLoginSysUserVo(String username);
+
+    /**
+     * 通过用户名称获取盐值
+     *
+     * @param username
+     * @return
+     */
+    String getSalt(String username);
+
+    /**
+     * 删除对应用户的Redis缓存
+     *
+     * @param token
+     * @param username
+     */
+    void deleteLoginInfo(String token, String username);
+
+    /**
+     * 判断token在redis中是否存在
+     *
+     * @param token
+     * @return
+     */
+    boolean exists(String token);
+
+    /**
+     * 删除用户所有登录缓存
+     *
+     * @param username
+     */
+    void deleteUserAllCache(String username);
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/cache/impl/LoginRedisServiceImpl.java

@@ -0,0 +1,199 @@
+/*
+ * 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.cache.impl;
+
+import io.geekidea.springbootplus.config.constant.CommonRedisKey;
+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.framework.shiro.jwt.JwtToken;
+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.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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 登录信息Redis缓存服务类
+ *
+ * @author geekidea
+ * @date 2019-09-30
+ * @since 1.3.0.RELEASE
+ **/
+@Service
+public class LoginRedisServiceImpl implements LoginRedisService {
+
+    @Autowired
+    private JwtProperties jwtProperties;
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    /**
+     * key-value: 有过期时间-->token过期时间
+     * 1. tokenMd5:jwtTokenRedisVo
+     * 2. username:loginSysUserRedisVo
+     * 3. username:salt
+     * hash: 没有过期时间，统计在线的用户信息
+     * username:num
+     */
+    @Override
+    public void cacheLoginInfo(JwtToken jwtToken, LoginSysUserVo loginSysUserVo) {
+        if (jwtToken == null) {
+            throw new IllegalArgumentException("jwtToken不能为空");
+        }
+        if (loginSysUserVo == null) {
+            throw new IllegalArgumentException("loginSysUserVo不能为空");
+        }
+        // token
+        String token = jwtToken.getToken();
+        // 盐值
+        String salt = jwtToken.getSalt();
+        // 登录用户名称
+        String username = loginSysUserVo.getUsername();
+        // token md5值
+        String tokenMd5 = DigestUtils.md5Hex(token);
+
+        // Redis缓存JWT Token信息
+        JwtTokenRedisVo jwtTokenRedisVo = ShiroMapstructConvert.INSTANCE.jwtTokenToJwtTokenRedisVo(jwtToken);
+
+        // 用户客户端信息
+        ClientInfo clientInfo = ClientInfoUtil.get(HttpServletRequestUtil.getRequest());
+
+        // Redis缓存登录用户信息
+        // 将LoginSysUserVo对象复制到LoginSysUserRedisVo，使用mapstruct进行对象属性复制
+        LoginSysUserRedisVo loginSysUserRedisVo = LoginSysUserVoConvert.INSTANCE.voToRedisVo(loginSysUserVo);
+        loginSysUserRedisVo.setSalt(salt);
+        loginSysUserRedisVo.setClientInfo(clientInfo);
+
+        // Redis过期时间与JwtToken过期时间一致
+        Duration expireDuration = Duration.ofSeconds(jwtToken.getExpireSecond());
+
+        // 判断是否启用单个用户登录，如果是，这每个用户只有一个有效token
+        boolean singleLogin = jwtProperties.isSingleLogin();
+        if (singleLogin) {
+            deleteUserAllCache(username);
+        }
+
+        // 1. tokenMd5:jwtTokenRedisVo
+        String loginTokenRedisKey = String.format(CommonRedisKey.LOGIN_TOKEN, tokenMd5);
+        redisTemplate.opsForValue().set(loginTokenRedisKey, jwtTokenRedisVo, expireDuration);
+        // 2. username:loginSysUserRedisVo
+        redisTemplate.opsForValue().set(String.format(CommonRedisKey.LOGIN_USER, username), loginSysUserRedisVo, expireDuration);
+        // 3. salt hash,方便获取盐值鉴权
+        redisTemplate.opsForValue().set(String.format(CommonRedisKey.LOGIN_SALT, username), salt, expireDuration);
+        // 4. login user token
+        redisTemplate.opsForValue().set(String.format(CommonRedisKey.LOGIN_USER_TOKEN, username, tokenMd5), loginTokenRedisKey, expireDuration);
+    }
+
+    @Override
+    public void refreshLoginInfo(String oldToken, String username, JwtToken newJwtToken) {
+        // 获取缓存的登录用户信息
+        LoginSysUserRedisVo loginSysUserRedisVo = getLoginSysUserRedisVo(username);
+        // 删除之前的token信息
+        deleteLoginInfo(oldToken, username);
+        // 缓存登录信息
+        cacheLoginInfo(newJwtToken, loginSysUserRedisVo);
+    }
+
+    @Override
+    public LoginSysUserRedisVo getLoginSysUserRedisVo(String username) {
+        if (StringUtils.isBlank(username)) {
+            throw new IllegalArgumentException("username不能为空");
+        }
+        return (LoginSysUserRedisVo) redisTemplate.opsForValue().get(String.format(CommonRedisKey.LOGIN_USER, username));
+    }
+
+    @Override
+    public LoginSysUserVo getLoginSysUserVo(String username) {
+        if (StringUtils.isBlank(username)) {
+            throw new IllegalArgumentException("username不能为空");
+        }
+        LoginSysUserRedisVo userRedisVo = getLoginSysUserRedisVo(username);
+        return userRedisVo;
+    }
+
+    @Override
+    public String getSalt(String username) {
+        if (StringUtils.isBlank(username)) {
+            throw new IllegalArgumentException("username不能为空");
+        }
+        String salt = (String) redisTemplate.opsForValue().get(String.format(CommonRedisKey.LOGIN_SALT, username));
+        return salt;
+    }
+
+    @Override
+    public void deleteLoginInfo(String token, String username) {
+        if (token == null) {
+            throw new IllegalArgumentException("token不能为空");
+        }
+        if (username == null) {
+            throw new IllegalArgumentException("username不能为空");
+        }
+        String tokenMd5 = DigestUtils.md5Hex(token);
+        // 1. delete tokenMd5
+        redisTemplate.delete(String.format(CommonRedisKey.LOGIN_TOKEN, tokenMd5));
+        // 2. delete username
+        redisTemplate.delete(String.format(CommonRedisKey.LOGIN_USER, username));
+        // 3. delete salt
+        redisTemplate.delete(String.format(CommonRedisKey.LOGIN_SALT, username));
+        // 4. delete user token
+        redisTemplate.delete(String.format(CommonRedisKey.LOGIN_USER_TOKEN, username, tokenMd5));
+    }
+
+    @Override
+    public boolean exists(String token) {
+        if (token == null) {
+            throw new IllegalArgumentException("token不能为空");
+        }
+        String tokenMd5 = DigestUtils.md5Hex(token);
+        Object object = redisTemplate.opsForValue().get(String.format(CommonRedisKey.LOGIN_TOKEN, tokenMd5));
+        return object != null;
+    }
+
+    @Override
+    public void deleteUserAllCache(String username) {
+        Set<String> userTokenMd5Set = redisTemplate.keys(String.format(CommonRedisKey.LOGIN_USER_ALL_TOKEN, username));
+        if (CollectionUtils.isEmpty(userTokenMd5Set)) {
+            return;
+        }
+
+        // 1. 删除登录用户的所有token信息
+        List<String> tokenMd5List = redisTemplate.opsForValue().multiGet(userTokenMd5Set);
+        redisTemplate.delete(tokenMd5List);
+        // 2. 删除登录用户的所有user:token信息
+        redisTemplate.delete(userTokenMd5Set);
+        // 3. 删除登录用户信息
+        redisTemplate.delete(String.format(CommonRedisKey.LOGIN_USER, username));
+        // 4. 删除登录用户盐值信息
+        redisTemplate.delete(String.format(CommonRedisKey.LOGIN_SALT, username));
+    }
+
+
+}

framework/src/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);
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvert.java

@@ -0,0 +1,44 @@
+/*
+ * 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.jwt.JwtToken;
+import io.geekidea.springbootplus.framework.shiro.vo.JwtTokenRedisVo;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * Shiro包下使用mapstruct对象属性复制转换器
+ *
+ * @author geekidea
+ * @date 2019-09-30
+ * @since 1.3.0.RELEASE
+ **/
+@Mapper
+public interface ShiroMapstructConvert {
+
+    ShiroMapstructConvert INSTANCE = Mappers.getMapper(ShiroMapstructConvert.class);
+
+    /**
+     * JwtToken对象转换成JwtTokenRedisVo
+     *
+     * @param jwtToken
+     * @return
+     */
+    JwtTokenRedisVo jwtTokenToJwtTokenRedisVo(JwtToken jwtToken);
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/exception/ShiroConfigException.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.exception;
+
+import io.geekidea.springbootplus.framework.common.api.ApiCode;
+import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusException;
+
+/**
+ * Shiro配置异常
+ *
+ * @author geekidea
+ * @date 2019-09-29
+ * @since 1.3.0.RELEASE
+ **/
+public class ShiroConfigException extends SpringBootPlusException {
+	private static final long serialVersionUID = -4573955712491628431L;
+
+	public ShiroConfigException(String message) {
+        super(message);
+    }
+
+    public ShiroConfigException(Integer errorCode, String message) {
+        super(errorCode, message);
+    }
+
+    public ShiroConfigException(ApiCode apiCode) {
+        super(apiCode);
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtCredentialsMatcher.java

@@ -0,0 +1,47 @@
+/*
+ * 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.jwt;
+
+import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.credential.CredentialsMatcher;
+
+/**
+ * JWT证书匹配
+ *
+ * @author geekidea
+ * @date 2019-09-30
+ * @since 1.3.0.RELEASE
+ **/
+@Slf4j
+public class JwtCredentialsMatcher implements CredentialsMatcher {
+
+    @Override
+    public boolean doCredentialsMatch(AuthenticationToken authenticationToken, AuthenticationInfo authenticationInfo) {
+        String token = authenticationToken.getCredentials().toString();
+        String salt = authenticationInfo.getCredentials().toString();
+        try {
+            return JwtUtil.verifyToken(token, salt);
+        } catch (Exception e) {
+            log.error("JWT Token CredentialsMatch Exception:" + e.getMessage(), e);
+        }
+        return false;
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtFilter.java

@@ -0,0 +1,181 @@
+/*
+ * 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.jwt;
+
+import io.geekidea.springbootplus.config.properties.JwtProperties;
+import io.geekidea.springbootplus.framework.common.api.ApiCode;
+import io.geekidea.springbootplus.framework.common.api.ApiResult;
+import io.geekidea.springbootplus.framework.shiro.cache.LoginRedisService;
+import io.geekidea.springbootplus.framework.shiro.service.ShiroLoginService;
+import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil;
+import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
+import io.geekidea.springbootplus.framework.util.HttpServletResponseUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.web.filter.authc.AuthenticatingFilter;
+import org.apache.shiro.web.util.WebUtils;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Shiro JWT授权过滤器
+ *
+ * @author geekidea
+ * @date 2019-09-27
+ * @since 1.3.0.RELEASE
+ **/
+@Slf4j
+public class JwtFilter extends AuthenticatingFilter {
+
+    private ShiroLoginService shiroLoginService;
+
+    private LoginRedisService loginRedisService;
+
+    private JwtProperties jwtProperties;
+
+    public JwtFilter(ShiroLoginService shiroLoginService, LoginRedisService loginRedisService, JwtProperties jwtProperties) {
+        this.shiroLoginService = shiroLoginService;
+        this.loginRedisService = loginRedisService;
+        this.jwtProperties = jwtProperties;
+    }
+
+    /**
+     * 将JWT Token包装成AuthenticationToken
+     *
+     * @param servletRequest
+     * @param servletResponse
+     * @return
+     * @throws Exception
+     */
+    @Override
+    protected AuthenticationToken createToken(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception {
+        String token = JwtTokenUtil.getToken();
+        if (StringUtils.isBlank(token)) {
+            throw new AuthenticationException("token不能为空");
+        }
+        if (JwtUtil.isExpired(token)) {
+            throw new AuthenticationException("JWT Token已过期,token:" + token);
+        }
+
+        // 如果开启redis二次校验，或者设置为单个用户token登录，则先在redis中判断token是否存在
+        if (jwtProperties.isRedisCheck() || jwtProperties.isSingleLogin()) {
+            boolean redisExpired = loginRedisService.exists(token);
+            if (!redisExpired) {
+                throw new AuthenticationException("Redis Token不存在,token:" + token);
+            }
+        }
+
+        String username = JwtUtil.getUsername(token);
+        String salt;
+        if (jwtProperties.isSaltCheck()){
+            salt = loginRedisService.getSalt(username);
+        }else{
+            salt = jwtProperties.getSecret();
+        }
+        return JwtToken.build(token, username, salt, jwtProperties.getExpireSecond());
+    }
+
+    /**
+     * 访问失败处理
+     *
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @Override
+    protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
+        HttpServletRequest httpServletRequest = WebUtils.toHttp(request);
+        HttpServletResponse httpServletResponse = WebUtils.toHttp(response);
+        // 返回401
+        httpServletResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+        // 设置响应码为401或者直接输出消息
+        String url = httpServletRequest.getRequestURI();
+        log.error("onAccessDenied url：{}", url);
+        ApiResult<Boolean> apiResult = ApiResult.fail(ApiCode.UNAUTHORIZED);
+        HttpServletResponseUtil.printJson(httpServletResponse, apiResult);
+        return false;
+    }
+
+    /**
+     * 判断是否允许访问
+     *
+     * @param request
+     * @param response
+     * @param mappedValue
+     * @return
+     */
+    @Override
+    protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
+        String url = WebUtils.toHttp(request).getRequestURI();
+        log.debug("isAccessAllowed url:{}", url);
+        if (this.isLoginRequest(request, response)) {
+            return true;
+        }
+        boolean allowed = false;
+        try {
+            allowed = executeLogin(request, response);
+        } catch (IllegalStateException e) { //not found any token
+            log.error("Token不能为空", e);
+        } catch (Exception e) {
+            log.error("访问错误", e);
+        }
+        return allowed || super.isPermissive(mappedValue);
+    }
+
+    /**
+     * 登录成功处理
+     *
+     * @param token
+     * @param subject
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @Override
+    protected boolean onLoginSuccess(AuthenticationToken token, Subject subject, ServletRequest request, ServletResponse response) throws Exception {
+        String url = WebUtils.toHttp(request).getRequestURI();
+        log.debug("鉴权成功,token:{},url:{}", token, url);
+        // 刷新token
+        JwtToken jwtToken = (JwtToken) token;
+        HttpServletResponse httpServletResponse = WebUtils.toHttp(response);
+        shiroLoginService.refreshToken(jwtToken, httpServletResponse);
+        return true;
+    }
+
+    /**
+     * 登录失败处理
+     *
+     * @param token
+     * @param e
+     * @param request
+     * @param response
+     * @return
+     */
+    @Override
+    protected boolean onLoginFailure(AuthenticationToken token, AuthenticationException e, ServletRequest request, ServletResponse response) {
+        log.error("登录失败，token:" + token + ",error:" + e.getMessage(), e);
+        return false;
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtRealm.java

@@ -0,0 +1,104 @@
+/*
+ * 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.jwt;
+
+import io.geekidea.springbootplus.framework.shiro.cache.LoginRedisService;
+import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserRedisVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.SetUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.SimpleAuthenticationInfo;
+import org.apache.shiro.authz.AuthorizationInfo;
+import org.apache.shiro.authz.SimpleAuthorizationInfo;
+import org.apache.shiro.realm.AuthorizingRealm;
+import org.apache.shiro.subject.PrincipalCollection;
+
+/**
+ * Shiro 授权认证
+ *
+ * @author geekidea
+ * @date 2019-09-27
+ * @since 1.3.0.RELEASE
+ **/
+@Slf4j
+public class JwtRealm extends AuthorizingRealm {
+
+    private LoginRedisService loginRedisService;
+
+    public JwtRealm(LoginRedisService loginRedisService) {
+        this.loginRedisService = loginRedisService;
+    }
+
+    @Override
+    public boolean supports(AuthenticationToken token) {
+        return token != null && token instanceof JwtToken;
+    }
+
+    /**
+     * 授权认证,设置角色/权限信息
+     *
+     * @param principalCollection
+     * @return
+     */
+    @Override
+    protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) {
+        log.debug("doGetAuthorizationInfo principalCollection...");
+        // 设置角色/权限信息
+        JwtToken jwtToken = (JwtToken) principalCollection.getPrimaryPrincipal();
+        // 获取username
+        String username = jwtToken.getUsername();
+        // 获取登录用户角色权限信息
+        LoginSysUserRedisVo loginSysUserRedisVo = loginRedisService.getLoginSysUserRedisVo(username);
+        SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo();
+        // 设置角色
+        authorizationInfo.setRoles(SetUtils.hashSet(loginSysUserRedisVo.getRoleCode()));
+        // 设置权限
+        authorizationInfo.setStringPermissions(loginSysUserRedisVo.getPermissionCodes());
+        return authorizationInfo;
+    }
+
+    /**
+     * 登录认证
+     *
+     * @param authenticationToken
+     * @return
+     * @throws AuthenticationException
+     */
+    @Override
+    protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException {
+        log.debug("doGetAuthenticationInfo authenticationToken...");
+        // 校验token
+        JwtToken jwtToken = (JwtToken) authenticationToken;
+        if (jwtToken == null) {
+            throw new AuthenticationException("jwtToken不能为空");
+        }
+        String salt = jwtToken.getSalt();
+        if (StringUtils.isBlank(salt)) {
+            throw new AuthenticationException("salt不能为空");
+        }
+        return new SimpleAuthenticationInfo(
+                jwtToken,
+                salt,
+                getName()
+        );
+
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtToken.java

@@ -0,0 +1,98 @@
+/*
+ * 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.jwt;
+
+import com.auth0.jwt.interfaces.DecodedJWT;
+import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
+import io.geekidea.springbootplus.framework.util.IpUtil;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.apache.shiro.authc.HostAuthenticationToken;
+
+import java.util.Date;
+
+/**
+ * Shiro JwtToken对象
+ *
+ * @author geekidea
+ * @date 2019-09-27
+ * @since 1.3.0.RELEASE
+ **/
+@Data
+@Accessors(chain = true)
+public class JwtToken implements HostAuthenticationToken {
+	private static final long serialVersionUID = 5101247566043093405L;
+	
+	/**
+     * 登录ip
+     */
+    private String host;
+    /**
+     * 登录用户名称
+     */
+    private String username;
+    /**
+     * 登录盐值
+     */
+    private String salt;
+    /**
+     * 登录token
+     */
+    private String token;
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+    /**
+     * 多长时间过期，默认一小时
+     */
+    private long expireSecond;
+    /**
+     * 过期日期
+     */
+    private Date expireDate;
+
+    private String principal;
+
+    private String credentials;
+
+    @Override
+    public Object getPrincipal() {
+        return token;
+    }
+
+    @Override
+    public Object getCredentials() {
+        return token;
+    }
+
+    public static JwtToken build(String token, String username, String salt, long expireSecond) {
+        DecodedJWT decodedJwt = JwtUtil.getJwtInfo(token);
+        Date createDate = decodedJwt.getIssuedAt();
+        Date expireDate = decodedJwt.getExpiresAt();
+        return new JwtToken()
+                .setUsername(username)
+                .setToken(token)
+                .setHost(IpUtil.getRequestIp())
+                .setSalt(salt)
+                .setCreateDate(createDate)
+                .setExpireSecond(expireSecond)
+                .setExpireDate(expireDate);
+
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/LoginToken.java

@@ -0,0 +1,36 @@
+/*
+ * 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.service;
+
+import java.io.Serializable;
+
+/**
+ * 获取登录token
+ *
+ * @author geekidea
+ * @date 2020/3/25
+ **/
+public interface LoginToken extends Serializable {
+
+    /**
+     * 获取登录token
+     *
+     * @return
+     */
+    String getToken();
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/LoginUsername.java

@@ -0,0 +1,36 @@
+/*
+ * 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.service;
+
+import java.io.Serializable;
+
+/**
+ * 获取登录用户名称
+ *
+ * @author geekidea
+ * @date 2020/3/24
+ **/
+public interface LoginUsername extends Serializable {
+
+    /**
+     * 获取用户名
+     *
+     * @return
+     */
+    String getUsername();
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/ShiroLoginService.java

@@ -0,0 +1,42 @@
+/*
+ * 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.service;
+
+import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author geekidea
+ * @date 2020/3/24
+ **/
+public interface ShiroLoginService {
+    /**
+     * 如果(当前时间+倒计时) > 过期时间，则刷新token
+     * 并更新缓存
+     * 当前token失效，返回新token
+     * 当前请求有效，返回状态码：460
+     * 前端下次使用新token
+     * 如果token继续发往后台，则提示，此token已失效，请使用新token，不在返回新token，返回状态码：461
+     *
+     * @param jwtToken
+     * @param httpServletResponse
+     * @throws Exception
+     */
+    void refreshToken(JwtToken jwtToken, HttpServletResponse httpServletResponse) throws Exception;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/impl/ShiroLoginServiceImpl.java

@@ -0,0 +1,115 @@
+/*
+ * 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.service.impl;
+
+import io.geekidea.springbootplus.config.constant.CommonConstant;
+import io.geekidea.springbootplus.config.properties.JwtProperties;
+import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
+import io.geekidea.springbootplus.framework.shiro.cache.LoginRedisService;
+import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
+import io.geekidea.springbootplus.framework.shiro.service.ShiroLoginService;
+import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil;
+import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.apache.shiro.authc.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
+import java.time.Duration;
+import java.util.Date;
+
+/**
+ * Shiro登录服务
+ *
+ * @author geekidea
+ * @date 2020/3/24
+ **/
+@Slf4j
+@Service
+public class ShiroLoginServiceImpl implements ShiroLoginService {
+
+
+    @Lazy
+    @Autowired
+    private LoginRedisService loginRedisService;
+
+    @Lazy
+    @Autowired
+    private JwtProperties jwtProperties;
+
+    @Lazy
+    @Autowired
+    private SpringBootPlusProperties springBootPlusProperties;
+
+    @Lazy
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+
+    @Override
+    public void refreshToken(JwtToken jwtToken, HttpServletResponse httpServletResponse) throws Exception {
+        if (jwtToken == null) {
+            return;
+        }
+        String token = jwtToken.getToken();
+        if (StringUtils.isBlank(token)) {
+            return;
+        }
+        // 判断是否刷新token
+        boolean isRefreshToken = jwtProperties.isRefreshToken();
+        if (!isRefreshToken) {
+            return;
+        }
+        // 获取过期时间
+        Date expireDate = JwtUtil.getExpireDate(token);
+        // 获取倒计时
+        Integer countdown = jwtProperties.getRefreshTokenCountdown();
+        // 如果(当前时间+倒计时) > 过期时间，则刷新token
+        boolean refresh = DateUtils.addSeconds(new Date(), countdown).after(expireDate);
+
+        if (!refresh) {
+            return;
+        }
+
+        // 如果token继续发往后台，则提示，此token已失效，请使用新token，不在返回新token，返回状态码：461
+        // 如果Redis缓存中没有，JwtToken没有过期，则说明，已经刷新token
+        boolean exists = loginRedisService.exists(token);
+        if (!exists) {
+            httpServletResponse.setStatus(CommonConstant.JWT_INVALID_TOKEN_CODE);
+            throw new AuthenticationException("token已无效，请使用已刷新的token");
+        }
+        String username = jwtToken.getUsername();
+        String salt = jwtToken.getSalt();
+        Long expireSecond = jwtProperties.getExpireSecond();
+        // 生成新token字符串
+        String newToken = JwtUtil.generateToken(username, salt, Duration.ofSeconds(expireSecond));
+        // 生成新JwtToken对象
+        JwtToken newJwtToken = JwtToken.build(newToken, username, salt, expireSecond);
+        // 更新redis缓存
+        loginRedisService.refreshLoginInfo(token, username, newJwtToken);
+        log.debug("刷新token成功，原token:{}，新token:{}", token, newToken);
+        // 设置响应头
+        // 刷新token
+        httpServletResponse.setStatus(CommonConstant.JWT_REFRESH_TOKEN_CODE);
+        httpServletResponse.setHeader(JwtTokenUtil.getTokenName(), newToken);
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/JwtTokenUtil.java

@@ -0,0 +1,81 @@
+/*
+ * 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.util;
+
+import io.geekidea.springbootplus.config.properties.JwtProperties;
+import io.geekidea.springbootplus.framework.util.HttpServletRequestUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * JwtToken工具类
+ *
+ * @author geekidea
+ * @date 2019-10-03
+ * @since 1.3.0.RELEASE
+ **/
+@Slf4j
+@Component
+public class JwtTokenUtil {
+
+    private static String tokenName;
+
+    public JwtTokenUtil(JwtProperties jwtProperties) {
+        tokenName = jwtProperties.getTokenName();
+        log.debug("tokenName:{}", tokenName);
+    }
+
+    /**
+     * 获取token名称
+     *
+     * @return
+     */
+    public static String getTokenName() {
+        return tokenName;
+    }
+
+    /**
+     * 从请求头或者请求参数中
+     *
+     * @return
+     */
+    public static String getToken() {
+        return getToken(HttpServletRequestUtil.getRequest());
+    }
+
+    /**
+     * 从请求头或者请求参数中
+     *
+     * @param request
+     * @return
+     */
+    public static String getToken(HttpServletRequest request) {
+        if (request == null) {
+            throw new IllegalArgumentException("request不能为空");
+        }
+        // 从请求头中获取token
+        String token = request.getHeader(tokenName);
+        if (StringUtils.isBlank(token)) {
+            // 从请求参数中获取token
+            token = request.getParameter(tokenName);
+        }
+        return token;
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/JwtUtil.java

@@ -0,0 +1,204 @@
+/*
+ * 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.util;
+
+import com.alibaba.fastjson.JSON;
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.JWTVerifier;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.interfaces.DecodedJWT;
+import io.geekidea.springbootplus.config.constant.CommonConstant;
+import io.geekidea.springbootplus.config.properties.JwtProperties;
+import io.geekidea.springbootplus.framework.util.UUIDUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.util.Date;
+
+/**
+ * JWT工具类
+ * https://github.com/auth0/java-jwt
+ *
+ * @author geekidea
+ * @date 2019-09-30
+ * @since 1.3.0.RELEASE
+ **/
+@Slf4j
+@Component
+public class JwtUtil {
+
+    private static JwtProperties jwtProperties;
+
+    public JwtUtil(JwtProperties jwtProperties) {
+        JwtUtil.jwtProperties = jwtProperties;
+        log.info(JSON.toJSONString(JwtUtil.jwtProperties));
+    }
+
+    /**
+     * 生成JWT Token
+     *
+     * @param username       用户名
+     * @param salt           盐值
+     * @param expireDuration 过期时间和单位
+     * @return token
+     */
+    public static String generateToken(String username, String salt, Duration expireDuration) {
+        try {
+            if (StringUtils.isBlank(username)) {
+                log.error("username不能为空");
+                return null;
+            }
+            log.debug("username:{}", username);
+
+            // 如果盐值为空，则使用默认值：666666
+            if (StringUtils.isBlank(salt)) {
+                salt = jwtProperties.getSecret();
+            }
+            log.debug("salt:{}", salt);
+
+            // 过期时间，单位：秒
+            Long expireSecond;
+            // 默认过期时间为1小时
+            if (expireDuration == null) {
+                expireSecond = jwtProperties.getExpireSecond();
+            } else {
+                expireSecond = expireDuration.getSeconds();
+            }
+            log.debug("expireSecond:{}", expireSecond);
+            Date expireDate = DateUtils.addSeconds(new Date(), expireSecond.intValue());
+            log.debug("expireDate:{}", expireDate);
+
+            // 生成token
+            Algorithm algorithm = Algorithm.HMAC256(salt);
+            String token = JWT.create()
+                    .withClaim(CommonConstant.JWT_USERNAME, username)
+                    // jwt唯一id
+                    .withJWTId(UUIDUtil.getUuid())
+                    // 签发人
+                    .withIssuer(jwtProperties.getIssuer())
+                    // 主题
+                    .withSubject(jwtProperties.getSubject())
+                    // 签发的目标
+                    .withAudience(jwtProperties.getAudience())
+                    // 签名时间
+                    .withIssuedAt(new Date())
+                    // token过期时间
+                    .withExpiresAt(expireDate)
+                    // 签名
+                    .sign(algorithm);
+            return token;
+        } catch (Exception e) {
+            log.error("generateToken exception", e);
+        }
+        return null;
+    }
+
+    public static boolean verifyToken(String token, String salt) {
+        try {
+            Algorithm algorithm = Algorithm.HMAC256(salt);
+            JWTVerifier verifier = JWT.require(algorithm)
+                    // 签发人
+                    .withIssuer(jwtProperties.getIssuer())
+                    // 主题
+                    .withSubject(jwtProperties.getSubject())
+                    // 签发的目标
+                    .withAudience(jwtProperties.getAudience())
+                    .build();
+            DecodedJWT jwt = verifier.verify(token);
+            if (jwt != null) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("Verify Token Exception", e);
+        }
+        return false;
+    }
+
+    /**
+     * 解析token，获取token数据
+     *
+     * @param token
+     * @return
+     */
+    public static DecodedJWT getJwtInfo(String token) {
+        return JWT.decode(token);
+    }
+
+    /**
+     * 获取用户名
+     *
+     * @param token
+     * @return
+     */
+    public static String getUsername(String token) {
+        if (StringUtils.isBlank(token)){
+            return null;
+        }
+        DecodedJWT decodedJwt = getJwtInfo(token);
+        if (decodedJwt == null) {
+            return null;
+        }
+        String username = decodedJwt.getClaim(CommonConstant.JWT_USERNAME).asString();
+        return username;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @param token
+     * @return
+     */
+    public static Date getIssuedAt(String token) {
+        DecodedJWT decodedJwt = getJwtInfo(token);
+        if (decodedJwt == null) {
+            return null;
+        }
+        return decodedJwt.getIssuedAt();
+    }
+
+    /**
+     * 获取过期时间
+     *
+     * @param token
+     * @return
+     */
+    public static Date getExpireDate(String token) {
+        DecodedJWT decodedJwt = getJwtInfo(token);
+        if (decodedJwt == null) {
+            return null;
+        }
+        return decodedJwt.getExpiresAt();
+    }
+
+    /**
+     * 判断token是否已过期
+     *
+     * @param token
+     * @return
+     */
+    public static boolean isExpired(String token) {
+        Date expireDate = getExpireDate(token);
+        if (expireDate == null) {
+            return true;
+        }
+        return expireDate.before(new Date());
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/SaltUtil.java

@@ -0,0 +1,77 @@
+/*
+ * 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.util;
+
+import io.geekidea.springbootplus.config.properties.JwtProperties;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.crypto.SecureRandomNumberGenerator;
+
+/**
+ * 盐值包装工具类
+ *
+ * @author geekidea
+ * @date 2019-09-30
+ * @since 1.3.0.RELEASE
+ **/
+public class SaltUtil {
+
+    /**
+     * 盐值包装
+     *
+     * @param secret 配置文件中配置的附加盐值
+     * @param salt   数据库中保存的盐值
+     * @return
+     */
+    public static String getSalt(String secret, String salt) {
+        if (StringUtils.isBlank(secret) && StringUtils.isBlank(salt)) {
+            return null;
+        }
+        // 加密方法
+        String newSalt = DigestUtils.sha256Hex(secret + salt);
+        return newSalt;
+    }
+
+    /**
+     * 生成32位随机盐
+     *
+     * @return
+     */
+    public static String generateSalt() {
+        return new SecureRandomNumberGenerator().nextBytes(16).toHex();
+    }
+
+    /**
+     * 加工盐值
+     *
+     * @param salt
+     * @param jwtProperties
+     * @return
+     */
+    public static String getSalt(String salt, JwtProperties jwtProperties) {
+        String newSalt;
+        if (jwtProperties.isSaltCheck()) {
+            // 包装盐值
+            newSalt = SaltUtil.getSalt(jwtProperties.getSecret(), salt);
+        } else {
+            newSalt = jwtProperties.getSecret();
+        }
+        return newSalt;
+    }
+
+}
+

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/JwtTokenRedisVo.java

@@ -0,0 +1,64 @@
+/*
+ * 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.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * JwtToken Redis缓存对象
+ *
+ * @author geekidea
+ * @date 2019-09-30
+ **/
+@Data
+@Accessors(chain = true)
+public class JwtTokenRedisVo implements Serializable {
+    private static final long serialVersionUID = 1831633309466775223L;
+    /**
+     * 登录ip
+     */
+    private String host;
+    /**
+     * 登录用户名称
+     */
+    private String username;
+    /**
+     * 登录盐值
+     */
+    private String salt;
+    /**
+     * 登录token
+     */
+    private String token;
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+    /**
+     * 多长时间过期，默认一小时
+     */
+    private long expireSecond;
+    /**
+     * 过期日期
+     */
+    private Date expireDate;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/LoginSysUserRedisVo.java

@@ -0,0 +1,47 @@
+/*
+ * 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.vo;
+
+import io.geekidea.springbootplus.framework.common.bean.ClientInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 登录用户Redis对象，后台使用
+ *
+ * @author geekidea
+ * @date 2019-9-30
+ **/
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class LoginSysUserRedisVo extends LoginSysUserVo {
+
+    private static final long serialVersionUID = -3858850188055605806L;
+
+    /**
+     * 包装后的盐值
+     */
+    private String salt;
+
+    /**
+     * 登录ip
+     */
+    private ClientInfo clientInfo;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/LoginSysUserVo.java

@@ -0,0 +1,73 @@
+/*
+ * 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.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Set;
+
+/**
+ * <p>
+ * 登录用户对象，响应给前端
+ * </p>
+ *
+ * @author geekidea
+ * @date 2019-05-15
+ **/
+@Data
+@Accessors(chain = true)
+public class LoginSysUserVo implements Serializable {
+
+    private static final long serialVersionUID = -1758338570596088158L;
+
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("用户名")
+    private String username;
+
+    @ApiModelProperty("昵称")
+    private String nickname;
+
+    @ApiModelProperty("性别，0：女，1：男，默认1")
+    private Integer gender;
+
+    @ApiModelProperty("状态，0：禁用，1：启用，2：锁定")
+    private Integer state;
+
+    @ApiModelProperty("部门id")
+    private Long departmentId;
+
+    @ApiModelProperty("部门名称")
+    private String departmentName;
+
+    @ApiModelProperty("角色id")
+    private Long roleId;
+
+    @ApiModelProperty("角色名称")
+    private String roleName;
+
+    @ApiModelProperty("角色编码")
+    private String roleCode;
+
+    @ApiModelProperty("权限编码列表")
+    private Set<String> permissionCodes;
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/util/AnsiUtil.java

@@ -0,0 +1,58 @@
+/*
+ * 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.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.fusesource.jansi.Ansi;
+import org.springframework.core.env.Environment;
+
+/**
+ * @author geekidea
+ * @date 2018-11-08
+ */
+@Slf4j
+public class AnsiUtil {
+
+    private static boolean enableAnsi;
+
+    static {
+        Boolean value = false;
+        try {
+            Environment environment = SpringContextUtil.getBean(Environment.class);
+            value = environment.getProperty("spring-boot-plus.enable-ansi",boolean.class);
+            value = value == null ? false : value;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        enableAnsi = value;
+    }
+
+    public static String getAnsi(Ansi.Color color,String text){
+
+        if (enableAnsi){
+            return Ansi.ansi().eraseScreen().fg(color).a(text).reset().toString();
+        }
+        return text;
+    }
+
+    public static String getAnsi(Ansi.Color color,String text,boolean flag){
+        if (flag){
+            return Ansi.ansi().eraseScreen().fg(color).a(text).reset().toString();
+        }
+        return text;
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/util/BaseEnumUtil.java

@@ -0,0 +1,151 @@
+/*
+ * 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.util;
+
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import io.geekidea.springbootplus.framework.common.vo.EnumVo;
+import org.apache.commons.collections4.MapUtils;
+
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * BaseEnum枚举工具类
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class BaseEnumUtil {
+
+    private static final Map<String, Map<Integer, EnumVo<? extends BaseEnum>>> ENUM_MAP = new LinkedHashMap<>();
+
+    /**
+     * 通过code获取描述
+     *
+     * @param baseEnumType
+     * @param code
+     * @return
+     */
+    public static BaseEnum getEnum(Class<? extends BaseEnum> baseEnumType, Integer code) {
+        EnumVo<? extends BaseEnum> enumVo = getEnumVo(baseEnumType, code);
+        if (enumVo == null) {
+            return null;
+        }
+        return enumVo.getBaseEnum();
+    }
+
+    /**
+     * 通过code获取描述
+     *
+     * @param baseEnumType
+     * @param code
+     * @return
+     */
+    public static EnumVo<? extends BaseEnum> getEnumVo(Class<? extends BaseEnum> baseEnumType, Integer code) {
+        Map<Integer, EnumVo<? extends BaseEnum>> map = getMap(baseEnumType);
+        if (MapUtils.isEmpty(map)) {
+            return null;
+        }
+        return map.get(code);
+    }
+
+    /**
+     * 判断code在枚举中是否存在
+     *
+     * @param baseEnumType
+     * @param code
+     * @return
+     */
+    public static boolean exists(Class<? extends BaseEnum> baseEnumType, Integer code) {
+        EnumVo<? extends BaseEnum> enumVo = getEnumVo(baseEnumType, code);
+        if (enumVo == null) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 判断code在枚举中是否不存在
+     *
+     * @param baseEnumType
+     * @param code
+     * @return
+     */
+    public static boolean notExists(Class<? extends BaseEnum> baseEnumType, Integer code) {
+        return !exists(baseEnumType, code);
+    }
+
+    /**
+     * 通过code获取描述
+     *
+     * @param baseEnumType
+     * @param code
+     * @return
+     */
+    public static String getDesc(Class<? extends BaseEnum> baseEnumType, Integer code) {
+        EnumVo<? extends BaseEnum> enumVo = getEnumVo(baseEnumType, code);
+        if (enumVo == null) {
+            return null;
+        }
+        return enumVo.getDesc();
+    }
+
+    /**
+     * 通过类型获取枚举Map
+     *
+     * @param baseEnumType
+     * @return
+     */
+    public static Map<Integer, EnumVo<? extends BaseEnum>> getMap(Class<? extends BaseEnum> baseEnumType) {
+        return ENUM_MAP.get(baseEnumType.getName());
+    }
+
+    /**
+     * 通过类型获取枚举code集合
+     *
+     * @param baseEnumType
+     * @return
+     */
+    public static Set<Integer> getCodeSet(Class<? extends BaseEnum> baseEnumType) {
+        Map<Integer, EnumVo<? extends BaseEnum>> map = getMap(baseEnumType);
+        if (MapUtils.isEmpty(map)) {
+            return null;
+        }
+        return map.keySet();
+    }
+
+    /**
+     * 通过类型获取枚举desc集合
+     *
+     * @param baseEnumType
+     * @return
+     */
+    public static Collection<EnumVo<? extends BaseEnum>> getDescList(Class<? extends BaseEnum> baseEnumType) {
+        Map<Integer, EnumVo<? extends BaseEnum>> map = getMap(baseEnumType);
+        if (MapUtils.isEmpty(map)) {
+            return null;
+        }
+        return map.values();
+    }
+
+    public static Map<String, Map<Integer, EnumVo<? extends BaseEnum>>> getEnumMap() {
+        return ENUM_MAP;
+    }
+
+}

framework/src/main/java/io/geekidea/springbootplus/framework/util/BrowserUtil.java

@@ -0,0 +1,89 @@
+/*
+ * 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.util;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <code>
+ * 浏览器工具类<br/>
+ * 1.获取当前浏览器名称
+ * 2.判断当前用户的浏览器
+ * </code>
+ *
+ * @author geekidea
+ * @since 2018-11-08
+ */
+public final class BrowserUtil {
+    public static final String IE = "msie";
+    public static final String FIREFOX = "firefox";
+    public static final String CHROME = "chrome";
+
+    private BrowserUtil() {
+        throw new AssertionError();
+    }
+
+    /**
+     * 获取当前浏览器名称
+     *
+     * @param request
+     * @return 返回浏览器名称
+     */
+    public static String getCurrent(HttpServletRequest request) {
+        String userAgent = request.getHeader("USER-AGENT").toLowerCase();
+        if (userAgent != null && !("".equals(userAgent.trim()))) {
+            if (userAgent.indexOf(CHROME) >= 0) {
+                return CHROME;
+            } else if (userAgent.indexOf(FIREFOX) >= 0) {
+                return FIREFOX;
+            } else if (userAgent.indexOf(IE) >= 0) {
+                return IE;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 是否是IE浏览器
+     *
+     * @param request
+     * @return
+     */
+    public static boolean isIe(HttpServletRequest request) {
+        return IE.equals(getCurrent(request));
+    }
+
+    /**
+     * 是否是Firefox浏览器
+     *
+     * @param request
+     * @return
+     */
+    public static boolean isFirefox(HttpServletRequest request) {
+        return FIREFOX.equals(getCurrent(request));
+    }
+
+    /**
+     * 是否是Chrome浏览器
+     *
+     * @param request
+     * @return
+     */
+    public static boolean isChrome(HttpServletRequest request) {
+        return CHROME.equals(getCurrent(request));
+    }
+}

framework/src/main/java/io/geekidea/springbootplus/framework/util/ClientInfoUtil.java

@@ -0,0 +1,120 @@
+/*
+ * 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.util;
+
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
+import io.geekidea.springbootplus.config.constant.CommonConstant;
+import io.geekidea.springbootplus.framework.common.bean.ClientInfo;
+import io.geekidea.springbootplus.framework.common.bean.DeviceInfo;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * <p>
+ *  用户客户端信息工具类
+ * </p>
+ * @author geekidea
+ * @date 2019-05-24
+ **/
+public class ClientInfoUtil {
+
+    private static final Pattern DEVICE_INFO_PATTERN = Pattern.compile(";\\s?(\\S*?\\s?\\S*?)\\s?Build/(\\S*?)[;)]");
+    private static final Pattern DEVICE_INFO_PATTERN_1 = Pattern.compile(";\\s?(\\S*?\\s?\\S*?)\\s?\\)");
+
+    /**
+     * 获取用户客户端信息
+     * @param request
+     * @return
+     */
+    public static ClientInfo get(HttpServletRequest request){
+        String userAgent = request.getHeader(CommonConstant.USER_AGENT);
+        return get(userAgent);
+    }
+
+    /**
+     * 获取用户客户端信息
+     * @param userAgentString
+     * @return
+     */
+    public static ClientInfo get(String userAgentString){
+        ClientInfo clientInfo = new ClientInfo();
+
+        UserAgent userAgent = UserAgentUtil.parse(userAgentString);
+
+        // 浏览器名称
+        clientInfo.setBrowserName(userAgent.getBrowser().getName());
+        // 浏览器版本
+        clientInfo.setBrowserversion(userAgent.getVersion());
+        // 浏览器引擎名称
+        clientInfo.setEngineName(userAgent.getEngine().getName());
+        // 浏览器引擎版本
+        clientInfo.setEngineVersion(userAgent.getEngineVersion());
+        // 用户操作系统名称
+        clientInfo.setOsName(userAgent.getOs().getName());
+        // 用户操作平台名称
+        clientInfo.setPlatformName(userAgent.getPlatform().getName());
+        // 是否是手机
+        clientInfo.setMobile(userAgent.isMobile());
+
+        // 获取移动设备名称和机型
+        DeviceInfo deviceInfo = getDeviceInfo(userAgentString);
+        // 设置移动设备名称和机型
+        clientInfo.setDeviceName(deviceInfo.getName());
+        clientInfo.setDeviceModel(deviceInfo.getModel());
+
+        // ip
+        clientInfo.setIp(IpUtil.getRequestIp());
+
+        return clientInfo;
+    }
+
+    /**
+     * 获取移动端用户设备的名称和机型
+     * @param userAgentString
+     * @return
+     */
+    public static DeviceInfo getDeviceInfo(String userAgentString){
+        DeviceInfo deviceInfo = new DeviceInfo();
+        try {
+
+            Matcher matcher = DEVICE_INFO_PATTERN.matcher(userAgentString);
+            String model = null;
+            String name = null;
+
+            if (matcher.find()) {
+                model = matcher.group(1);
+                name = matcher.group(2);
+            }
+
+            if (model == null && name == null){
+                matcher = DEVICE_INFO_PATTERN_1.matcher(userAgentString);
+                if (matcher.find()) {
+                    model = matcher.group(1);
+                }
+            }
+           
+            deviceInfo.setName(name);
+            deviceInfo.setModel(model);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return deviceInfo;
+    }
+}