zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复合并冲突后的若干错误

Browse Source 
1.完善 @Serial
2.完善 javax => jakarta
3.修复 canAccess() 使用错误
4.兼容 JustAuth Spring Boot Starter
5.CI 脚本更新 JDK 8 => 17
This commit is contained in:
Charles7c 2023-11-05 10:41:26 +08:00
parent 51e1cd9307
commit 8dbec9d1a3
63 changed files with 144 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/deploy.yml vendored
View File

@ -20,7 +20,7 @@ jobs:
uses: actions/setup-java@master
with:
distribution: 'adopt'
java-version: '8'
java-version: '17'
cache: 'maven'
# 3、打包
- name: Build

4
continew-admin-common/pom.xml
View File

@ -154,10 +154,6 @@ limitations under the License.
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-data-27</artifactId>
</dependency>
<!-- Easy Captcha（Java 图形验证码，支持 gif、中文、算术等类型，可用于 Java Web、JavaSE 等项目） -->
<dependency>

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseReq.java
View File

@ -19,8 +19,6 @@ package top.charles7c.cnadmin.common.base;
import java.io.Serial;
import java.io.Serializable;
import jakarta.validation.groups.Default;
import lombok.Data;
/**

1
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java
View File

@ -250,7 +250,6 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseDO,
public void fillDetail(Object detailObj) {
if (detailObj instanceof BaseDetailResp detail) {
this.fill(detail);
Long updateUser = detail.getUpdateUser();
if (null == updateUser) {
return;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/ValidateGroup.java
View File

@ -16,7 +16,7 @@
package top.charles7c.cnadmin.common.base;
import javax.validation.groups.Default;
import jakarta.validation.groups.Default;
/**
* 分组校验

14
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java
View File

@ -16,19 +16,21 @@
package top.charles7c.cnadmin.common.handler;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import static top.charles7c.cnadmin.common.annotation.CrudRequestMapping.Api;
import java.lang.reflect.Method;
import org.springframework.lang.NonNull;
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import org.springframework.web.util.pattern.PathPatternParser;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import top.charles7c.cnadmin.common.annotation.CrudRequestMapping;
import top.charles7c.cnadmin.common.util.ExceptionUtils;
import java.lang.reflect.Method;
import static top.charles7c.cnadmin.common.annotation.CrudRequestMapping.Api;
/**
* CRUD 请求映射器处理器映射器
*

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

@ -20,9 +20,9 @@ import java.io.IOException;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java
View File

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.common.model.query;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@ -41,6 +42,7 @@ import top.charles7c.cnadmin.common.constant.StringConsts;
@Schema(description = "排序查询条件")
public class SortQuery implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -20,7 +20,6 @@ import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import cn.hutool.core.collection.CollUtil;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -65,7 +64,6 @@ public class QueryHelper {
if (null == query) {
return queryWrapper;
}
// 获取查询条件中所有的字段
List<Field> fieldList = ReflectUtils.getNonStaticFields(query.getClass());
fieldList.forEach(field -> buildQuery(query, field, queryWrapper));
@ -87,7 +85,7 @@ public class QueryHelper {
* 查询数据类型
*/
private static <Q, R> void buildQuery(Q query, Field field, QueryWrapper<R> queryWrapper) {
boolean accessible = field.canAccess(null);
boolean accessible = field.canAccess(query);
try {
field.setAccessible(true);
// 没有 @Query，直接返回

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

@ -247,7 +247,7 @@ public class LogInterceptor implements HandlerInterceptor {
}
logDO.setClientIp(JakartaServletUtil.getClientIP(request));
logDO.setLocation(IpUtils.getCityInfo(logDO.getClientIp()));
logDO.setBrowser(JakartaServletUtil.getBrowser(request));
logDO.setBrowser(ServletUtils.getBrowser(request));
}
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.monitor.model.resp;
import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
@ -32,6 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "仪表盘-访问趋势信息")
public class DashboardAccessTrendResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.monitor.model.resp;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "仪表盘-访客地域分布信息")
public class DashboardGeoDistributionResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.monitor.model.resp;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
@ -35,6 +36,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
@Schema(description = "仪表盘-热门模块信息")
public class DashboardPopularModuleResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.monitor.model.resp;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
@ -35,6 +36,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
@Schema(description = "仪表盘-总计信息")
public class DashboardTotalResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,10 +16,11 @@
package top.charles7c.cnadmin.auth.model.req;
import java.io.Serial;
import java.io.Serializable;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.Data;
@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts;
@Schema(description = "邮箱登录信息")
public class EmailLoginReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,10 +16,11 @@
package top.charles7c.cnadmin.auth.model.req;
import java.io.Serial;
import java.io.Serializable;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.Data;
@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts;
@Schema(description = "手机号登录信息")
public class PhoneLoginReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.auth.model.resp;
import java.io.Serial;
import java.io.Serializable;
import lombok.Builder;
@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "令牌信息")
public class LoginResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.entity;
import java.io.Serial;
import java.time.LocalDateTime;
import lombok.Data;
@ -34,6 +35,7 @@ import top.charles7c.cnadmin.common.base.BaseDO;
@TableName("sys_announcement")
public class AnnouncementDO extends BaseDO {
@Serial
private static final long serialVersionUID = 1L;
/**

3
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictDO.java
View File

@ -16,6 +16,8 @@
package top.charles7c.cnadmin.system.model.entity;
import java.io.Serial;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
@ -32,6 +34,7 @@ import top.charles7c.cnadmin.common.base.BaseDO;
@TableName("sys_dict")
public class DictDO extends BaseDO {
@Serial
private static final long serialVersionUID = 1L;
/**

3
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictItemDO.java
View File

@ -16,6 +16,8 @@
package top.charles7c.cnadmin.system.model.entity;
import java.io.Serial;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
@ -32,6 +34,7 @@ import top.charles7c.cnadmin.common.base.BaseDO;
@TableName("sys_dict_item")
public class DictItemDO extends BaseDO {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.entity;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
@ -38,6 +39,7 @@ import top.charles7c.cnadmin.common.enums.MessageTypeEnum;
@TableName("sys_message")
public class MessageDO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.entity;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
@ -36,6 +37,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("sys_option")
public class OptionDO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.entity;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
@ -35,6 +36,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("sys_user_social")
public class UserSocialDO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.query;
import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
@ -35,6 +36,7 @@ import top.charles7c.cnadmin.common.enums.QueryTypeEnum;
@Schema(description = "公告查询条件")
public class AnnouncementQuery implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.query;
import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
@ -34,6 +35,7 @@ import top.charles7c.cnadmin.common.annotation.Query;
@Schema(description = "字典项查询条件")
public class DictItemQuery implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.query;
import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
@ -34,6 +35,7 @@ import top.charles7c.cnadmin.common.annotation.Query;
@Schema(description = "字典查询条件")
public class DictQuery implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/OptionQuery.java
View File

@ -16,10 +16,11 @@
package top.charles7c.cnadmin.system.model.query;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
import javax.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotEmpty;
import lombok.Data;
@ -38,6 +39,7 @@ import top.charles7c.cnadmin.common.enums.QueryTypeEnum;
@Schema(description = "参数查询条件")
public class OptionQuery implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,9 +16,10 @@
package top.charles7c.cnadmin.system.model.req;
import java.io.Serial;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
import jakarta.validation.constraints.*;
import lombok.Data;
@ -38,6 +39,7 @@ import top.charles7c.cnadmin.common.base.BaseReq;
@Schema(description = "创建或修改公告信息")
public class AnnouncementReq extends BaseReq {
@Serial
private static final long serialVersionUID = 1L;
/**

5
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DictItemReq.java
View File

@ -16,7 +16,9 @@
package top.charles7c.cnadmin.system.model.req;
import javax.validation.constraints.*;
import java.io.Serial;
import jakarta.validation.constraints.*;
import lombok.Data;
@ -36,6 +38,7 @@ import top.charles7c.cnadmin.common.base.BaseReq;
@Schema(description = "创建或修改字典项信息")
public class DictItemReq extends BaseReq {
@Serial
private static final long serialVersionUID = 1L;
/**

5
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DictReq.java
View File

@ -16,7 +16,9 @@
package top.charles7c.cnadmin.system.model.req;
import javax.validation.constraints.*;
import java.io.Serial;
import jakarta.validation.constraints.*;
import lombok.Data;
@ -37,6 +39,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts;
@Schema(description = "创建或修改字典信息")
public class DictReq extends BaseReq {
@Serial
private static final long serialVersionUID = 1L;
/**

7
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/MessageReq.java
View File

@ -16,8 +16,10 @@
package top.charles7c.cnadmin.system.model.req;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serial;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@ -38,6 +40,7 @@ import top.charles7c.cnadmin.common.enums.MessageTypeEnum;
@Schema(description = "创建消息信息")
public class MessageReq extends BaseReq {
@Serial
private static final long serialVersionUID = 1L;
/**

5
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/OptionReq.java
View File

@ -16,7 +16,9 @@
package top.charles7c.cnadmin.system.model.req;
import javax.validation.constraints.NotBlank;
import java.io.Serial;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
@ -36,6 +38,7 @@ import top.charles7c.cnadmin.common.base.BaseReq;
@Schema(description = "修改参数信息")
public class OptionReq extends BaseReq {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,10 +16,11 @@
package top.charles7c.cnadmin.system.model.req;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
import javax.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotEmpty;
import lombok.Data;
@ -35,6 +36,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "参数重置信息")
public class OptionResetValueReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserPhoneUpdateReq.java
View File

@ -16,10 +16,11 @@
package top.charles7c.cnadmin.system.model.req;
import java.io.Serial;
import java.io.Serializable;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.Data;
@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts;
@Schema(description = "用户手机号修改信息")
public class UserPhoneUpdateReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serial;
import java.time.LocalDateTime;
import lombok.Data;
@ -38,6 +39,7 @@ import top.charles7c.cnadmin.common.base.BaseDetailResp;
@Schema(description = "公告详情信息")
public class AnnouncementDetailResp extends BaseDetailResp {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serial;
import java.time.LocalDateTime;
import lombok.Data;
@ -35,6 +36,7 @@ import top.charles7c.cnadmin.system.enums.AnnouncementStatusEnum;
@Schema(description = "公告信息")
public class AnnouncementResp extends BaseResp {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
@ -32,6 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "仪表盘-公告信息")
public class DashboardAnnouncementResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

3
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictDetailResp.java
View File

@ -16,6 +16,8 @@
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serial;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
@ -32,6 +34,7 @@ import top.charles7c.cnadmin.common.base.BaseDetailResp;
@Schema(description = "字典详情信息")
public class DictDetailResp extends BaseDetailResp {
@Serial
private static final long serialVersionUID = 1L;
/**

3
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictItemDetailResp.java
View File

@ -16,6 +16,8 @@
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serial;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
@ -36,6 +38,7 @@ import top.charles7c.cnadmin.common.base.BaseDetailResp;
@Schema(description = "字典项详情信息")
public class DictItemDetailResp extends BaseDetailResp {
@Serial
private static final long serialVersionUID = 1L;
/**

3
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictItemResp.java
View File

@ -16,6 +16,8 @@
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serial;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
@ -32,6 +34,7 @@ import top.charles7c.cnadmin.common.base.BaseResp;
@Schema(description = "字典项信息")
public class DictItemResp extends BaseResp {
@Serial
private static final long serialVersionUID = 1L;
/**

3
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictResp.java
View File

@ -16,6 +16,8 @@
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serial;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
@ -32,6 +34,7 @@ import top.charles7c.cnadmin.common.base.BaseResp;
@Schema(description = "字典信息")
public class DictResp extends BaseResp {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
@ -37,6 +38,7 @@ import top.charles7c.cnadmin.common.enums.MessageTypeEnum;
@Schema(description = "消息信息")
public class MessageResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
@ -34,6 +35,7 @@ import top.charles7c.cnadmin.common.enums.MessageTypeEnum;
@Schema(description = "各类型未读消息信息")
public class MessageTypeUnreadResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
@ -36,6 +37,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MessageUnreadResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
@ -36,6 +37,7 @@ import cn.hutool.core.util.StrUtil;
@Schema(description = "参数信息")
public class OptionResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

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

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
@ -32,6 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "第三方账号绑定信息")
public class UserSocialBindResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictServiceImpl.java
View File

@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;

1
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
View File

@ -153,7 +153,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
public void fillDetail(Object detailObj) {
super.fillDetail(detailObj);
if (detailObj instanceof UserDetailResp detail) {
UserDetailResp detail = (UserDetailResp)detailObj;
detail.setDeptName(ExceptionUtils.exToNull(() -> deptService.get(detail.getDeptId()).getName()));
List<Long> roleIdList = userRoleService.listRoleIdByUserId(detail.getId());
detail.setRoleIds(roleIdList);

4
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java
View File

@ -16,10 +16,11 @@
package top.charles7c.cnadmin.tool.model.entity;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import javax.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -52,6 +53,7 @@ import top.charles7c.cnadmin.tool.enums.FormTypeEnum;
@Schema(description = "字段配置信息")
public class FieldConfigDO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

8
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/GenConfigDO.java
View File

@ -16,12 +16,13 @@
package top.charles7c.cnadmin.tool.model.entity;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
import lombok.AccessLevel;
import lombok.Data;
@ -51,6 +52,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts;
@Schema(description = "生成配置信息")
public class GenConfigDO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

6
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/req/GenConfigReq.java
View File

@ -16,12 +16,13 @@
package top.charles7c.cnadmin.tool.model.req;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@ -40,6 +41,7 @@ import top.charles7c.cnadmin.tool.model.entity.GenConfigDO;
@Schema(description = "代码生成配置信息")
public class GenConfigReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

2
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/resp/TableResp.java
View File

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.tool.model.resp;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
@ -33,6 +34,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "表信息")
public class TableResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

1
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java
View File

@ -22,7 +22,6 @@ import java.sql.SQLException;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.sql.DataSource;
import lombok.RequiredArgsConstructor;

1
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/util/MetaUtils.java
View File

@ -20,7 +20,6 @@ import java.sql.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import javax.sql.DataSource;
import lombok.AccessLevel;

2
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/util/Table.java
View File

@ -16,6 +16,7 @@
package top.charles7c.cnadmin.tool.util;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
@ -32,6 +33,7 @@ import lombok.Setter;
@Setter
public class Table implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**

2
continew-admin-tool/src/main/resources/templates/generator/DetailResp.ftl
View File

@ -16,6 +16,7 @@
package ${packageName}.${subPackageName};
import java.io.Serial;
<#if hasLocalDateTime>
import java.time.LocalDateTime;
</#if>
@ -43,6 +44,7 @@ import top.charles7c.cnadmin.common.base.BaseDetailResp;
@Schema(description = "${businessName}详情信息")
public class ${className} extends BaseDetailResp {
@Serial
private static final long serialVersionUID = 1L;
<#if fieldConfigs??>
<#list fieldConfigs as fieldConfig>

2
continew-admin-tool/src/main/resources/templates/generator/Entity.ftl
View File

@ -16,6 +16,7 @@
package ${packageName}.${subPackageName};
import java.io.Serial;
<#if hasLocalDateTime>
import java.time.LocalDateTime;
</#if>
@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.base.BaseDO;
@TableName("${tableName}")
public class ${className} extends BaseDO {
@Serial
private static final long serialVersionUID = 1L;
<#if fieldConfigs??>
<#list fieldConfigs as fieldConfig>

2
continew-admin-tool/src/main/resources/templates/generator/Query.ftl
View File

@ -16,6 +16,7 @@
package ${packageName}.${subPackageName};
import java.io.Serial;
import java.io.Serializable;
<#if hasLocalDateTime>
import java.time.LocalDateTime;
@ -44,6 +45,7 @@ import top.charles7c.cnadmin.common.enums.QueryTypeEnum;
@Schema(description = "${businessName}查询条件")
public class ${className} implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
<#if fieldConfigs??>
<#list fieldConfigs as fieldConfig>

4
continew-admin-tool/src/main/resources/templates/generator/Req.ftl
View File

@ -16,6 +16,7 @@
package ${packageName}.${subPackageName};
import java.io.Serial;
<#if hasLocalDateTime>
import java.time.LocalDateTime;
</#if>
@ -24,7 +25,7 @@ import java.math.BigDecimal;
</#if>
<#if hasRequiredField>
import javax.validation.constraints.*;
import jakarta.validation.constraints.*;
</#if>
import lombok.Data;
@ -43,6 +44,7 @@ import top.charles7c.cnadmin.common.base.BaseReq;
@Schema(description = "创建或修改${businessName}信息")
public class ${className} extends BaseReq {
@Serial
private static final long serialVersionUID = 1L;
<#if fieldConfigs??>
<#list fieldConfigs as fieldConfig>

2
continew-admin-tool/src/main/resources/templates/generator/Resp.ftl
View File

@ -16,6 +16,7 @@
package ${packageName}.${subPackageName};
import java.io.Serial;
<#if hasLocalDateTime>
import java.time.LocalDateTime;
</#if>
@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.base.BaseResp;
@Schema(description = "${businessName}信息")
public class ${className} extends BaseResp {
@Serial
private static final long serialVersionUID = 1L;
<#if fieldConfigs??>
<#list fieldConfigs as fieldConfig>

2
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java
View File

@ -23,7 +23,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;

1
continew-admin-webapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports Normal file
View File

@ -0,0 +1 @@
com.xkcoding.justauth.autoconfigure.JustAuthAutoConfiguration

2
docker/continew-admin/Dockerfile
View File

@ -1,4 +1,4 @@
FROM java:8
FROM openjdk:17
MAINTAINER Charles7c charles7c@126.com