mirror of
				https://github.com/continew-org/continew-admin.git
				synced 2025-11-04 10:57:10 +08:00 
			
		
		
		
	refactor: 优化部分使用类的引用路径
This commit is contained in:
		@@ -38,11 +38,11 @@ import cn.hutool.core.util.StrUtil;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import top.charles7c.cnadmin.common.annotation.CrudRequestMapping;
 | 
					import top.charles7c.cnadmin.common.annotation.CrudRequestMapping;
 | 
				
			||||||
import top.charles7c.cnadmin.common.annotation.NoResponseAdvice;
 | 
					import top.charles7c.cnadmin.common.annotation.NoResponseAdvice;
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.model.query.PageQuery;
 | 
					import top.charles7c.cnadmin.common.model.query.PageQuery;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.query.SortQuery;
 | 
					import top.charles7c.cnadmin.common.model.query.SortQuery;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
 | 
					import top.charles7c.cnadmin.common.model.resp.PageDataResp;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.resp.R;
 | 
					import top.charles7c.cnadmin.common.model.resp.R;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 控制器基类
 | 
					 * 控制器基类
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -47,11 +47,11 @@ import top.charles7c.cnadmin.common.model.query.SortQuery;
 | 
				
			|||||||
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
 | 
					import top.charles7c.cnadmin.common.model.resp.PageDataResp;
 | 
				
			||||||
import top.charles7c.cnadmin.common.service.CommonUserService;
 | 
					import top.charles7c.cnadmin.common.service.CommonUserService;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ExcelUtils;
 | 
					import top.charles7c.cnadmin.common.util.ExcelUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ExceptionUtils;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ReflectUtils;
 | 
					import top.charles7c.cnadmin.common.util.ReflectUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.TreeUtils;
 | 
					import top.charles7c.cnadmin.common.util.TreeUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.helper.QueryHelper;
 | 
					import top.charles7c.cnadmin.common.util.helper.QueryHelper;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.validate.CheckUtils;
 | 
					import top.charles7c.cnadmin.common.util.validate.CheckUtils;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.util.ExceptionUtils;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 业务实现基类
 | 
					 * 业务实现基类
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,12 +18,10 @@ package top.charles7c.cnadmin.common.config;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import java.util.List;
 | 
					import java.util.List;
 | 
				
			||||||
import java.util.Objects;
 | 
					import java.util.Objects;
 | 
				
			||||||
import java.util.concurrent.TimeUnit;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
import lombok.RequiredArgsConstructor;
 | 
					import lombok.RequiredArgsConstructor;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import org.springframework.context.annotation.Configuration;
 | 
					import org.springframework.context.annotation.Configuration;
 | 
				
			||||||
import org.springframework.http.CacheControl;
 | 
					 | 
				
			||||||
import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 | 
					import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 | 
				
			||||||
import org.springframework.http.converter.HttpMessageConverter;
 | 
					import org.springframework.http.converter.HttpMessageConverter;
 | 
				
			||||||
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 | 
					import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 | 
				
			||||||
@@ -32,7 +30,7 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 | 
				
			|||||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 | 
					import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import top.charles7c.cnadmin.common.config.properties.LocalStorageProperties;
 | 
					import top.charles7c.cnadmin.common.config.properties.LocalStorageProperties;
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * Web MVC 配置
 | 
					 * Web MVC 配置
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -27,7 +27,7 @@ import cn.hutool.core.convert.Convert;
 | 
				
			|||||||
import cn.hutool.core.util.ClassUtil;
 | 
					import cn.hutool.core.util.ClassUtil;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import top.charles7c.cnadmin.common.base.IBaseEnum;
 | 
					import top.charles7c.cnadmin.common.base.IBaseEnum;
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * Easy Excel 枚举基类转换器
 | 
					 * Easy Excel 枚举基类转换器
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,30 +16,14 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
package top.charles7c.cnadmin.common.config.jackson;
 | 
					package top.charles7c.cnadmin.common.config.jackson;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.time.LocalDate;
 | 
					 | 
				
			||||||
import java.time.LocalDateTime;
 | 
					 | 
				
			||||||
import java.time.LocalTime;
 | 
					 | 
				
			||||||
import java.time.format.DateTimeFormatter;
 | 
					 | 
				
			||||||
