Compare commits

...

23 Commits

Author SHA1 Message Date
dependabot[bot]
9f4f5df05d build(deps): bump pagehelper-spring-boot-starter from 1.4.0 to 1.4.1
Bumps pagehelper-spring-boot-starter from 1.4.0 to 1.4.1.

---
updated-dependencies:
- dependency-name: com.github.pagehelper:pagehelper-spring-boot-starter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-19 23:24:14 +08:00
dependabot[bot]
c51798c87f build(deps): bump okhttp from 4.9.2 to 4.9.3
Bumps [okhttp](https://github.com/square/okhttp) from 4.9.2 to 4.9.3.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.9.2...parent-4.9.3)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-19 23:24:01 +08:00
dependabot[bot]
8f6a75cd6a build(deps): bump protostuff-core from 1.1.6 to 1.2.2
Bumps protostuff-core from 1.1.6 to 1.2.2.

---
updated-dependencies:
- dependency-name: com.dyuproject.protostuff:protostuff-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-19 23:23:50 +08:00
dependabot[bot]
7e652e105b build(deps): bump protostuff-runtime from 1.1.6 to 1.2.2
Bumps protostuff-runtime from 1.1.6 to 1.2.2.

---
updated-dependencies:
- dependency-name: com.dyuproject.protostuff:protostuff-runtime
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-19 23:23:38 +08:00
dependabot[bot]
932333b595 build(deps-dev): bump junit-vintage-engine from 5.7.1 to 5.8.2
Bumps [junit-vintage-engine](https://github.com/junit-team/junit5) from 5.7.1 to 5.8.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.1...r5.8.2)

---
updated-dependencies:
- dependency-name: org.junit.vintage:junit-vintage-engine
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-19 23:23:24 +08:00
dependabot[bot]
2f122234fb build(deps): bump h2 from 1.4.200 to 2.0.206
Bumps [h2](https://github.com/h2database/h2database) from 1.4.200 to 2.0.206.
- [Release notes](https://github.com/h2database/h2database/releases)
- [Commits](https://github.com/h2database/h2database/compare/version-1.4.200...version-2.0.206)

---
updated-dependencies:
- dependency-name: com.h2database:h2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-07 09:05:38 +08:00
dependabot[bot]
7ba4137bf1 build(deps): bump lombok from 1.18.20 to 1.18.22
Bumps [lombok](https://github.com/projectlombok/lombok) from 1.18.20 to 1.18.22.
- [Release notes](https://github.com/projectlombok/lombok/releases)
- [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/projectlombok/lombok/compare/v1.18.20...v1.18.22)

---
updated-dependencies:
- dependency-name: org.projectlombok:lombok
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 12:14:12 -05:00
dependabot[bot]
850349bac0 build(deps): bump spring-boot-starter-parent from 2.5.5 to 2.5.6
Bumps [spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 2.5.5 to 2.5.6.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.5.5...v2.5.6)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-starter-parent
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 12:13:53 -05:00
禾几海
f7f8f41759 Update sync.yml 2021-11-02 01:04:38 +08:00
a2258d183f 修复找不到测试用例的异常 2021-11-02 01:00:29 +08:00
dependabot[bot]
68e2a4772c build(deps): bump pagehelper-spring-boot-starter from 1.3.1 to 1.4.0
Bumps pagehelper-spring-boot-starter from 1.3.1 to 1.4.0.

---
updated-dependencies:
- dependency-name: com.github.pagehelper:pagehelper-spring-boot-starter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 11:38:09 -05:00
dependabot[bot]
f6e67aca07 build(deps): bump spring-boot-maven-plugin from 2.5.5 to 2.5.6
Bumps [spring-boot-maven-plugin](https://github.com/spring-projects/spring-boot) from 2.5.5 to 2.5.6.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.5.5...v2.5.6)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 11:37:22 -05:00
禾几海
d667689f1a 修复不兼容项 2021-10-05 16:54:23 +08:00
dependabot[bot]
6cfa132a66 build(deps): bump spring-boot-starter-parent from 2.1.3.RELEASE to 2.5.5
Bumps [spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 2.1.3.RELEASE to 2.5.5.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.1.3.RELEASE...v2.5.5)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-starter-parent
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-05 16:54:23 +08:00
dependabot[bot]
359d3c2664 build(deps): bump pagehelper-spring-boot-starter from 1.3.0 to 1.3.1
Bumps pagehelper-spring-boot-starter from 1.3.0 to 1.3.1.

---
updated-dependencies:
- dependency-name: com.github.pagehelper:pagehelper-spring-boot-starter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-05 16:24:23 +08:00
dependabot[bot]
243bbe8b20 build(deps): bump springfox-swagger2 from 2.9.2 to 3.0.0
Bumps [springfox-swagger2](https://github.com/springfox/springfox) from 2.9.2 to 3.0.0.
- [Release notes](https://github.com/springfox/springfox/releases)
- [Changelog](https://github.com/springfox/springfox/blob/master/docs/release-notes.md)
- [Commits](https://github.com/springfox/springfox/compare/2.9.2...3.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-05 16:24:02 +08:00
dependabot[bot]
306f695f3f build(deps): bump jaxb-core from 2.3.0.1 to 3.0.2
Bumps jaxb-core from 2.3.0.1 to 3.0.2.

---
updated-dependencies:
- dependency-name: com.sun.xml.bind:jaxb-core
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-05 16:09:20 +08:00
dependabot[bot]
6d5b69ecd6 build(deps): bump jaxb-impl from 3.0.0 to 3.0.2
Bumps jaxb-impl from 3.0.0 to 3.0.2.

---
updated-dependencies:
- dependency-name: com.sun.xml.bind:jaxb-impl
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-05 16:04:22 +08:00
dependabot[bot]
d7fdd3ec23 build(deps): bump junit from 4.13.1 to 4.13.2
Bumps [junit](https://github.com/junit-team/junit4) from 4.13.1 to 4.13.2.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.13.1...r4.13.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-05 16:04:11 +08:00
禾几海
a6c9405499 Update sync.yml 2021-10-05 15:56:40 +08:00
禾几海
f090264066 Update sync.yml 2021-10-05 15:49:44 +08:00
禾几海
2d1c1a7208 Update build.yml 2021-10-05 15:44:20 +08:00
禾几海
9997caaedf Create sync.yml 2021-10-05 15:43:38 +08:00
8 changed files with 41 additions and 24 deletions

View File

@@ -26,17 +26,6 @@ jobs:
with: with:
java-version: 1.8 java-version: 1.8
- name: Sync repository
uses: x-dr/sync-repo-to-gitee@v1.0
env:
# 在 Settings->Secrets 配置 GITEE_KEY
SSH_KEY: ${{ secrets.GITEE_KEY }}
with:
# GitHub存储库的SSH URL.
github-repo: git@github.com:xiaohai2271/blog-backEnd.git
# Gitee存储库的SSH URL.
gitee-repo: git@gitee.com:xiaohai2271/blog-backEnd.git
- name: Cache local Maven repository - name: Cache local Maven repository
uses: actions/cache@v2 uses: actions/cache@v2
with: with:

22
.github/workflows/sync.yml vendored Normal file
View File

@@ -0,0 +1,22 @@
name: Sync Repository Action
on:
push:
branches: [ master ]
schedule:
# 每周一0:00
- cron: '0 0 * * 1'
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Sync to Gitee
uses: x-dr/sync-repo-to-gitee@master
env:
# 在 Settings->Secrets 配置 GITEE_KEY
SSH_KEY: ${{ secrets.GITEE_KEY }}
with:
# GitHub存储库的SSH URL.
github-repo: git@github.com:xiaohai2271/blog-backEnd.git
# Gitee存储库的SSH URL.
gitee-repo: git@gitee.com:xiaohai2271/blog-backEnd.git

View File

@@ -65,7 +65,7 @@
<dependency> <dependency>
<groupId>com.github.pagehelper</groupId> <groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId> <artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.3.0</version> <version>1.4.1</version>
</dependency> </dependency>
@@ -98,12 +98,12 @@
<dependency> <dependency>
<groupId>com.dyuproject.protostuff</groupId> <groupId>com.dyuproject.protostuff</groupId>
<artifactId>protostuff-core</artifactId> <artifactId>protostuff-core</artifactId>
<version>1.1.6</version> <version>1.2.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.dyuproject.protostuff</groupId> <groupId>com.dyuproject.protostuff</groupId>
<artifactId>protostuff-runtime</artifactId> <artifactId>protostuff-runtime</artifactId>
<version>1.1.6</version> <version>1.2.2</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@@ -229,7 +229,7 @@ public abstract class BaseTest {
try { try {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
mapper.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE); mapper.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
response = mapper.readValue(json, responseType); response = (Response<T>) mapper.readValue(json, responseType);
} catch (IOException e) { } catch (IOException e) {
logger.error("解析json Response对象错误json:[{}]", json); logger.error("解析json Response对象错误json:[{}]", json);
e.printStackTrace(); e.printStackTrace();

View File

@@ -19,7 +19,7 @@
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version> <version>3.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.xiaoymin</groupId> <groupId>com.github.xiaoymin</groupId>
@@ -88,7 +88,7 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>2.5.5</version> <version>2.5.6</version>
<configuration> <configuration>
<mainClass>cn.celess.BlogApplication</mainClass> <mainClass>cn.celess.BlogApplication</mainClass>
</configuration> </configuration>

View File

@@ -32,7 +32,7 @@
<dependency> <dependency>
<groupId>com.squareup.okhttp3</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
<version>4.9.2</version> <version>4.9.3</version>
</dependency> </dependency>
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>org.jetbrains.kotlin</groupId>--> <!-- <groupId>org.jetbrains.kotlin</groupId>-->

View File

@@ -38,12 +38,12 @@
<dependency> <dependency>
<groupId>com.sun.xml.bind</groupId> <groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId> <artifactId>jaxb-impl</artifactId>
<version>3.0.0</version> <version>3.0.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.xml.bind</groupId> <groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId> <artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version> <version>3.0.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.activation</groupId> <groupId>javax.activation</groupId>

14
pom.xml
View File

@@ -19,7 +19,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version> <version>2.5.6</version>
<relativePath/> <relativePath/>
</parent> </parent>
<groupId>cn.celess</groupId> <groupId>cn.celess</groupId>
@@ -49,18 +49,24 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.18.20</version> <version>1.18.22</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.13.1</version> <version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.8.2</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<version>1.4.200</version> <version>2.0.206</version>
</dependency> </dependency>
</dependencies> </dependencies>