提交 674dce47 作者: 方治民

feat: 适配 Spring Boot 2.6.6, 更新文档

上级 4b8557a1
...@@ -7,5 +7,5 @@ indent_style = space ...@@ -7,5 +7,5 @@ indent_style = space
end_of_line = lf end_of_line = lf
insert_final_newline = true insert_final_newline = true
[**.yml] [*.{yml,yaml}]
indent_size = 2 indent_size = 2
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
## 开发环境 ## 开发环境
<!-- prettier-ignore --> <!-- prettier-ignore -->
- JDK 1.8+ (推荐同时安装最新 LTS 版本) [下载](https://www.oracle.com/java/technologies/downloads/#jdk17-windows) - JDK 17 [版本管理工具](https://github.com/shyiko/jabba)
- NodeJS [latest](https://nodejs.org/zh-cn/) - NodeJS [下载](https://nodejs.org/zh-cn/)
- IDEA [下载](https://www.jetbrains.com/idea/) - IDEA [下载](https://www.jetbrains.com/idea/)
- Navicat Premium [下载](http://www.downcc.com/soft/430673.html) - Navicat Premium [下载](http://www.downcc.com/soft/430673.html)
- RedisDesktopManager [下载](https://github.com/FuckDoctors/rdm-builder) - RedisDesktopManager [下载](https://github.com/FuckDoctors/rdm-builder)
......
...@@ -10,7 +10,7 @@ import javax.persistence.Table; ...@@ -10,7 +10,7 @@ import javax.persistence.Table;
import lombok.*; import lombok.*;
import lombok.experimental.FieldDefaults; import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants; import lombok.experimental.FieldNameConstants;
import org.hibernate.annotaions.Comment; import org.hibernate.annotations.Comment;
/** /**
* 测试表 * 测试表
......
spring:
mvc:
pathmatch:
# 修复 swagger 插件在 2.6.x 接口路径匹配问题
matching-strategy: ant_path_matcher
...@@ -4,7 +4,7 @@ spring: ...@@ -4,7 +4,7 @@ spring:
username: root username: root
password: 123456 password: 123456
jpa: jpa:
database-platform: org.hibernate.dialect.MySQL5InnoDBDialect database-platform: org.hibernate.dialect.MySQL8Dialect
open-in-view: true open-in-view: true
hibernate: hibernate:
ddl-auto: update ddl-auto: update
...@@ -17,6 +17,11 @@ spring: ...@@ -17,6 +17,11 @@ spring:
host: 127.0.0.1 host: 127.0.0.1
password: 123456 password: 123456
# Optional: MyBatis Plus
mybatis-plus:
global-config:
banner: false
# knife4j # knife4j
knife4j: knife4j:
enable: true enable: true
......
...@@ -7,8 +7,8 @@ spring: ...@@ -7,8 +7,8 @@ spring:
application: application:
name: "basic-api-app" name: "basic-api-app"
profiles: profiles:
include: auth include: auth, conf-patch
active: mock active: dev
# DEBUG # DEBUG
debug: false debug: false
...@@ -11,7 +11,7 @@ import lombok.*; ...@@ -11,7 +11,7 @@ import lombok.*;
import lombok.experimental.FieldDefaults; import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants; import lombok.experimental.FieldNameConstants;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
import org.hibernate.annotaions.Comment; import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId; import org.hibernate.snowflake.SnowflakeId;
......
...@@ -14,7 +14,7 @@ import lombok.*; ...@@ -14,7 +14,7 @@ import lombok.*;
import lombok.experimental.FieldDefaults; import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants; import lombok.experimental.FieldNameConstants;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
import org.hibernate.annotaions.Comment; import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId; import org.hibernate.snowflake.SnowflakeId;
......
...@@ -14,7 +14,7 @@ import lombok.*; ...@@ -14,7 +14,7 @@ import lombok.*;
import lombok.experimental.FieldDefaults; import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants; import lombok.experimental.FieldNameConstants;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
import org.hibernate.annotaions.Comment; import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId; import org.hibernate.snowflake.SnowflakeId;
......
...@@ -7,8 +7,6 @@ buildscript { ...@@ -7,8 +7,6 @@ buildscript {
knife4jVersion = '2.0.9' knife4jVersion = '2.0.9'
// https://mvnrepository.com/artifact/io.swagger/swagger-annotations // https://mvnrepository.com/artifact/io.swagger/swagger-annotations
swaggerAnnotationsVersion = '1.6.6' swaggerAnnotationsVersion = '1.6.6'
// https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator
hibernateValidatorVersion = '7.0.4.Final'
// https://mvnrepository.com/artifact/cn.dev33/sa-token-spring-boot-starter // https://mvnrepository.com/artifact/cn.dev33/sa-token-spring-boot-starter
saTokenVersion = '1.29.1.trial' saTokenVersion = '1.29.1.trial'
// https://mvnrepository.com/artifact/cn.hutool/hutool-all // https://mvnrepository.com/artifact/cn.hutool/hutool-all
...@@ -28,7 +26,7 @@ buildscript { ...@@ -28,7 +26,7 @@ buildscript {
plugins { plugins {
id 'java' id 'java'
id 'org.springframework.boot' version '2.5.12' id 'org.springframework.boot' version '2.6.6'
// https://plugins.gradle.org/plugin/io.spring.dependency-management // https://plugins.gradle.org/plugin/io.spring.dependency-management
id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'io.spring.dependency-management' version '1.0.11.RELEASE'
// https://plugins.gradle.org/plugin/com.diffplug.spotless // https://plugins.gradle.org/plugin/com.diffplug.spotless
...@@ -48,9 +46,9 @@ allprojects { ...@@ -48,9 +46,9 @@ allprojects {
} }
subprojects { subprojects {
apply plugin: 'java'
apply plugin: 'org.springframework.boot' apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management' apply plugin: 'io.spring.dependency-management'
apply plugin: 'java'
apply plugin: "com.diffplug.spotless" apply plugin: "com.diffplug.spotless"
// apply plugin: "com.github.spotbugs" // apply plugin: "com.github.spotbugs"
...@@ -114,9 +112,6 @@ subprojects { ...@@ -114,9 +112,6 @@ subprojects {
} }
} }
// format
spotlessApply
// GitHook pre-commit (spotless, spotbugs) // GitHook pre-commit (spotless, spotbugs)
def hook = new File("$rootProject.projectDir/.git/hooks/pre-commit") def hook = new File("$rootProject.projectDir/.git/hooks/pre-commit")
hook.text = """#!/bin/bash hook.text = """#!/bin/bash
......
...@@ -3,15 +3,17 @@ ...@@ -3,15 +3,17 @@
### 基础 ### 基础
<!-- prettier-ignore --> <!-- prettier-ignore -->
- [SpringBoot v2.5.x](https://spring.io/projects/spring-boot) - [SpringBoot v2.6.x](https://spring.io/projects/spring-boot)
- [Lombok](https://projectlombok.org/) - [Lombok](https://projectlombok.org/)
- [Spring Web](https://docs.spring.io/spring-framework/docs/current/reference/html/web.html) - [Spring Web](https://docs.spring.io/spring-framework/docs/current/reference/html/web.html)
- [Spring Data Jpa](https://spring.io/projects/spring-data-jpa) - [Spring Data Jpa](https://spring.io/projects/spring-data-jpa)
- [Spring Data Redis](https://spring.io/projects/spring-data-redis)
### Tools ### Tools
<!-- prettier-ignore --> <!-- prettier-ignore -->
- [Hutool](https://www.hutool.cn/) 工具包 - [Hutool](https://www.hutool.cn/) 工具包
- [FastJson](https://github.com/alibaba/fastjson) JSON 工具包
### Doc ### Doc
...@@ -22,7 +24,12 @@ ...@@ -22,7 +24,12 @@
<!-- prettier-ignore --> <!-- prettier-ignore -->
- [sa-token](https://sa-token.dev33.cn/) 权限认证框架 - [sa-token](https://sa-token.dev33.cn/) 权限认证框架
- [MinIO](https://docs.min.io/) MinIO S3 文件存储 - [MinIO](https://docs.min.io/) 文件存储
### 可选
<!-- prettier-ignore -->
- [MyBatis Plus](https://baomidou.com/) MyBatis 增强包(允许与 JPA 混合使用)
### 构建工具 ### 构建工具
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论