import java.util.TimeZone;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import lombok.extern.slf4j.Slf4j;
 | 
					import lombok.extern.slf4j.Slf4j;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 | 
					 | 
				
			||||||
import org.springframework.context.annotation.Bean;
 | 
					import org.springframework.context.annotation.Bean;
 | 
				
			||||||
import org.springframework.context.annotation.Configuration;
 | 
					import org.springframework.context.annotation.Configuration;
 | 
				
			||||||
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 | 
					import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.fasterxml.jackson.databind.*;
 | 
					import com.fasterxml.jackson.databind.*;
 | 
				
			||||||
import com.fasterxml.jackson.databind.module.SimpleModule;
 | 
					import com.fasterxml.jackson.databind.module.SimpleModule;
 | 
				
			||||||
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 | 
					 | 
				
			||||||
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
 | 
					 | 
				
			||||||
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 | 
					 | 
				
			||||||
import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
 | 
					 | 
				
			||||||
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 | 
					 | 
				
			||||||
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 | 
					 | 
				
			||||||
import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import cn.hutool.core.date.DatePattern;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
import top.charles7c.cnadmin.common.base.IBaseEnum;
 | 
					import top.charles7c.cnadmin.common.base.IBaseEnum;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -25,11 +25,11 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 | 
				
			|||||||
import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
 | 
					import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import top.charles7c.cnadmin.common.annotation.DataPermission;
 | 
					import top.charles7c.cnadmin.common.annotation.DataPermission;
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.enums.DataScopeEnum;
 | 
					import top.charles7c.cnadmin.common.enums.DataScopeEnum;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.dto.LoginUser;
 | 
					import top.charles7c.cnadmin.common.model.dto.LoginUser;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.dto.RoleDTO;
 | 
					import top.charles7c.cnadmin.common.model.dto.RoleDTO;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
 | 
					import top.charles7c.cnadmin.common.util.helper.LoginHelper;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import net.sf.jsqlparser.expression.Expression;
 | 
					import net.sf.jsqlparser.expression.Expression;
 | 
				
			||||||
import net.sf.jsqlparser.expression.Function;
 | 
					import net.sf.jsqlparser.expression.Function;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,11 +18,6 @@ package top.charles7c.cnadmin.common.config.properties;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import lombok.Data;
 | 
					import lombok.Data;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import io.swagger.v3.oas.models.info.Contact;
 | 
					 | 
				
			||||||
import io.swagger.v3.oas.models.info.License;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
 | 
					 | 
				
			||||||
import org.springframework.boot.context.properties.NestedConfigurationProperty;
 | 
					 | 
				
			||||||
import org.springframework.stereotype.Component;
 | 
					import org.springframework.stereotype.Component;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import cn.hutool.core.convert.Convert;
 | 
					import cn.hutool.core.convert.Convert;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,62 +0,0 @@
 | 
				
			|||||||
