blog/blog-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

chore: update and move to the new server

Browse Source
This commit is contained in:
merlin
2026-03-06 10:15:06 +08:00
parent ff49b4f508
commit ccaddf7df7
3 changed files with 83 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
.gitea/workflows/dev.yaml
View File

@@ -1,35 +1,35 @@
name: Docker Image CI name: Docker Image CI
on: on:
push: push:
branches: branches:
- dev - dev
jobs: jobs:
build: build:
runs-on: gitea-runner-group-blog runs-on: gitea-runner-group-blog
container: container:
image: harbor.merlin.xin/release/merlin/action_builder:v0.0.1 image: ${{ vars.HARBOR_URL }}/candlelight/action_builder:v0.0.1
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: docker login - name: docker login
env: env:
HARBOR_USERNAME: ${{ secrets.HARBOR_ROBOT }} HARBOR_USERNAME: ${{ secrets.HARBOR_ROBOT }}
HARBOR_PASSWORD: ${{ secrets.HARBOR_ROBOT_SECRET }} HARBOR_PASSWORD: ${{ secrets.HARBOR_ROBOT_SECRET }}
HARBOR_URL: ${{ vars.HARBOR_URL }} HARBOR_URL: ${{ vars.HARBOR_URL }}
run: docker login ${HARBOR_URL} -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD} run: docker login ${HARBOR_URL} -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD}
- name: Build and push Docker images - name: Build and push Docker images
env: env:
HARBOR_URL: ${{ vars.HARBOR_URL }} HARBOR_URL: ${{ vars.HARBOR_URL }}
TAG: ${{ github.sha }} TAG: ${{ github.sha }}
REPOSITORY: ${{ github.repository }} REPOSITORY: ${{ github.repository }}
run: | run: |
ROOT_DIR=$(pwd) ROOT_DIR=$(pwd)
IMAGE_NAME="${HARBOR_URL}/testing/$REPOSITORY:${TAG}" IMAGE_NAME="${HARBOR_URL}/testing/$REPOSITORY:${TAG}"
echo "Building image: ${IMAGE_NAME}" echo "Building image: ${IMAGE_NAME}"
docker build -t ${IMAGE_NAME} . docker build -t ${IMAGE_NAME} .
echo "Pushing image: ${IMAGE_NAME}" echo "Pushing image: ${IMAGE_NAME}"
docker push ${IMAGE_NAME} docker push ${IMAGE_NAME}
echo "Successfully pushed: ${IMAGE_NAME}" echo "Successfully pushed: ${IMAGE_NAME}"
docker rmi ${IMAGE_NAME} docker rmi ${IMAGE_NAME}
echo "cleaned up local image" echo "cleaned up local image"

68
.gitea/workflows/tag.yaml
View File

@@ -1,34 +1,34 @@
name: Docker Image CI name: Docker Image CI
on: on:
push: push:
tags: tags:
- '*' - '*'
jobs: jobs:
build: build:
runs-on: gitea-runner-group-blog runs-on: gitea-runner-group-blog
container: container:
image: harbor.merlin.xin/release/merlin/action_builder:v0.0.1 image: ${{ vars.HARBOR_URL }}/candlelight/action_builder:v0.0.1
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: docker login - name: docker login
env: env:
HARBOR_USERNAME: ${{ secrets.HARBOR_ROBOT }} HARBOR_USERNAME: ${{ secrets.HARBOR_ROBOT }}
HARBOR_PASSWORD: ${{ secrets.HARBOR_ROBOT_SECRET }} HARBOR_PASSWORD: ${{ secrets.HARBOR_ROBOT_SECRET }}
HARBOR_URL: ${{ vars.HARBOR_URL }} HARBOR_URL: ${{ vars.HARBOR_URL }}
run: docker login ${HARBOR_URL} -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD} run: docker login ${HARBOR_URL} -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD}
- name: Build and push Docker images - name: Build and push Docker images
env: env:
HARBOR_URL: ${{ vars.HARBOR_URL }} HARBOR_URL: ${{ vars.HARBOR_URL }}
REPOSITORY: ${{ github.repository }} REPOSITORY: ${{ github.repository }}
run: | run: |
ROOT_DIR=$(pwd) ROOT_DIR=$(pwd)
IMAGE_NAME="${HARBOR_URL}/release/$REPOSITORY:$GITHUB_REF_NAME" IMAGE_NAME="${HARBOR_URL}/$REPOSITORY:$GITHUB_REF_NAME"
echo "Building image: ${IMAGE_NAME}" echo "Building image: ${IMAGE_NAME}"
docker build -t ${IMAGE_NAME} . docker build -t ${IMAGE_NAME} .
echo "Pushing image: ${IMAGE_NAME}" echo "Pushing image: ${IMAGE_NAME}"
docker push ${IMAGE_NAME} docker push ${IMAGE_NAME}
echo "Successfully pushed: ${IMAGE_NAME}" echo "Successfully pushed: ${IMAGE_NAME}"
docker rmi ${IMAGE_NAME} docker rmi ${IMAGE_NAME}
echo "cleaned up local image" echo "cleaned up local image"

14
src/main/java/xin/merlin/myblog_server/utils/JwtUtil.java
View File

@@ -3,7 +3,9 @@ package xin.merlin.myblog_server.utils;
import io.jsonwebtoken.*; import io.jsonwebtoken.*;
import io.jsonwebtoken.security.Keys; import io.jsonwebtoken.security.Keys;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import xin.merlin.myblog_server.config.JwtProperties; import xin.merlin.myblog_server.config.JwtProperties;
@@ -12,6 +14,8 @@ import java.nio.charset.StandardCharsets;
import java.util.Date; import java.util.Date;
import java.util.UUID; import java.util.UUID;
@Slf4j
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor
public class JwtUtil { public class JwtUtil {
@@ -34,6 +38,16 @@ public class JwtUtil {
} }
} }
@PreDestroy
public void destroy() {
log.info("JWT 组件正在关闭...");
// 如有线程池、定时任务、IO 连接，在这里 shutdown/close
// 本例仅把引用置空，帮助 GC（可选）
this.jwtParser = null;
this.key = null;
log.info("JWT 组件已关闭");
}
/** /**
* 生成 JWT Token * 生成 JWT Token
*/ */