diff --git a/.github/workflows/build-base.yml b/.github/workflows/build-base.yml index 567b547..24c63d0 100644 --- a/.github/workflows/build-base.yml +++ b/.github/workflows/build-base.yml @@ -6,7 +6,7 @@ on: branches: - main paths: - - 'Dockerfile.base' + - 'docker/Dockerfile.base' env: REGISTRY: ghcr.io @@ -17,9 +17,39 @@ jobs: runs-on: ubuntu-latest strategy: matrix: + base_type: [debian, alpine, debian13] platform: - linux/amd64 - linux/arm64 + include: + - base_type: debian + platform: linux/arm/v7 + dockerfile: docker/Dockerfile.base + tag_suffix: "" + - base_type: debian + platform: linux/amd64 + dockerfile: docker/Dockerfile.base + tag_suffix: "" + - base_type: debian + platform: linux/arm64 + dockerfile: docker/Dockerfile.base + tag_suffix: "" + - base_type: alpine + platform: linux/amd64 + dockerfile: docker/Dockerfile.alpine.base + tag_suffix: "-alpine" + - base_type: alpine + platform: linux/arm64 + dockerfile: docker/Dockerfile.alpine.base + tag_suffix: "-alpine" + - base_type: debian13 + platform: linux/amd64 + dockerfile: docker/Dockerfile.debian13.base + tag_suffix: "-debian13" + - base_type: debian13 + platform: linux/arm64 + dockerfile: docker/Dockerfile.debian13.base + tag_suffix: "-debian13" permissions: contents: read @@ -33,7 +63,7 @@ jobs: id: platform run: | platform=${{ matrix.platform }} - echo "pair=${platform//\//-}" >> $GITHUB_OUTPUT + echo "pair=${platform//\//-}-${{ matrix.base_type }}" >> $GITHUB_OUTPUT - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -55,14 +85,14 @@ jobs: images: | ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }} tags: | - type=raw,value=base + type=raw,value=base${{ matrix.tag_suffix }} - name: Build and push by digest id: build uses: docker/build-push-action@v6 with: context: . - file: ./Dockerfile.base + file: ${{ matrix.dockerfile }} platforms: ${{ matrix.platform }} labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true @@ -87,6 +117,16 @@ jobs: merge: runs-on: ubuntu-latest needs: build + strategy: + matrix: + base_type: [debian, alpine, debian13] + include: + - base_type: debian + tag: base + - base_type: alpine + tag: base-alpine + - base_type: debian13 + tag: base-debian13 permissions: contents: read @@ -100,7 +140,7 @@ jobs: uses: actions/download-artifact@v4 with: path: /tmp/digests - pattern: digests-* + pattern: digests-*-${{ matrix.base_type }} merge-multiple: true - name: Set up Docker Buildx @@ -120,7 +160,7 @@ jobs: images: | ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }} tags: | - type=raw,value=base + type=raw,value=${{ matrix.tag }} - name: Create manifest list and push working-directory: /tmp/digests @@ -130,4 +170,4 @@ jobs: - name: Inspect image run: | - docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:base + docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ matrix.tag }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 03d33f0..cc9b70e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,6 +12,19 @@ env: jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + base_type: [debian, alpine, debian13] + include: + - base_type: debian + base_tag: base + tag_suffix: "" + - base_type: alpine + base_tag: base-alpine + tag_suffix: "-alpine" + - base_type: debian13 + base_tag: base-debian13 + tag_suffix: "-debian13" permissions: contents: read @@ -38,10 +51,9 @@ jobs: images: | ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }} tags: | - type=semver,pattern={{version}}-amd64 - type=raw,value=latest-amd64,enable={{is_default_branch}} - type=ref,event=branch,suffix=-amd64 - type=sha,prefix={{branch}}-,suffix=-amd64 + type=raw,value=latest-amd64${{ matrix.tag_suffix }},enable={{is_default_branch}} + type=ref,event=branch,suffix=-amd64${{ matrix.tag_suffix }} + type=sha,prefix={{branch}}-,suffix=-amd64${{ matrix.tag_suffix }} - name: Get build time id: build_time @@ -51,6 +63,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . + file: ./docker/Dockerfile platforms: linux/amd64 push: true tags: ${{ steps.meta.outputs.tags }} @@ -58,11 +71,13 @@ jobs: build-args: | VERSION=${{ github.ref_name }} BUILD_TIME=${{ steps.build_time.outputs.time }} - cache-from: type=gha,scope=linux-amd64 - cache-to: type=gha,scope=linux-amd64,mode=max + BASE_TAG=${{ matrix.base_tag }} + cache-from: type=gha,scope=linux-amd64-${{ matrix.base_type }} + cache-to: type=gha,scope=linux-amd64-${{ matrix.base_type }},mode=max provenance: false - name: Deploy to Demo server + if: github.ref == 'refs/heads/main' && matrix.base_type == 'debian' uses: appleboy/ssh-action@v1.2.0 with: host: ${{ secrets.DEPLOY_HOST }} @@ -71,10 +86,11 @@ jobs: port: ${{ secrets.DEPLOY_PORT }} script: | cd ${{ secrets.DEPLOY_PATH }} - docker-compose pull - docker-compose up -d + docker-compose -f docker/docker-compose.yml pull + docker-compose -f docker/docker-compose.yml up -d - name: Deploy to X server + if: github.ref == 'refs/heads/main' && matrix.base_type == 'debian' uses: appleboy/ssh-action@v1.2.0 with: host: ${{ secrets.DEPLOY_HOST }} @@ -83,5 +99,5 @@ jobs: port: ${{ secrets.DEPLOY_PORT }} script: | cd ${{ secrets.DEPLOY_X_PATH }} - docker-compose pull - docker-compose up -d \ No newline at end of file + docker-compose -f docker/docker-compose.yml pull + docker-compose -f docker/docker-compose.yml up -d \ No newline at end of file diff --git a/.github/workflows/docker-amd64.yml b/.github/workflows/docker-amd64.yml index da931c3..8f5b081 100644 --- a/.github/workflows/docker-amd64.yml +++ b/.github/workflows/docker-amd64.yml @@ -12,6 +12,19 @@ env: jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + base_type: [debian, alpine, debian13] + include: + - base_type: debian + base_tag: base + tag_suffix: "" + - base_type: alpine + base_tag: base-alpine + tag_suffix: "-alpine" + - base_type: debian13 + base_tag: base-debian13 + tag_suffix: "-debian13" permissions: contents: read @@ -38,8 +51,9 @@ jobs: images: | ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }} tags: | - type=semver,pattern={{version}}-amd64 - type=raw,value=latest-amd64,enable={{is_default_branch}} + type=semver,pattern={{version}}-amd64${{ matrix.tag_suffix }} + type=raw,value=latest-amd64${{ matrix.tag_suffix }},enable={{is_default_branch}} + type=ref,event=branch,suffix=-amd64${{ matrix.tag_suffix }} - name: Get build time id: build_time @@ -49,6 +63,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . + file: ./docker/Dockerfile platforms: linux/amd64 push: true tags: ${{ steps.meta.outputs.tags }} @@ -56,6 +71,7 @@ jobs: build-args: | VERSION=${{ github.ref_name }} BUILD_TIME=${{ steps.build_time.outputs.time }} - cache-from: type=gha,scope=linux-amd64 - cache-to: type=gha,scope=linux-amd64,mode=max + BASE_TAG=${{ matrix.base_tag }} + cache-from: type=gha,scope=linux-amd64-${{ matrix.base_type }} + cache-to: type=gha,scope=linux-amd64-${{ matrix.base_type }},mode=max provenance: false diff --git a/.github/workflows/docker-arm64.yml b/.github/workflows/docker-arm64.yml index 82e5949..83cde29 100644 --- a/.github/workflows/docker-arm64.yml +++ b/.github/workflows/docker-arm64.yml @@ -12,6 +12,19 @@ env: jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + base_type: [debian, alpine, debian13] + include: + - base_type: debian + base_tag: base + tag_suffix: "" + - base_type: alpine + base_tag: base-alpine + tag_suffix: "-alpine" + - base_type: debian13 + base_tag: base-debian13 + tag_suffix: "-debian13" permissions: contents: read @@ -41,8 +54,9 @@ jobs: images: | ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }} tags: | - type=semver,pattern={{version}}-arm64 - type=raw,value=latest-arm64,enable={{is_default_branch}} + type=semver,pattern={{version}}-arm64${{ matrix.tag_suffix }} + type=raw,value=latest-arm64${{ matrix.tag_suffix }},enable={{is_default_branch}} + type=ref,event=branch,suffix=-arm64${{ matrix.tag_suffix }} - name: Get build time id: build_time @@ -52,6 +66,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . + file: ./docker/Dockerfile platforms: linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} @@ -59,6 +74,7 @@ jobs: build-args: | VERSION=${{ github.ref_name }} BUILD_TIME=${{ steps.build_time.outputs.time }} - cache-from: type=gha,scope=linux-arm64 - cache-to: type=gha,scope=linux-arm64,mode=max + BASE_TAG=${{ matrix.base_tag }} + cache-from: type=gha,scope=linux-arm64-${{ matrix.base_type }} + cache-to: type=gha,scope=linux-arm64-${{ matrix.base_type }},mode=max provenance: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c3cfb94..c5c026f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,9 +14,39 @@ jobs: runs-on: ubuntu-latest strategy: matrix: + base_type: [debian, alpine, debian13] platform: - linux/amd64 - linux/arm64 + include: + - base_type: debian + platform: linux/arm/v7 + base_tag: base + tag_suffix: "" + - base_type: debian + platform: linux/amd64 + base_tag: base + tag_suffix: "" + - base_type: debian + platform: linux/arm64 + base_tag: base + tag_suffix: "" + - base_type: alpine + platform: linux/amd64 + base_tag: base-alpine + tag_suffix: "-alpine" + - base_type: alpine + platform: linux/arm64 + base_tag: base-alpine + tag_suffix: "-alpine" + - base_type: debian13 + platform: linux/amd64 + base_tag: base-debian13 + tag_suffix: "-debian13" + - base_type: debian13 + platform: linux/arm64 + base_tag: base-debian13 + tag_suffix: "-debian13" permissions: contents: read @@ -30,7 +60,7 @@ jobs: id: platform run: | platform=${{ matrix.platform }} - echo "pair=${platform//\//-}" >> $GITHUB_OUTPUT + echo "pair=${platform//\//-}-${{ matrix.base_type }}" >> $GITHUB_OUTPUT - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -61,10 +91,12 @@ jobs: uses: docker/build-push-action@v6 with: context: . + file: ./docker/Dockerfile platforms: ${{ matrix.platform }} build-args: | VERSION=${{ github.ref_name }} BUILD_TIME=${{ steps.build_time.outputs.time }} + BASE_TAG=${{ matrix.base_tag }} labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true cache-from: type=gha,scope=${{ steps.platform.outputs.pair }} @@ -88,6 +120,16 @@ jobs: merge: runs-on: ubuntu-latest needs: build + strategy: + matrix: + base_type: [debian, alpine, debian13] + include: + - base_type: debian + tag_suffix: "" + - base_type: alpine + tag_suffix: "-alpine" + - base_type: debian13 + tag_suffix: "-debian13" permissions: contents: write @@ -101,7 +143,7 @@ jobs: uses: actions/download-artifact@v4 with: path: /tmp/digests - pattern: digests-* + pattern: digests-*-${{ matrix.base_type }} merge-multiple: true - name: Set up Docker Buildx @@ -121,8 +163,8 @@ jobs: images: | ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }} tags: | - type=semver,pattern={{version}} - type=raw,value=latest + type=semver,pattern={{version}}${{ matrix.tag_suffix }} + type=raw,value=latest${{ matrix.tag_suffix }} - name: Create manifest list and push working-directory: /tmp/digests @@ -132,9 +174,10 @@ jobs: - name: Inspect image run: | - docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }} + docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}${{ matrix.tag_suffix }} - name: Create GitHub Release + if: matrix.base_type == 'debian' uses: softprops/action-gh-release@v2 with: tag_name: ${{ github.ref_name }} diff --git a/.gitignore b/.gitignore index 8f6ede5..7688636 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ configs/config.local.json __pycache__/ # Misc +.stfolder \ No newline at end of file diff --git a/.stignore b/.stignore new file mode 100644 index 0000000..4e8e3b7 --- /dev/null +++ b/.stignore @@ -0,0 +1,3 @@ +.git/ +web/node_modules +web/dist \ No newline at end of file diff --git a/Makefile b/Makefile index c7289dd..dbfa3d0 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ GOGET=go get GOMOD=go mod VERSION=$(shell git describe --tags --always --dirty 2>/dev/null || echo "dev") BUILD_TIME=$(shell date '+%Y/%m/%d %H:%M:%S') -LDFLAGS=-ldflags="-s -w -X 'baihu/internal/constant.Version=$(VERSION)' -X 'baihu/internal/constant.BuildTime=$(BUILD_TIME)'" +LDFLAGS=-ldflags="-s -w -X 'github.com/engigu/baihu-panel/internal/constant.Version=$(VERSION)' -X 'github.com/engigu/baihu-panel/internal/constant.BuildTime=$(BUILD_TIME)'" # Default target all: build @@ -66,7 +66,7 @@ deps: # Docker build docker-build: - docker build -t $(BINARY) . + docker build -t $(BINARY) -f docker/Dockerfile . # Docker run docker-run: @@ -74,11 +74,11 @@ docker-run: # Docker compose up docker-up: - docker-compose up -d + docker-compose -f docker/docker-compose.yml up -d # Docker compose down docker-down: - docker-compose down + docker-compose -f docker/docker-compose.yml down # Help help: diff --git a/README.md b/README.md index 4700a4f..3716849 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # 白虎面板 [![Hits](https://hits.sh/github.com/engigu/baihu-panel.svg?view=today-total)](https://hits.sh/github.com/engigu/baihu-panel/) -[![Image Tags](https://ghcr-badge.egpl.dev/engigu/baihu/tags?color=%2344cc11&ignore=latest%2Cmain*%2Cdev&n=3&label=docker+tags&trim=)](https://ghcr-badge.egpl.dev/engigu/baihu/tags) ![Latest Version](https://ghcr-badge.egpl.dev/engigu/baihu/latest_tag?color=%2344cc11&ignore=latest%2Cmain*&label=docker+version&trim=) ![Image Size](https://ghcr-badge.egpl.dev/engigu/baihu/size?color=%2344cc11&tag=latest&label=docker+image&trim=) ![Image pulls](https://img.shields.io/badge/dynamic/json?url=https://ghcr-badge.elias.eu.org/api/engigu/baihu-panel/baihu&query=downloadCount&style=flat&label=docker%20pulls&color=44cc11) @@ -10,6 +9,14 @@ 演示站点(演示站点的服务器比较烂，见谅) [演示站点](https://baihu-demo-site.qwapi.eu.org/) +## 更新日志 ☕ + +### 最近更新 + +**2026.02.06** - 整理 Docker 目录结构，增加 Alpine 及 Debian 13 (Trixie) 镜像支持 + +[查看完整更新日志](./CHANGELOG.md) + ## 项目来由 多少和青龙面板有点关系，我自己也是青龙面板的使用者，但是现在的青龙面板性能我觉得有点难以接受。以我自己的使用（`机器1C2G`）为例，一个`python`的`requests`脚本每隔`30s`执行一次，有时候cpu执行的时候能跳变到`50%`以上。可以看看下面gif图片（如果不动，点击图片查看） @@ -24,6 +31,8 @@ ![baihu.gif](https://f.pz.al/pzal/2025/12/24/f0d171f9a686d.gif) +如果项目有用，请帮忙点个star。 + ## 特色 - **轻量级：** docker/compose部署，无需复杂配置，开箱即用 diff --git a/Dockerfile b/docker/Dockerfile similarity index 93% rename from Dockerfile rename to docker/Dockerfile index e8eb2d5..72d2047 100644 --- a/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,8 @@ +ARG BASE_TAG=base # ================================ # Stage 1: Build frontend # ================================ -FROM node:20-alpine AS frontend-builder +FROM --platform=$BUILDPLATFORM node:20-alpine AS frontend-builder WORKDIR /app/web @@ -59,7 +60,7 @@ COPY --from=frontend-builder /app/web/dist ./internal/static/dist RUN VERSION_VAL=$(cat /build-info/version.txt) && \ BUILD_TIME_VAL=$(cat /build-info/build_time.txt) && \ CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \ - go build -ldflags="-s -w -X baihu/internal/constant.Version=${VERSION_VAL} -X 'baihu/internal/constant.BuildTime=${BUILD_TIME_VAL}'" \ + go build -ldflags="-s -w -X github.com/engigu/baihu-panel/internal/constant.Version=${VERSION_VAL} -X 'github.com/engigu/baihu-panel/internal/constant.BuildTime=${BUILD_TIME_VAL}'" \ -o baihu . # ================================ @@ -104,7 +105,8 @@ RUN VERSION_VAL=$(cat /build-info/version.txt) && \ # ================================ # Stage 4: Final image # ================================ -FROM ghcr.io/engigu/baihu:base +ARG BASE_TAG +FROM ghcr.io/engigu/baihu:${BASE_TAG} ENV TZ=Asia/Shanghai ENV PATH="/app/envs/node/bin:/app/envs/python/bin:$PATH" @@ -130,7 +132,7 @@ COPY --from=frontend-builder /app/web/dist ./internal/static/dist # Copy configs and entrypoint COPY --from=backend-builder /app/configs ./configs -COPY docker-entrypoint.sh . +COPY docker/docker-entrypoint.sh . # Copy sync.py to /opt COPY custom/sync.py /opt/sync.py diff --git a/docker/Dockerfile.alpine.base b/docker/Dockerfile.alpine.base new file mode 100644 index 0000000..7fb9a8c --- /dev/null +++ b/docker/Dockerfile.alpine.base @@ -0,0 +1,24 @@ +FROM alpine:3.19 + +ENV TZ=Asia/Shanghai +ENV PATH="/app/envs/node/bin:/app/envs/python/bin:$PATH" +ENV NODE_PATH="/app/envs/node/lib/node_modules" + +# 安装必要系统工具 + Node + Python +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories \ + && apk add --no-cache \ + tzdata \ + git \ + gcc \ + musl-dev \ + curl \ + wget \ + vim \ + nodejs \ + npm \ + python3 \ + py3-pip \ + htop \ + && cp /usr/share/zoneinfo/${TZ} /etc/localtime \ + && echo "${TZ}" > /etc/timezone \ + && rm -rf /var/cache/apk/* diff --git a/Dockerfile.base b/docker/Dockerfile.base similarity index 100% rename from Dockerfile.base rename to docker/Dockerfile.base diff --git a/docker/Dockerfile.debian13.base b/docker/Dockerfile.debian13.base new file mode 100644 index 0000000..d37c4a1 --- /dev/null +++ b/docker/Dockerfile.debian13.base @@ -0,0 +1,15 @@ +FROM debian:trixie-slim + +ENV TZ=Asia/Shanghai +ENV PATH="/app/envs/node/bin:/app/envs/python/bin:$PATH" +ENV NODE_PATH="/app/envs/node/lib/node_modules" + +# 安装必要系统工具 + Node + Python +RUN sed -i 's@deb.debian.org@mirrors.tuna.tsinghua.edu.cn@g' /etc/apt/sources.list.d/debian.sources \ + && sed -i 's@security.debian.org@mirrors.tuna.tsinghua.edu.cn@g' /etc/apt/sources.list.d/debian.sources \ + && echo "${TZ}" > /etc/timezone \ + && ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + tzdata git gcc curl wget vim nodejs htop npm python3 python3-venv python3-pip \ + && rm -rf /var/lib/apt/lists/* diff --git a/docker-compose.ghcr.yml b/docker/docker-compose.ghcr.yml similarity index 100% rename from docker-compose.ghcr.yml rename to docker/docker-compose.ghcr.yml diff --git a/docker-compose.yml b/docker/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to docker/docker-compose.yml diff --git a/docker-entrypoint.sh b/docker/docker-entrypoint.sh similarity index 100% rename from docker-entrypoint.sh rename to docker/docker-entrypoint.sh diff --git a/go.mod b/go.mod index 37ac774..8cf0468 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module baihu +module github.com/engigu/baihu-panel go 1.24.0 @@ -11,8 +11,10 @@ require ( github.com/golang-jwt/jwt/v5 v5.3.0 github.com/gorilla/websocket v1.5.3 github.com/robfig/cron/v3 v3.0.1 + github.com/shirou/gopsutil/v3 v3.24.5 github.com/sirupsen/logrus v1.9.3 golang.org/x/text v0.32.0 + gopkg.in/ini.v1 v1.67.0 gorm.io/driver/mysql v1.6.0 gorm.io/driver/postgres v1.6.0 gorm.io/gorm v1.31.1 @@ -51,7 +53,6 @@ require ( github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/rogpeppe/go-internal v1.14.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.5 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect @@ -64,7 +65,6 @@ require ( golang.org/x/sync v0.19.0 // indirect golang.org/x/sys v0.39.0 // indirect google.golang.org/protobuf v1.30.0 // indirect - gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect modernc.org/libc v1.22.5 // indirect modernc.org/mathutil v1.5.0 // indirect diff --git a/go.sum b/go.sum index 660d760..2f80a43 100644 --- a/go.sum +++ b/go.sum @@ -41,9 +41,10 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo= github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= @@ -100,6 +101,8 @@ github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/i github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= +github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= +github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -111,8 +114,9 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= @@ -144,8 +148,6 @@ golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU= golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go index 8c4fb4f..16020b8 100644 --- a/internal/bootstrap/bootstrap.go +++ b/internal/bootstrap/bootstrap.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "baihu/internal/constant" - "baihu/internal/database" - "baihu/internal/logger" - "baihu/internal/router" - "baihu/internal/services" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/logger" + "github.com/engigu/baihu-panel/internal/router" + "github.com/engigu/baihu-panel/internal/services" "github.com/gin-gonic/gin" ) diff --git a/internal/cache/site_cache.go b/internal/cache/site_cache.go index 874af8b..385b690 100644 --- a/internal/cache/site_cache.go +++ b/internal/cache/site_cache.go @@ -3,9 +3,9 @@ package cache import ( "sync" - "baihu/internal/constant" - "baihu/internal/database" - "baihu/internal/models" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/models" ) // siteCache 站点设置内存缓存 diff --git a/internal/constant/sentence.go b/internal/constant/sentence.go index 109c041..efdd5b8 100644 --- a/internal/constant/sentence.go +++ b/internal/constant/sentence.go @@ -18,9 +18,9 @@ type Sentence struct { } var ( - lineCount int - lineOffsets []int64 - sentenceOnce sync.Once + lineCount int + lineOffsets []int64 + sentenceOnce sync.Once ) // initSentences 初始化：统计行数和记录每行偏移 @@ -44,13 +44,16 @@ func GetRandomSentence() string { } targetLine := rand.Intn(lineCount) - + scanner := bufio.NewScanner(bytes.NewReader(sentenceData)) currentLine := 0 for scanner.Scan() { if currentLine == targetLine { var s Sentence if err := json.Unmarshal(scanner.Bytes(), &s); err == nil && s.Name != "" { + if s.From != "" { + return "\"" + s.Name + "\"—— " + s.From + } return s.Name } break diff --git a/internal/controllers/agent_controller.go b/internal/controllers/agent_controller.go index abefcd8..03faf50 100644 --- a/internal/controllers/agent_controller.go +++ b/internal/controllers/agent_controller.go @@ -1,10 +1,10 @@ package controllers import ( - "baihu/internal/logger" - "baihu/internal/models" - "baihu/internal/services" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/logger" + "github.com/engigu/baihu-panel/internal/models" + "github.com/engigu/baihu-panel/internal/services" + "github.com/engigu/baihu-panel/internal/utils" "encoding/json" "net/http" "strconv" diff --git a/internal/controllers/auth_controller.go b/internal/controllers/auth_controller.go index 08783d0..d8e1e67 100644 --- a/internal/controllers/auth_controller.go +++ b/internal/controllers/auth_controller.go @@ -3,10 +3,10 @@ package controllers import ( "strconv" - "baihu/internal/constant" - "baihu/internal/middleware" - "baihu/internal/services" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/middleware" + "github.com/engigu/baihu-panel/internal/services" + "github.com/engigu/baihu-panel/internal/utils" "github.com/gin-gonic/gin" ) diff --git a/internal/controllers/dashboard_controller.go b/internal/controllers/dashboard_controller.go index bb6f5aa..8eb4f4a 100644 --- a/internal/controllers/dashboard_controller.go +++ b/internal/controllers/dashboard_controller.go @@ -4,11 +4,11 @@ import ( "sort" "time" - "baihu/internal/constant" - "baihu/internal/database" - "baihu/internal/models" - "baihu/internal/services/tasks" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/models" + "github.com/engigu/baihu-panel/internal/services/tasks" + "github.com/engigu/baihu-panel/internal/utils" "github.com/gin-gonic/gin" ) diff --git a/internal/controllers/dependency_controller.go b/internal/controllers/dependency_controller.go index 64b6ab4..134f2f8 100644 --- a/internal/controllers/dependency_controller.go +++ b/internal/controllers/dependency_controller.go @@ -4,9 +4,9 @@ import ( "strconv" "strings" - "baihu/internal/models" - "baihu/internal/services" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/models" + "github.com/engigu/baihu-panel/internal/services" + "github.com/engigu/baihu-panel/internal/utils" "github.com/gin-gonic/gin" ) diff --git a/internal/controllers/env_controller.go b/internal/controllers/env_controller.go index 2bc6b12..436d7f9 100644 --- a/internal/controllers/env_controller.go +++ b/internal/controllers/env_controller.go @@ -3,8 +3,8 @@ package controllers import ( "strconv" - "baihu/internal/services" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/services" + "github.com/engigu/baihu-panel/internal/utils" "github.com/gin-gonic/gin" ) diff --git a/internal/controllers/executor_controller.go b/internal/controllers/executor_controller.go index 5d7a608..2267caf 100644 --- a/internal/controllers/executor_controller.go +++ b/internal/controllers/executor_controller.go @@ -3,8 +3,8 @@ package controllers import ( "strconv" - "baihu/internal/services/tasks" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/services/tasks" + "github.com/engigu/baihu-panel/internal/utils" "github.com/gin-gonic/gin" ) diff --git a/internal/controllers/file_controller.go b/internal/controllers/file_controller.go index 0f3d58c..538ddb5 100644 --- a/internal/controllers/file_controller.go +++ b/internal/controllers/file_controller.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/utils" "github.com/gin-gonic/gin" ) diff --git a/internal/controllers/log_controller.go b/internal/controllers/log_controller.go index 18c8939..3b2f59d 100644 --- a/internal/controllers/log_controller.go +++ b/internal/controllers/log_controller.go @@ -3,9 +3,9 @@ package controllers import ( "strconv" - "baihu/internal/database" - "baihu/internal/models" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/models" + "github.com/engigu/baihu-panel/internal/utils" "github.com/gin-gonic/gin" ) diff --git a/internal/controllers/script_controller.go b/internal/controllers/script_controller.go index 52d864e..1c4f32e 100644 --- a/internal/controllers/script_controller.go +++ b/internal/controllers/script_controller.go @@ -3,8 +3,8 @@ package controllers import ( "strconv" - "baihu/internal/services" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/services" + "github.com/engigu/baihu-panel/internal/utils" "github.com/gin-gonic/gin" ) diff --git a/internal/controllers/settings_controller.go b/internal/controllers/settings_controller.go index b47f7bb..6203c99 100644 --- a/internal/controllers/settings_controller.go +++ b/internal/controllers/settings_controller.go @@ -5,12 +5,12 @@ import ( "runtime" "strconv" - "baihu/internal/constant" - "baihu/internal/database" - "baihu/internal/models" - "baihu/internal/services" - "baihu/internal/services/tasks" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/models" + "github.com/engigu/baihu-panel/internal/services" + "github.com/engigu/baihu-panel/internal/services/tasks" + "github.com/engigu/baihu-panel/internal/utils" "fmt" "os" "time" diff --git a/internal/controllers/task_controller.go b/internal/controllers/task_controller.go index 3e50893..c6ef6b7 100644 --- a/internal/controllers/task_controller.go +++ b/internal/controllers/task_controller.go @@ -4,10 +4,10 @@ import ( "path/filepath" "strconv" - "baihu/internal/constant" - "baihu/internal/services" - "baihu/internal/services/tasks" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/services" + "github.com/engigu/baihu-panel/internal/services/tasks" + "github.com/engigu/baihu-panel/internal/utils" "github.com/gin-gonic/gin" ) diff --git a/internal/controllers/terminal_controller.go b/internal/controllers/terminal_controller.go index 8d012b5..04317ae 100644 --- a/internal/controllers/terminal_controller.go +++ b/internal/controllers/terminal_controller.go @@ -10,8 +10,8 @@ import ( "sync" "unicode/utf8" - "baihu/internal/constant" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/utils" "github.com/creack/pty" "github.com/gin-gonic/gin" diff --git a/internal/database/database.go b/internal/database/database.go index 566f3f9..e7a67bc 100644 --- a/internal/database/database.go +++ b/internal/database/database.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "baihu/internal/logger" + "github.com/engigu/baihu-panel/internal/logger" "github.com/glebarez/sqlite" "gorm.io/driver/mysql" diff --git a/internal/database/migrate.go b/internal/database/migrate.go index b13b2ba..a85a7d5 100644 --- a/internal/database/migrate.go +++ b/internal/database/migrate.go @@ -1,8 +1,8 @@ package database import ( - "baihu/internal/logger" - "baihu/internal/models" + "github.com/engigu/baihu-panel/internal/logger" + "github.com/engigu/baihu-panel/internal/models" ) func Migrate() error { diff --git a/internal/middleware/auth.go b/internal/middleware/auth.go index 79ebea2..5444e2c 100644 --- a/internal/middleware/auth.go +++ b/internal/middleware/auth.go @@ -1,8 +1,8 @@ package middleware import ( - "baihu/internal/constant" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/utils" "github.com/gin-gonic/gin" ) diff --git a/internal/middleware/logger.go b/internal/middleware/logger.go index bf8fc92..7c9231e 100644 --- a/internal/middleware/logger.go +++ b/internal/middleware/logger.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "baihu/internal/logger" + "github.com/engigu/baihu-panel/internal/logger" "github.com/gin-gonic/gin" ) diff --git a/internal/models/agent.go b/internal/models/agent.go index 253a3a9..9e7cf2a 100644 --- a/internal/models/agent.go +++ b/internal/models/agent.go @@ -1,7 +1,7 @@ package models import ( - "baihu/internal/constant" + "github.com/engigu/baihu-panel/internal/constant" "gorm.io/gorm" ) diff --git a/internal/models/dependency.go b/internal/models/dependency.go index b86031b..67f0313 100644 --- a/internal/models/dependency.go +++ b/internal/models/dependency.go @@ -1,7 +1,7 @@ package models import ( - "baihu/internal/constant" + "github.com/engigu/baihu-panel/internal/constant" "time" ) diff --git a/internal/models/env.go b/internal/models/env.go index 183008c..11d0f5b 100644 --- a/internal/models/env.go +++ b/internal/models/env.go @@ -1,7 +1,7 @@ package models import ( - "baihu/internal/constant" + "github.com/engigu/baihu-panel/internal/constant" "gorm.io/gorm" ) diff --git a/internal/models/login_log.go b/internal/models/login_log.go index 864afc8..d893136 100644 --- a/internal/models/login_log.go +++ b/internal/models/login_log.go @@ -1,7 +1,7 @@ package models import ( - "baihu/internal/constant" + "github.com/engigu/baihu-panel/internal/constant" ) // LoginLog 登录日志 diff --git a/internal/models/send_stats.go b/internal/models/send_stats.go index 44ceb88..b5bee13 100644 --- a/internal/models/send_stats.go +++ b/internal/models/send_stats.go @@ -1,7 +1,7 @@ package models import ( - "baihu/internal/constant" + "github.com/engigu/baihu-panel/internal/constant" ) // SendStats 任务执行统计 diff --git a/internal/models/setting.go b/internal/models/setting.go index 1e958d0..ddefa22 100644 --- a/internal/models/setting.go +++ b/internal/models/setting.go @@ -1,7 +1,7 @@ package models import ( - "baihu/internal/constant" + "github.com/engigu/baihu-panel/internal/constant" ) // Setting 系统设置 diff --git a/internal/models/task.go b/internal/models/task.go index c3a009f..4fe36db 100644 --- a/internal/models/task.go +++ b/internal/models/task.go @@ -1,7 +1,7 @@ package models import ( - "baihu/internal/constant" + "github.com/engigu/baihu-panel/internal/constant" "gorm.io/gorm" ) diff --git a/internal/models/user.go b/internal/models/user.go index 081808c..6afd6c8 100644 --- a/internal/models/user.go +++ b/internal/models/user.go @@ -1,7 +1,7 @@ package models import ( - "baihu/internal/constant" + "github.com/engigu/baihu-panel/internal/constant" "gorm.io/gorm" ) diff --git a/internal/router/register.go b/internal/router/register.go index 462dc4b..68bb135 100644 --- a/internal/router/register.go +++ b/internal/router/register.go @@ -1,10 +1,10 @@ package router import ( - "baihu/internal/constant" - "baihu/internal/controllers" - "baihu/internal/services" - "baihu/internal/services/tasks" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/controllers" + "github.com/engigu/baihu-panel/internal/services" + "github.com/engigu/baihu-panel/internal/services/tasks" ) var cronService *tasks.CronService diff --git a/internal/router/router.go b/internal/router/router.go index 26996b7..70aa3d1 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -5,10 +5,10 @@ import ( "net/http" "strings" - "baihu/internal/controllers" - "baihu/internal/middleware" - "baihu/internal/services" - "baihu/internal/static" + "github.com/engigu/baihu-panel/internal/controllers" + "github.com/engigu/baihu-panel/internal/middleware" + "github.com/engigu/baihu-panel/internal/services" + "github.com/engigu/baihu-panel/internal/static" "github.com/gin-gonic/gin" ) diff --git a/internal/services/agent_service.go b/internal/services/agent_service.go index da43d2e..ddfe5fd 100644 --- a/internal/services/agent_service.go +++ b/internal/services/agent_service.go @@ -1,11 +1,11 @@ package services import ( - "baihu/internal/constant" - "baihu/internal/database" - "baihu/internal/logger" - "baihu/internal/models" - "baihu/internal/services/tasks" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/logger" + "github.com/engigu/baihu-panel/internal/models" + "github.com/engigu/baihu-panel/internal/services/tasks" "crypto/rand" "encoding/hex" "fmt" diff --git a/internal/services/agent_ws_service.go b/internal/services/agent_ws_service.go index 4bf3668..6ad62b0 100644 --- a/internal/services/agent_ws_service.go +++ b/internal/services/agent_ws_service.go @@ -1,9 +1,9 @@ package services import ( - "baihu/internal/database" - "baihu/internal/logger" - "baihu/internal/models" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/logger" + "github.com/engigu/baihu-panel/internal/models" "encoding/json" "sync" "time" diff --git a/internal/services/backup_service.go b/internal/services/backup_service.go index bb164c8..0b025fc 100644 --- a/internal/services/backup_service.go +++ b/internal/services/backup_service.go @@ -9,9 +9,9 @@ import ( "path/filepath" "time" - "baihu/internal/constant" - "baihu/internal/database" - "baihu/internal/models" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/models" ) type BackupService struct { diff --git a/internal/services/config_service.go b/internal/services/config_service.go index d06256b..7fdbaae 100644 --- a/internal/services/config_service.go +++ b/internal/services/config_service.go @@ -1,8 +1,8 @@ package services import ( - "baihu/internal/constant" - "baihu/internal/logger" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/logger" "os" "strconv" @@ -67,7 +67,7 @@ func LoadConfig(path string) (*AppConfig, error) { Port: 3306, User: "root", Password: "", - DBName: "baihu", + DBName: "github.com/engigu/baihu-panel", Path: constant.DefaultDBPath, TablePrefix: "baihu_", }, diff --git a/internal/services/dependency_service.go b/internal/services/dependency_service.go index 4a899d7..b162355 100644 --- a/internal/services/dependency_service.go +++ b/internal/services/dependency_service.go @@ -5,9 +5,9 @@ import ( "os/exec" "strings" - "baihu/internal/database" - "baihu/internal/logger" - "baihu/internal/models" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/logger" + "github.com/engigu/baihu-panel/internal/models" ) type DependencyService struct{} diff --git a/internal/services/env_service.go b/internal/services/env_service.go index a218756..84c04eb 100644 --- a/internal/services/env_service.go +++ b/internal/services/env_service.go @@ -4,8 +4,8 @@ import ( "strconv" "strings" - "baihu/internal/database" - "baihu/internal/models" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/models" ) type EnvService struct{} diff --git a/internal/services/init_service.go b/internal/services/init_service.go index 8fb8c95..a7d0b3d 100644 --- a/internal/services/init_service.go +++ b/internal/services/init_service.go @@ -1,7 +1,7 @@ package services import ( - "baihu/internal/logger" + "github.com/engigu/baihu-panel/internal/logger" ) type InitService struct { diff --git a/internal/services/login_log_service.go b/internal/services/login_log_service.go index 6251c6e..701f278 100644 --- a/internal/services/login_log_service.go +++ b/internal/services/login_log_service.go @@ -1,8 +1,8 @@ package services import ( - "baihu/internal/database" - "baihu/internal/models" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/models" ) type LoginLogService struct{} diff --git a/internal/services/script_service.go b/internal/services/script_service.go index 4f317aa..ca1921a 100644 --- a/internal/services/script_service.go +++ b/internal/services/script_service.go @@ -1,8 +1,8 @@ package services import ( - "baihu/internal/database" - "baihu/internal/models" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/models" ) type ScriptService struct{} diff --git a/internal/services/send_stats_service.go b/internal/services/send_stats_service.go index facc89a..1359662 100644 --- a/internal/services/send_stats_service.go +++ b/internal/services/send_stats_service.go @@ -3,8 +3,8 @@ package services import ( "time" - "baihu/internal/database" - "baihu/internal/models" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/models" ) type SendStatsService struct{} diff --git a/internal/services/settings_service.go b/internal/services/settings_service.go index c92b90f..85330d2 100644 --- a/internal/services/settings_service.go +++ b/internal/services/settings_service.go @@ -1,10 +1,10 @@ package services import ( - "baihu/internal/cache" - "baihu/internal/constant" - "baihu/internal/database" - "baihu/internal/models" + "github.com/engigu/baihu-panel/internal/cache" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/models" ) type SettingsService struct{} diff --git a/internal/services/tasks/cron_service.go b/internal/services/tasks/cron_service.go index 364bfb1..53105a6 100644 --- a/internal/services/tasks/cron_service.go +++ b/internal/services/tasks/cron_service.go @@ -4,9 +4,9 @@ import ( "sync" "time" - "baihu/internal/database" - "baihu/internal/logger" - "baihu/internal/models" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/logger" + "github.com/engigu/baihu-panel/internal/models" "github.com/robfig/cron/v3" ) diff --git a/internal/services/tasks/executor_service.go b/internal/services/tasks/executor_service.go index fa89cec..89607ed 100644 --- a/internal/services/tasks/executor_service.go +++ b/internal/services/tasks/executor_service.go @@ -1,9 +1,9 @@ package tasks import ( - "baihu/internal/constant" - "baihu/internal/logger" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/logger" + "github.com/engigu/baihu-panel/internal/utils" "bytes" "context" "fmt" diff --git a/internal/services/tasks/task_execution_service.go b/internal/services/tasks/task_execution_service.go index 86ff59c..4aa5c9a 100644 --- a/internal/services/tasks/task_execution_service.go +++ b/internal/services/tasks/task_execution_service.go @@ -1,11 +1,11 @@ package tasks import ( - "baihu/internal/constant" - "baihu/internal/database" - "baihu/internal/logger" - "baihu/internal/models" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/logger" + "github.com/engigu/baihu-panel/internal/models" + "github.com/engigu/baihu-panel/internal/utils" "bytes" "context" "encoding/json" diff --git a/internal/services/tasks/task_log_service.go b/internal/services/tasks/task_log_service.go index 90b5e39..1b2f373 100644 --- a/internal/services/tasks/task_log_service.go +++ b/internal/services/tasks/task_log_service.go @@ -1,10 +1,10 @@ package tasks import ( - "baihu/internal/database" - "baihu/internal/logger" - "baihu/internal/models" - "baihu/internal/utils" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/logger" + "github.com/engigu/baihu-panel/internal/models" + "github.com/engigu/baihu-panel/internal/utils" "encoding/json" "time" ) diff --git a/internal/services/tasks/task_service.go b/internal/services/tasks/task_service.go index fcc6f55..9d55c53 100644 --- a/internal/services/tasks/task_service.go +++ b/internal/services/tasks/task_service.go @@ -1,8 +1,8 @@ package tasks import ( - "baihu/internal/database" - "baihu/internal/models" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/models" ) type TaskService struct{} diff --git a/internal/services/user_service.go b/internal/services/user_service.go index c132faa..d941960 100644 --- a/internal/services/user_service.go +++ b/internal/services/user_service.go @@ -4,9 +4,9 @@ import ( "crypto/sha256" "encoding/hex" - "baihu/internal/constant" - "baihu/internal/database" - "baihu/internal/models" + "github.com/engigu/baihu-panel/internal/constant" + "github.com/engigu/baihu-panel/internal/database" + "github.com/engigu/baihu-panel/internal/models" ) type UserService struct{} diff --git a/internal/utils/pagination.go b/internal/utils/pagination.go index 3a76358..b147d1a 100644 --- a/internal/utils/pagination.go +++ b/internal/utils/pagination.go @@ -3,8 +3,8 @@ package utils import ( "strconv" - "baihu/internal/cache" - "baihu/internal/constant" + "github.com/engigu/baihu-panel/internal/cache" + "github.com/engigu/baihu-panel/internal/constant" "github.com/gin-gonic/gin" ) diff --git a/main.go b/main.go index 4472c9c..519e34a 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,6 @@ package main -import "baihu/internal/bootstrap" +import "github.com/engigu/baihu-panel/internal/bootstrap" func main() { bootstrap.New().Run() diff --git a/web/src/layouts/MainLayout.vue b/web/src/layouts/MainLayout.vue index b9e7353..619273a 100644 --- a/web/src/layouts/MainLayout.vue +++ b/web/src/layouts/MainLayout.vue @@ -1,5 +1,5 @@