/*
 | 
					 | 
				
			||||||
 * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * 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 top.charles7c.cnadmin.common.constant;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import lombok.AccessLevel;
 | 
					 | 
				
			||||||
import lombok.NoArgsConstructor;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import cn.hutool.core.text.StrPool;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					 | 
				
			||||||
 * 字符串相关常量
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * @author Charles7c
 | 
					 | 
				
			||||||
 * @since 2023/2/10 20:14
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
@NoArgsConstructor(access = AccessLevel.PRIVATE)
 | 
					 | 
				
			||||||
public class StringConsts implements StrPool {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * 空字符串
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public static final String EMPTY = "";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * 空格
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public static final String SPACE = " ";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * 分号
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public static final String SEMICOLON = ";";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * 星号
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public static final String ASTERISK = "*";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * 问号
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public static final String QUESTION_MARK = "?";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * 中文逗号
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public static final String CHINESE_COMMA = ",";
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@@ -19,6 +19,8 @@ package top.charles7c.cnadmin.common.constant;
 | 
				
			|||||||
import lombok.AccessLevel;
 | 
					import lombok.AccessLevel;
 | 
				
			||||||
import lombok.NoArgsConstructor;
 | 
					import lombok.NoArgsConstructor;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 系统相关常量
 | 
					 * 系统相关常量
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -29,7 +29,7 @@ import cn.hutool.core.util.ArrayUtil;
 | 
				
			|||||||
import cn.hutool.core.util.StrUtil;
 | 
					import cn.hutool.core.util.StrUtil;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import top.charles7c.cnadmin.common.annotation.CrudRequestMapping;
 | 
					import top.charles7c.cnadmin.common.annotation.CrudRequestMapping;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ExceptionUtils;
 | 
					import top.charles7c.continew.starter.core.util.ExceptionUtils;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * CRUD 请求映射器处理器映射器
 | 
					 * CRUD 请求映射器处理器映射器
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -43,9 +43,9 @@ import cn.hutool.core.util.StrUtil;
 | 
				
			|||||||
import top.charles7c.cnadmin.common.exception.BadRequestException;
 | 
					import top.charles7c.cnadmin.common.exception.BadRequestException;
 | 
				
			||||||
import top.charles7c.cnadmin.common.exception.ServiceException;
 | 
					import top.charles7c.cnadmin.common.exception.ServiceException;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.resp.R;
 | 
					import top.charles7c.cnadmin.common.model.resp.R;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ExceptionUtils;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.util.StreamUtils;
 | 
					import top.charles7c.cnadmin.common.util.StreamUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.holder.LogContextHolder;
 | 
					import top.charles7c.cnadmin.common.util.holder.LogContextHolder;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.util.ExceptionUtils;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 全局异常处理器
 | 
					 * 全局异常处理器
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,7 +30,7 @@ import org.springframework.data.domain.Sort;
 | 
				
			|||||||
import cn.hutool.core.util.ArrayUtil;
 | 
					import cn.hutool.core.util.ArrayUtil;
 | 
				
			||||||
import cn.hutool.core.util.StrUtil;
 | 
					import cn.hutool.core.util.StrUtil;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 排序查询条件
 | 
					 * 排序查询条件
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,161 +0,0 @@
 | 
				
			|||||||
/*
 | 
					 | 
				
			||||||
 * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * 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 top.charles7c.cnadmin.common.util;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import java.util.concurrent.CancellationException;
 | 
					 | 
				
			||||||
import java.util.concurrent.ExecutionException;
 | 
					 | 
				
			||||||
import java.util.concurrent.Future;
 | 
					 | 
				
			||||||
import java.util.function.Consumer;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import lombok.AccessLevel;
 | 
					 | 
				
			||||||
import lombok.NoArgsConstructor;
 | 
					 | 
				
			||||||
import lombok.extern.slf4j.Slf4j;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					 | 
				
			||||||
 * 异常工具类
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * @author Charles7c
 | 
					 | 
				
			||||||
 * @since 2022/12/21 20:56
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
@Slf4j
 | 
					 | 
				
			||||||
@NoArgsConstructor(access = AccessLevel.PRIVATE)
 | 
					 | 
				
			||||||
public class ExceptionUtils {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * 打印线程异常信息
 | 
					 | 
				
			||||||
     *
 | 
					 | 
				
			||||||
     * @param runnable
 | 
					 | 
				
			||||||
     *            线程执行内容
 | 
					 | 
				
			||||||
     * @param throwable
 | 
					 | 
				
			||||||
     *            异常
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public static void printException(Runnable runnable, Throwable throwable) {
 | 
					 | 
				
			||||||
        if (null == throwable && runnable instanceof Future<?> future) {
 | 
					 | 
				
			||||||
            try {
 | 
					 | 
				
			||||||
                if (future.isDone()) {
 | 
					 | 
				
			||||||
                    future.get();
 | 
					 | 
				
			||||||
                }
 | 
					 | 
				
			||||||
            } catch (CancellationException e) {
 | 
					 | 
				
			||||||
                throwable = e;
 | 
					 | 
				
			||||||
            } catch (ExecutionException e) {
 | 
					 | 
				
			||||||
                throwable = e.getCause();
 | 
					 | 
				
			||||||
            } catch (InterruptedException e) {
 | 
					 | 
				
			||||||
                Thread.currentThread().interrupt();
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
        if (null != throwable) {
 | 
					 | 
				
			||||||
            log.error(throwable.getMessage(), throwable);
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * 如果有异常,返回 null
 | 
					 | 
				
			||||||
     *
 | 
					 | 
				
			||||||
     * @param exSupplier
 | 
					 | 
				
			||||||
     *            可能会出现异常的方法执行
 | 
					 | 
				
			||||||
     * @param <T>
 | 
					 | 
				
			||||||
     *            /
 | 
					 | 
				
			||||||
     * @return /
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public static <T> T exToNull(ExSupplier<T> exSupplier) {
 | 
					 | 
				
			||||||
        return exToDefault(exSupplier, null);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * 如果有异常,执行异常处理
 | 
					 | 
				
			||||||
     *
 | 
					 | 
				
			||||||
     * @param supplier
 | 
					 | 
				
			||||||
     *            可能会出现异常的方法执行
 | 
					 | 
				
			||||||
     * @param exConsumer
 | 
					 | 
				
			||||||
     *            异常处理
 | 
					 | 
				
			||||||
     * @param <T>
 | 
					 | 
				
			||||||
     *            /
 | 
					 | 
				
			||||||
     * @return /
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public static <T> T exToNull(ExSupplier<T> supplier, Consumer<Exception> exConsumer) {
 | 
					 | 
				
			||||||
        return exToDefault(supplier, null, exConsumer);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * 如果有异常,返回空字符串
 | 
					 | 
				
			||||||
     *
 | 
					 | 
				
			||||||
     * @param exSupplier
 | 
					 | 
				
			||||||
     *            可能会出现异常的方法执行
 | 
					 | 
				
			||||||
     * @return /
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public static String exToBlank(ExSupplier<String> exSupplier) {
 | 
					 | 
				
			||||||
        return exToDefault(exSupplier, StringConsts.EMPTY);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * 如果有异常,返回默认值
 | 
					 | 
				
			||||||
     *
 | 
					 | 
				
			||||||
     * @param exSupplier
 | 
					 | 
				
			||||||
     *            可能会出现异常的方法执行
 | 
					 | 
				
			||||||
     * @param defaultValue
 | 
					 | 
				
			||||||
     *            默认值
 | 
					 | 
				
			||||||
     * @param <T>
 | 
					 | 
				
			||||||
     *            /
 | 
					 | 
				
			||||||
     * @return /
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public static <T> T exToDefault(ExSupplier<T> exSupplier, T defaultValue) {
 | 
					 | 
				
			||||||
        return exToDefault(exSupplier, defaultValue, null);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * 如果有异常,执行异常处理,返回默认值
 | 
					 | 
				
			||||||
     *
 | 
					 | 
				
			||||||
     * @param exSupplier
 | 
					 | 
				
			||||||
     *            可能会出现异常的方法执行
 | 
					 | 
				
			||||||
     * @param defaultValue
 | 
					 | 
				
			||||||
     *            默认值
 | 
					 | 
				
			||||||
     * @param exConsumer
 | 
					 | 
				
			||||||
     *            异常处理
 | 
					 | 
				
			||||||
     * @param <T>
 | 
					 | 
				
			||||||
     *            /
 | 
					 | 
				
			||||||
     * @return /
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public static <T> T exToDefault(ExSupplier<T> exSupplier, T defaultValue, Consumer<Exception> exConsumer) {
 | 
					 | 
				
			||||||
        try {
 | 
					 | 
				
			||||||
            return exSupplier.get();
 | 
					 | 
				
			||||||
        } catch (Exception e) {
 | 
					 | 
				
			||||||
            if (null != exConsumer) {
 | 
					 | 
				
			||||||
                exConsumer.accept(e);
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
            return defaultValue;
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * 异常提供者
 | 
					 | 
				
			||||||
     *
 | 
					 | 
				
			||||||
     * @param <T>
 | 
					 | 
				
			||||||
     *            /
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    public interface ExSupplier<T> {
 | 
					 | 
				
			||||||
        /**
 | 
					 | 
				
			||||||
         * 获取返回值
 | 
					 | 
				
			||||||
         *
 | 
					 | 
				
			||||||
         * @return /
 | 
					 | 
				
			||||||
         * @throws Exception
 | 
					 | 
				
			||||||
         *             /
 | 
					 | 
				
			||||||
         */
 | 
					 | 
				
			||||||
        T get() throws Exception;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@@ -37,8 +37,8 @@ import cn.hutool.core.util.ArrayUtil;
 | 
				
			|||||||
