Skip to content

Commit a794b91

Browse files
zhoutaoozhoutaoo
authored
Merge pull request #23 from opensabre/0.1.1
0.1.1
2 parents 36b09fc + e28fb20 commit a794b91

8 files changed

Lines changed: 81 additions & 38 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
.DS_Store
21
data
32
logs
43
target/
54
pom-xml-flattened
5+
.vscode/
66

77
### STS ###
88
.apt_generated
@@ -11,6 +11,7 @@ pom-xml-flattened
1111
.project
1212
.settings
1313
.springBeans
14+
.DS_Store
1415

1516
### IntelliJ IDEA ###
1617
.idea

‎opensabre-base-dependencies/pom.xml‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,36 @@
1717
<dockerhub.repository>opensabre</dockerhub.repository>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20-
<!-- 编译 -->
20+
<!-- 编译 -->
2121
<maven.compiler.source>17</maven.compiler.source>
2222
<maven.compiler.target>17</maven.compiler.target>
2323
<lombok.version>1.18.30</lombok.version>
24-
<spring-boot-maven-plugin.version>3.2.3</spring-boot-maven-plugin.version>
24+
<spring-boot-maven-plugin.version>3.4.1</spring-boot-maven-plugin.version>
2525
<dockerfile-maven-plugin.version>1.4.13</dockerfile-maven-plugin.version>
2626
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
2727
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
28-
<!-- 依赖 -->
29-
<spring.boot.version>3.2.3</spring.boot.version>
30-
<spring.cloud.version>2023.0.0</spring.cloud.version>
31-
<spring.cloud.alibaba.version>2023.0.0.0-RC1</spring.cloud.alibaba.version>
32-
<jetcache-starter-redis.version>2.7.5</jetcache-starter-redis.version>
33-
<knife4j-openapi3.version>4.4.0</knife4j-openapi3.version>
34-
<swagger-annotations.version>2.2.19</swagger-annotations.version>
35-
<mysql-connector-j.version>8.0.31</mysql-connector-j.version>
36-
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
28+
<!-- 依赖 -->
29+
<spring.boot.version>3.4.1</spring.boot.version>
30+
<spring.cloud.version>2024.0.0</spring.cloud.version>
31+
<spring.cloud.alibaba.version>2023.0.3.2</spring.cloud.alibaba.version>
32+
<!--swagger文档相关-->
33+
<knife4j-openapi3.version>4.5.0</knife4j-openapi3.version>
34+
<swagger-annotations.version>2.2.25</swagger-annotations.version>
35+
<!--数据库相关-->
36+
<mysql-connector-j.version>8.2.0</mysql-connector-j.version>
3737
<mybatis-plus-boot-starter.version>3.5.5</mybatis-plus-boot-starter.version>
38-
<mybatis-spring.version>3.0.3</mybatis-spring.version>
39-
<hutool.version>5.8.18</hutool.version>
38+
<mybatis-spring.version>3.0.4</mybatis-spring.version>
39+
<!--中间件-->
40+
<jetcache-starter-redis.version>2.7.7</jetcache-starter-redis.version>
41+
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
4042
<feign-interceptors>1.1.2</feign-interceptors>
41-
<guava.version>31.1-jre</guava.version>
43+
<!--工具-->
44+
<hutool.version>5.8.35</hutool.version>
45+
<guava.version>33.4.0-jre</guava.version>
4246
<jasypt-springboot.version>3.0.5</jasypt-springboot.version>
43-
<!-- 测试 -->
44-
<junit-jupiter.version>5.9.1</junit-jupiter.version>
45-
<spring-test.version>5.3.31</spring-test.version>
46-
<httpclient5.version>5.2.3</httpclient5.version>
47+
<!-- 测试 -->
48+
<junit-jupiter.version>5.11.4</junit-jupiter.version>
49+
<httpclient5.version>5.3.1</httpclient5.version>
4750
</properties>
4851

