ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-11-04 10:57:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 💥 项目包结构 top.charles7c.cnadmin => top.charles7c.continew.admin

Browse Source
This commit is contained in:
Charles7c
2023-11-30 21:27:06 +08:00
parent b62095d66e
commit b86fe329d0
230 changed files with 723 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/DataPermission.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/annotation/DataPermission.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.annotation;
package top.charles7c.continew.admin.common.annotation;
import java.lang.annotation.*;

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/DataPermissionMapper.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/base/DataPermissionMapper.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.base;
package top.charles7c.continew.admin.common.base;
import java.util.List;
@@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import top.charles7c.cnadmin.common.annotation.DataPermission;
import top.charles7c.continew.admin.common.annotation.DataPermission;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/SpringCacheConfiguration.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/SpringCacheConfiguration.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.config;
package top.charles7c.continew.admin.common.config;
import java.util.Map;

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/WebMvcConfiguration.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.config;
package top.charles7c.continew.admin.common.config;
import java.util.List;
import java.util.Objects;
@@ -29,7 +29,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import top.charles7c.cnadmin.common.config.properties.LocalStorageProperties;
import top.charles7c.continew.admin.common.config.properties.LocalStorageProperties;
import top.charles7c.continew.starter.core.constant.StringConstants;
/**

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/easyexcel/ExcelBaseEnumConverter.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/easyexcel/ExcelBaseEnumConverter.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.config.easyexcel;
package top.charles7c.continew.admin.common.config.easyexcel;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/BaseEnumDeserializer.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.config.jackson;
package top.charles7c.continew.admin.common.config.jackson;
import java.io.IOException;
import java.lang.reflect.Field;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/BaseEnumSerializer.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumSerializer.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.config.jackson;
package top.charles7c.continew.admin.common.config.jackson;
import java.io.IOException;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/JacksonConfiguration.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/JacksonConfiguration.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.config.jackson;
package top.charles7c.continew.admin.common.config.jackson;
import lombok.extern.slf4j.Slf4j;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/SimpleDeserializersWrapper.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.config.jackson;
package top.charles7c.continew.admin.common.config.jackson;
import lombok.extern.slf4j.Slf4j;

12
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionHandlerImpl.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.config.mybatis;
package top.charles7c.continew.admin.common.config.mybatis;
import java.lang.reflect.Method;
import java.util.Collections;
@@ -24,11 +24,11 @@ import lombok.extern.slf4j.Slf4j;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
import top.charles7c.cnadmin.common.annotation.DataPermission;
import top.charles7c.cnadmin.common.enums.DataScopeEnum;
import top.charles7c.cnadmin.common.model.dto.LoginUser;
import top.charles7c.cnadmin.common.model.dto.RoleDTO;
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
import top.charles7c.continew.admin.common.annotation.DataPermission;
import top.charles7c.continew.admin.common.enums.DataScopeEnum;
import top.charles7c.continew.admin.common.model.dto.LoginUser;
import top.charles7c.continew.admin.common.model.dto.RoleDTO;
import top.charles7c.continew.admin.common.util.helper.LoginHelper;
import top.charles7c.continew.starter.core.constant.StringConstants;
import net.sf.jsqlparser.expression.Expression;

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.config.mybatis;
package top.charles7c.continew.admin.common.config.mybatis;
import java.time.LocalDateTime;
@@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import cn.hutool.core.util.ObjectUtil;
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
import top.charles7c.continew.admin.common.util.helper.LoginHelper;
import top.charles7c.continew.starter.extension.crud.base.BaseDO;
import top.charles7c.continew.starter.extension.crud.exception.BusinessException;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MybatisPlusConfiguration.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.config.mybatis;
package top.charles7c.continew.admin.common.config.mybatis;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/CaptchaProperties.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/CaptchaProperties.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.config.properties;
package top.charles7c.continew.admin.common.config.properties;
import java.awt.*;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/LocalStorageProperties.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/LocalStorageProperties.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.config.properties;
package top.charles7c.continew.admin.common.config.properties;
import lombok.Data;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/RsaProperties.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/RsaProperties.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.config.properties;
package top.charles7c.continew.admin.common.config.properties;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConstants.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.constant;
package top.charles7c.continew.admin.common.constant;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/FileConstants.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/FileConstants.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.constant;
package top.charles7c.continew.admin.common.constant;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/RegexConstants.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/RegexConstants.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.constant;
package top.charles7c.continew.admin.common.constant;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConstants.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/SysConstants.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.constant;
package top.charles7c.continew.admin.common.constant;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/UIConstants.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UIConstants.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.constant;
package top.charles7c.continew.admin.common.constant;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataScopeEnum.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.enums;
package top.charles7c.continew.admin.common.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DisEnableStatusEnum.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.enums;
package top.charles7c.continew.admin.common.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import top.charles7c.cnadmin.common.constant.UIConstants;
import top.charles7c.continew.admin.common.constant.UIConstants;
import top.charles7c.continew.starter.extension.crud.base.IBaseEnum;
/**

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/GenderEnum.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.enums;
package top.charles7c.continew.admin.common.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/MenuTypeEnum.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.enums;
package top.charles7c.continew.admin.common.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/MessageTypeEnum.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.enums;
package top.charles7c.continew.admin.common.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import top.charles7c.cnadmin.common.constant.UIConstants;
import top.charles7c.continew.admin.common.constant.UIConstants;
import top.charles7c.continew.starter.extension.crud.base.IBaseEnum;
/**

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/SocialSourceEnum.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SocialSourceEnum.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.enums;
package top.charles7c.continew.admin.common.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/SuccessFailureStatusEnum.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.enums;
package top.charles7c.continew.admin.common.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import top.charles7c.cnadmin.common.constant.UIConstants;
import top.charles7c.continew.admin.common.constant.UIConstants;
import top.charles7c.continew.starter.extension.crud.base.IBaseEnum;
/**

6
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/handler/GlobalExceptionHandler.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.handler;
package top.charles7c.continew.admin.common.handler;
import java.util.Objects;
@@ -40,8 +40,8 @@ import cn.dev33.satoken.exception.NotRoleException;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import top.charles7c.cnadmin.common.util.StreamUtils;
import top.charles7c.cnadmin.common.util.holder.LogContextHolder;
import top.charles7c.continew.admin.common.util.StreamUtils;
import top.charles7c.continew.admin.common.util.holder.LogContextHolder;
import top.charles7c.continew.starter.core.util.ExceptionUtils;
import top.charles7c.continew.starter.extension.crud.exception.BadRequestException;
import top.charles7c.continew.starter.extension.crud.exception.BusinessException;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LogContext.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LogContext.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.model.dto;
package top.charles7c.continew.admin.common.model.dto;
import java.io.Serial;
import java.io.Serializable;

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LoginUser.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.model.dto;
package top.charles7c.continew.admin.common.model.dto;
import java.io.Serial;
import java.io.Serializable;
@@ -25,7 +25,7 @@ import lombok.Data;
import cn.hutool.core.collection.CollUtil;
import top.charles7c.cnadmin.common.constant.SysConstants;
import top.charles7c.continew.admin.common.constant.SysConstants;
/**
* 登录用户信息

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/RoleDTO.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.model.dto;
package top.charles7c.continew.admin.common.model.dto;
import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
import top.charles7c.cnadmin.common.enums.DataScopeEnum;
import top.charles7c.continew.admin.common.enums.DataScopeEnum;
/**
* 角色信息

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/req/UpdateStatusReq.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/req/UpdateStatusReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.model.req;
package top.charles7c.continew.admin.common.model.req;
import java.io.Serial;
import java.io.Serializable;
@@ -25,7 +25,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum;
/**
* 修改状态信息

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/CaptchaResp.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/CaptchaResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.model.resp;
package top.charles7c.continew.admin.common.model.resp;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/LabelValueResp.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/LabelValueResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.model.resp;
package top.charles7c.continew.admin.common.model.resp;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/FileUtils.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/FileUtils.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.util;
package top.charles7c.continew.admin.common.util;
import java.io.File;
import java.time.LocalDateTime;

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/SecureUtils.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.util;
package top.charles7c.continew.admin.common.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -23,7 +23,7 @@ import cn.hutool.core.codec.Base64;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.asymmetric.KeyType;
import top.charles7c.cnadmin.common.config.properties.RsaProperties;
import top.charles7c.continew.admin.common.config.properties.RsaProperties;
import top.charles7c.continew.starter.extension.crud.util.validate.ValidationUtils;
/**

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ServletUtils.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/ServletUtils.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.util;
package top.charles7c.continew.admin.common.util;
import java.util.*;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/StreamUtils.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.util;
package top.charles7c.continew.admin.common.util;
import java.util.Collection;
import java.util.Objects;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/TemplateUtils.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/TemplateUtils.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.util;
package top.charles7c.continew.admin.common.util;
import java.util.Map;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/URLUtils.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/URLUtils.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.util;
package top.charles7c.continew.admin.common.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

12
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.util.helper;
package top.charles7c.continew.admin.common.util.helper;
import java.time.LocalDateTime;
@@ -29,11 +29,11 @@ import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.extra.servlet.JakartaServletUtil;
import cn.hutool.extra.spring.SpringUtil;
import top.charles7c.cnadmin.common.constant.CacheConstants;
import top.charles7c.cnadmin.common.model.dto.LogContext;
import top.charles7c.cnadmin.common.model.dto.LoginUser;
import top.charles7c.cnadmin.common.util.ServletUtils;
import top.charles7c.cnadmin.common.util.holder.LogContextHolder;
import top.charles7c.continew.admin.common.constant.CacheConstants;
import top.charles7c.continew.admin.common.model.dto.LogContext;
import top.charles7c.continew.admin.common.model.dto.LoginUser;
import top.charles7c.continew.admin.common.util.ServletUtils;
import top.charles7c.continew.admin.common.util.holder.LogContextHolder;
import top.charles7c.continew.starter.core.util.ExceptionUtils;
import top.charles7c.continew.starter.core.util.IpUtils;
import top.charles7c.continew.starter.extension.crud.base.CommonUserService;

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/holder/LogContextHolder.java → continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/holder/LogContextHolder.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.common.util.holder;
package top.charles7c.continew.admin.common.util.holder;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import top.charles7c.cnadmin.common.model.dto.LogContext;
import top.charles7c.continew.admin.common.model.dto.LogContext;
/**
* 系统日志上下文持有者

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/annotation/Log.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/annotation/Log.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.annotation;
package top.charles7c.continew.admin.monitor.annotation;
import java.lang.annotation.*;

4
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/config/WebMvcMonitorConfiguration.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/WebMvcMonitorConfiguration.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.config;
package top.charles7c.continew.admin.monitor.config;
import lombok.RequiredArgsConstructor;
@@ -23,7 +23,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import top.charles7c.cnadmin.monitor.interceptor.LogInterceptor;
import top.charles7c.continew.admin.monitor.interceptor.LogInterceptor;
/**
* 监控模块 Web MVC 配置

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/config/properties/LogProperties.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/properties/LogProperties.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.config.properties;
package top.charles7c.continew.admin.monitor.config.properties;
import java.util.ArrayList;
import java.util.List;

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/enums/LogStatusEnum.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/enums/LogStatusEnum.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.enums;
package top.charles7c.continew.admin.monitor.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/filter/LogFilter.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/filter/LogFilter.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.filter;
package top.charles7c.continew.admin.monitor.filter;
import java.io.IOException;
import java.util.Objects;

24
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/interceptor/LogInterceptor.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.interceptor;
package top.charles7c.continew.admin.monitor.interceptor;
import java.time.LocalDateTime;
import java.util.ArrayList;
@@ -50,17 +50,17 @@ import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import top.charles7c.cnadmin.auth.model.req.AccountLoginReq;
import top.charles7c.cnadmin.common.constant.SysConstants;
import top.charles7c.cnadmin.common.model.dto.LogContext;
import top.charles7c.cnadmin.common.util.ServletUtils;
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
import top.charles7c.cnadmin.common.util.holder.LogContextHolder;
import top.charles7c.cnadmin.monitor.annotation.Log;
import top.charles7c.cnadmin.monitor.config.properties.LogProperties;
import top.charles7c.cnadmin.monitor.enums.LogStatusEnum;
import top.charles7c.cnadmin.monitor.model.entity.LogDO;
import top.charles7c.cnadmin.system.service.UserService;
import top.charles7c.continew.admin.auth.model.req.AccountLoginReq;
import top.charles7c.continew.admin.common.constant.SysConstants;
import top.charles7c.continew.admin.common.model.dto.LogContext;
import top.charles7c.continew.admin.common.util.ServletUtils;
import top.charles7c.continew.admin.common.util.helper.LoginHelper;
import top.charles7c.continew.admin.common.util.holder.LogContextHolder;
import top.charles7c.continew.admin.monitor.annotation.Log;
import top.charles7c.continew.admin.monitor.config.properties.LogProperties;
import top.charles7c.continew.admin.monitor.enums.LogStatusEnum;
import top.charles7c.continew.admin.monitor.model.entity.LogDO;
import top.charles7c.continew.admin.system.service.UserService;
import top.charles7c.continew.starter.core.constant.StringConstants;
import top.charles7c.continew.starter.core.util.ExceptionUtils;
import top.charles7c.continew.starter.core.util.IpUtils;

10
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/mapper/LogMapper.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/mapper/LogMapper.java
View File

@@ -14,17 +14,17 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.mapper;
package top.charles7c.continew.admin.monitor.mapper;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.annotations.Param;
import top.charles7c.cnadmin.monitor.model.entity.LogDO;
import top.charles7c.cnadmin.monitor.model.resp.DashboardAccessTrendResp;
import top.charles7c.cnadmin.monitor.model.resp.DashboardPopularModuleResp;
import top.charles7c.cnadmin.monitor.model.resp.DashboardTotalResp;
import top.charles7c.continew.admin.monitor.model.entity.LogDO;
import top.charles7c.continew.admin.monitor.model.resp.DashboardAccessTrendResp;
import top.charles7c.continew.admin.monitor.model.resp.DashboardPopularModuleResp;
import top.charles7c.continew.admin.monitor.model.resp.DashboardTotalResp;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

4
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/entity/LogDO.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.model.entity;
package top.charles7c.continew.admin.monitor.model.entity;
import java.io.Serial;
import java.io.Serializable;
@@ -25,7 +25,7 @@ import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import top.charles7c.cnadmin.monitor.enums.LogStatusEnum;
import top.charles7c.continew.admin.monitor.enums.LogStatusEnum;
/**
* 系统日志实体

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.model.query;
package top.charles7c.continew.admin.monitor.model.query;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.model.query;
package top.charles7c.continew.admin.monitor.model.query;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.model.query;
package top.charles7c.continew.admin.monitor.model.query;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardAccessTrendResp.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardAccessTrendResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.model.resp;
package top.charles7c.continew.admin.monitor.model.resp;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardGeoDistributionResp.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardGeoDistributionResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.model.resp;
package top.charles7c.continew.admin.monitor.model.resp;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardPopularModuleResp.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardPopularModuleResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.model.resp;
package top.charles7c.continew.admin.monitor.model.resp;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardTotalResp.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardTotalResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.model.resp;
package top.charles7c.continew.admin.monitor.model.resp;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LogResp.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/LogResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.model.resp;
package top.charles7c.continew.admin.monitor.model.resp;
import java.io.Serial;
import java.io.Serializable;

4
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LoginLogResp.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/LoginLogResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.model.resp;
package top.charles7c.continew.admin.monitor.model.resp;
import java.io.Serial;
@@ -22,7 +22,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.cnadmin.monitor.enums.LogStatusEnum;
import top.charles7c.continew.admin.monitor.enums.LogStatusEnum;
/**
* 登录日志信息

4
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/OperationLogResp.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/OperationLogResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.model.resp;
package top.charles7c.continew.admin.monitor.model.resp;
import java.io.Serial;
@@ -22,7 +22,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.cnadmin.monitor.enums.LogStatusEnum;
import top.charles7c.continew.admin.monitor.enums.LogStatusEnum;
/**
* 操作日志信息

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogDetailResp.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogDetailResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.model.resp;
package top.charles7c.continew.admin.monitor.model.resp;
import java.io.Serial;

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogResp.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.model.resp;
package top.charles7c.continew.admin.monitor.model.resp;
import java.io.Serial;

12
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/DashboardService.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/DashboardService.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.service;
package top.charles7c.continew.admin.monitor.service;
import java.util.List;
import top.charles7c.cnadmin.monitor.model.resp.DashboardAccessTrendResp;
import top.charles7c.cnadmin.monitor.model.resp.DashboardGeoDistributionResp;
import top.charles7c.cnadmin.monitor.model.resp.DashboardPopularModuleResp;
import top.charles7c.cnadmin.monitor.model.resp.DashboardTotalResp;
import top.charles7c.cnadmin.system.model.resp.DashboardAnnouncementResp;
import top.charles7c.continew.admin.monitor.model.resp.DashboardAccessTrendResp;
import top.charles7c.continew.admin.monitor.model.resp.DashboardGeoDistributionResp;
import top.charles7c.continew.admin.monitor.model.resp.DashboardPopularModuleResp;
import top.charles7c.continew.admin.monitor.model.resp.DashboardTotalResp;
import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp;
/**
* 仪表盘业务接口

10
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/LogService.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/LogService.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.service;
package top.charles7c.continew.admin.monitor.service;
import java.util.List;
import java.util.Map;
import top.charles7c.cnadmin.monitor.model.query.LoginLogQuery;
import top.charles7c.cnadmin.monitor.model.query.OperationLogQuery;
import top.charles7c.cnadmin.monitor.model.query.SystemLogQuery;
import top.charles7c.cnadmin.monitor.model.resp.*;
import top.charles7c.continew.admin.monitor.model.query.LoginLogQuery;
import top.charles7c.continew.admin.monitor.model.query.OperationLogQuery;
import top.charles7c.continew.admin.monitor.model.query.SystemLogQuery;
import top.charles7c.continew.admin.monitor.model.resp.*;
import top.charles7c.continew.starter.extension.crud.model.query.PageQuery;
import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp;

20
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/DashboardServiceImpl.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.service.impl;
package top.charles7c.continew.admin.monitor.service.impl;
import java.math.BigDecimal;
import java.util.List;
@@ -29,15 +29,15 @@ import org.springframework.stereotype.Service;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.NumberUtil;
import top.charles7c.cnadmin.common.constant.CacheConstants;
import top.charles7c.cnadmin.monitor.model.resp.DashboardAccessTrendResp;
import top.charles7c.cnadmin.monitor.model.resp.DashboardGeoDistributionResp;
import top.charles7c.cnadmin.monitor.model.resp.DashboardPopularModuleResp;
import top.charles7c.cnadmin.monitor.model.resp.DashboardTotalResp;
import top.charles7c.cnadmin.monitor.service.DashboardService;
import top.charles7c.cnadmin.monitor.service.LogService;
import top.charles7c.cnadmin.system.model.resp.DashboardAnnouncementResp;
import top.charles7c.cnadmin.system.service.AnnouncementService;
import top.charles7c.continew.admin.common.constant.CacheConstants;
import top.charles7c.continew.admin.monitor.model.resp.DashboardAccessTrendResp;
import top.charles7c.continew.admin.monitor.model.resp.DashboardGeoDistributionResp;
import top.charles7c.continew.admin.monitor.model.resp.DashboardPopularModuleResp;
import top.charles7c.continew.admin.monitor.model.resp.DashboardTotalResp;
import top.charles7c.continew.admin.monitor.service.DashboardService;
import top.charles7c.continew.admin.monitor.service.LogService;
import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp;
import top.charles7c.continew.admin.system.service.AnnouncementService;
/**
* 仪表盘业务实现

18
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java → continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.monitor.service.impl;
package top.charles7c.continew.admin.monitor.service.impl;
import java.util.List;
import java.util.Map;
@@ -33,14 +33,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import top.charles7c.cnadmin.common.constant.SysConstants;
import top.charles7c.cnadmin.monitor.mapper.LogMapper;
import top.charles7c.cnadmin.monitor.model.entity.LogDO;
import top.charles7c.cnadmin.monitor.model.query.LoginLogQuery;
import top.charles7c.cnadmin.monitor.model.query.OperationLogQuery;
import top.charles7c.cnadmin.monitor.model.query.SystemLogQuery;
import top.charles7c.cnadmin.monitor.model.resp.*;
import top.charles7c.cnadmin.monitor.service.LogService;
import top.charles7c.continew.admin.common.constant.SysConstants;
import top.charles7c.continew.admin.monitor.mapper.LogMapper;
import top.charles7c.continew.admin.monitor.model.entity.LogDO;
import top.charles7c.continew.admin.monitor.model.query.LoginLogQuery;
import top.charles7c.continew.admin.monitor.model.query.OperationLogQuery;
import top.charles7c.continew.admin.monitor.model.query.SystemLogQuery;
import top.charles7c.continew.admin.monitor.model.resp.*;
import top.charles7c.continew.admin.monitor.service.LogService;
import top.charles7c.continew.starter.core.util.ExceptionUtils;
import top.charles7c.continew.starter.extension.crud.base.CommonUserService;
import top.charles7c.continew.starter.extension.crud.model.query.PageQuery;

8
continew-admin-monitor/src/main/resources/mapper/LogMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="top.charles7c.cnadmin.monitor.mapper.LogMapper">
<select id="selectDashboardTotal" resultType="top.charles7c.cnadmin.monitor.model.resp.DashboardTotalResp">
<mapper namespace="top.charles7c.continew.admin.monitor.mapper.LogMapper">
<select id="selectDashboardTotal" resultType="top.charles7c.continew.admin.monitor.model.resp.DashboardTotalResp">
SELECT
(SELECT COUNT(*) FROM `sys_log`) AS pvCount,
(SELECT COUNT(DISTINCT `client_ip`) FROM `sys_log`) AS ipCount,
@@ -10,7 +10,7 @@
</select>
<select id="selectListDashboardAccessTrend"
resultType="top.charles7c.cnadmin.monitor.model.resp.DashboardAccessTrendResp">
resultType="top.charles7c.continew.admin.monitor.model.resp.DashboardAccessTrendResp">
SELECT
DATE(`create_time`) AS date,
COUNT(*) AS pvCount,
@@ -23,7 +23,7 @@
</select>
<select id="selectListDashboardPopularModule"
resultType="top.charles7c.cnadmin.monitor.model.resp.DashboardPopularModuleResp">
resultType="top.charles7c.continew.admin.monitor.model.resp.DashboardPopularModuleResp">
SELECT
`module`,
COUNT(*) AS pvCount,

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenPermissionImpl.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.config.satoken;
package top.charles7c.continew.admin.auth.config.satoken;
import java.util.ArrayList;
import java.util.List;
import cn.dev33.satoken.stp.StpInterface;
import top.charles7c.cnadmin.common.model.dto.LoginUser;
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
import top.charles7c.continew.admin.common.model.dto.LoginUser;
import top.charles7c.continew.admin.common.util.helper.LoginHelper;
/**
* Sa-Token 权限认证适配

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/query/OnlineUserQuery.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.query;
package top.charles7c.continew.admin.auth.model.query;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/AccountLoginReq.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/AccountLoginReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.req;
package top.charles7c.continew.admin.auth.model.req;
import java.io.Serial;
import java.io.Serializable;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/EmailLoginReq.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/EmailLoginReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.req;
package top.charles7c.continew.admin.auth.model.req;
import java.io.Serial;
import java.io.Serializable;
@@ -28,7 +28,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;
import top.charles7c.cnadmin.common.constant.RegexConstants;
import top.charles7c.continew.admin.common.constant.RegexConstants;
/**
* 邮箱登录信息

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/PhoneLoginReq.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/req/PhoneLoginReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.req;
package top.charles7c.continew.admin.auth.model.req;
import java.io.Serial;
import java.io.Serializable;
@@ -28,7 +28,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;
import top.charles7c.cnadmin.common.constant.RegexConstants;
import top.charles7c.continew.admin.common.constant.RegexConstants;
/**
* 手机号登录信息

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/LoginResp.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/LoginResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.resp;
package top.charles7c.continew.admin.auth.model.resp;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/MetaResp.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/MetaResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.resp;
package top.charles7c.continew.admin.auth.model.resp;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/OnlineUserResp.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/OnlineUserResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.resp;
package top.charles7c.continew.admin.auth.model.resp;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/RouteResp.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/RouteResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.resp;
package top.charles7c.continew.admin.auth.model.resp;
import java.io.Serial;
import java.io.Serializable;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/UserInfoResp.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/UserInfoResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.resp;
package top.charles7c.continew.admin.auth.model.resp;
import java.io.Serial;
import java.io.Serializable;
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import cn.hutool.core.util.DesensitizedUtil;
import top.charles7c.cnadmin.common.enums.GenderEnum;
import top.charles7c.continew.admin.common.enums.GenderEnum;
/**
* 用户信息

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/LoginService.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/LoginService.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.service;
package top.charles7c.continew.admin.auth.service;
import java.util.List;
import top.charles7c.cnadmin.auth.model.resp.RouteResp;
import top.charles7c.continew.admin.auth.model.resp.RouteResp;
import me.zhyd.oauth.model.AuthUser;

8
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/OnlineUserService.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/OnlineUserService.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.service;
package top.charles7c.continew.admin.auth.service;
import java.util.List;
import top.charles7c.cnadmin.auth.model.query.OnlineUserQuery;
import top.charles7c.cnadmin.auth.model.resp.OnlineUserResp;
import top.charles7c.cnadmin.common.model.dto.LoginUser;
import top.charles7c.continew.admin.auth.model.query.OnlineUserQuery;
import top.charles7c.continew.admin.auth.model.resp.OnlineUserResp;
import top.charles7c.continew.admin.common.model.dto.LoginUser;
import top.charles7c.continew.starter.extension.crud.model.query.PageQuery;
import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp;

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/PermissionService.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/PermissionService.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.service;
package top.charles7c.continew.admin.auth.service;
import java.util.Set;

44
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.service.impl;
package top.charles7c.continew.admin.auth.service.impl;
import java.time.LocalDateTime;
import java.util.*;
@@ -34,27 +34,27 @@ import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import top.charles7c.cnadmin.auth.model.resp.MetaResp;
import top.charles7c.cnadmin.auth.model.resp.RouteResp;
import top.charles7c.cnadmin.auth.service.LoginService;
import top.charles7c.cnadmin.auth.service.PermissionService;
import top.charles7c.cnadmin.common.constant.RegexConstants;
import top.charles7c.cnadmin.common.constant.SysConstants;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
import top.charles7c.cnadmin.common.enums.GenderEnum;
import top.charles7c.cnadmin.common.enums.MenuTypeEnum;
import top.charles7c.cnadmin.common.enums.MessageTypeEnum;
import top.charles7c.cnadmin.common.model.dto.LoginUser;
import top.charles7c.cnadmin.common.util.SecureUtils;
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
import top.charles7c.cnadmin.system.enums.MessageTemplateEnum;
import top.charles7c.cnadmin.system.model.entity.RoleDO;
import top.charles7c.cnadmin.system.model.entity.UserDO;
import top.charles7c.cnadmin.system.model.entity.UserSocialDO;
import top.charles7c.cnadmin.system.model.req.MessageReq;
import top.charles7c.cnadmin.system.model.resp.DeptDetailResp;
import top.charles7c.cnadmin.system.model.resp.MenuResp;
import top.charles7c.cnadmin.system.service.*;
import top.charles7c.continew.admin.auth.model.resp.MetaResp;
import top.charles7c.continew.admin.auth.model.resp.RouteResp;
import top.charles7c.continew.admin.auth.service.LoginService;
import top.charles7c.continew.admin.auth.service.PermissionService;
import top.charles7c.continew.admin.common.constant.RegexConstants;
import top.charles7c.continew.admin.common.constant.SysConstants;
import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum;
import top.charles7c.continew.admin.common.enums.GenderEnum;
import top.charles7c.continew.admin.common.enums.MenuTypeEnum;
import top.charles7c.continew.admin.common.enums.MessageTypeEnum;
import top.charles7c.continew.admin.common.model.dto.LoginUser;
import top.charles7c.continew.admin.common.util.SecureUtils;
import top.charles7c.continew.admin.common.util.helper.LoginHelper;
import top.charles7c.continew.admin.system.enums.MessageTemplateEnum;
import top.charles7c.continew.admin.system.model.entity.RoleDO;
import top.charles7c.continew.admin.system.model.entity.UserDO;
import top.charles7c.continew.admin.system.model.entity.UserSocialDO;
import top.charles7c.continew.admin.system.model.req.MessageReq;
import top.charles7c.continew.admin.system.model.resp.DeptDetailResp;
import top.charles7c.continew.admin.system.model.resp.MenuResp;
import top.charles7c.continew.admin.system.service.*;
import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties;
import top.charles7c.continew.starter.extension.crud.annotation.TreeField;
import top.charles7c.continew.starter.extension.crud.util.TreeUtils;

12
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/OnlineUserServiceImpl.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.service.impl;
package top.charles7c.continew.admin.auth.service.impl;
import java.util.ArrayList;
import java.util.Comparator;
@@ -31,11 +31,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import top.charles7c.cnadmin.auth.model.query.OnlineUserQuery;
import top.charles7c.cnadmin.auth.model.resp.OnlineUserResp;
import top.charles7c.cnadmin.auth.service.OnlineUserService;
import top.charles7c.cnadmin.common.model.dto.LoginUser;
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
import top.charles7c.continew.admin.auth.model.query.OnlineUserQuery;
import top.charles7c.continew.admin.auth.model.resp.OnlineUserResp;
import top.charles7c.continew.admin.auth.service.OnlineUserService;
import top.charles7c.continew.admin.common.model.dto.LoginUser;
import top.charles7c.continew.admin.common.util.helper.LoginHelper;
import top.charles7c.continew.starter.core.constant.StringConstants;
import top.charles7c.continew.starter.extension.crud.model.query.PageQuery;
import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp;

10
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/PermissionServiceImpl.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/PermissionServiceImpl.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.service.impl;
package top.charles7c.continew.admin.auth.service.impl;
import java.util.Set;
@@ -24,10 +24,10 @@ import org.springframework.stereotype.Service;
import cn.hutool.core.collection.CollUtil;
import top.charles7c.cnadmin.auth.service.PermissionService;
import top.charles7c.cnadmin.common.constant.SysConstants;
import top.charles7c.cnadmin.system.service.MenuService;
import top.charles7c.cnadmin.system.service.RoleService;
import top.charles7c.continew.admin.auth.service.PermissionService;
import top.charles7c.continew.admin.common.constant.SysConstants;
import top.charles7c.continew.admin.system.service.MenuService;
import top.charles7c.continew.admin.system.service.RoleService;
/**
* 权限业务实现

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/enums/AnnouncementStatusEnum.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.enums;
package top.charles7c.continew.admin.system.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import top.charles7c.cnadmin.common.constant.UIConstants;
import top.charles7c.continew.admin.common.constant.UIConstants;
import top.charles7c.continew.starter.extension.crud.base.IBaseEnum;
/**

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/enums/MessageTemplateEnum.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/MessageTemplateEnum.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.enums;
package top.charles7c.continew.admin.system.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/AnnouncementMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/AnnouncementMapper.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import java.util.List;
import top.charles7c.cnadmin.system.model.entity.AnnouncementDO;
import top.charles7c.cnadmin.system.model.resp.DashboardAnnouncementResp;
import top.charles7c.continew.admin.system.model.entity.AnnouncementDO;
import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/DeptMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DeptMapper.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import top.charles7c.cnadmin.system.model.entity.DeptDO;
import top.charles7c.continew.admin.system.model.entity.DeptDO;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/DictItemMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import top.charles7c.cnadmin.common.model.resp.LabelValueResp;
import top.charles7c.cnadmin.system.model.entity.DictItemDO;
import top.charles7c.continew.admin.common.model.resp.LabelValueResp;
import top.charles7c.continew.admin.system.model.entity.DictItemDO;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/DictMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictMapper.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import top.charles7c.cnadmin.system.model.entity.DictDO;
import top.charles7c.continew.admin.system.model.entity.DictDO;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/MenuMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MenuMapper.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import java.util.List;
import java.util.Set;
import org.apache.ibatis.annotations.Param;
import top.charles7c.cnadmin.system.model.entity.MenuDO;
import top.charles7c.continew.admin.system.model.entity.MenuDO;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/MessageMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageMapper.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import org.apache.ibatis.annotations.Param;
@@ -22,8 +22,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import top.charles7c.cnadmin.system.model.entity.MessageDO;
import top.charles7c.cnadmin.system.model.resp.MessageResp;
import top.charles7c.continew.admin.system.model.entity.MessageDO;
import top.charles7c.continew.admin.system.model.resp.MessageResp;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/MessageUserMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageUserMapper.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import org.apache.ibatis.annotations.Param;
import top.charles7c.cnadmin.system.model.entity.MessageUserDO;
import top.charles7c.continew.admin.system.model.entity.MessageUserDO;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/OptionMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/OptionMapper.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import top.charles7c.cnadmin.system.model.entity.OptionDO;
import top.charles7c.continew.admin.system.model.entity.OptionDO;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/RoleDeptMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleDeptMapper.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import top.charles7c.cnadmin.system.model.entity.RoleDeptDO;
import top.charles7c.continew.admin.system.model.entity.RoleDeptDO;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/RoleMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMapper.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import top.charles7c.cnadmin.system.model.entity.RoleDO;
import top.charles7c.continew.admin.system.model.entity.RoleDO;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/RoleMenuMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMenuMapper.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import java.util.List;
import top.charles7c.cnadmin.system.model.entity.RoleMenuDO;
import top.charles7c.continew.admin.system.model.entity.RoleMenuDO;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/UserMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserMapper.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import top.charles7c.cnadmin.common.base.DataPermissionMapper;
import top.charles7c.cnadmin.system.model.entity.UserDO;
import top.charles7c.continew.admin.common.base.DataPermissionMapper;
import top.charles7c.continew.admin.system.model.entity.UserDO;
/**
* 用户 Mapper

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/UserRoleMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserRoleMapper.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import top.charles7c.cnadmin.system.model.entity.UserRoleDO;
import top.charles7c.continew.admin.system.model.entity.UserRoleDO;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/UserSocialMapper.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserSocialMapper.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.mapper;
package top.charles7c.continew.admin.system.mapper;
import org.apache.ibatis.annotations.Param;
import top.charles7c.cnadmin.system.model.entity.UserSocialDO;
import top.charles7c.continew.admin.system.model.entity.UserSocialDO;
import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
/**

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/AnnouncementDO.java → continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/AnnouncementDO.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.entity;
package top.charles7c.continew.admin.system.model.entity;
import java.io.Serial;
import java.time.LocalDateTime;

Some files were not shown because too many files have changed in this diff Show More