import cn.hutool.core.util.StrUtil;
 | 
					import cn.hutool.core.util.StrUtil;
 | 
				
			||||||
import cn.hutool.extra.spring.SpringUtil;
 | 
					import cn.hutool.extra.spring.SpringUtil;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.util.validate.CheckUtils;
 | 
					import top.charles7c.cnadmin.common.util.validate.CheckUtils;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 邮件工具类
 | 
					 * 邮件工具类
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,7 +26,7 @@ import lombok.NoArgsConstructor;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import cn.hutool.core.collection.CollUtil;
 | 
					import cn.hutool.core.collection.CollUtil;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * Stream 工具类
 | 
					 * Stream 工具类
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -33,10 +33,10 @@ import top.charles7c.cnadmin.common.constant.CacheConsts;
 | 
				
			|||||||
import top.charles7c.cnadmin.common.model.dto.LogContext;
 | 
					import top.charles7c.cnadmin.common.model.dto.LogContext;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.dto.LoginUser;
 | 
					import top.charles7c.cnadmin.common.model.dto.LoginUser;
 | 
				
			||||||
import top.charles7c.cnadmin.common.service.CommonUserService;
 | 
					import top.charles7c.cnadmin.common.service.CommonUserService;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ExceptionUtils;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.util.IpUtils;
 | 
					import top.charles7c.cnadmin.common.util.IpUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ServletUtils;
 | 
					import top.charles7c.cnadmin.common.util.ServletUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.holder.LogContextHolder;
 | 
					import top.charles7c.cnadmin.common.util.holder.LogContextHolder;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.util.ExceptionUtils;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 登录助手
 | 
					 * 登录助手
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,8 +24,8 @@ import lombok.extern.slf4j.Slf4j;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import cn.hutool.core.util.StrUtil;
 | 
					import cn.hutool.core.util.StrUtil;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.exception.ServiceException;
 | 
					import top.charles7c.cnadmin.common.exception.ServiceException;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 业务参数校验工具类(抛出 500 ServiceException)
 | 
					 * 业务参数校验工具类(抛出 500 ServiceException)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -51,11 +51,9 @@ import cn.hutool.json.JSONObject;
 | 
				
			|||||||
