Merge old/master into main, resolving conflicts by preferring old in workflows and removing deprecated adapter files

x
tg
2025-12-28 15:56:07 -08:00 · 2025-09-30 07:52:54 -07:00 · 2025-09-29 17:45:09 -07:00 · 2025-09-29 17:32:10 -07:00 · 2025-09-27 10:52:39 -07:00 · 2025-09-26 21:49:16 -07:00
42 changed files with 538 additions and 316 deletions
@@ -0,0 +1,231 @@
+name: Build docker and publish
+run-name: 简化的Docker构建和部署流程
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+  pull_request:
+    branches:
+      - main
+      - dev
+
+env:
+  # Docker镜像仓库
+  REPO: ${{ vars.REPO || 'registry.kxsw.us/ppanel-server' }}
+  # SSH连接信息
+  SSH_HOST: ${{ vars.SSH_HOST }}
+  SSH_PORT: ${{ vars.SSH_PORT }}
+  SSH_USER: ${{ vars.SSH_USER }}
+  SSH_PASSWORD: ${{ vars.SSH_PASSWORD }}
+  # TG通知
+  TG_BOT_TOKEN: 8114337882:AAHkEx03HSu7RxN4IHBJJEnsK9aPPzNLIk0
+  TG_CHAT_ID: "-4940243803"
+  # Go构建变量
+  SERVICE: ppanel
+  SERVICE_STYLE: ppanel
+  VERSION: ${{ github.sha }}
+  BUILDTIME: ${{ github.event.head_commit.timestamp }}
+  GOARCH: amd64
+
+jobs:
+  build:
+    runs-on: ppanel-server
+    container:
+      image: node:20
+    strategy:
+      matrix:
+        # 只有node支持版本号别名
+        node: ['20.15.1']
+    steps:
+      # 步骤1: 下载代码
+      - name: 📥 下载代码
+        uses: actions/checkout@v4
+        
+      # 步骤2: 设置动态环境变量
+      - name: ⚙️ 设置动态环境变量
+        run: |
+          if [ "${{ github.ref_name }}" = "main" ]; then
+            echo "DOCKER_TAG_SUFFIX=latest" >> $GITHUB_ENV
+            echo "CONTAINER_NAME=ppanel-server" >> $GITHUB_ENV
+            echo "DEPLOY_PATH=/root/vpn_server" >> $GITHUB_ENV
+            echo "为 main 分支设置生产环境变量"
+          elif [ "${{ github.ref_name }}" = "dev" ]; then
+            echo "DOCKER_TAG_SUFFIX=dev" >> $GITHUB_ENV
+            echo "CONTAINER_NAME=ppanel-server-dev" >> $GITHUB_ENV
+            echo "DEPLOY_PATH=/root/vpn_server_dev" >> $GITHUB_ENV
+            echo "为 dev 分支设置开发环境变量"
+          else
+            echo "DOCKER_TAG_SUFFIX=${{ github.ref_name }}" >> $GITHUB_ENV
+            echo "CONTAINER_NAME=ppanel-server-${{ github.ref_name }}" >> $GITHUB_ENV
+            echo "DEPLOY_PATH=/root/vpn_server_other" >> $GITHUB_ENV
+            echo "为其他分支 (${{ github.ref_name }}) 设置环境变量"
+          fi
+        
+      # 步骤3: 安装系统工具 (Docker, curl, jq)
+      - name: 🔧 安装系统工具 (Docker, curl, jq)
+        run: |
+          set -e
+          export DEBIAN_FRONTEND=noninteractive
+          echo "等待 apt/dpkg 锁释放 (unattended-upgrades)..."
+          # 等待最多 300 秒让 unattended-upgrades/apt/dpkg 锁释放
+          end=$((SECONDS+300))
+          while true; do
+            LOCKS_BUSY=0
+            # 如果 unattended-upgrades 正在运行，标记为忙碌
+            if pgrep -x unattended-upgrades >/dev/null 2>&1; then LOCKS_BUSY=1; fi
+            # 如果 fuser 存在，检查常见的锁文件
+            if command -v fuser >/dev/null 2>&1; then
+              if fuser /var/lib/dpkg/lock >/dev/null 2>&1 \
+                || fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1 \
+                || fuser /var/lib/apt/lists/lock >/dev/null 2>&1; then
+                LOCKS_BUSY=1
+              fi
+            fi
+            # 如果不忙碌则跳出循环
+            if [ "$LOCKS_BUSY" -eq 0 ]; then break; fi
+            # 超时后约 5 分钟
+            if [ $SECONDS -ge $end ]; then
+              echo "等待 apt/dpkg 锁超时，使用 Dpkg::Lock::Timeout 继续..."
+              break
+            fi
+            echo "仍在等待锁释放..."; sleep 5
+          done
+          apt-get update -y -o Dpkg::Lock::Timeout=600
+          apt-get install -y -o Dpkg::Lock::Timeout=600 jq curl ca-certificates docker.io
+          docker --version
+          jq --version
+          curl --version
+        
+      # 步骤4: 构建并发布到镜像仓库
+      - name: 📤 构建并发布到镜像仓库
+        run: |
+          echo "开始构建并推送镜像..."
+          echo "仓库: ${{ env.REPO }}"
+          echo "版本标签: ${{ env.VERSION }}"
+          echo "分支标签: ${{ env.DOCKER_TAG_SUFFIX }}"
+
+          # 构建镜像，同时打上版本和分支两个标签
+          docker build -f Dockerfile \
+            --platform linux/amd64 \
+            --build-arg TARGETARCH=amd64 \
+            --build-arg VERSION=${{ env.VERSION }} \
+            --build-arg BUILDTIME=${{ env.BUILDTIME }} \
+            -t ${{ env.REPO }}:${{ env.VERSION }} \
+            -t ${{ env.REPO }}:${{ env.DOCKER_TAG_SUFFIX }} \
+            .
+          
+          echo "推送版本标签镜像: ${{ env.REPO }}:${{ env.VERSION }}"
+          docker push ${{ env.REPO }}:${{ env.VERSION }}
+          
+          echo "推送分支标签镜像: ${{ env.REPO }}:${{ env.DOCKER_TAG_SUFFIX }}"
+          docker push ${{ env.REPO }}:${{ env.DOCKER_TAG_SUFFIX }}
+          
+          echo "镜像推送完成"
+          
+      # 步骤5: 连接服务器拉镜像启动
+      - name: 🚀 连接服务器拉镜像启动
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ env.SSH_HOST }}
+          username: ${{ env.SSH_USER }}
+          password: ${{ env.SSH_PASSWORD }}
+          port: ${{ env.SSH_PORT }}
+          timeout: 300s
+          command_timeout: 600s
+          script: |
+            echo "连接服务器成功，开始部署..."
+            echo "部署容器名: ${{ env.CONTAINER_NAME }}"
+            echo "部署路径: ${{ env.DEPLOY_PATH }}"
+            echo "部署镜像: ${{ env.REPO }}:${{ env.DOCKER_TAG_SUFFIX }}"
+
+            # 确保部署目录存在
+            mkdir -p ${{ env.DEPLOY_PATH }}/config
+            mkdir -p ${{ env.DEPLOY_PATH }}/logs
+            
+            # 停止并删除旧容器（忽略所有错误）
+            if docker ps -a | grep -q ${{ env.CONTAINER_NAME }} 2>/dev/null; then
+              echo "停止旧容器..."
+              docker stop ${{ env.CONTAINER_NAME }} >/dev/null 2>&1 || true
+              echo "等待容器完全停止..."
+              sleep 5
+              
+              echo "删除旧容器..."
+              # 静默删除，完全忽略错误输出
+              docker rm ${{ env.CONTAINER_NAME }} >/dev/null 2>&1 || true
+              sleep 2
+              
+              # 如果仍然存在，尝试强制删除（静默）
+              if docker ps -a | grep -q ${{ env.CONTAINER_NAME }} 2>/dev/null; then
+                echo "尝试强制删除..."
+                docker rm -f ${{ env.CONTAINER_NAME }} >/dev/null 2>&1 || true
+                sleep 3
+              fi
+              
+              echo "容器清理完成，继续部署..."
+            fi
+            
+            # 拉取最新分支镜像
+            echo "拉取镜像: ${{ env.REPO }}:${{ env.DOCKER_TAG_SUFFIX }}..."
+            docker pull ${{ env.REPO }}:${{ env.DOCKER_TAG_SUFFIX }}
+            
+            # 启动新容器
+            echo "启动新容器..."
+            cd ${{ env.DEPLOY_PATH }}
+            docker run -d \
+              --name ${{ env.CONTAINER_NAME }} \
+              --restart unless-stopped \
+              --network host \
+              -v ./config/ppanel.yaml:/app/etc/ppanel.yaml \
+              -v ./logs:/app/logs \
+              ${{ env.REPO }}:${{ env.DOCKER_TAG_SUFFIX }}
+              
+            # 检查容器状态
+            sleep 5
+            if docker ps | grep -q ${{ env.CONTAINER_NAME }}; then
+              echo "✅ 容器启动成功"
+            else
+              echo "❌ 容器启动失败"
+              docker logs ${{ env.CONTAINER_NAME }}
+              exit 1
+            fi
+            
+      # 步骤6: TG通知 (成功)
+      - name: 📱 发送成功通知到Telegram
+        if: success()
+        uses: appleboy/telegram-action@master
+        with:
+          token: ${{ env.TG_BOT_TOKEN }}
+          to: ${{ env.TG_CHAT_ID }}
+          message: |
+            ✅ 部署成功！
+            
+            📦 项目: ${{ github.repository }}
+            🌿 分支: ${{ github.ref_name }}
+            📝 提交: ${{ github.sha }}
+            👤 提交者: ${{ github.actor }}
+            🕐 时间: ${{ github.event.head_commit.timestamp }}
+            
+            🚀 服务已成功部署到生产环境
+          parse_mode: Markdown
+          
+      # 步骤5: TG通知 (失败)
+      - name: 📱 发送失败通知到Telegram
+        if: failure()
+        uses: appleboy/telegram-action@master
+        with:
+          token: ${{ env.TG_BOT_TOKEN }}
+          to: ${{ env.TG_CHAT_ID }}
+          message: |
+            ❌ 部署失败！
+            
+            📦 项目: ${{ github.repository }}
+            🌿 分支: ${{ github.ref_name }}
+            📝 提交: ${{ github.sha }}
+            👤 提交者: ${{ github.actor }}
+            🕐 时间: ${{ github.event.head_commit.timestamp }}
+            
+            ⚠️ 请检查构建日志获取详细信息
+          parse_mode: Markdown
+          
@@ -1,131 +0,0 @@
-name: Release
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  build-docker:
-    runs-on: ubuntu-latest
-    env:
-      IMAGE_NAME: ppanel-server
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract version from git tag
-        id: version
-        run: echo "VERSION=$(git describe --tags --abbrev=0 | sed 's/^v//')" >> $GITHUB_ENV
-
-      - name: Get short SHA
-        id: sha
-        run: echo "GIT_SHA=${GITHUB_SHA::8}" >> $GITHUB_ENV
-
-      - name: Set BUILD_TIME env
-        run: echo BUILD_TIME=$(date --iso-8601=seconds) >> ${GITHUB_ENV}
-
-
-      - name: Build and push Docker image for main release
-        if: "!contains(github.ref_name, 'beta')"
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          build-args: |
-            VERSION=${{ env.VERSION }}
-          tags: |
-            ${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:latest
-            ${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}-${{ env.GIT_SHA }}
-
-      - name: Build and push Docker image for beta release
-        if: contains(github.ref_name, 'beta')
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          build-args: |
-            VERSION=${{ env.VERSION }}
-          tags: |
-            ${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:beta
-            ${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}-${{ env.GIT_SHA }}
-
-  release-notes:
-    runs-on: ubuntu-latest
-    needs: build-docker
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.21'
-
-      - name: Install GoReleaser
-        run: |
-          go install github.com/goreleaser/goreleaser/v2@latest
-
-      - name: Run GoReleaser
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: |
-          goreleaser check
-          goreleaser release --clean
-
-  releases-matrix:
-    name: Release ppanel-server binary
-    runs-on: ubuntu-latest
-    needs: release-notes  # wait for release-notes job to finish
-    strategy:
-      matrix:
-        # build and publish in parallel: linux/386, linux/amd64, linux/arm64,
-        # windows/386, windows/amd64, windows/arm64, darwin/amd64, darwin/arm64
-        goos: [ linux, windows, darwin ]
-        goarch: [ '386', amd64, arm64 ]
-        exclude:
-          - goarch: '386'
-            goos: darwin
-
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Extract version from git tag
-        id: version
-        run: echo "VERSION=$(git describe --tags --abbrev=0 | sed 's/^v//')" >> $GITHUB_ENV
-
-      - name: Set BUILD_TIME env
-        run: echo BUILD_TIME=$(date --iso-8601=seconds) >> ${GITHUB_ENV}
-
-      - uses: actions/checkout@v4
-      - uses: wangyoucao577/go-release-action@v1
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          goos: ${{ matrix.goos }}
-          goarch: ${{ matrix.goarch }}
-          asset_name: "ppanel-server-${{ matrix.goos }}-${{ matrix.goarch }}"
-          goversion: "https://dl.google.com/go/go1.23.3.linux-amd64.tar.gz"
-          project_path: "."
-          binary_name: "ppanel-server"
-          extra_files: LICENSE etc
-          ldflags: -X "github.com/perfect-panel/server/pkg/constant.Version=${{env.VERSION}}" -X "github.com/perfect-panel/server/pkg/constant.BuildTime=${{env.BUILD_TIME}}"
@@ -3,10 +3,8 @@
 *-dev.yaml
 *.local.yaml
 /test/
-*.log
 .DS_Store
 *_test_config.go
-*.log*
 /build/
 *.p8
 *.crt
@@ -24,12 +24,13 @@ RUN BUILD_TIME=$(date -u +"%Y-%m-%d %H:%M:%S") && \
    go build -ldflags="-s -w -X 'github.com/perfect-panel/server/pkg/constant.Version=${VERSION}' -X 'github.com/perfect-panel/server/pkg/constant.BuildTime=${BUILD_TIME}'" -o /app/ppanel ppanel.go

 # Final minimal image
-FROM scratch
+FROM alpine:latest

 # Copy CA certificates and timezone data
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /usr/share/zoneinfo/Asia/Shanghai /usr/share/zoneinfo/Asia/Shanghai
+COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo

+# Set Shanghai timezone
 ENV TZ=Asia/Shanghai

 # Set working directory and copy binary
@@ -37,6 +38,7 @@ WORKDIR /app

 COPY --from=builder /app/ppanel /app/ppanel
 COPY --from=builder /build/etc /app/etc
+COPY --from=builder /build/logs /app/logs

 # Expose the port (optional)
 EXPOSE 8080
@@ -1,84 +1,73 @@
-NAME="ppanel-server"
-BINDIR=bin
-VERSION=$(shell git describe --tags || echo "unknown version")
-BUILDTIME=$(shell date -u)
+# Custom configuration | 独立配置
+# Service name | 项目名称
+SERVICE=ppanel
+# Service name in specific style | 项目经过style格式化的名称
+SERVICE_STYLE=ppanel
+
+# Service name in lowercase | 项目名称全小写格式
+SERVICE_LOWER=ppanel
+# Service name in snake format | 项目名称下划线格式
+SERVICE_SNAKE=ppanel
+# Service name in snake format | 项目名称短杠格式
+SERVICE_DASH=ppanel
+
+# The project version, if you don't use git, you should set it manually | 项目版本，如果不使用git请手动设置
+VERSION=$(shell git describe --tags --always)
+# Build time | 构建时间
+BUILDTIME=$(shell date '+%Y-%m-%d %H:%M:%S')
+
+# The project file name style | 项目文件命名风格
+PROJECT_STYLE=go_zero
+
+# Whether to use i18n | 是否启用 i18n
+PROJECT_I18N=true
+
+# The suffix after build or compile | 构建后缀
+PROJECT_BUILD_SUFFIX=api
+
+
+# The arch of the build | 构建的架构
+GOARCH=amd64
+
+# The repository of docker | Docker 仓库地址
+DOCKER_REPO=docker.i.on ticcheck
+
+# ---- You may not need to modify the codes below | 下面的代码大概率不需要更改 ----
+
+GO ?= go
+GOFMT ?= gofmt "-s"
+GOFILES := $(shell find . -name "*.go")
+LDFLAGS := -s -w
+
+# Build command with version injection | 带版本信息注入的构建命令
 GOBUILD=CGO_ENABLED=0 go build -trimpath -ldflags '-X "github.com/perfect-panel/server/pkg/constant.Version=$(VERSION)" \
 	-X "github.com/perfect-panel/server/pkg/constant.BuildTime=$(BUILDTIME)" \
 	-w -s -buildid='

-PLATFORM_LIST = \
-	darwin-amd64 \
-	darwin-amd64-v3 \
-	darwin-arm64 \
-	linux-386 \
-	linux-amd64 \
-	linux-amd64-v3 \
-	linux-armv5 \
-	linux-armv6 \
-	linux-armv7 \
-	linux-arm64 \
+.PHONY: docker
+docker: # Build the docker image | 构建 docker 镜像
+	docker build -f Dockerfile -t ${API_IMAGE_NAME}:${VERSION} .
+	@echo "Build docker successfully"

-WINDOWS_ARCH_LIST = \
-	windows-386 \
-	windows-amd64 \
-	windows-amd64-v3 \
-	windows-arm64 \
-	windows-armv7
+.PHONY: publish-docker
+publish-docker: # Publish docker image | 发布 docker 镜像
+	docker tag ${API_IMAGE_NAME}:${VERSION} ${API_IMAGE_NAME}:latest
+	docker push ${API_IMAGE_NAME}:latest
+	@echo "Publish docker successfully"

-all: linux-amd64 darwin-amd64 windows-amd64 # Most used
-
-darwin-amd64:
-	GOARCH=amd64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-darwin-amd64-v3:
-	GOARCH=amd64 GOOS=darwin GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-darwin-arm64:
-	GOARCH=arm64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-linux-386:
-	GOARCH=386 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-linux-amd64:
-	GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-linux-amd64-v3:
-	GOARCH=amd64 GOOS=linux GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-linux-armv5:
-	GOARCH=arm GOOS=linux GOARM=5 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-linux-armv6:
-	GOARCH=arm GOOS=linux GOARM=6 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-linux-armv7:
-	GOARCH=arm GOOS=linux GOARM=7 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-linux-arm64:
-	GOARCH=arm64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-windows-386:
-	GOARCH=386 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
-
-windows-amd64:
-	GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
-
-windows-amd64-v3:
-	GOARCH=amd64 GOOS=windows GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
-
-windows-arm64:
-	GOARCH=arm64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
-
-windows-armv7:
-	GOARCH=arm GOOS=windows GOARM=7 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
+.PHONY: docker-run
+docker-run: # Publish docker image | 发布 docker 镜像
+	docker rm -f ${API_CONTAINER_NAME}
+	@echo "pwd: $(pwd)"
+	docker compose -p ${DOCKER_PROJECT_NAME} -f ${DOCKER_COMPOSE_FILE} up -d
+	@echo "docker run successfully"


-gz_releases=$(addsuffix .gz, $(PLATFORM_LIST))
-zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))
+.PHONY: build-linux
+build-linux: # Build project for Linux | 构建Linux下的可执行文件
+	GOOS=linux GOARCH=$(GOARCH) $(GOBUILD) -o /app/ppanel $(SERVICE_STYLE).go
+	@echo "Build project for Linux successfully"

