diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index e26ab4d..c8f3b73 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -2,52 +2,67 @@ name: 全局K3s部署 on: push: branches: [master] - jobs: deploy: - runs-on: ubuntu-latest + # ========== 核心修复：替换为具体Ubuntu版本，解决运行期匹配问题 ========== + runs-on: ubuntu-24.04 env: - K3S_HOST: 121.37.117.181 + # 从组织级Secrets读取，不用在仓库重复配置 + K3S_HOST: ${{ secrets.K3S_HOST }} APP_NAME: ${{ gitea.repo_name }} - REGISTRY: 你的镜像仓库地址 # 比如 docker.io/你的用户名 + # 补充：若后续要推送镜像，需替换为实际镜像仓库地址（比如你的Gitea镜像仓库） + REGISTRY: 116.204.74.41:3000/red-future steps: - - uses: gitea/actions/checkout@v4 + # ========== 核心：新增国内Git代理，彻底解决GitHub拉取慢 ========== + - name: 配置国内GitHub代理加速 + run: | + # 全局Git代理：所有GitHub请求走国内镜像站 + git config --global url."https://ghproxy.com/https://github.com/".insteadOf "https://github.com/" + # 可选：替换Ubuntu源为清华源，加速依赖安装 + sed -i 's/archive.ubuntu.com/mirrors.tuna.tsinghua.edu.cn/g' /etc/apt/sources.list + apt update -y + # ========== 核心修改：替换checkout源，避开GitHub ========== + - name: 拉取代码（Gitea官方源） + uses: gitea/actions/checkout@v4 + with: + fetch-depth: 0 # 可选：拉取完整历史，加速后续操作 + timeout-minutes: 10 # 增加超时，避免拉取中断 - # 1. 初始化 Docker Buildx + # 1. 初始化 Docker Buildx（原内容不变） - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - # 2. 登录镜像仓库（按需） - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USER }} - password: ${{ secrets.DOCKER_PWD }} + # 2. 可选：登录镜像仓库（若需推送镜像，取消注释并配置密钥） + # - name: Login to Gitea Registry + # uses: docker/login-action@v3 + # with: + # registry: 116.204.74.41:3000 + # username: ${{ secrets.GITEA_USER }} + # password: ${{ secrets.GITEA_PWD }} - # 3. 构建+推送，启用缓存 + # 3. 构建+推送（原内容不变） - name: Build and push uses: docker/build-push-action@v5 with: context: . push: true tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }} - # 缓存配置：推送到镜像仓库 cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max - # 4. 核心修改：先上传deploy.yaml到K3s服务器，再执行kubectl + # 4. 修复后的SSH部署步骤（解决路径+命名空间问题） - name: SSH部署K3s - run: + run: | mkdir -p ~/.ssh echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem chmod 600 k3s.pem - # 关键1：把Gitea仓库里的deploy.yaml上传到K3s服务器临时目录（/tmp） - # 注意：如果你的deploy.yaml不在仓库根目录，要修改./deploy.yaml为实际路径 + + # ========== 修正1：上传仓库根目录的deploy.yaml到K3s临时目录 ========== scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/ - # 关键2：执行kubectl时指向临时目录的文件，而非不存在的/k8s/ + + # ========== 修正2：kubectl指向临时文件+补充命名空间 ========== ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD kubectl apply -f /tmp/deploy.yaml kubectl rollout restart deployment ${APP_NAME} -n default - # 可选：部署完成后删除临时文件，清理服务器 - rm -f /tmp/deploy.yaml + rm -f /tmp/deploy.yaml # 可选：清理临时文件 CMD \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index e8b6670..4c85bd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,6 @@ -FROM gitea/gitea:latest -# 拷贝预设工作流模板到容器内仓库模板目录 -COPY ./workflow_template/.gitea /data/gitea/templates/repo/.gitea - # ==================== 第一阶段：构建前端 ==================== FROM node:18-alpine AS builder - WORKDIR /app - # 配置Alpine国内镜像源 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories @@ -30,6 +24,6 @@ COPY ngnix.conf /etc/nginx/conf.d/default.conf # 复制SSL证书 COPY ssl/* /etc/nginx/ssl/ -EXPOSE 443 +EXPOSE 80 443 CMD ["nginx", "-g", "daemon off;"] diff --git a/deploy.yaml b/deploy.yaml new file mode 100644 index 0000000..2f35ab8 --- /dev/null +++ b/deploy.yaml @@ -0,0 +1,44 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: ${APP_NAME} + namespace: default + labels: + app: ${APP_NAME} +spec: + replicas: 1 + selector: + matchLabels: + app: ${APP_NAME} + template: + metadata: + labels: + app: ${APP_NAME} + spec: + containers: + - name: ${APP_NAME} + image: ${REGISTRY}/${APP_NAME}:${gitea.sha} + imagePullPolicy: Always + ports: + - containerPort: 80 # 你的项目实际端口（比如前端80、后端8080） + resources: + requests: + cpu: 100m + memory: 128Mi + limits: + cpu: 500m + memory: 512Mi +--- +apiVersion: v1 +kind: Service +metadata: + name: ${APP_NAME}-service + namespace: default +spec: + type: NodePort + selector: + app: ${APP_NAME} + ports: + - port: 80 + targetPort: 80 + nodePort: 30001 # 必须在30000-32767之间 \ No newline at end of file diff --git a/ngnix.conf b/ngnix.conf index b9857ce..5a8af7b 100644 --- a/ngnix.conf +++ b/ngnix.conf @@ -1,5 +1,12 @@ # Nginx 静态文件服务 + 智能代理 +# HTTP 重定向到 HTTPS +server { + listen 80; + server_name _; + return 301 https://$host$request_uri; +} + server { # 静态资源根目录（dist） root /usr/share/nginx/html; diff --git a/src/api/system/pwconfig/index.ts b/src/api/system/pwconfig/index.ts new file mode 100644 index 0000000..df45c39 --- /dev/null +++ b/src/api/system/pwconfig/index.ts @@ -0,0 +1,16 @@ +import request from '/@/utils/request'; + +export function getPwConfig() { + return request({ + url: '/admin-go/api/v1/system/pwconfig/get', + method: 'get', + }); +} + +export function savePwConfig(data: any) { + return request({ + url: '/admin-go/api/v1/system/pwconfig/save', + method: 'post', + data: data, + }); +} diff --git a/src/views/system/pwconfig/index.vue b/src/views/system/pwconfig/index.vue new file mode 100644 index 0000000..c5eaa00 --- /dev/null +++ b/src/views/system/pwconfig/index.vue @@ -0,0 +1,217 @@ + + + + +