import cn.hutool.json.JSONUtil;
 | 
					import cn.hutool.json.JSONUtil;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import top.charles7c.cnadmin.auth.model.req.AccountLoginReq;
 | 
					import top.charles7c.cnadmin.auth.model.req.AccountLoginReq;
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.SysConsts;
 | 
					import top.charles7c.cnadmin.common.constant.SysConsts;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.dto.LogContext;
 | 
					import top.charles7c.cnadmin.common.model.dto.LogContext;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.resp.R;
 | 
					import top.charles7c.cnadmin.common.model.resp.R;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ExceptionUtils;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.util.IpUtils;
 | 
					import top.charles7c.cnadmin.common.util.IpUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ServletUtils;
 | 
					import top.charles7c.cnadmin.common.util.ServletUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
 | 
					import top.charles7c.cnadmin.common.util.helper.LoginHelper;
 | 
				
			||||||
@@ -65,6 +63,8 @@ import top.charles7c.cnadmin.monitor.config.properties.LogProperties;
 | 
				
			|||||||
import top.charles7c.cnadmin.monitor.enums.LogStatusEnum;
 | 
					import top.charles7c.cnadmin.monitor.enums.LogStatusEnum;
 | 
				
			||||||
import top.charles7c.cnadmin.monitor.model.entity.LogDO;
 | 
					import top.charles7c.cnadmin.monitor.model.entity.LogDO;
 | 
				
			||||||
import top.charles7c.cnadmin.system.service.UserService;
 | 
					import top.charles7c.cnadmin.system.service.UserService;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.util.ExceptionUtils;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 系统日志拦截器
 | 
					 * 系统日志拦截器
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -37,7 +37,6 @@ import top.charles7c.cnadmin.common.constant.SysConsts;
 | 
				
			|||||||
import top.charles7c.cnadmin.common.model.query.PageQuery;
 | 
					import top.charles7c.cnadmin.common.model.query.PageQuery;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
 | 
					import top.charles7c.cnadmin.common.model.resp.PageDataResp;
 | 
				
			||||||
import top.charles7c.cnadmin.common.service.CommonUserService;
 | 
					import top.charles7c.cnadmin.common.service.CommonUserService;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ExceptionUtils;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ReflectUtils;
 | 
					import top.charles7c.cnadmin.common.util.ReflectUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.helper.QueryHelper;
 | 
					import top.charles7c.cnadmin.common.util.helper.QueryHelper;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.validate.CheckUtils;
 | 
					import top.charles7c.cnadmin.common.util.validate.CheckUtils;
 | 
				
			||||||