-$(gz_releases): %.gz : %
-	chmod +x $(BINDIR)/$(NAME)-$(basename $@)
-	gzip -f -S -$(VERSION).gz $(BINDIR)/$(NAME)-$(basename $@)
-
-$(zip_releases): %.zip : %
-	zip -m -j $(BINDIR)/$(NAME)-$(basename $@)-$(VERSION).zip $(BINDIR)/$(NAME)-$(basename $@).exe
+.PHONY: help
+help: # Show help | 显示帮助
+	@grep kfile | sort | while read-r l; do printf "\033[1;32m$$(echo $$l | cut -f 1 -d':')\033[00m:$$(echo $$l | cut -f 2- -d'#')\n"; done
@@ -113,7 +113,7 @@ proxy services. Built with Go, it emphasizes performance, security, and scalabil
   ```

 4. **Pull from Docker Hub** (after CI/CD publishes):
-   ```bash
+   ```bashw
   docker pull yourusername/ppanel-server:latest
   docker run --rm -p 8080:8080 yourusername/ppanel-server:latest
   ```
@@ -20,6 +20,7 @@ type (
 		Size      int64  `form:"size"`
 		UserId    int64  `form:"user_id,omitempty"`
 		Status    *uint8 `form:"status,omitempty"`
+		IssueType *uint8 `form:"issue_type,omitempty"`
 		Search    string `form:"search,omitempty"`
 	}
 	GetTicketListResponse {
@@ -18,11 +18,13 @@ type (
 	CreateUserTicketRequest {
 		Title       string `json:"title"`
 		Description string `json:"description"`
+		IssueType   uint8  `json:"issue_type"`
 	}
 	GetUserTicketListRequest {
 		Page      int    `form:"page"`
 		Size      int    `form:"size"`
 		Status    *uint8 `form:"status,omitempty"`
+		IssueType *uint8 `form:"issue_type,omitempty"`
 		Search    string `form:"search,omitempty"`
 	}
 	GetUserTicketDetailRequest {
@@ -176,8 +176,9 @@ type (
 	}
 	InviteConfig {
 		ForcedInvite                bool  `json:"forced_invite"`
-		ReferralPercentage int64 `json:"referral_percentage"`
-		OnlyFirstPurchase  bool  `json:"only_first_purchase"`
+	FirstPurchasePercentage     int64 `json:"first_purchase_percentage"`
+	FirstYearlyPurchasePercentage int64 `json:"first_yearly_purchase_percentage"`
+	NonFirstPurchasePercentage  int64 `json:"non_first_purchase_percentage"`
 	}
 	TelegramConfig {
 		TelegramBotToken      string `json:"telegram_bot_token"`
@@ -0,0 +1,50 @@
+Host: 0.0.0.0
+Port: 8080
+Debug: false
+JwtAuth:
+  AccessSecret: e4bbdb8ca57179374c0e8a7a85038da21341aee4bdff98c0e612751d7c362cac
+  AccessExpire: 604800
+Logger:
+  ServiceName: PPanel
+  Mode: file
+  Encoding: plain
+  TimeFormat: '2025-01-01 00:00:00.000'
+  Path: logs
+  Level: debug
+  MaxContentLength: 0
+  Compress: false
+  Stat: true
+  KeepDays: 0
+  StackCooldownMillis: 100
+  MaxBackups: 0
+  MaxSize: 0
+  Rotation: daily
+  FileTimeFormat: 2025-01-01T00:00:00.000Z00:00
+MySQL:
+  Addr: ppanel-db:3306
+  Dbname: ppanel
+  Username: ppanel
+  Password: ppanelpassword
+  Config: charset=utf8mb4&parseTime=true&loc=Asia%2FShanghai
+  MaxIdleConns: 10
+  MaxOpenConns: 10
+  SlowThreshold: 1000
+Redis:
+  Host: ppanel-cache:6379
+  Pass:
+  DB: 0
+Administrator:
+  Password: password
+  Email: admin@ppanel.dev
+Email:
+  Enable: true
+  Platform: smtp
+  PlatformConfig: '{"host":"smtp.gmail.com","port":465,"user":"devneeds52@gmail.com","pass":"bqxn hurw ckxt ookj","from":"devneeds52@gmail.com","ssl":true}'
+  EnableVerify: true
+  EnableNotify: true
+  EnableDomainSuffix: false
+  DomainSuffixList: ""
+  VerifyEmailTemplate: ""
+  ExpirationEmailTemplate: ""
+  MaintenanceEmailTemplate: ""
+  TrafficExceedEmailTemplate: ""
@@ -379,6 +379,7 @@ CREATE TABLE IF NOT EXISTS `user`
    `referer_id`              bigint                                                                 DEFAULT NULL COMMENT 'Referrer ID',
    `commission`              bigint                                                                 DEFAULT '0' COMMENT 'Commission',
    `gift_amount`             bigint                                                                 DEFAULT '0' COMMENT 'User Gift Amount',
+    `remark`                  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci          DEFAULT '' COMMENT 'User Remark',
    `enable`                  tinyint(1)                                                    NOT NULL DEFAULT '1' COMMENT 'Is Account Enabled',
    `is_admin`                tinyint(1)                                                    NOT NULL DEFAULT '0' COMMENT 'Is Admin',
    `valid_email`             tinyint(1)                                                    NOT NULL DEFAULT '0' COMMENT 'Is Email Verified',
@@ -90,11 +90,15 @@ VALUES (1, 'site', 'SiteLogo', '/favicon.svg', 'string', 'Site Logo', '2025-04-2
        '2025-04-22 14:25:16.640'),
       (23, 'invite', 'ForcedInvite', 'false', 'bool', 'Forced invite', '2025-04-22 14:25:16.640',
        '2025-04-22 14:25:16.640'),
-       (24, 'invite', 'ReferralPercentage', '20', 'int', 'Referral percentage', '2025-04-22 14:25:16.640',
+       (24, 'invite', 'FirstPurchasePercentage', '20', 'int', 'First purchase commission percentage', '2025-04-22 14:25:16.640',
        '2025-04-22 14:25:16.640'),
-       (25, 'invite', 'OnlyFirstPurchase', 'false', 'bool', 'Only first purchase', '2025-04-22 14:25:16.640',
+       (25, 'invite', 'NonFirstPurchasePercentage', '10', 'int', 'Non-first purchase commission percentage', '2025-04-22 14:25:16.640',
        '2025-04-22 14:25:16.640'),
-       (26, 'register', 'StopRegister', 'false', 'bool', 'is stop register', '2025-04-22 14:25:16.640',
+       (26, 'invite', 'ForcedInvite', 'false', 'bool', 'Forced invite', '2025-04-22 14:25:16.640',
+        '2025-04-22 14:25:16.640'),
+       (42, 'invite', 'FirstYearlyPurchasePercentage', '25', 'int', 'First yearly purchase commission percentage', '2025-04-22 14:25:16.640',
+        '2025-04-22 14:25:16.640'),
+       (27, 'register', 'StopRegister', 'false', 'bool', 'is stop register', '2025-04-22 14:25:16.640',
        '2025-04-22 14:25:16.640'),
       (27, 'register', 'EnableTrial', 'false', 'bool', 'is enable trial', '2025-04-22 14:25:16.640',
        '2025-04-22 14:25:16.640'),
@@ -191,8 +191,9 @@ type File struct {

 type InviteConfig struct {
 	ForcedInvite                bool  `yaml:"ForcedInvite" default:"false"`
-	ReferralPercentage int64 `yaml:"ReferralPercentage" default:"0"`
-	OnlyFirstPurchase  bool  `yaml:"OnlyFirstPurchase" default:"false"`
+	FirstPurchasePercentage     int64 `yaml:"FirstPurchasePercentage" default:"20"`
+	FirstYearlyPurchasePercentage int64 `yaml:"FirstYearlyPurchasePercentage" default:"25"`
+	NonFirstPurchasePercentage  int64 `yaml:"NonFirstPurchasePercentage" default:"10"`
 }

 type Telegram struct {
@@ -4,6 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/perfect-panel/server/internal/logic/public/user"
 	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/result"
 )

@@ -11,8 +12,15 @@ import (
 func QueryUserBalanceLogHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
 	return func(c *gin.Context) {

+		var req types.QueryUserBalanceLogListRequest
+		_ = c.ShouldBind(&req)
+		validateErr := svcCtx.Validate(&req)
+		if validateErr != nil {
+			result.ParamErrorResult(c, validateErr)
+			return
+		}
 		l := user.NewQueryUserBalanceLogLogic(c.Request.Context(), svcCtx)
-		resp, err := l.QueryUserBalanceLog()
+		resp, err := l.QueryUserBalanceLog(&req)
 		result.HttpResult(c, resp, err)
 	}
 }
@@ -27,7 +27,7 @@ func NewGetTicketListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Get
 }

 func (l *GetTicketListLogic) GetTicketList(req *types.GetTicketListRequest) (resp *types.GetTicketListResponse, err error) {
-	total, list, err := l.svcCtx.TicketModel.QueryTicketList(l.ctx, int(req.Page), int(req.Size), req.UserId, req.Status, req.Search)
+	total, list, err := l.svcCtx.TicketModel.QueryTicketList(l.ctx, int(req.Page), int(req.Size), req.UserId, req.Status, req.IssueType, req.Search)
 	if err != nil {
 		l.Errorw("[GetTicketList] Query Database Error: ", logger.Field("error", err.Error()))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "QueryTicketList error: %v", err)
@@ -3,11 +3,6 @@ package common
 import (
 	"context"
 	"encoding/json"
-	"io"
-	"net"
-	"net/http"
-	"slices"
-	"strings"
 	"time"

 	"github.com/perfect-panel/server/internal/config"
@@ -68,52 +63,14 @@ func (l *GetStatLogic) GetStat() (resp *types.GetStatResponse, err error) {
 		l.Logger.Error("[GetStatLogic] get server_addr failed: ", logger.Field("error", err.Error()))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get server_addr failed: %v", err.Error())
 	}
-	type apireq struct {
-		query  string
-		fields string
-	}
-	type apiret struct {
-		CountryCode string `json:"countryCode"`
-	}
-	//map as dict
-	type void struct{}
-	var v void
-	country := make(map[string]void)
-	for c := range slices.Chunk(nodeaddr, 100) {
-		var batchreq []apireq
-		for _, addr := range c {
-			isAddr := net.ParseIP(addr)
-			if isAddr == nil {
-				ip, err := net.LookupIP(addr)
-				if err == nil && len(ip) > 0 {
-					batchreq = append(batchreq, apireq{query: ip[0].String(), fields: "countryCode"})
-				}
-			} else {
-				batchreq = append(batchreq, apireq{query: addr, fields: "countryCode"})
-			}
-		}
-		req, _ := json.Marshal(batchreq)
-		ret, err := http.Post("http://ip-api.com/batch", "application/json", strings.NewReader(string(req)))
-		if err == nil {
-			retBytes, err := io.ReadAll(ret.Body)
-			if err == nil {
-				var retStruct []apiret
-				err := json.Unmarshal(retBytes, &retStruct)
-				if err == nil {
-					for _, dat := range retStruct {
-						if dat.CountryCode != "" {
-							country[dat.CountryCode] = v
-						}
-					}
-				}
-			}
-		}
-	}
-	protocolDict := make(map[string]void)
+
+	country := 0
+
+	protocolDict := make(map[string]struct{})
 	var protocol []string
 	l.svcCtx.DB.Model(&server.Server{}).Where("enable = true").Pluck("protocol", &protocol)
 	for _, p := range protocol {
-		protocolDict[p] = v
+		protocolDict[p] = struct{}{}
 	}
 	protocol = nil
 	for p := range protocolDict {
@@ -122,8 +79,9 @@ func (l *GetStatLogic) GetStat() (resp *types.GetStatResponse, err error) {
 	resp = &types.GetStatResponse{
 		User:         u,
 		Node:         n,
-		Country:  int64(len(country)),
+		Country:      int64(country),
 		Protocol:     protocol,
+		OnlineDevice: l.svcCtx.DeviceManager.GetOnlineDeviceCount(),
 	}
 	val, _ := json.Marshal(*resp)
 	_ = l.svcCtx.Redis.Set(l.ctx, config.CommonStatCacheKey, string(val), time.Duration(3600)*time.Second).Err()
@@ -50,10 +50,26 @@ func (l *GetSubscriptionLogic) GetSubscription(req *types.GetSubscriptionRequest
 		tool.DeepCopy(&sub, item)
 		if item.Discount != "" {
 			var discount []types.SubscribeDiscount
+
 			_ = json.Unmarshal([]byte(item.Discount), &discount)
 			sub.Discount = discount
-			list[i] = sub
 		}
+
+		// 计算节点数量（通过服务组查询关联的实际节点数量）
+		if item.ServerGroup != "" {
+			// 获取服务组ID列表
+			groupIds := tool.StringToInt64Slice(item.ServerGroup)
+
+			// 通过服务组查询关联的节点数量
+			servers, err := l.svcCtx.ServerModel.FindServerListByGroupIds(l.ctx, groupIds)
+			if err != nil {
+				l.Errorw("[Site GetSubscription] FindServerListByGroupIds error", logger.Field("error", err.Error()))
+				sub.ServerCount = 0
+			} else {
+				sub.ServerCount = int64(len(servers))
+			}
+		}
+
 		list[i] = sub
 	}
 	resp.List = list
@@ -48,6 +48,7 @@ func (l *QuerySubscribeListLogic) QuerySubscribeList(req *types.QuerySubscribeLi
 	list := make([]types.Subscribe, len(data))
 	for i, item := range data {
 		var sub types.Subscribe
+
 		tool.DeepCopy(&sub, item)
 		if item.Discount != "" {
 			var discount []types.SubscribeDiscount
@@ -56,6 +57,20 @@ func (l *QuerySubscribeListLogic) QuerySubscribeList(req *types.QuerySubscribeLi
 			list[i] = sub
 		}
 		list[i] = sub
+		// 通过服务组查询关联的节点数量
+		if item.ServerGroup != "" {
+			groupIds := tool.StringToInt64Slice(item.ServerGroup)
+			servers, err := l.svcCtx.ServerModel.FindServerListByGroupIds(l.ctx, groupIds)
+			if err != nil {
+				l.Errorw("[QuerySubscribeListLogic] FindServerListByGroupIds error", logger.Field("error", err.Error()))
+				sub.ServerCount = 0
+			} else {
+				sub.ServerCount = int64(len(servers))
+			}
+		} else {
+			sub.ServerCount = 0
+		}
+		list[i] = sub
 	}
 	resp.List = list
 	return
@@ -41,6 +41,7 @@ func (l *CreateUserTicketLogic) CreateUserTicket(req *types.CreateUserTicketRequ
 		Description: req.Description,
 		UserId:      u.Id,
 		Status:      ticket.Pending,
+		IssueType:   req.IssueType,
 	})
 	if err != nil {
 		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "insert ticket error: %v", err.Error())
@@ -36,7 +36,7 @@ func (l *GetUserTicketListLogic) GetUserTicketList(req *types.GetUserTicketListR
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
 	}
 	l.Logger.Debugf("Current user: %v", u.Id)
-	total, list, err := l.svcCtx.TicketModel.QueryTicketList(l.ctx, req.Page, req.Size, u.Id, req.Status, req.Search)
+	total, list, err := l.svcCtx.TicketModel.QueryTicketList(l.ctx, req.Page, req.Size, u.Id, req.Status, req.IssueType, req.Search)
 	if err != nil {
 		l.Errorw("[GetUserTicketListLogic] Database Error", logger.Field("error", err.Error()))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "QueryTicketList error: %v", err)
@@ -29,7 +29,7 @@ func NewQueryUserBalanceLogLogic(ctx context.Context, svcCtx *svc.ServiceContext
 	}
 }

-func (l *QueryUserBalanceLogLogic) QueryUserBalanceLog() (resp *types.QueryUserBalanceLogListResponse, err error) {
+func (l *QueryUserBalanceLogLogic) QueryUserBalanceLog(req *types.QueryUserBalanceLogListRequest) (resp *types.QueryUserBalanceLogListResponse, err error) {
 	u, ok := l.ctx.Value(constant.CtxKeyUser).(*user.User)
 	if !ok {
 		logger.Error("current user is not found in context")
@@ -60,6 +60,25 @@ func (l *QueryUserSubscribeLogic) QueryUserSubscribe() (resp *types.QueryUserSub
 			}
 		}

+		// 计算节点数量（通过服务组关联的实际节点数量）
+		if item.Subscribe != nil {
+			// 获取服务组ID列表
+			groupIds := tool.StringToInt64Slice(item.Subscribe.ServerGroup)
+
+			// 通过服务组查询关联的节点数量
+			servers, err := l.svcCtx.ServerModel.FindServerListByGroupIds(l.ctx, groupIds)
+			if err != nil {
+				l.Errorw("[QueryUserSubscribeLogic] FindServerListByGroupIds error", logger.Field("error", err.Error()))
+				sub.Subscribe.ServerCount = 0
+			} else {
+				sub.Subscribe.ServerCount = int64(len(servers))
+			}
+
+			// 保留原始服务器ID列表用于其他用途
+			serverIds := tool.StringToInt64Slice(item.Subscribe.Server)
+			sub.Subscribe.Server = serverIds
+		}
+
 		sub.ResetTime = calculateNextResetTime(&sub)
 		resp.List = append(resp.List, sub)
 	}
@@ -12,6 +12,9 @@ const (
 	RelayModeNone          = "none"
 	RelayModeAll           = "all"
 	RelayModeRandom        = "random"
+	RelayModeMixed         = "mixed"
+	RelayModeAllDirect     = "all_direct"
+	RelayModeRandomDirect  = "random_direct"
 	RuleGroupTypeReject    = "reject"
 	RuleGroupTypeDefault   = "default"
 	RuleGroupTypeDirect    = "direct"
@@ -17,6 +17,7 @@ type Details struct {
 	Description string    `gorm:"type:text;comment:Description"`
 	UserId      int64     `gorm:"type:bigint;not null;default:0;comment:UserId"`
 	Status      uint8     `gorm:"type:tinyint(1);not null;default:1;comment:Status"`
+	IssueType   uint8     `gorm:"type:tinyint(1);not null;default:0;comment:Issue Type: 0 ticket, 1 withdraw"`
 	Follows     []Follow  `gorm:"foreignKey:TicketId;references:Id"`
 	CreatedAt   time.Time `gorm:"<-:create;comment:Create Time"`
 	UpdatedAt   time.Time `gorm:"comment:Update Time"`
@@ -24,7 +25,7 @@ type Details struct {
 type customTicketLogicModel interface {
 	QueryTicketDetail(ctx context.Context, id int64) (*Details, error)
 	InsertTicketFollow(ctx context.Context, data *Follow) error
-	QueryTicketList(ctx context.Context, page, size int, userId int64, status *uint8, search string) (int64, []*Ticket, error)
+	QueryTicketList(ctx context.Context, page, size int, userId int64, status *uint8, issueType *uint8, search string) (int64, []*Ticket, error)
 	UpdateTicketStatus(ctx context.Context, id, userId int64, status uint8) error
 	QueryWaitReplyTotal(ctx context.Context) (int64, error)
 }
@@ -55,7 +56,7 @@ func (m *customTicketModel) InsertTicketFollow(ctx context.Context, data *Follow
 }

 // QueryTicketList returns the ticket list.
-func (m *customTicketModel) QueryTicketList(ctx context.Context, page, size int, userId int64, status *uint8, search string) (int64, []*Ticket, error) {
+func (m *customTicketModel) QueryTicketList(ctx context.Context, page, size int, userId int64, status *uint8, issueType *uint8, search string) (int64, []*Ticket, error) {
 	var data []*Ticket
 	var total int64
 	err := m.QueryNoCacheCtx(ctx, &data, func(conn *gorm.DB, v interface{}) error {
@@ -65,8 +66,9 @@ func (m *customTicketModel) QueryTicketList(ctx context.Context, page, size int,
 		}
 		if status != nil {
 			query = query.Where("status = ?", status)
-		} else {
-			query = query.Where("status != ?", 4)
+		}
+		if issueType != nil {
+			query = query.Where("issue_type = ?", issueType)
 		}
 		if search != "" {
 			query = query.Where("title like ? or description like ?", "%"+search+"%", "%"+search+"%")
@@ -12,9 +12,10 @@ const (
 type Ticket struct {
 	Id          int64     `gorm:"primaryKey"`
 	Title       string    `gorm:"type:varchar(255);not null;default:'';comment:Title"`
-	Description string    `gorm:"type:text;comment:Description"`
+	Description string    `gorm:"type:longtext;comment:Description"`
 	UserId      int64     `gorm:"type:bigint;not null;default:0;comment:UserId"`
 	Status      uint8     `gorm:"type:tinyint(1);not null;default:1;comment:Status"`
+	IssueType   uint8     `gorm:"type:tinyint(1);not null;default:0;comment:Issue Type: 0 ticket, 1 withdraw"`
 	CreatedAt   time.Time `gorm:"<-:create;comment:Create Time"`
 	UpdatedAt   time.Time `gorm:"comment:Update Time"`
 }
@@ -118,6 +118,6 @@ func (m *customTrafficModel) TopUsersTrafficByMonthly(ctx context.Context, date
 func (m *customTrafficModel) QueryTrafficLogPageList(ctx context.Context, userId, subscribeId int64, page, size int) ([]*TrafficLog, int64, error) {
 	var list []*TrafficLog
 	var total int64
-	err := m.Conn.WithContext(ctx).Model(&TrafficLog{}).Where("user_id = ? and subscribe_id= ?", userId, subscribeId).Count(&total).Limit(size).Offset((page - 1) * size).Find(&list).Error
+	err := m.Conn.WithContext(ctx).Model(&TrafficLog{}).Where("user_id = ? and subscribe_id= ?", userId, subscribeId).Count(&total).Order("timestamp DESC").Limit(size).Offset((page - 1) * size).Find(&list).Error
 	return list, total, err
 }
@@ -88,6 +88,7 @@ func (m *defaultUserModel) QueryUserSubscribe(ctx context.Context, userId int64,
 		// 订阅过期时间大于当前时间或者订阅结束时间大于当前时间
 		return conn.Where("`expire_time` > ? OR `finished_at` >= ? OR `expire_time` = ?", now, sevenDaysAgo, time.UnixMilli(0)).
 			Preload("Subscribe").
+			Order("created_at DESC").
 			Find(&list).Error
 	})
 	return list, err
@@ -15,6 +15,7 @@ type User struct {
 	ReferralPercentage    uint8         `gorm:"default:0;comment:Referral"`                        // Referral Percentage
 	OnlyFirstPurchase     *bool         `gorm:"default:true;not null;comment:Only First Purchase"` // Only First Purchase Referral
 	GiftAmount            int64         `gorm:"default:0;comment:User Gift Amount"`
+	Remark                string        `gorm:"type:varchar(255);default:'';comment:User Remark"`
 	Enable                *bool         `gorm:"default:true;not null;comment:Is Account Enabled"`
 	IsAdmin               *bool         `gorm:"default:false;not null;comment:Is Admin"`
 	EnableBalanceNotify   *bool         `gorm:"default:false;not null;comment:Enable Balance Change Notifications"`
@@ -451,6 +451,7 @@ type CreateUserTicketFollowRequest struct {
 type CreateUserTicketRequest struct {
 	Title       string `json:"title"`
 	Description string `json:"description"`
+	IssueType   uint8  `json:"issue_type"`
 }

 type Currency struct {
@@ -928,6 +929,7 @@ type GetStatResponse struct {
 	Node         int64    `json:"node"`
 	Country      int64    `json:"country"`
 	Protocol     []string `json:"protocol"`
+	OnlineDevice int64    `json:"online_device"`
 }

 type GetSubscribeApplicationListRequest struct {
@@ -989,6 +991,7 @@ type GetTicketListRequest struct {
 	Size      int64  `form:"size"`
 	UserId    int64  `form:"user_id,omitempty"`
 	Status    *uint8 `form:"status,omitempty"`
+	IssueType *uint8 `form:"issue_type,omitempty"`
 	Search    string `form:"search,omitempty"`
 }

@@ -1110,6 +1113,7 @@ type GetUserTicketListRequest struct {
 	Page      int    `form:"page"`
 	Size      int    `form:"size"`
 	Status    *uint8 `form:"status,omitempty"`
+	IssueType *uint8 `form:"issue_type,omitempty"`
 	Search    string `form:"search,omitempty"`
 }

@@ -1148,8 +1152,9 @@ type Hysteria2 struct {

 type InviteConfig struct {
 	ForcedInvite                  bool  `json:"forced_invite"`
-	ReferralPercentage int64 `json:"referral_percentage"`
-	OnlyFirstPurchase  bool  `json:"only_first_purchase"`
+	FirstPurchasePercentage       int64 `json:"first_purchase_percentage"`
+	FirstYearlyPurchasePercentage int64 `json:"first_yearly_purchase_percentage"`
+	NonFirstPurchasePercentage    int64 `json:"non_first_purchase_percentage"`
 }

 type KickOfflineRequest struct {
@@ -1652,6 +1657,11 @@ type QueryUserAffiliateListRequest struct {
 	Size int `form:"size"`
 }

+type QueryUserBalanceLogListRequest struct {
+	Page int `form:"page"`
+	Size int `form:"size"`
+}
+
 type QueryUserAffiliateListResponse struct {
 	List  []UserAffiliate `json:"list"`
 	Total int64           `json:"total"`
@@ -2136,6 +2146,7 @@ type Ticket struct {
 	UserId      int64    `json:"user_id"`
 	Follows     []Follow `json:"follow,omitempty"`
 	Status      uint8    `json:"status"`
+	IssueType   uint8    `json:"issue_type"`
 	CreatedAt   int64    `json:"created_at"`
 	UpdatedAt   int64    `json:"updated_at"`
 }
@@ -2442,6 +2453,7 @@ type User struct {
 	Telegram              int64            `json:"telegram"`
 	ReferCode             string           `json:"refer_code"`
 	RefererId             int64            `json:"referer_id"`
+	Remark                string           `json:"remark"`
 	Enable                bool             `json:"enable"`
 	IsAdmin               bool             `json:"is_admin,omitempty"`
 	EnableBalanceNotify   bool             `json:"enable_balance_notify"`
@@ -340,6 +340,11 @@ func (dm *DeviceManager) Broadcast(message string) {

 }

+// GetOnlineDeviceCount returns the total number of online devices
+func (dm *DeviceManager) GetOnlineDeviceCount() int64 {
+	return int64(atomic.LoadInt32(&dm.totalOnline))
+}
+
 // Gracefully shut down all WebSocket connections
 func (dm *DeviceManager) Shutdown(ctx context.Context) {
 	<-ctx.Done()
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# 简洁的代码对比脚本
+echo "🔍 代码对比报告"
+echo "==========================================="
+echo ""
+
+# 检查old远程仓库是否存在
+if ! git remote | grep -q "old"; then
+    echo "❌ 请先添加old远程仓库: git remote add old https://github.com/perfect-panel/server.git && git fetch old"
+    exit 1
+fi
+
+echo "📋 文件变更对比:"
+echo "-------------------------------------------"
+echo "我们修改的文件:"
+git diff --name-status old/master main | grep -E '^[AM]' | sed 's/^A/🆕 新增: /' | sed 's/^M/✏️  修改: /'
+echo ""
+echo "他们修改的文件:"
+git diff --name-status main old/master | grep -E '^[AM]' | sed 's/^A/🆕 新增: /' | sed 's/^M/✏️  修改: /'
+echo ""
+
+echo "📊 变更统计:"
+echo "-------------------------------------------"
+echo "我们的变更:"
+git diff --stat --color=always old/master main | tail -1
+echo "他们的变更:"
+git diff --stat --color=always main old/master | tail -1
+echo ""
+
+echo "✅ 对比完成！"
Author	SHA1	Message	Date
shanshanzhong147	49d59eccb0	Merge old/master into main, resolving conflicts by preferring old in workflows and removing deprecated adapter files Build docker and publish / build (20.15.1) (push) Has been cancelled Details	2025-12-28 15:56:07 -08:00
shanshanzhong147	c07c58aa16	x	2025-09-30 07:52:54 -07:00
shanshanzhong147	b650b1a108	tg Build docker and publish / build (20.15.1) (push) Successful in 6m13s Details	2025-09-29 17:45:09 -07:00
shanshanzhong147	efc5be5142	maindev Build docker and publish / build (20.15.1) (push) Failing after 6m30s Details	2025-09-29 17:32:10 -07:00
shanshanzhong147	5c43bd7a3d	init Build docker and publish / build (20.15.1) (push) Failing after 9m55s Details	2025-09-27 10:52:39 -07:00
shanshanzhong147	30bbb33129	init Build docker and publish / build (20.15.1) (push) Failing after 6m3s Details	2025-09-26 21:49:16 -07:00
shanshanzhong147	66e753e69b	x Build docker and publish / build (20.15.1) (push) Failing after 6m2s Details	2025-09-26 21:04:11 -07:00
shanshanzhong147	93fcaace26	x Build docker and publish / build (20.15.1) (push) Failing after 5m51s Details	2025-09-26 20:12:09 -07:00
shanshanzhong147	97bb873bb8	x Build docker and publish / build (20.15.1) (push) Failing after 5m41s Details	2025-09-26 19:46:56 -07:00
shanshanzhong147	723ceddc3d	x Build docker and publish / build (20.15.1) (push) Failing after 5m24s Details	2025-09-26 19:34:49 -07:00
shanshanzhong147	be532bec1b	x Build docker and publish / build (20.15.1) (push) Failing after 5m23s Details	2025-09-26 19:25:47 -07:00
shanshanzhong147	e788693713	x Build docker and publish / build (20.15.1) (push) Failing after 5m33s Details	2025-09-26 19:16:32 -07:00
shanshanzhong147	aaa6cb149c	x Build docker and publish / build (20.15.1) (push) Failing after 10m26s Details	2025-09-26 19:05:02 -07:00
shanshanzhong147	6a146f0898	x Build docker and publish / build (20.15.1) (push) Failing after 1m1s Details	2025-09-26 19:00:51 -07:00
shanshanzhong147	b9b0dc3bda	x Build docker and publish / build (20.15.1) (push) Failing after 14s Details	2025-09-26 18:57:19 -07:00
shanshanzhong147	4d39fd1b84	i1 Build docker and publish / build (20.15.1) (push) Failing after 7s Details	2025-09-26 18:43:33 -07:00
shanshanzhong147	bcf81ab683	i1 Build docker and publish / build (push) Failing after 19s Details	2025-09-26 18:42:35 -07:00
shanshanzhong147	7471fd8e3d	ci Build docker and publish / linux (1.24.3) (push) Has been cancelled Details	2025-09-26 18:37:43 -07:00
shanshanzhong147	ac3bbaf7bf	feat(ticket): 添加issue_type字段支持工单分类在工单系统中新增issue_type字段用于区分工单类型（0-普通工单，1-提现工单）修改相关API、模型和逻辑以支持该字段的创建、查询和筛选	2025-09-15 01:42:44 -07:00
shanshanzhong147	2d4bfe0330	remark	2025-09-14 23:41:00 -07:00
shanshanzhong147	602ecc31bc	feat(proxy): 新增混合模式和中继直连模式支持添加 RelayModeMixed、RelayModeAllDirect 和 RelayModeRandomDirect 三种中继模式修复 README.md 中的拼写错误更新 JWT 密钥和日志模式配置优化流量日志查询排序统一邮件验证码主题格式	2025-09-01 02:22:16 -07:00
shanshanzhong147	b16ac2cb9b	feat(用户): 添加用户余额日志分页查询功能修复AnyTLSUri端口使用错误问题添加订阅列表排序功能更新.gitignore移除日志文件忽略完善流量通知模板变量	2025-08-27 08:15:31 -07:00
shanshanzhong147	41423ca666	fix: 修复订阅列表查询逻辑并更新Dockerfile配置修复订阅列表查询中服务器组为空时的处理逻辑，避免潜在错误在getSubscribeListLogic.go中添加服务器数量统计功能更新Dockerfile添加logs目录拷贝清理ppanel.yaml配置文件中的合并冲突和冗余配置	2025-08-17 04:28:32 -07:00
shanshanzhong147	e898e6afbe	init	2025-08-12 07:52:04 -07:00
shanshanzhong147	a52c7142ee	feat: 添加在线设备统计功能并优化订阅相关逻辑 - 在DeviceManager中添加GetOnlineDeviceCount方法用于获取在线设备数 - 在统计接口中增加在线设备数返回 - 优化订阅查询逻辑，增加服务组关联节点数量计算 - 添加AnyTLS协议支持及相关URI生成功能 - 重构邀请佣金计算逻辑，支持首购/年付/非首购不同比例 - 修复用户基本信息更新中IsAdmin和Enable字段类型不匹配问题 - 更新数据库迁移脚本和配置文件中邀请相关配置项	2025-08-12 07:46:45 -07:00
shanshanzhong147	2e01ba0e3d	ci(docker): 更新Docker工作流和配置清理Go模块缓存并移除go.sum文件更新Docker网络名称和数据库连接配置	2025-08-10 00:28:32 -07:00
shanshanzhong147	25db7ea428	chore(deploy): 更新GITEA_RUNNER_NAME为ubuntu-latest	2025-08-09 08:32:09 -07:00
shanshanzhong147	e37ad50410	ci: 将linux作业的运行环境从vpn改为ubuntu-latest	2025-08-09 08:17:36 -07:00
shanshanzhong147	c503e06c9c	ci(workflow): 将linux作业的运行环境改为vpn 避免使用公共runner以提高构建安全性	2025-08-09 08:00:12 -07:00
shanshanzhong147	0992c2ad7b	ci(docker): 更新Docker工作流以包含构建步骤添加checkout步骤并使用环境变量进行认证包含构建Linux可执行文件的步骤	2025-08-09 07:18:58 -07:00
shanshanzhong147	e78b93d6fb	ci: 移除不必要的检出步骤	2025-08-09 07:13:25 -07:00
shanshanzhong147	79020ccea0	1	2025-08-09 06:55:11 -07:00
shanshanzhong147	8a8ece76b1	ci: 将Linux构建任务运行环境从vpn改为ubuntu-latest	2025-08-09 06:26:21 -07:00
shanshanzhong147	0316345e9f	ci: 将linux job的运行环境从vpn-runner改为vpn	2025-08-09 06:25:23 -07:00
shanshanzhong147	b56b1240f3	ci(workflow): 将linux job的运行环境改为vpn-runner并移除build-linux步骤	2025-08-09 06:23:30 -07:00
shanshanzhong147	77b3af8015	init	2025-08-09 05:18:44 -07:00
shanshanzhong147	634f43d644	fix: 更新MySQL和Redis的连接地址为具体IP 将MySQL和Redis的连接地址从服务名称改为具体IP地址，以便在特定网络环境下能够正确连接	2025-08-05 10:37:47 -07:00
shanshanzhong147	e5b4dc75d7	fix(deploy): 更新docker-compose配置和数据库连接地址 - 在docker-compose中添加时区环境变量 - 将MySQL和Redis连接地址从localhost改为服务名 - 更新Makefile中的docker compose命令语法	2025-08-05 10:12:29 -07:00
shanshanzhong147	40b8c07036	chore: 在docker-run命令中添加当前工作目录打印	2025-08-05 10:00:07 -07:00
shanshanzhong147	b261ddeeb1	ci(docker): 更新Docker工作流，添加构建步骤并注释发布步骤添加应用构建步骤以确保镜像包含最新代码暂时注释发布步骤以进行本地测试	2025-08-05 09:52:27 -07:00
shanshanzhong147	62f07b7f6b	ci(docker): 移除构建应用的步骤并修复docker-compose命令移除docker.yml中冗余的go mod tidy和build-linux步骤，这些步骤已在其他流程中处理将docker compose命令改为docker-compose以兼容旧版本	2025-08-05 09:46:27 -07:00
shanshanzhong147	31a2aa0e84	ci(workflow): 优化Docker工作流配置并简化步骤 - 添加DOMAIN环境变量以替代硬编码的域名 - 简化git克隆流程，使用凭证存储提高安全性 - 移除不必要的SSH文件复制步骤 - 添加构建和发布Docker镜像的详细日志输出	2025-08-05 09:24:13 -07:00
shanshanzhong147	7965c33790	ci(docker): 更新Gitea工作流以使用容器化构建环境将Linux作业改为在golang容器中运行，简化Go环境设置步骤移除不必要的SSH步骤，优化构建流程	2025-08-05 09:22:37 -07:00
shanshanzhong147	fcae874fd2	ci: 移除不再需要的Node.js安装步骤	2025-08-05 09:20:50 -07:00
shanshanzhong147	dad83339c1	ci(docker): 更新Gitea工作流配置并优化构建步骤 - 使用标准actions/checkout@v4替代自定义checkout - 添加Go环境设置步骤并启用缓存 - 优化SSH action使用标准appleboy/ssh-action - 调整工作空间路径变量为github标准	2025-08-05 09:18:32 -07:00
shanshanzhong147	84842ec3dd	ci(docker): 添加 Node.js 设置步骤以支持前端构建	2025-08-05 09:16:06 -07:00
shanshanzhong147	59bc008b69	ci(docker): 更新SSH action的版本引用使用明确的版本号v1替代隐式引用，提高工作流的稳定性	2025-08-05 09:13:06 -07:00
shanshanzhong147	8cb58ad91f	ci(docker): 更新Gitea Actions checkout步骤使用v1版本修复checkout步骤未指定版本的问题，确保构建稳定性	2025-08-05 09:12:16 -07:00
shanshanzhong147	7372302618	ci(docker): 移除actions引用中的main分支后缀	2025-08-05 09:10:44 -07:00
shanshanzhong147	cbf5a2b450	1	2025-08-05 09:09:02 -07:00
shanshanzhong147	33f450cdbc	init	2025-08-05 08:47:18 -07:00
shanshanzhong147	bce4c4e56e	ci(workflow): 更新Gitea工作流使用内部actions 使用内部认证的actions替换公开actions以增强安全性	2025-08-05 08:22:04 -07:00
shanshanzhong147	b6cbcb3040	ci: 移除不必要的Node.js设置和检出步骤	2025-08-05 08:09:59 -07:00
shanshanzhong147	fdbe3c75ee	ci(workflow): 添加Node.js环境并降级checkout action版本添加Node.js环境设置步骤以满足构建需求将actions/checkout从v4降级至v3以解决兼容性问题	2025-08-05 08:08:36 -07:00
shanshanzhong147	bf13c56261	ci: 更新Gitea工作流中使用GitHub官方actions 将自定义的actions地址替换为GitHub官方actions，提高工作流的稳定性和可维护性	2025-08-05 08:05:21 -07:00
shanshanzhong147	85343f3f82	fix(deploy): 修正GITEA_RUNNER_NAME变量值为vpn-runner	2025-08-05 08:01:25 -07:00
shanshanzhong147	51b493a10d	ci(workflow): 将linux作业的运行环境从ubuntu-latest改为vpn	2025-08-05 07:59:50 -07:00
shanshanzhong147	ae04e0d518	chore: 更新GITEA_RUNNER_NAME为vpn-runner	2025-08-05 07:54:18 -07:00
shanshanzhong147	2b1ce740e1	ci: 更新部署配置和CI认证方式将域名从ppanel.kxsw.us更改为api.kxsw.us 将CI工作流中的SSH认证方式从私钥改为密码认证	2025-08-05 07:47:50 -07:00
shanshanzhong147	e620abcce6	init	2025-08-05 06:19:25 -07:00
shanshanzhong147	7ea6fc226e	refactor(Dockerfile): 优化时区文件拷贝并添加注释将单个时区文件拷贝改为拷贝整个时区目录，提高可维护性添加时区设置的环境变量注释	2025-07-28 06:56:07 -07:00
shanshanzhong147	d5f4b04c6c	fix(deploy): 将API外部端口从8070改为8080	2025-07-24 09:33:40 -07:00
shanshanzhong147	a0ca976e66	chore: 开启调试模式并添加代码对比脚本开启调试模式以便更好地排查问题。添加代码对比脚本 see.sh，用于简洁地对比代码变更，包括文件变更对比和变更统计，方便查看我们和他们的修改情况。	2025-07-23 10:13:42 -07:00
shanshanzhong147	917732eeee	fix: 修改 MySQL 配置中的密码和数据库名	2025-07-23 09:43:38 -07:00
shanshanzhong147	f0fbd9d208	fix: 更新MySQL和Redis连接地址以及Docker网络名称将MySQL地址从localhost改为mysql_db，Redis地址从127.0.0.1改为redis_cache 更新Docker网络名称为ppanel-script_ppanel-network以匹配部署配置	2025-07-23 09:25:32 -07:00
shanshanzhong147	2d07182bd6	fix: 修正 Dockerfile 中的 CMD 命令参数	2025-07-23 09:20:32 -07:00
shanshanzhong147	e0ae15355b	style: 将项目名称从Ppanel改为ppanel以保持命名一致性	2025-07-23 08:48:36 -07:00
shanshanzhong147	c0e0d03431	fix: 修正Dockerfile和Makefile中的可执行文件名称将Dockerfile中的CMD命令和Makefile中的build-linux目标输出文件名称统一为'ppanel'，确保容器运行时使用正确的可执行文件名称	2025-07-23 08:22:45 -07:00
shanshanzhong147	bb5d6974fa	ci: 从发布流程中移除docker登录步骤移除Makefile中自动登录docker的步骤，因为登录凭证应通过更安全的方式处理	2025-07-23 07:51:46 -07:00
shanshanzhong147	df7fcddb40	refactor: 更新Dockerfile和Makefile配置统一服务名称为Ppanel并更新相关变量命名优化Makefile结构，移除无用swagger相关命令添加构建时间变量并改进构建命令	2025-07-23 07:36:26 -07:00
shanshanzhong147	6c9d5fb39e	fix: 修正Makefile中的服务名称拼写错误	2025-07-22 10:25:41 -07:00
shanshanzhong147	4ecc5177ed	ci(docker): 优化Go环境设置并启用缓存使用setup-go替代gitea-tool-cache来设置Go环境启用依赖缓存以提高构建效率移除不必要的清理步骤	2025-07-22 10:11:10 -07:00
shanshanzhong147	c11d46bdbf	ci: 更新工作流中使用的工作空间变量从github到gitea	2025-07-22 10:09:55 -07:00
shanshanzhong147	9b7a588997	ci(workflow): 更新docker工作流配置 - 添加GOSUMDB=off设置并清理go缓存 - 修复工作空间路径变量引用错误 - 增加go.sum清理步骤	2025-07-22 10:05:09 -07:00
shanshanzhong147	0f40c63ea0	ci(docker): 修复工作流中容器环境变量处理逻辑修复容器名称变量引用错误，并添加对RUNNER_CONTAINER_NAME未设置的检查	2025-07-22 09:53:59 -07:00
shanshanzhong147	1d1d8c0e30	ci(workflows): 修改docker工作流中的环境文件路径将环境文件存储路径从/install/cicd_env_files改为用户主目录下的~/cicd_env_files，避免权限问题	2025-07-22 09:52:25 -07:00
shanshanzhong147	5d890fdfcc	ci: 更新Gitea Actions的引用版本为main分支	2025-07-22 09:50:20 -07:00
shanshanzhong147	94e2f33db1	ci: 移除Gitea Actions插件版本号以使用最新版本	2025-07-22 09:45:30 -07:00
shanshanzhong147	a7d9deb9cd	ci(workflow): 更新 setup-go action 的引用方式	2025-07-22 09:36:18 -07:00
shanshanzhong147	9f9e832e37	chore(deploy): 更新GITEA_RUNNER_NAME为server-runner	2025-07-22 09:08:59 -07:00
shanshanzhong147	a73a3f2313	feat: 添加docker-compose配置和用户管理逻辑更新 fix(ci): 移除敏感信息并更新SSH认证方式 refactor: 清理无用文件和更新Makefile配置 docs: 添加项目配置文件和更新环境变量说明	2025-07-22 08:53:30 -07:00
shanshanzhong147	cc6ebc18e5	ci(docker): 添加docker构建工作流并更新Makefile配置添加Gitea的docker构建工作流，包含环境变量配置、Go环境安装、镜像构建和发布步骤重构Makefile以支持多平台构建、docker操作和swagger文档生成	2025-07-21 07:25:47 -07:00