From 61eb1bdd961740335beee21b8626d4b47746a418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 26 Sep 2025 11:55:43 +0800 Subject: [PATCH] xx --- drone/drone-server-deployment.yaml | 2 ++ ...web-ingress.yaml => ifly-web-ingress.yaml} | 4 +-- xxljob/README.md | 26 +++++++------------ xxljob/install-xxljob.sh | 4 +-- xxljob/xxljob-deployment.yaml | 4 +-- 5 files changed, 18 insertions(+), 22 deletions(-) rename ingress/{aweb-ingress.yaml => ifly-web-ingress.yaml} (89%) diff --git a/drone/drone-server-deployment.yaml b/drone/drone-server-deployment.yaml index 5118f8f..c65605b 100644 --- a/drone/drone-server-deployment.yaml +++ b/drone/drone-server-deployment.yaml @@ -39,6 +39,8 @@ spec: value: "true" - name: DRONE_USER_CREATE value: "username:tuoheng,admin:true" + - name: DRONE_GIT_ALWAYS_AUTH + value: "true" volumeMounts: - name: drone-data mountPath: /data diff --git a/ingress/aweb-ingress.yaml b/ingress/ifly-web-ingress.yaml similarity index 89% rename from ingress/aweb-ingress.yaml rename to ingress/ifly-web-ingress.yaml index 65f8467..7e0d13d 100644 --- a/ingress/aweb-ingress.yaml +++ b/ingress/ifly-web-ingress.yaml @@ -1,7 +1,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: aweb-ingress + name: ifly-web-ingress namespace: default annotations: traefik.ingress.kubernetes.io/router.entrypoints: web,websecure @@ -19,6 +19,6 @@ spec: pathType: Prefix backend: service: - name: aweb + name: ifly-web port: number: 80 diff --git a/xxljob/README.md b/xxljob/README.md index 8265790..de22c4a 100644 --- a/xxljob/README.md +++ b/xxljob/README.md @@ -11,17 +11,10 @@ XXL-JOB 是一个分布式任务调度平台,本目录包含了在 Kubernetes ## 安装前准备 -### 1. 数据库准备 -确保 MySQL 数据库已安装并运行,并创建 `xxl_job` 数据库: +### 1. 数据库配置 +本部署使用 H2 内存数据库,无需额外配置数据库服务。H2 数据库会在应用启动时自动创建和初始化。 -```sql -CREATE DATABASE xxl_job DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; -``` - -### 2. 数据库初始化 -执行 XXL-JOB 提供的数据库初始化脚本 `/sql/xxl_job.sql` - -### 3. 镜像准备 +### 2. 镜像准备 确保以下镜像已推送到镜像仓库: - `registry.t-aaron.com/xxl-job/xxl-job-admin:latest` @@ -53,10 +46,11 @@ kubectl apply -f xxljob-ingress.yaml ## 配置说明 ### 数据库连接 -默认配置连接到名为 `mysql` 的 MySQL 服务: -- 数据库: xxl_job -- 用户名: root -- 密码: 123456 +默认配置使用 H2 内存数据库: +- 数据库: xxl_job (内存数据库) +- 用户名: sa +- 密码: (空) +- 驱动: org.h2.Driver 如需修改数据库连接信息,请编辑 `xxljob-deployment.yaml` 文件中的 `PARAMS` 环境变量。 @@ -80,9 +74,9 @@ kubectl get ingress xxl-job-admin-ingress ## 故障排除 ### 常见问题 -1. **Pod 启动失败**: 检查数据库连接配置是否正确 +1. **Pod 启动失败**: 检查镜像是否正确拉取 2. **无法访问**: 检查 Ingress 配置和域名解析 -3. **数据库连接失败**: 确认 MySQL 服务是否正常运行 +3. **数据丢失**: H2 是内存数据库,Pod 重启后数据会丢失 ### 日志查看 ```bash diff --git a/xxljob/install-xxljob.sh b/xxljob/install-xxljob.sh index 4dc2c72..20d3fa2 100755 --- a/xxljob/install-xxljob.sh +++ b/xxljob/install-xxljob.sh @@ -32,6 +32,6 @@ echo "XXL-JOB 安装完成!" echo "访问地址: https://xxljob-ops.t-aaron.com" echo "默认用户名/密码: admin/123456" echo "" -echo "注意: 请确保MySQL数据库已正确配置,并且xxl_job数据库已创建" -echo "数据库初始化脚本: /sql/xxl_job.sql" +echo "注意: 使用H2内存数据库,Pod重启后数据会丢失" +echo "如需持久化数据,请配置MySQL或PostgreSQL数据库" diff --git a/xxljob/xxljob-deployment.yaml b/xxljob/xxljob-deployment.yaml index 4459d56..7ba2a08 100644 --- a/xxljob/xxljob-deployment.yaml +++ b/xxljob/xxljob-deployment.yaml @@ -17,13 +17,13 @@ spec: spec: containers: - name: xxl-job-admin - image: registry.t-aaron.com/xxl-job/xxl-job-admin:latest + image: registry.t-aaron.com/xuxueli/xxl-job-admin.0 ports: - containerPort: 8080 name: http env: - name: PARAMS - value: "--spring.datasource.url=jdbc:mysql://mysql:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai --spring.datasource.username=root --spring.datasource.password=123456 --xxl.job.accessToken=default_token" + value: "--spring.datasource.url=jdbc:h2:mem:xxl_job;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE --spring.datasource.username=sa --spring.datasource.password= --spring.datasource.driver-class-name=org.h2.Driver --xxl.job.accessToken=default_token" resources: requests: memory: "512Mi"