@@ -48,6 +47,7 @@ import top.charles7c.cnadmin.monitor.model.query.OperationLogQuery;
 | 
				
			|||||||
import top.charles7c.cnadmin.monitor.model.query.SystemLogQuery;
 | 
					import top.charles7c.cnadmin.monitor.model.query.SystemLogQuery;
 | 
				
			||||||
import top.charles7c.cnadmin.monitor.model.resp.*;
 | 
					import top.charles7c.cnadmin.monitor.model.resp.*;
 | 
				
			||||||
import top.charles7c.cnadmin.monitor.service.LogService;
 | 
					import top.charles7c.cnadmin.monitor.service.LogService;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.util.ExceptionUtils;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 系统日志业务实现
 | 
					 * 系统日志业务实现
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,11 +34,11 @@ import cn.hutool.core.util.StrUtil;
 | 
				
			|||||||
import top.charles7c.cnadmin.auth.model.query.OnlineUserQuery;
 | 
					import top.charles7c.cnadmin.auth.model.query.OnlineUserQuery;
 | 
				
			||||||
import top.charles7c.cnadmin.auth.model.resp.OnlineUserResp;
 | 
					import top.charles7c.cnadmin.auth.model.resp.OnlineUserResp;
 | 
				
			||||||
import top.charles7c.cnadmin.auth.service.OnlineUserService;
 | 
					import top.charles7c.cnadmin.auth.service.OnlineUserService;
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.model.dto.LoginUser;
 | 
					import top.charles7c.cnadmin.common.model.dto.LoginUser;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.query.PageQuery;
 | 
					import top.charles7c.cnadmin.common.model.query.PageQuery;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
 | 
					import top.charles7c.cnadmin.common.model.resp.PageDataResp;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
 | 
					import top.charles7c.cnadmin.common.util.helper.LoginHelper;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 在线用户业务实现
 | 
					 * 在线用户业务实现
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,7 +34,6 @@ import cn.hutool.core.util.ObjectUtil;
 | 
				
			|||||||
import top.charles7c.cnadmin.common.base.BaseServiceImpl;
 | 
					import top.charles7c.cnadmin.common.base.BaseServiceImpl;
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.SysConsts;
 | 
					import top.charles7c.cnadmin.common.constant.SysConsts;
 | 
				
			||||||
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
 | 
					import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ExceptionUtils;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.util.validate.CheckUtils;
 | 
					import top.charles7c.cnadmin.common.util.validate.CheckUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.system.mapper.DeptMapper;
 | 
					import top.charles7c.cnadmin.system.mapper.DeptMapper;
 | 
				
			||||||
import top.charles7c.cnadmin.system.model.entity.DeptDO;
 | 
					import top.charles7c.cnadmin.system.model.entity.DeptDO;
 | 
				
			||||||
@@ -45,6 +44,7 @@ import top.charles7c.cnadmin.system.model.resp.DeptResp;
 | 
				
			|||||||
import top.charles7c.cnadmin.system.service.DeptService;
 | 
					import top.charles7c.cnadmin.system.service.DeptService;
 | 
				
			||||||
import top.charles7c.cnadmin.system.service.RoleDeptService;
 | 
					import top.charles7c.cnadmin.system.service.RoleDeptService;
 | 
				
			||||||
import top.charles7c.cnadmin.system.service.UserService;
 | 
					import top.charles7c.cnadmin.system.service.UserService;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.util.ExceptionUtils;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 部门业务实现
 | 
					 * 部门业务实现
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -33,7 +33,6 @@ import cn.hutool.extra.spring.SpringUtil;
 | 
				
			|||||||
import top.charles7c.cnadmin.common.model.query.PageQuery;
 | 
					import top.charles7c.cnadmin.common.model.query.PageQuery;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
 | 
					import top.charles7c.cnadmin.common.model.resp.PageDataResp;
 | 
				
			||||||
import top.charles7c.cnadmin.common.service.CommonUserService;
 | 
					import top.charles7c.cnadmin.common.service.CommonUserService;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ExceptionUtils;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.util.helper.QueryHelper;
 | 
					import top.charles7c.cnadmin.common.util.helper.QueryHelper;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.validate.CheckUtils;
 | 
					import top.charles7c.cnadmin.common.util.validate.CheckUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.system.mapper.MessageMapper;
 | 
					import top.charles7c.cnadmin.system.mapper.MessageMapper;
 | 
				
			||||||