4952
<!-- 依赖管理定义 -->
@@ -117,6 +120,12 @@
117120
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
118121
<version>${knife4j-openapi3.version}</version>
119122
</dependency>
123+
<!--Swagger - RESTFULL API文档-->
124+
<dependency>
125+
<groupId>io.swagger.core.v3</groupId>
126+
<artifactId>swagger-annotations-jakarta</artifactId>
127+
<version>${swagger-annotations.version}</version>
128+
</dependency>
120129
<!--opensabre 组件-->
121130
<dependency>
122131
<groupId>io.github.opensabre</groupId>
@@ -318,23 +327,23 @@
318327
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
319328
<!-- 默认是true，如果打包是pom(e.g. `<packaging>pom</packaging>`)，则运行该插件 -->
320329
<skipPoms>true</skipPoms>
321-
<!-- 默认true，说明：当设置为“true”时，此插件将尝试将生成的属性公开到`System.getProperties()`. 设置为{@code'false'}以避免此曝光。注意通过命令行提供的参数（例如`-Dgit.commit.id=值`)仍然有优先权。 -->
330+
<!-- 默认true，说明：当设置为"true"时，此插件将尝试将生成的属性公开到`System.getProperties()`. 设置为{@code'false'}以避免此曝光。注意通过命令行提供的参数（例如`-Dgit.commit.id=值`)仍然有优先权。 -->
322331
<injectIntoSysProperties>true</injectIntoSysProperties>
323-
<!-- 默认false， 指定在找不到.git目录时插件是否应失败。当设置为“false”并且没有找到.git目录时，插件将跳过执行。 -->
332+
<!-- 默认false， 指定在找不到.git目录时插件是否应失败。当设置为"false"并且没有找到.git目录时，插件将跳过执行。 -->
324333
<failOnNoGitDirectory>true</failOnNoGitDirectory>
325-
<!-- 默认7，配置缩写git提交id的长度(`git.commit.id.abbrev`）到长度至少为N。`0'具有特殊含义（签出git/git文档描述-描述.md)对于特殊情况，缩写为0）。最大值为“40”，因为最大SHA-1长度。 -->
334+
<!-- 默认7，配置缩写git提交id的长度(`git.commit.id.abbrev`）到长度至少为N。`0'具有特殊含义（签出git/git文档描述-描述.md)对于特殊情况，缩写为0）。最大值为"40"，因为最大SHA-1长度。 -->
326335
<abbrevLength>7</abbrevLength>
327-
<!-- 目前，交换机允许两种不同的选择：1默认情况下，此属性设置为“flat”，并将生成以前已知的财产`git.commit.id`就像以前版本的插件一样。保持默认情况下，它将“flat”保留向后兼容性，不需要进一步的操作最终用户调整。2如果将此开关设置为“full”，则插件将导出以前已知的属性`git.commit.id`作为`git.commit.id.full`因此将生成完全有效的导出机制中的json对象。-->
336+
<!-- 目前，交换机允许两种不同的选择：1默认情况下，此属性设置为"flat"，并将生成以前已知的财产`git.commit.id`就像以前版本的插件一样。保持默认情况下，它将"flat"保留向后兼容性，不需要进一步的操作最终用户调整。2如果将此开关设置为"full"，则插件将导出以前已知的属性`git.commit.id`作为`git.commit.id.full`因此将生成完全有效的导出机制中的json对��。-->
328337
<commitIdGenerationMode>flat</commitIdGenerationMode>
329338
<!-- 可以用作非常强大的版本控制助手, 可以参考https://git-scm.com/docs/git-describe -->
330339
<gitDescribe>
331340
<!-- 默认false， 如果true，则不使用该配置 -->
332341
<skip>false</skip>
333-
<!-- 默认true，在某些情况下，在提交附近找不到标记（例如，通常在执行浅克隆）。如果将其设置为“true”，并且未找到标记，则此属性将改为回退到提交的id（当“true”时，此属性不会变为空）-->
342+
<!-- 默认true，在某些情况下，在提交附近找不到标记（例如，通常在执行浅克隆）。如果将其设置为"true"，并且未找到标记，则此属性将改为回退到提交的id（当"true"时，此属性不会变为空）-->
334343
<always>true</always>
335344
<!-- 在describe输出中，哈希的对象id总是缩写为N个字母（默认为7）-->
336345
<abbrev>7</abbrev>
337-
<!-- Default (optional): -dirty 在处于“脏状态”（未提交）的存储库上运行“描述”时更改），说明输出将包含一个附加后缀 -->
346+
<!-- Default (optional): -dirty 在处于"脏状态"（未提交）的存储库上运行"描述"时更改），说明输出将包含一个附加后缀 -->
338347
<dirty>-dirty</dirty>
339348
</gitDescribe>
340349
<!-- 附加的验证实用程序，可用于验证项目属性是否设置 -->

‎opensabre-starter-boot/pom.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<artifactId>opensabre-starter-boot</artifactId>
1414
<packaging>jar</packaging>
1515

16+
<properties>
17+
<logback-core.version>1.5.13</logback-core.version>
18+
<springdoc-openapi-starter.version>2.7.0</springdoc-openapi-starter.version>
19+
</properties>
20+
1621
<dependencyManagement>
1722
<dependencies>
1823
<dependency>
@@ -45,6 +50,12 @@
4550
<dependency>
4651
<groupId>org.springframework.boot</groupId>
4752
<artifactId>spring-boot-starter-actuator</artifactId>
53+
<exclusions>
54+
<exclusion>
55+
<groupId>ch.qos.logback</groupId>
56+
<artifactId>logback-core</artifactId>
57+
</exclusion>
58+
</exclusions>
4859
</dependency>
4960
<!-- 分布式链路追踪 -->
5061
<dependency>
@@ -65,6 +76,26 @@
6576
<dependency>
6677
<groupId>com.github.xiaoymin</groupId>
6778
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
79+
<exclusions>
80+
<exclusion>
81+
<groupId>org.springframework.boot</groupId>
82+
<artifactId>spring-boot-configuration-processor</artifactId>
83+
</exclusion>
84+
<exclusion>
85+
<groupId>org.springdoc</groupId>
86+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
87+
</exclusion>
88+
</exclusions>
89+
</dependency>
90+
<dependency>
91+
<groupId>ch.qos.logback</groupId>
92+
<artifactId>logback-core</artifactId>
93+
<version>${logback-core.version}</version>
94+
</dependency>
95+
<dependency>
96+
<groupId>org.springdoc</groupId>
97+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
98+
<version>${springdoc-openapi-starter.version}</version>
6899
</dependency>
69100
<!-- 提示文件生成 -->
70101
<dependency>

‎opensabre-starter-boot/src/main/resources/bootstrap.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ logging:
88
file:
99
path: logs
1010
pattern:
11-
level: '%5p [${spring.application.name},%X{traceId:-},%X{spanId:-}]'
11+
level: '%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-},%X{parentSpanId:-}]'

‎opensabre-starter-boot/src/main/resources/logback-spring.xml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@
1010
/>
1111
<!--0. 日志格式和颜色渲染 -->
1212
<!-- 彩色日志依赖的渲染类 -->
13-
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
14-
<conversionRule conversionWord="wex"
15-
converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
16-
<conversionRule conversionWord="wEx"
17-
converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
13+
<conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter"/>
14+
<conversionRule conversionWord="wex" class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
15+
<conversionRule conversionWord="wEx" class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
1816
<!-- 脱敏Converter -->
19-
<conversionRule conversionWord="m"
20-
converterClass="io.github.opensabre.boot.sensitive.log.LogBackCoreConverter"/>
17+
<conversionRule conversionWord="m" class="io.github.opensabre.boot.sensitive.log.LogBackCoreConverter"/>
2118
<!-- 彩色日志格式 -->
2219
<property name="CONSOLE_LOG_PATTERN"
2320
value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>

‎opensabre-starter-rpc/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
<groupId>io.github.openfeign</groupId>
4646
<artifactId>feign-hc5</artifactId>
4747
</dependency>
48+
<!--feign-micrometer 5-->
49+
<dependency>
50+
<groupId>io.github.openfeign</groupId>
51+
<artifactId>feign-micrometer</artifactId>
52+
</dependency>
4853
<!--服务调用熔断降级-->
4954
<dependency>
5055
<groupId>com.alibaba.cloud</groupId>

‎opensabre-test/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2222
<!-- 编译 -->
23-
<maven.compiler.source>11</maven.compiler.source>
24-
<maven.compiler.target>11</maven.compiler.target>
23+
<maven.compiler.source>17</maven.compiler.source>
24+
<maven.compiler.target>17</maven.compiler.target>
2525
<!-- 测试 -->
2626
<!-- 依赖 -->
2727
</properties>

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@
5555
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5656
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5757
<!-- 编译 -->
58-
<maven.compiler.source>11</maven.compiler.source>
59-
<maven.compiler.target>11</maven.compiler.target>
58+
<maven.compiler.source>17</maven.compiler.source>
59+
<maven.compiler.target>17</maven.compiler.target>
6060
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
6161
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
6262
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
6363
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
6464
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
6565

66-
<revision>0.1.0</revision>
66+
<revision>0.1.1</revision>
6767
</properties>
6868

6969
<!--发布仓库的定义-->

0 commit comments

Comments
 (0)