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

refactor: 调整 starter 内的 BaseResp、BaseDetailResp 到 admin 项目

Browse Source
This commit is contained in:
Charles7c
2024-12-27 20:48:38 +08:00
parent 438615f87c
commit 144251b21e
53 changed files with 220 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
continew-module-system/src/main/java/top/continew/admin/auth/LoginHandler.java
View File

@@ -44,7 +44,6 @@ public interface LoginHandler<T extends LoginReq> {
/**
* 登录前置处理
*
*
* @param req 登录请求参数
* @param client 客户端信息
* @param request 请求对象
@@ -54,7 +53,6 @@ public interface LoginHandler<T extends LoginReq> {
/**
* 登录后置处理
*
*
* @param req 登录请求参数
* @param client 客户端信息
* @param request 请求对象

5
continew-module-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java
View File

@@ -16,7 +16,10 @@
package top.continew.admin.auth.model.resp;
import cn.crane4j.annotation.*;
import cn.crane4j.annotation.Assemble;
import cn.crane4j.annotation.AssembleMethod;
import cn.crane4j.annotation.ContainerMethod;
import cn.crane4j.annotation.MappingType;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.auth.service.OnlineUserService;

5
continew-module-system/src/main/java/top/continew/admin/system/mapper/ClientMapper.java
View File

@@ -16,8 +16,8 @@
package top.continew.admin.system.mapper;
import top.continew.starter.data.mp.base.BaseMapper;
import top.continew.admin.system.model.entity.ClientDO;
import top.continew.starter.data.mp.base.BaseMapper;
/**
* 客户端 Mapper
@@ -25,4 +25,5 @@ import top.continew.admin.system.model.entity.ClientDO;
* @author KAI
* @since 2024/12/03 16:04
*/
public interface ClientMapper extends BaseMapper<ClientDO> {}
public interface ClientMapper extends BaseMapper<ClientDO> {
}

2
continew-module-system/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java
View File

@@ -17,8 +17,8 @@
package top.continew.admin.system.mapper;
import org.apache.ibatis.annotations.Param;
import top.continew.starter.data.mp.base.BaseMapper;
import top.continew.admin.system.model.entity.UserPasswordHistoryDO;
import top.continew.starter.data.mp.base.BaseMapper;
/**
* 用户历史密码 Mapper

2
continew-module-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java
View File

@@ -117,7 +117,7 @@ public class FileDO extends BaseDO {
* 例如:
* http://domain.cn/bucketName/2024/11/27/6746ec3b2907f0de80afdd70.png => 2024/11/27/
* http://bucketName.domain.cn/2024/11/27/6746ec3b2907f0de80afdd70.png => 2024/11/27/
*
*
* @param url 文件路径
* @param storageDO 存储桶信息
* @return

2
continew-module-system/src/main/java/top/continew/admin/system/model/resp/ClientDetailResp.java
View File

@@ -18,8 +18,8 @@ package top.continew.admin.system.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.base.BaseDetailResp;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
import java.io.Serial;
import java.util.List;

4
continew-module-system/src/main/java/top/continew/admin/system/model/resp/ClientResp.java
View File

@@ -18,8 +18,8 @@ package top.continew.admin.system.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.base.BaseDetailResp;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.starter.extension.crud.model.resp.BaseResp;
import java.io.Serial;
import java.util.List;
@@ -33,7 +33,7 @@ import java.util.List;
*/
@Data
@Schema(description = "客户端信息")
public class ClientResp extends BaseResp {
public class ClientResp extends BaseDetailResp {
@Serial
private static final long serialVersionUID = 1L;

2
continew-module-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java
View File

@@ -20,10 +20,10 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.base.BaseDetailResp;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.starter.extension.crud.annotation.TreeField;
import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
import java.io.Serial;

2
continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java
View File

@@ -19,9 +19,9 @@ package top.continew.admin.system.model.resp;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.base.BaseDetailResp;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
import java.io.Serial;

2
continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java
View File

@@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
import top.continew.admin.common.base.BaseDetailResp;
import java.io.Serial;

2
continew-module-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java
View File

@@ -19,8 +19,8 @@ package top.continew.admin.system.model.resp;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.base.BaseDetailResp;
import top.continew.admin.system.enums.FileTypeEnum;
import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
import java.io.Serial;

2
continew-module-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java
View File

@@ -18,10 +18,10 @@ package top.continew.admin.system.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.base.BaseResp;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.system.enums.MenuTypeEnum;
import top.continew.starter.extension.crud.annotation.TreeField;
import top.continew.starter.extension.crud.model.resp.BaseResp;
import java.io.Serial;

2
continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java
View File

@@ -20,8 +20,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.base.BaseDetailResp;
import top.continew.admin.system.enums.NoticeScopeEnum;
import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
import java.io.Serial;
import java.time.LocalDateTime;

2
continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java
View File

@@ -18,9 +18,9 @@ package top.continew.admin.system.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.base.BaseResp;
import top.continew.admin.system.enums.NoticeScopeEnum;
import top.continew.admin.system.enums.NoticeStatusEnum;
import top.continew.starter.extension.crud.model.resp.BaseResp;
import java.io.Serial;
import java.time.LocalDateTime;

2
continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java
View File

@@ -23,10 +23,10 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.base.BaseDetailResp;
import top.continew.admin.common.enums.DataScopeEnum;
import top.continew.admin.system.service.RoleDeptService;
import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
import java.io.Serial;
import java.util.List;

2
continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java
View File

@@ -18,8 +18,8 @@ package top.continew.admin.system.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.base.BaseDetailResp;
import top.continew.admin.common.enums.DataScopeEnum;
import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
import java.io.Serial;

2
continew-module-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java
View File

@@ -18,9 +18,9 @@ package top.continew.admin.system.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.base.BaseDetailResp;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.system.enums.StorageTypeEnum;
import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
import top.continew.starter.security.mask.annotation.JsonMask;
import java.io.Serial;

2
continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java
View File

@@ -26,13 +26,13 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.base.BaseDetailResp;
import top.continew.admin.common.constant.ContainerConstants;
import top.continew.admin.common.context.UserContextHolder;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.common.enums.GenderEnum;
import top.continew.admin.system.model.resp.DeptResp;
import top.continew.admin.system.service.DeptService;
import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
import top.continew.starter.file.excel.converter.ExcelListConverter;
import top.continew.starter.security.crypto.annotation.FieldEncrypt;

2
continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java
View File

@@ -20,11 +20,11 @@ import cn.crane4j.annotation.Assemble;
import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.base.BaseDetailResp;
import top.continew.admin.common.constant.ContainerConstants;
import top.continew.admin.common.context.UserContextHolder;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.common.enums.GenderEnum;
import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
import top.continew.starter.security.mask.annotation.JsonMask;
import top.continew.starter.security.mask.enums.MaskType;

3
continew-module-system/src/main/java/top/continew/admin/system/service/ClientService.java
View File

@@ -18,7 +18,6 @@ package top.continew.admin.system.service;
import top.continew.admin.system.model.query.ClientQuery;
import top.continew.admin.system.model.req.ClientReq;
import top.continew.admin.system.model.resp.ClientDetailResp;
import top.continew.admin.system.model.resp.ClientResp;
import top.continew.starter.extension.crud.service.BaseService;
@@ -29,7 +28,7 @@ import top.continew.starter.extension.crud.service.BaseService;
* @author Charles7c
* @since 2024/12/03 16:04
*/
public interface ClientService extends BaseService<ClientResp, ClientDetailResp, ClientQuery, ClientReq> {
public interface ClientService extends BaseService<ClientResp, ClientResp, ClientQuery, ClientReq> {
/**
* 根据客户端 ID 查詢

2
continew-module-system/src/main/java/top/continew/admin/system/service/MenuService.java
View File

@@ -20,8 +20,8 @@ import top.continew.admin.system.model.entity.MenuDO;
import top.continew.admin.system.model.query.MenuQuery;
import top.continew.admin.system.model.req.MenuReq;
import top.continew.admin.system.model.resp.MenuResp;
import top.continew.starter.extension.crud.service.BaseService;
import top.continew.starter.data.mp.service.IService;
import top.continew.starter.extension.crud.service.BaseService;
import java.util.List;
import java.util.Set;

4
continew-module-system/src/main/java/top/continew/admin/system/service/MessageService.java
View File

@@ -16,14 +16,14 @@
package top.continew.admin.system.service;
import java.util.List;
import top.continew.admin.system.model.query.MessageQuery;
import top.continew.admin.system.model.req.MessageReq;
import top.continew.admin.system.model.resp.MessageResp;
import top.continew.starter.extension.crud.model.query.PageQuery;
import top.continew.starter.extension.crud.model.resp.PageResp;
import java.util.List;
/**
* 消息业务接口
*

4
continew-module-system/src/main/java/top/continew/admin/system/service/MessageUserService.java
View File

@@ -16,10 +16,10 @@
package top.continew.admin.system.service;
import java.util.List;
import top.continew.admin.system.model.resp.MessageUnreadResp;
import java.util.List;
/**
* 消息和用户关联业务接口
*

2
continew-module-system/src/main/java/top/continew/admin/system/service/NoticeService.java
View File

@@ -22,8 +22,8 @@ import top.continew.admin.system.model.req.NoticeReq;
import top.continew.admin.system.model.resp.NoticeDetailResp;
import top.continew.admin.system.model.resp.NoticeResp;
import top.continew.admin.system.model.resp.dashboard.DashboardNoticeResp;
import top.continew.starter.extension.crud.service.BaseService;
import top.continew.starter.data.mp.service.IService;
import top.continew.starter.extension.crud.service.BaseService;
import java.util.List;

5
continew-module-system/src/main/java/top/continew/admin/system/service/UserSocialService.java
View File

@@ -16,11 +16,10 @@
package top.continew.admin.system.service;
import java.util.List;
import me.zhyd.oauth.model.AuthUser;
import top.continew.admin.system.model.entity.UserSocialDO;
import me.zhyd.oauth.model.AuthUser;
import java.util.List;
/**
* 用户社会化关联业务接口

3
continew-module-system/src/main/java/top/continew/admin/system/service/impl/ClientServiceImpl.java
View File

@@ -24,7 +24,6 @@ import top.continew.admin.system.mapper.ClientMapper;
import top.continew.admin.system.model.entity.ClientDO;
import top.continew.admin.system.model.query.ClientQuery;
import top.continew.admin.system.model.req.ClientReq;
import top.continew.admin.system.model.resp.ClientDetailResp;
import top.continew.admin.system.model.resp.ClientResp;
import top.continew.admin.system.service.ClientService;
import top.continew.starter.core.constant.StringConstants;
@@ -41,7 +40,7 @@ import java.util.List;
* @since 2024/12/03 16:04
*/
@Service
public class ClientServiceImpl extends BaseServiceImpl<ClientMapper, ClientDO, ClientResp, ClientDetailResp, ClientQuery, ClientReq> implements ClientService {
public class ClientServiceImpl extends BaseServiceImpl<ClientMapper, ClientDO, ClientResp, ClientResp, ClientQuery, ClientReq> implements ClientService {
@Override
public void beforeAdd(ClientReq req) {

2
continew-module-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java
View File

@@ -23,9 +23,9 @@ import top.continew.admin.system.mapper.NoticeMapper;
import top.continew.admin.system.model.entity.NoticeDO;
import top.continew.admin.system.model.query.NoticeQuery;
import top.continew.admin.system.model.req.NoticeReq;
import top.continew.admin.system.model.resp.dashboard.DashboardNoticeResp;
import top.continew.admin.system.model.resp.NoticeDetailResp;
import top.continew.admin.system.model.resp.NoticeResp;
import top.continew.admin.system.model.resp.dashboard.DashboardNoticeResp;
import top.continew.admin.system.service.NoticeService;
import top.continew.starter.extension.crud.service.BaseServiceImpl;

2
continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
View File

@@ -81,8 +81,8 @@ import top.continew.starter.core.validation.CheckUtils;
import top.continew.starter.extension.crud.model.query.PageQuery;
import top.continew.starter.extension.crud.model.query.SortQuery;
import top.continew.starter.extension.crud.model.resp.PageResp;
import top.continew.starter.extension.crud.service.CommonUserService;
import top.continew.starter.extension.crud.service.BaseServiceImpl;
import top.continew.starter.extension.crud.service.CommonUserService;
import top.continew.starter.web.util.FileUploadUtils;
import java.io.IOException;

18
continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java
View File

@@ -16,24 +16,20 @@
package top.continew.admin.system.service.impl;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import cn.hutool.json.JSONUtil;
import lombok.RequiredArgsConstructor;
import me.zhyd.oauth.model.AuthUser;
import org.springframework.stereotype.Service;
import top.continew.admin.system.enums.SocialSourceEnum;
import top.continew.admin.system.mapper.UserSocialMapper;
import top.continew.admin.system.model.entity.UserSocialDO;
import top.continew.admin.system.service.UserSocialService;
import top.continew.starter.core.validation.CheckUtils;
import me.zhyd.oauth.model.AuthUser;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
* 用户社会化关联业务实现