@@ -43,6 +42,7 @@ import top.charles7c.cnadmin.system.model.req.MessageReq;
 | 
				
			|||||||
import top.charles7c.cnadmin.system.model.resp.MessageResp;
 | 
					import top.charles7c.cnadmin.system.model.resp.MessageResp;
 | 
				
			||||||
import top.charles7c.cnadmin.system.service.MessageService;
 | 
					import top.charles7c.cnadmin.system.service.MessageService;
 | 
				
			||||||
import top.charles7c.cnadmin.system.service.MessageUserService;
 | 
					import top.charles7c.cnadmin.system.service.MessageUserService;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.util.ExceptionUtils;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 消息业务实现
 | 
					 * 消息业务实现
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -40,11 +40,9 @@ import top.charles7c.cnadmin.common.base.BaseServiceImpl;
 | 
				
			|||||||
import top.charles7c.cnadmin.common.config.properties.LocalStorageProperties;
 | 
					import top.charles7c.cnadmin.common.config.properties.LocalStorageProperties;
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.CacheConsts;
 | 
					import top.charles7c.cnadmin.common.constant.CacheConsts;
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.FileConsts;
 | 
					import top.charles7c.cnadmin.common.constant.FileConsts;
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.SysConsts;
 | 
					import top.charles7c.cnadmin.common.constant.SysConsts;
 | 
				
			||||||
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
 | 
					import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
 | 
				
			||||||
import top.charles7c.cnadmin.common.service.CommonUserService;
 | 
					import top.charles7c.cnadmin.common.service.CommonUserService;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ExceptionUtils;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.util.FileUtils;
 | 
					import top.charles7c.cnadmin.common.util.FileUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.SecureUtils;
 | 
					import top.charles7c.cnadmin.common.util.SecureUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
 | 
					import top.charles7c.cnadmin.common.util.helper.LoginHelper;
 | 
				
			||||||
@@ -61,6 +59,8 @@ import top.charles7c.cnadmin.system.service.DeptService;
 | 
				
			|||||||
import top.charles7c.cnadmin.system.service.RoleService;
 | 
					import top.charles7c.cnadmin.system.service.RoleService;
 | 
				
			||||||
import top.charles7c.cnadmin.system.service.UserRoleService;
 | 
					import top.charles7c.cnadmin.system.service.UserRoleService;
 | 
				
			||||||
import top.charles7c.cnadmin.system.service.UserService;
 | 
					import top.charles7c.cnadmin.system.service.UserService;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.util.ExceptionUtils;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 用户业务实现
 | 
					 * 用户业务实现
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -37,9 +37,9 @@ import cn.hutool.db.meta.Column;
 | 
				
			|||||||
import cn.hutool.setting.dialect.Props;
 | 
					import cn.hutool.setting.dialect.Props;
 | 
				
			||||||
import cn.hutool.setting.dialect.PropsUtil;
 | 
					import cn.hutool.setting.dialect.PropsUtil;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.enums.QueryTypeEnum;
 | 
					import top.charles7c.cnadmin.common.enums.QueryTypeEnum;
 | 
				
			||||||
import top.charles7c.cnadmin.tool.enums.FormTypeEnum;
 | 
					import top.charles7c.cnadmin.tool.enums.FormTypeEnum;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 字段配置实体
 | 
					 * 字段配置实体
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -42,7 +42,6 @@ import cn.hutool.core.util.StrUtil;
 | 
				
			|||||||
import cn.hutool.db.meta.Column;
 | 
					import cn.hutool.db.meta.Column;
 | 
				
			||||||
import cn.hutool.system.SystemUtil;
 | 
					import cn.hutool.system.SystemUtil;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.StringConsts;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.enums.QueryTypeEnum;
 | 
					import top.charles7c.cnadmin.common.enums.QueryTypeEnum;
 | 
				
			||||||
import top.charles7c.cnadmin.common.exception.ServiceException;
 | 
					import top.charles7c.cnadmin.common.exception.ServiceException;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.query.PageQuery;
 | 
					import top.charles7c.cnadmin.common.model.query.PageQuery;
 | 
				
			||||||
