Skip to content

Commit

Permalink
Merge pull request #2 from vnobo/dev
Browse files Browse the repository at this point in the history
♻️ refactor(boot, platform): 更新日志服务,增加操作日志记录器功能,优化构建和缓存逻辑
  • Loading branch information
vnobo authored Jul 31, 2024
2 parents 9ec1029 + 82f5ada commit 46b0d02
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 31 deletions.
62 changes: 31 additions & 31 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,50 +5,50 @@
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle

name: Java CI with Gradle

name: Gradle Package
run-name: ${{ github.actor }} is bootBuildImage Actions
on:
workflow_dispatch:
branches:
- main
release:
types: [ created ]
pull_request:
branches:
- main
push:
branches:
- main

permissions:
contents: read
packages: write

jobs:
bootBuildImage:
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
checks: write
contents: read
packages: write
attestations: write
id-token: write
steps:
- uses: actions/checkout@v3
- name: Set up JDK 21 for x64
uses: actions/setup-java@v3
with:
version: 'latest'
java-version: '21'
distribution: 'liberica'
architecture: x64
- name: Checkout repository
- uses: actions/checkout@v4

- name: Set up JDK 21 for x64
uses: actions/setup-java@v4
with:
version: 'latest'
java-version: '21'
distribution: 'liberica'
architecture: x64
settings-path: ${{ github.workspace }}

- name: Set Gradle action
uses: gradle/gradle-build-action@v2
- name: Setup Gradle
uses: gradle/gradle-build-action@v3

- name: Make gradlew executable
run: chmod +x ./gradlew
- name: Make gradlew executable
run: chmod +x ./gradlew

- name: Execute Gradle bootBuildImage
run: ./gradlew bootBuildImage
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
DOCKER_PREFIX: ${{ vars.DOCKER_PREFIX }}
DOCKER_EMAIL: ${{ vars.DOCKER_EMAIL }}
- name: Execute Gradle bootBuildImage
run: ./gradlew bootBuildImage
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
DOCKER_PREFIX: ${{ vars.DOCKER_PREFIX }}
DOCKER_EMAIL: ${{ vars.DOCKER_EMAIL }}
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,16 @@ public Mono<Page<Logger>> page(LoggerRequest request, Pageable pageable) {
.map(tuple2 -> new PageImpl<>(tuple2.getT1(), pageable, tuple2.getT2()));
}

/**
* 操作日志记录器请求,将请求转换为日志记录器对象,保存并在完成后清除缓存。
* @param request 请求对象,包含创建或更新日志记录器所需的数据。
* @return 一个 Mono<Logger> 对象,代表保存操作的结果。
*/
public Mono<Logger> operate(LoggerRequest request) {
return this.save(request.toLogger()).doAfterTerminate(() -> this.cache.clear());
}


public Mono<Logger> save(Logger logger) {
if (logger.isNew()) {
return this.loggersRepository.save(logger);
Expand Down

0 comments on commit 46b0d02

Please sign in to comment.