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

1.完善 @serial 2.完善 javax => jakarta 3.修复 canAccess() 使用错误 4.兼容 JustAuth Spring Boot Starter 5.CI 脚本更新 JDK 8 => 17
continew-org · Nov 5, 2023 · 8dbec9d · 8dbec9d
1 parent 51e1cd9
commit 8dbec9d
Show file tree

Hide file tree

Showing 63 changed files with 144 additions and 49 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -20,7 +20,7 @@ jobs:
  uses: actions/setup-java@master
  with:
  distribution: 'adopt'
- java-version: '8'
+ java-version: '17'
  cache: 'maven'
  # 3、打包
  - name: Build

diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml
@@ -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>

diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseReq.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseReq.java
@@ -19,8 +19,6 @@
 import java.io.Serial;
 import java.io.Serializable;
 
-import jakarta.validation.groups.Default;
-
 import lombok.Data;
 
 /**

diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java
@@ -250,7 +250,6 @@ protected void fill(Object baseObj) {
  public void fillDetail(Object detailObj) {
  if (detailObj instanceof BaseDetailResp detail) {
  this.fill(detail);
-
  Long updateUser = detail.getUpdateUser();
  if (null == updateUser) {
  return;

diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/ValidateGroup.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/ValidateGroup.java
@@ -16,7 +16,7 @@
 
 package top.charles7c.cnadmin.common.base;
 
-import javax.validation.groups.Default;
+import jakarta.validation.groups.Default;
 
 /**
  * 分组校验

diff --git a/.../src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java b/.../src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java
@@ -16,18 +16,20 @@
 
 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 top.charles7c.cnadmin.common.annotation.CrudRequestMapping;
-import top.charles7c.cnadmin.common.util.ExceptionUtils;
 
-import java.lang.reflect.Method;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 
-import static top.charles7c.cnadmin.common.annotation.CrudRequestMapping.Api;
+import top.charles7c.cnadmin.common.annotation.CrudRequestMapping;
+import top.charles7c.cnadmin.common.util.ExceptionUtils;
 
 /**
  * CRUD 请求映射器处理器映射器

diff --git a/...w-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalErrorHandler.java b/...w-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalErrorHandler.java
@@ -20,9 +20,9 @@
 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;
 

diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java
@@ -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 @@
 @Schema(description = "排序查询条件")
 public class SortQuery implements Serializable {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/...inew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java b/...inew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java
@@ -20,7 +20,6 @@
 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 static <Q, R> QueryWrapper<R> build(Q query) {
  if (null == query) {
  return queryWrapper;
  }
-
  // 获取查询条件中所有的字段
  List<Field> fieldList = ReflectUtils.getNonStaticFields(query.getClass());
  fieldList.forEach(field -> buildQuery(query, field, queryWrapper));
@@ -87,7 +85,7 @@ public static <Q, R> QueryWrapper<R> build(Q query) {
  * 查询数据类型
  */
  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，直接返回

diff --git a/...admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java b/...admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java
@@ -247,7 +247,7 @@ private void logRequest(LogDO logDO, HttpServletRequest request) {
  }
  logDO.setClientIp(JakartaServletUtil.getClientIP(request));
  logDO.setLocation(IpUtils.getCityInfo(logDO.getClientIp()));
- logDO.setBrowser(JakartaServletUtil.getBrowser(request));
+ logDO.setBrowser(ServletUtils.getBrowser(request));
  }
 
  /**

diff --git a/...itor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardAccessTrendResp.java b/...itor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardAccessTrendResp.java
@@ -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 @@
 @Schema(description = "仪表盘-访问趋势信息")
 public class DashboardAccessTrendResp implements Serializable {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/.../src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardGeoDistributionResp.java b/.../src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardGeoDistributionResp.java
@@ -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 @@
 @Schema(description = "仪表盘-访客地域分布信息")
 public class DashboardGeoDistributionResp implements Serializable {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/...or/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardPopularModuleResp.java b/...or/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardPopularModuleResp.java
@@ -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 @@
 @Schema(description = "仪表盘-热门模块信息")
 public class DashboardPopularModuleResp implements Serializable {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/...in-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardTotalResp.java b/...in-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardTotalResp.java
@@ -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 @@
 @Schema(description = "仪表盘-总计信息")
 public class DashboardTotalResp implements Serializable {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/EmailLoginReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/EmailLoginReq.java
@@ -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 @@
 @Schema(description = "邮箱登录信息")
 public class EmailLoginReq implements Serializable {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/PhoneLoginReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/PhoneLoginReq.java
@@ -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 @@
 @Schema(description = "手机号登录信息")
 public class PhoneLoginReq implements Serializable {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/LoginResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/LoginResp.java
@@ -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 @@
 @Schema(description = "令牌信息")
 public class LoginResp implements Serializable {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/...-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/AnnouncementDO.java b/...-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/AnnouncementDO.java
@@ -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 @@
 @TableName("sys_announcement")
 public class AnnouncementDO extends BaseDO {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictDO.java
@@ -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 @@
 @TableName("sys_dict")
 public class DictDO extends BaseDO {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/...inew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictItemDO.java b/...inew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DictItemDO.java
@@ -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 @@
 @TableName("sys_dict_item")
 public class DictItemDO extends BaseDO {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MessageDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MessageDO.java
@@ -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 @@
 @TableName("sys_message")
 public class MessageDO implements Serializable {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/OptionDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/OptionDO.java
@@ -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 @@
 @TableName("sys_option")
 public class OptionDO implements Serializable {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/...ew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserSocialDO.java b/...ew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserSocialDO.java
@@ -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 @@
 @TableName("sys_user_social")
 public class UserSocialDO implements Serializable {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/...dmin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java b/...dmin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java
@@ -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 @@
 @Schema(description = "公告查询条件")
 public class AnnouncementQuery implements Serializable {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**

diff --git a/...ew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DictItemQuery.java b/...ew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DictItemQuery.java
@@ -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 @@
 @Schema(description = "字典项查询条件")
 public class DictItemQuery implements Serializable {
 
+ @Serial
  private static final long serialVersionUID = 1L;
 
  /**