@@ -61,6 +60,7 @@ import top.charles7c.cnadmin.tool.model.resp.TableResp;
 | 
				
			|||||||
import top.charles7c.cnadmin.tool.service.GeneratorService;
 | 
					import top.charles7c.cnadmin.tool.service.GeneratorService;
 | 
				
			||||||
import top.charles7c.cnadmin.tool.util.MetaUtils;
 | 
					import top.charles7c.cnadmin.tool.util.MetaUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.tool.util.Table;
 | 
					import top.charles7c.cnadmin.tool.util.Table;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.constant.StringConsts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 代码生成业务实现
 | 
					 * 代码生成业务实现
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -41,7 +41,6 @@ import top.charles7c.cnadmin.auth.model.resp.UserInfoResp;
 | 
				
			|||||||
import top.charles7c.cnadmin.auth.service.LoginService;
 | 
					import top.charles7c.cnadmin.auth.service.LoginService;
 | 
				
			||||||
import top.charles7c.cnadmin.common.constant.CacheConsts;
 | 
					import top.charles7c.cnadmin.common.constant.CacheConsts;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.dto.LoginUser;
 | 
					import top.charles7c.cnadmin.common.model.dto.LoginUser;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ExceptionUtils;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.util.RedisUtils;
 | 
					import top.charles7c.cnadmin.common.util.RedisUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.SecureUtils;
 | 
					import top.charles7c.cnadmin.common.util.SecureUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
 | 
					import top.charles7c.cnadmin.common.util.helper.LoginHelper;
 | 
				
			||||||
@@ -49,6 +48,7 @@ import top.charles7c.cnadmin.common.util.validate.ValidationUtils;
 | 
				
			|||||||
import top.charles7c.cnadmin.monitor.annotation.Log;
 | 
					import top.charles7c.cnadmin.monitor.annotation.Log;
 | 
				
			||||||
import top.charles7c.cnadmin.system.model.resp.UserDetailResp;
 | 
					import top.charles7c.cnadmin.system.model.resp.UserDetailResp;
 | 
				
			||||||
import top.charles7c.cnadmin.system.service.UserService;
 | 
					import top.charles7c.cnadmin.system.service.UserService;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.util.ExceptionUtils;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 认证 API
 | 
					 * 认证 API
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -40,7 +40,6 @@ import top.charles7c.cnadmin.common.constant.CacheConsts;
 | 
				
			|||||||
import top.charles7c.cnadmin.common.constant.RegexConsts;
 | 
					import top.charles7c.cnadmin.common.constant.RegexConsts;
 | 
				
			||||||
import top.charles7c.cnadmin.common.enums.SocialSourceEnum;
 | 
					import top.charles7c.cnadmin.common.enums.SocialSourceEnum;
 | 
				
			||||||
import top.charles7c.cnadmin.common.model.resp.R;
 | 
					import top.charles7c.cnadmin.common.model.resp.R;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.ExceptionUtils;
 | 
					 | 
				
			||||||
import top.charles7c.cnadmin.common.util.RedisUtils;
 | 
					import top.charles7c.cnadmin.common.util.RedisUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.SecureUtils;
 | 
					import top.charles7c.cnadmin.common.util.SecureUtils;
 | 
				
			||||||
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
 | 
					import top.charles7c.cnadmin.common.util.helper.LoginHelper;
 | 
				
			||||||
@@ -54,6 +53,7 @@ import top.charles7c.cnadmin.system.model.resp.AvatarResp;
 | 
				
			|||||||
import top.charles7c.cnadmin.system.model.resp.UserSocialBindResp;
 | 
					import top.charles7c.cnadmin.system.model.resp.UserSocialBindResp;
 | 
				
			||||||
import top.charles7c.cnadmin.system.service.UserService;
 | 
					import top.charles7c.cnadmin.system.service.UserService;
 | 
				
			||||||
import top.charles7c.cnadmin.system.service.UserSocialService;
 | 
					import top.charles7c.cnadmin.system.service.UserSocialService;
 | 
				
			||||||
 | 
					import top.charles7c.continew.starter.core.util.ExceptionUtils;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import me.zhyd.oauth.model.AuthCallback;
 | 
					import me.zhyd.oauth.model.AuthCallback;
 | 
				
			||||||
import me.zhyd.oauth.model.AuthResponse;
 | 
					import me.zhyd.oauth.model.AuthResponse;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user