feat: 升级到 JDK17 进行适配

app/build.gradle

@@ -7,6 +7,7 @@ bootJar {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	// 💬 Mock/Test Env
 	runtimeOnly 'com.h2database:h2'
@@ -14,13 +15,18 @@ dependencies {
 	runtimeOnly 'mysql:mysql-connector-java'
 	// runtimeOnly 'org.postgresql:postgresql'
 
+	// 本地依赖
+	implementation fileTree(dir: project.rootDir.getPath() + '\\libs', includes: ['*jar'])
+
 	implementation project(":basic-common:core")
 	implementation project(":basic-common:util")
 
+	// Optional: Redis
+	implementation project(":basic-common:redis")
+
 	// Optional: Doc
 	implementation project(":basic-common:doc")
 	implementation "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
-	implementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
 
 	// Optional: Auth
 	implementation project(":basic-auth")
@@ -31,6 +37,9 @@ dependencies {
 	// FIX: minio dep
 	implementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
 
+	// Optional: MyBatis Plus
+	implementation "com.baomidou:mybatis-plus-boot-starter:${mybatisPlusVersion}"
+
 	// fastjson
 	implementation "com.alibaba:fastjson:${fastJsonVersion}"
 }

app/src/main/java/com/yiring/app/Application.java

 /* (C) 2021 YiRing, Inc. */
 package com.yiring.app;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
+@MapperScan(basePackages = Application.BASE_PACKAGES + ".app.mapper")
 @EnableJpaRepositories(basePackages = Application.BASE_PACKAGES)
 @EntityScan(
     basePackageClasses = { Application.class, Jsr310JpaConverters.class },

app/src/main/java/com/yiring/app/config/GlobalExceptionHandler.java

@@ -42,8 +42,7 @@ public class GlobalExceptionHandler {
     public Result<String> bindErrorHandler(Exception e) {
         String error = "未知参数校验错误";
 
-        if (e instanceof ConstraintViolationException) {
-            ConstraintViolationException ex = (ConstraintViolationException) e;
+        if (e instanceof ConstraintViolationException ex) {
             error = ex.getConstraintViolations().iterator().next().getMessage();
         } else {
             BindingResult result = null;

app/src/main/java/com/yiring/app/domain/TestTable.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serial;
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
+import org.hibernate.annotaions.Comment;
+
+/**
+ * 测试表
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/4/15 18:34
+ */
+
+@Getter
+@Setter
+@ToString
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldNameConstants
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@Entity
+@TableName("TEST_TABLE")
+@Table(name = "TEST_TABLE")
+@Comment("测试表")
+public class TestTable implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -6168070383092874608L;
+
+    @Comment("主键")
+    @Id
+    String id;
+
+    @Comment("姓名")
+    String name;
+
+    @Comment("年龄")
+    Integer age;
+}

app/src/main/java/com/yiring/app/exception/CodeException.java

@@ -2,6 +2,7 @@
 package com.yiring.app.exception;
 
 import com.yiring.app.constant.Code;
+import java.io.Serial;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 
@@ -19,6 +20,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class CodeException extends RuntimeException {
 
+    @Serial
     private static final long serialVersionUID = -4226669531686389671L;
 
     /**

app/src/main/java/com/yiring/app/mapper/TestTableMapper.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yiring.app.domain.TestTable;
+
+/**
+ * @author Jim
+ * @version 0.1
+ * 2022/4/15 17:25
+ */
+public interface TestTableMapper extends BaseMapper<TestTable> {}

app/src/main/java/com/yiring/app/mapper/package-info.java

+/**
+ * @author Jim
+ * @version 0.1
+ * 2022/4/5 16:57
+ */
+package com.yiring.app.mapper;
+// MyBatis Mapper/XML 目录

app/src/main/java/com/yiring/app/web/HelloController.java

@@ -2,13 +2,17 @@
 package com.yiring.app.web;
 
 import com.yiring.app.constant.Code;
+import com.yiring.app.domain.TestTable;
 import com.yiring.app.exception.CodeException;
+import com.yiring.app.mapper.TestTableMapper;
 import com.yiring.common.core.Result;
 import com.yiring.common.param.PageParam;
 import com.yiring.common.vo.PageVo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.Arrays;
 import java.util.List;
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -46,4 +50,14 @@ public class HelloController {
         PageVo<String> vo = PageVo.build(data, data.size());
         return Result.ok(vo);
     }
+
+    @Resource
+    TestTableMapper testTableMapper;
+
+    @ApiOperation("测试 MyBatis Plus 查询")
+    @GetMapping("test")
+    public Result<String> test() {
+        List<TestTable> tests = testTableMapper.selectList(null);
+        return Result.ok(tests.stream().map(TestTable::getName).reduce((a, b) -> a + "," + b).orElse(""));
+    }
 }

app/src/main/resources/application-mock.yml

@@ -17,6 +17,11 @@ spring:
     host: 127.0.0.1
     password: 123456
 
+# Optional: MyBatis Plus
+mybatis-plus:
+  global-config:
+    banner: false
+
 # knife4j
 knife4j:
   enable: true
@@ -40,3 +45,4 @@ logging:
   level:
     # sql bind parameter
     org.hibernate.type.descriptor.sql.BasicBinder: trace
+

app/src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
     name: "basic-api-app"
   profiles:
     include: auth
-    active: dev
+    active: mock
 
 # DEBUG
 debug: false

app/src/test/java/com/yiring/MapperSampleTest.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring;
+
+import com.yiring.app.domain.TestTable;
+import com.yiring.app.mapper.TestTableMapper;
+import java.util.List;
+import javax.annotation.Resource;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.util.Assert;
+
+/**
+ * @author Jim
+ * @version 0.1
+ * 2022/4/15 17:25
+ */
+
+@SpringBootTest
+public class MapperSampleTest {
+
+    @Resource
+    TestTableMapper testTableMapper;
+
+    @Test
+    public void testSelect() {
+        List<TestTable> tests = testTableMapper.selectList(null);
+        Assert.isTrue(tests.size() > 0, "查询失败");
+    }
+}

basic-auth/build.gradle

@@ -3,13 +3,13 @@ dependencies {
 	implementation project(':basic-common:util')
 
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 
 	// 本地依赖
 	implementation fileTree(dir: project.rootDir.getPath() + '\\libs', includes: ['*jar'])
 
 	// swagger annotations
 	implementation "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
-	implementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
 
 	// sa-token
 	implementation "cn.dev33:sa-token-spring-boot-starter:${saTokenVersion}"

basic-auth/src/main/java/com/yiring/auth/domain/permission/Permission.java

@@ -3,11 +3,14 @@ package com.yiring.auth.domain.permission;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import java.io.Serial;
 import java.io.Serializable;
+import java.util.Objects;
 import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
+import org.hibernate.Hibernate;
 import org.hibernate.annotaions.Comment;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.snowflake.SnowflakeId;
@@ -19,7 +22,9 @@ import org.hibernate.snowflake.SnowflakeId;
  * 2018/9/3 17:08
  */
 
-@Data
+@Getter
+@Setter
+@ToString
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
@@ -38,6 +43,7 @@ import org.hibernate.snowflake.SnowflakeId;
 )
 public class Permission implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -2001221843529000953L;
 
     @Comment("主键")
@@ -128,4 +134,17 @@ public class Permission implements Serializable {
 
         return meta;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        Permission that = (Permission) o;
+        return id != null && Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
 }

basic-auth/src/main/java/com/yiring/auth/domain/role/Role.java

@@ -4,13 +4,16 @@ package com.yiring.auth.domain.role;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yiring.auth.domain.permission.Permission;
 import com.yiring.auth.domain.user.User;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
+import org.hibernate.Hibernate;
 import org.hibernate.annotaions.Comment;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.snowflake.SnowflakeId;
@@ -22,7 +25,9 @@ import org.hibernate.snowflake.SnowflakeId;
  * 2018/9/3 15:45
  */
 
-@Data
+@Getter
+@Setter
+@ToString
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
@@ -33,6 +38,7 @@ import org.hibernate.snowflake.SnowflakeId;
 @Table(name = "SYS_ROLE", indexes = { @Index(columnList = "uid", unique = true) })
 public class Role implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 910404402503275957L;
 
     @Comment("主键")
@@ -52,6 +58,7 @@ public class Role implements Serializable {
     @Builder.Default
     @Comment("权限集合")
     @ManyToMany
+    @ToString.Exclude
     private Set<Permission> permissions = new HashSet<>();
 
     @JsonIgnore
@@ -66,4 +73,17 @@ public class Role implements Serializable {
         inverseJoinColumns = { @JoinColumn(name = "user_id") }
     )
     private Set<User> users = new HashSet<>();
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        Role role = (Role) o;
+        return id != null && Objects.equals(id, role.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
 }

basic-auth/src/main/java/com/yiring/auth/domain/user/User.java

@@ -3,14 +3,17 @@ package com.yiring.auth.domain.user;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yiring.auth.domain.role.Role;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
+import org.hibernate.Hibernate;
 import org.hibernate.annotaions.Comment;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.snowflake.SnowflakeId;
@@ -22,7 +25,9 @@ import org.hibernate.snowflake.SnowflakeId;
  * 2018/9/3 15:27
  */
 
-@Data
+@Getter
+@Setter
+@ToString
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
@@ -42,6 +47,7 @@ import org.hibernate.snowflake.SnowflakeId;
 @Comment("系统用户")
 public class User implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -5787847701210907511L;
 
     @Comment("主键")
@@ -99,4 +105,17 @@ public class User implements Serializable {
 
     @Comment("创建时间")
     LocalDateTime createTime;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        User user = (User) o;
+        return id != null && Objects.equals(id, user.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
 }

basic-auth/src/main/java/com/yiring/auth/param/IdsParam.java

@@ -3,6 +3,7 @@ package com.yiring.auth.param;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Set;
@@ -28,6 +29,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class IdsParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -8379896695668632733L;
 
     @ApiModelProperty(value = "ids 多个以逗号分割", example = "1,2", required = true)

basic-auth/src/main/java/com/yiring/auth/param/auth/LoginParam.java

@@ -3,6 +3,7 @@ package com.yiring.auth.param.auth;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import javax.validation.constraints.NotEmpty;
 import lombok.*;
@@ -23,6 +24,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class LoginParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -8690942241103456895L;
 
     @ApiModelProperty(value = "账号(支持用户名/手机号/邮箱)", example = "admin", required = true)

basic-auth/src/main/java/com/yiring/auth/param/auth/RegisterParam.java

@@ -3,6 +3,7 @@ package com.yiring.auth.param.auth;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Pattern;
@@ -24,6 +25,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class RegisterParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -8690942241103456895L;
 
     @ApiModelProperty(value = "用户名", example = "admin", required = true)

basic-auth/src/main/java/com/yiring/auth/param/permission/PermissionParam.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.yiring.auth.domain.permission.Permission;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -27,6 +28,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class PermissionParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -6781934969837655538L;
 
     @ApiModelProperty(value = "权限类型", example = "MENU", required = true)

basic-auth/src/main/java/com/yiring/auth/param/role/RoleParam.java

@@ -3,6 +3,7 @@ package com.yiring.auth.param.role;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import javax.validation.constraints.NotEmpty;
 import lombok.*;
@@ -23,6 +24,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class RoleParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 6572751635422870217L;
 
     @ApiModelProperty(value = "标识", example = "admin", required = true)

basic-auth/src/main/java/com/yiring/auth/vo/auth/LoginVo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
@@ -25,6 +26,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class LoginVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -8690942241103456896L;
 
     @JsonSerialize(using = ToStringSerializer.class)

basic-auth/src/main/java/com/yiring/auth/vo/permission/MenuVo.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
 import lombok.*;
@@ -27,6 +28,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class MenuVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -9139328772148985141L;
 
     @JsonIgnore

basic-auth/src/main/java/com/yiring/auth/vo/permission/PermissionVo.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yiring.auth.domain.permission.Permission;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
 import lombok.*;
@@ -29,6 +30,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class PermissionVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -9139328772148985141L;
 
     @JsonSerialize(using = ToStringSerializer.class)

basic-auth/src/main/java/com/yiring/auth/vo/role/RoleVo.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yiring.auth.vo.permission.PermissionVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
 import lombok.*;
@@ -26,6 +27,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class RoleVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -9154497137563970840L;
 
     @JsonSerialize(using = ToStringSerializer.class)

basic-auth/src/main/java/com/yiring/auth/vo/user/UserInfoVo.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yiring.auth.vo.role.RoleVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,6 +27,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class UserInfoVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -5319037883240327088L;
 
     @JsonSerialize(using = ToStringSerializer.class)

basic-auth/src/main/java/com/yiring/auth/vo/user/UserMenuListVo.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yiring.auth.vo.role.RoleVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,6 +27,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class UserMenuListVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -5319037883240327088L;
 
     @JsonSerialize(using = ToStringSerializer.class)

basic-auth/src/main/java/com/yiring/auth/vo/user/UserVo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import lombok.*;
@@ -24,6 +25,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class UserVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -2184378273450466835L;
 
     @JsonSerialize(using = ToStringSerializer.class)

basic-common/core/build.gradle

@@ -3,11 +3,11 @@ dependencies {
 
 	implementation 'org.springframework.boot:spring-boot-starter-aop'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 
 	// swagger annotations
 	implementation "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
-	implementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
 
 	// hutool-extra
 	implementation "cn.hutool:hutool-extra:${hutoolVersion}"

basic-common/core/src/main/java/com/yiring/common/core/Result.java

@@ -4,6 +4,7 @@ package com.yiring.common.core;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.AccessLevel;
 import lombok.Builder;
@@ -28,6 +29,7 @@ import lombok.extern.slf4j.Slf4j;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class Result<T extends Serializable> implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -4802543396830024571L;
 
     /**

basic-common/core/src/main/java/com/yiring/common/exception/FailStatusException.java

@@ -2,6 +2,7 @@
 package com.yiring.common.exception;
 
 import com.yiring.common.core.Status;
+import java.io.Serial;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -22,6 +23,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class FailStatusException extends RuntimeException {
 
+    @Serial
     private static final long serialVersionUID = -4226669531686389671L;
 
     /**

basic-common/core/src/main/java/com/yiring/common/param/IdParam.java

@@ -3,6 +3,7 @@ package com.yiring.common.param;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -25,6 +26,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class IdParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -8690942241103456893L;
 
     @ApiModelProperty(value = "id", example = "1", required = true)

basic-common/core/src/main/java/com/yiring/common/param/PageParam.java

@@ -3,6 +3,7 @@ package com.yiring.common.param;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Objects;
 import javax.validation.constraints.DecimalMin;
@@ -32,6 +33,7 @@ import org.springframework.data.domain.Sort;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class PageParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 6103761701912769946L;
 
     @ApiModelProperty(value = "分页条数", example = "10", required = true)

basic-common/core/src/main/java/com/yiring/common/vo/DataVo.java

@@ -3,6 +3,7 @@ package com.yiring.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import lombok.*;
@@ -22,6 +23,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class DataVo<T extends Serializable> implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 2472779197432240431L;
 
     @ApiModelProperty(value = "数据")

basic-common/core/src/main/java/com/yiring/common/vo/KeyValueVo.java

@@ -3,6 +3,7 @@ package com.yiring.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
@@ -23,6 +24,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class KeyValueVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -5238793972067296346L;
 
     @ApiModelProperty(value = "key", example = "key")

basic-common/core/src/main/java/com/yiring/common/vo/PageVo.java

@@ -3,6 +3,7 @@ package com.yiring.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -22,6 +23,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class PageVo<T extends Serializable> implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 6103761701912769946L;
 
     @ApiModelProperty(value = "数据")

basic-common/doc/build.gradle

@@ -2,9 +2,9 @@ dependencies {
 	implementation project(":basic-common:core")
 
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 
 	// swagger(knife4j)
 	implementation "com.github.xiaoymin:knife4j-spring-boot-starter:${knife4jVersion}"
-	implementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
 
 }

basic-common/redis/build.gradle

+dependencies {
+
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
+}

basic-common/redis/src/main/java/com/yiring/common/package-info.java

+/**
+ * @author Jim
+ * @version 0.1
+ * 2022/3/26 10:36
+ */
+package com.yiring.common;

basic-common/util/src/main/java/com/yiring/common/jackson/ObjectMappingSerializer.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import java.io.IOException;
+import java.io.Serial;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -21,6 +22,7 @@ import java.util.Objects;
  */
 public class ObjectMappingSerializer extends StdSerializer<Object> implements ContextualSerializer {
 
+    @Serial
     private static final long serialVersionUID = -1924851196524453827L;
 
     protected ObjectMappingSerializer() {

build.gradle

@@ -6,21 +6,23 @@ buildscript {
         // https://mvnrepository.com/artifact/com.github.xiaoymin/knife4j-spring-boot-starter
         knife4jVersion = '2.0.9'
         // https://mvnrepository.com/artifact/io.swagger/swagger-annotations
-        swaggerAnnotationsVersion = '1.6.4'
+        swaggerAnnotationsVersion = '1.6.6'
         // https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator
-        hibernateValidatorVersion = '6.0.23.Final'
+        hibernateValidatorVersion = '7.0.4.Final'
         // https://mvnrepository.com/artifact/cn.dev33/sa-token-spring-boot-starter
-        saTokenVersion = '1.28.0'
+        saTokenVersion = '1.29.1.trial'
         // https://mvnrepository.com/artifact/cn.hutool/hutool-all
         hutoolVersion = '5.7.22'
         // https://mvnrepository.com/artifact/com.alibaba/fastjson
-        fastJsonVersion = '1.2.79'
+        fastJsonVersion = '1.2.80'
         // https://mvnrepository.com/artifact/com.xuxueli/xxl-job-core
         xxlJobVersion = '2.3.0'
         // https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
         okhttpVersion = '4.9.3'
         // https://mvnrepository.com/artifact/io.minio/minio
-        minioVersion = '8.3.7'
+        minioVersion = '8.3.8'
+        // https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter
+        mybatisPlusVersion = '3.5.1'
     }
 }
 
@@ -30,13 +32,11 @@ plugins {
     // https://plugins.gradle.org/plugin/io.spring.dependency-management
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     // https://plugins.gradle.org/plugin/com.diffplug.spotless
-    id "com.diffplug.spotless" version "6.3.0"
+    id "com.diffplug.spotless" version "6.4.2"
     // https://plugins.gradle.org/plugin/com.github.spotbugs
-    // id "com.github.spotbugs" version "4.7.10"
+    // id "com.github.spotbugs" version "5.0.6"
 }
 
-sourceCompatibility = '1.8'
-
 allprojects {
     repositories {
         mavenLocal()
@@ -104,7 +104,7 @@ subprojects {
             licenseHeader '/* (C) $YEAR YiRing, Inc. */'
             // https://www.npmjs.com/package/prettier
             // https://www.npmjs.com/package/prettier-plugin-java
-            prettier(['prettier': '2.6.0', 'prettier-plugin-java': '1.6.1']).config([
+            prettier(['prettier': '2.6.2', 'prettier-plugin-java': '1.6.1']).config([
                 'parser'    : 'java',
                 'tabWidth'  : 4,
                 'printWidth': 120,

gradle.properties

+# https://github.com/diffplug/spotless/issues/834
+# fix: jdk16+
+org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

settings.gradle

@@ -11,4 +11,5 @@ include 'basic-common:core'
 include 'basic-common:util'
 include 'basic-common:doc'
 include 'basic-common:minio'
+include 'basic-common:redis'