1

2026-01-27 06:40:49 +00:00
parent 4078511183
commit 445aab3c22
3 changed files with 89 additions and 81 deletions
--- a/.woodpecker/my-first-workflow.yaml
+++ b/.woodpecker/my-first-workflow.yaml
@@ -1,8 +1,9 @@
-# 触发条件：仅push、manual手动触发，分支限定main（修正格式错误）
+# 触发条件：仅push、manual手动触发，分支限定main
 when:
-  - event: push
-  - event: manual
-    branch: main
+  event:
+    - push
+    - manual
+  branch: main

 skip_clone: true

@@ -13,7 +14,7 @@ variables:
  JSON_CONFIG_URL: "https://你的JSON配置地址.com/deploy.json"
  LOG_PATH: "$HOME/run.log"

-# 流水线核心步骤：理顺依赖链，确保build依赖clone结果
+# 流水线核心步骤：理顺依赖链，确保各步骤依赖正确
 steps:
  # ========== 1. 替代clone：拉取代码（核心依赖） ==========
  prepare:
@@ -22,87 +23,80 @@ steps:
      from_secret:
        WOODPECKER_SSH_KEY: WOODPECKER_SSH_KEY
    commands:
-      - apt update
+      - apt update -y
      # 安装完整依赖（解决SSH/libcrypto问题）
-      - apt install -y ca-certificates curl git openssh-client openssl libssl-dev
+      - apt install -y --no-install-recommends ca-certificates curl git openssh-client openssl libssl-dev
      # 清理旧SSH文件，严格配置权限
      - rm -rf /root/.ssh/*
      - mkdir -p /root/.ssh && chmod 700 /root/.ssh
-      # 写入并清理SSH密钥（兼容RSA/ED25519，保留原始换行）
-  # 替换原echo "$WOODPECKER_SSH_KEY"那行，其余ssh配置不变
-      # ========== 关键修改：SSH密钥写入逻辑（核心修复） ==========
-      # 替换原echo命令，用cat+EOF保留密钥原始换行，避免格式损坏
+      # ========== 关键修复：SSH密钥写入逻辑（删除外层chmod，优化格式） ==========
      - |
-        
- 
        if [ -n "$WOODPECKER_SSH_KEY" ]; then
- 
-         cat > /root/.ssh/id_ed25519 << EOF
+          # 写入ED25519密钥（保留原始换行，避免格式损坏）
+          cat > /root/.ssh/id_ed25519 << EOF
        $WOODPECKER_SSH_KEY
        EOF
-  
-        chmod 600 /root/.ssh/id_ed25519
+          chmod 600 /root/.ssh/id_ed25519
          echo "✅ ED25519密钥写入完成"
        else
-        echo "⚠️ WOODPECKER_SSH_KEY变量为空，未写入SSH密钥"
+          echo "⚠️ WOODPECKER_SSH_KEY变量为空，未写入SSH密钥"
+          exit 1  # 密钥为空时终止流程，避免后续无效操作
        fi
-
-
-      
-      - chmod 600 /root/.ssh/id_ed25519
      # 添加GitHub主机密钥（完整覆盖，避免重复）
      - ssh-keyscan -H github.com > /root/.ssh/known_hosts
      - chmod 600 /root/.ssh/known_hosts
-# 检查私钥是否能被解析（关键测试）
-      - ssh-keygen -lf /root/.ssh/id_ed25519
+      # 检查私钥是否能被解析（关键测试）
+      - ssh-keygen -lf /root/.ssh/id_ed25519 || { echo "❌ SSH密钥解析失败"; exit 1; }
      - echo "🔍 尝试SSH连接GitHub（详细日志）..."
-# 重新执行命令（取消输出屏蔽），查看具体错误
-   
+      # 重新执行命令（取消输出屏蔽），查看具体错误
      - ssh -vvv -i /root/.ssh/id_ed25519 -o StrictHostKeyChecking=accept-new git@github.com 2>&1
-      # 拉取代码（拆分命令，避免静默失败）
-      - git init
-      - git remote add origin $CI_REPO_CLONE_SSH_URL
+      # 拉取代码（拆分命令，添加错误处理，避免静默失败）
+      - git init || { echo "❌ git init失败"; exit 1; }
+      - git remote add origin "$CI_REPO_CLONE_SSH_URL" || { echo "❌ 添加远程仓库失败"; exit 1; }
      - git config core.sshCommand 'ssh -i /root/.ssh/id_ed25519'
-      - git fetch origin $CI_REPO_DEFAULT_BRANCH
-      - git checkout $CI_REPO_DEFAULT_BRANCH
+      - git fetch origin "$CI_REPO_DEFAULT_BRANCH" || { echo "❌ git fetch失败"; exit 1; }
+      - git checkout "$CI_REPO_DEFAULT_BRANCH" || { echo "❌ git checkout失败"; exit 1; }
      - echo "✅ 代码拉取完成"

  # ========== 2. 初始化Go环境（依赖prepare：代码拉取完成） ==========
  prepare-go:
    image: golang:1.25
-    depends_on: [prepare]  # 明确依赖：先拉代码，再初始化Go
+    depends_on: [prepare]
    commands:
      - go version
-      - go mod download -x
-      - go mod verify
+      - go mod download -x || { echo "❌ 下载Go依赖失败"; exit 1; }
+      - go mod verify || { echo "❌ 验证Go依赖失败"; exit 1; }
      - echo "✅ Go环境初始化完成"

  # ========== 3. 生成版本号（依赖prepare-go：Go环境就绪） ==========
  set-version:
    image: golang:1.25
-    depends_on: [prepare-go]  # 明确依赖：Go环境就绪后生成版本号
+    depends_on: [prepare-go]
    commands:
      - |
        if [ -n "${CI_COMMIT_TAG}" ]; then
          VERSION="${CI_COMMIT_TAG}"
        else
-          VERSION="v$(git rev-parse --short=8 HEAD)"  # 依赖prepare拉取的代码
+          # 确保git能获取到提交信息（依赖prepare拉取的代码）
+          VERSION="v$(git rev-parse --short=8 HEAD 2>/dev/null || echo "unknown")"
        fi
-        echo "BUILD_VERSION=${VERSION}" >> $CI_ENV_FILE
+        # 确保CI_ENV_FILE目录存在
+        mkdir -p "$(dirname "$CI_ENV_FILE")"
+        echo "BUILD_VERSION=${VERSION}" >> "$CI_ENV_FILE"
        echo "✅ 生成版本号：${VERSION}"

  # ========== 4. 编译Go服务（核心依赖：prepare+prepare-go+set-version） ==========
  build_logic:
    image: golang:1.25
-    depends_on: [set-version]  # 明确依赖：版本号生成后再编译
+    depends_on: [set-version]
    environment:
      CGO_ENABLED: 0
      GO111MODULE: on
      GOSUMDB: off
    commands:
      - mkdir -p build
-      - BIN_NAME="logic_${BUILD_VERSION}"  # 依赖set-version的BUILD_VERSION
-      - echo "BIN_NAME=${BIN_NAME}" >> $CI_ENV_FILE
+      - BIN_NAME="logic_${BUILD_VERSION}"
+      - echo "BIN_NAME=${BIN_NAME}" >> "$CI_ENV_FILE"
      - |
        go build -v \
          -p=4 \
@@ -110,7 +104,7 @@ steps:
          -buildvcs=false \
          -ldflags "-s -w -buildid= -extldflags '-static' -X main.version=${BUILD_VERSION}" \
          -o ./build/${BIN_NAME} \
-          ./logic  # 依赖prepare拉取的./logic代码目录
+          ./logic
      - |
        if [ ! -f ./build/${BIN_NAME} ]; then
          echo "❌ 编译失败：产物${BIN_NAME}不存在"
@@ -123,32 +117,38 @@ steps:
  # ========== 5. 拉取部署配置（可并行，依赖prepare确保代码拉取完成） ==========
  fetch-deploy-config:
    image: alpine:latest
-    depends_on: [prepare]  # 确保代码拉取完成后再拉配置
+    depends_on: [prepare]
    commands:
      - apk add --no-cache curl jq
      - echo "🔧 拉取部署配置：${JSON_CONFIG_URL}"
      - |
+        # 重试机制（最多3次）
        for i in 1 2 3; do
-          curl -sSL --connect-timeout 10 ${JSON_CONFIG_URL} -o /tmp/deploy-config.json && break
+          curl -sSL --connect-timeout 10 --max-time 30 "${JSON_CONFIG_URL}" -o /tmp/deploy-config.json && break
          echo "⚠️ 第${i}次拉取失败，重试中..."
          sleep 2
        done
        if [ ! -f /tmp/deploy-config.json ]; then
-          echo "❌ 拉取JSON失败"
+          echo "❌ 拉取JSON配置失败"
          exit 1
        fi
      - |
-        JSON_TYPE=$(jq -r 'type' /tmp/deploy-config.json)
+        # 安全解析JSON，避免jq报错终止流程
+        JSON_TYPE=$(jq -r 'type' /tmp/deploy-config.json 2>/dev/null || echo "invalid")
        if [ "$JSON_TYPE" = "array" ]; then
            REMOTE_HOSTS=$(jq -r '.[].loginaddr' /tmp/deploy-config.json | tr '\n' ',' | sed 's/,$//')
            REMOTE_USERS=$(jq -r '.[].user' /tmp/deploy-config.json | tr '\n' ',' | sed 's/,$//')
            REMOTE_PASSWORDS=$(jq -r '.[].password' /tmp/deploy-config.json | tr '\n' ',' | sed 's/,$//')
            REMOTE_ONLINE_IDS=$(jq -r '.[].online_id' /tmp/deploy-config.json | tr '\n' ',' | sed 's/,$//')
-        else
+        elif [ "$JSON_TYPE" = "object" ]; then
            REMOTE_HOSTS=$(jq -r '.loginaddr' /tmp/deploy-config.json)
            REMOTE_USERS=$(jq -r '.user' /tmp/deploy-config.json)
            REMOTE_PASSWORDS=$(jq -r '.password' /tmp/deploy-config.json)
            REMOTE_ONLINE_IDS=$(jq -r '.online_id' /tmp/deploy-config.json)
+        else
+            echo "❌ JSON配置格式错误（非数组/对象）"
+            cat /tmp/deploy-config.json
+            exit 1
        fi
      - |
        if [ -z "$REMOTE_HOSTS" ] || [ -z "$REMOTE_USERS" ]; then
@@ -157,10 +157,10 @@ steps:
          exit 1
        fi
      - echo "✅ 配置解析完成 | 服务器：${REMOTE_HOSTS} | OnlineID：${REMOTE_ONLINE_IDS}"
-      - echo "REMOTE_HOSTS=${REMOTE_HOSTS}" >> $CI_ENV_FILE
-      - echo "REMOTE_USERS=${REMOTE_USERS}" >> $CI_ENV_FILE
-      - echo "REMOTE_PASSWORDS=${REMOTE_PASSWORDS}" >> $CI_ENV_FILE
-      - echo "REMOTE_ONLINE_IDS=${REMOTE_ONLINE_IDS}" >> $CI_ENV_FILE
+      - echo "REMOTE_HOSTS=${REMOTE_HOSTS}" >> "$CI_ENV_FILE"
+      - echo "REMOTE_USERS=${REMOTE_USERS}" >> "$CI_ENV_FILE"
+      - echo "REMOTE_PASSWORDS=${REMOTE_PASSWORDS}" >> "$CI_ENV_FILE"
+      - echo "REMOTE_ONLINE_IDS=${REMOTE_ONLINE_IDS}" >> "$CI_ENV_FILE"

  # ========== 6. SCP推送产物（依赖编译+配置解析） ==========
  scp-exe-to-servers:
@@ -189,12 +189,11 @@ steps:
      timeout: 60s
      script:
        - |
-          if command -v screen &> /dev/null; then
-              echo "✅ Screen已安装"
-          else
+          # 安装Screen（增强容错）
+          if ! command -v screen &> /dev/null; then
              echo "🔧 安装Screen..."
              if command -v apt &> /dev/null; then
-                  apt update -y && apt install -y screen -qq
+                  apt update -y && apt install -y --no-install-recommends screen -qq
              elif command -v yum &> /dev/null; then
                  yum install -y screen -q
              elif command -v dnf &> /dev/null; then
@@ -203,23 +202,31 @@ steps:
                  echo "❌ 不支持的包管理器，安装失败"
                  exit 1
              fi
-              command -v screen || { echo "❌ Screen安装后检测失败"; exit 1; }
          fi
+          # 验证Screen安装
+          if ! command -v screen &> /dev/null; then
+              echo "❌ Screen安装后检测失败"
+              exit 1
+          fi
+          echo "✅ Screen已安装/存在"
        - mkdir -p ${REMOTE_EXE_DIR}
        - chmod +x ${REMOTE_EXE_DIR}/${BIN_NAME} || { echo "❌ 设置执行权限失败"; exit 1; }
-        - screen -S ${SCREEN_NAME} -X quit || true
+        # 停止旧会话（容错：不存在则忽略）
+        - screen -S ${SCREEN_NAME} -X quit 2>/dev/null || true
        - |
          echo "🚀 启动程序：${REMOTE_EXE_DIR}/${BIN_NAME} -id=${REMOTE_ONLINE_IDS}"
-          screen -dmS ${SCREEN_NAME} bash -c "\"${REMOTE_EXE_DIR}/${BIN_NAME}\" -id=${REMOTE_ONLINE_IDS} | tee -a ${LOG_PATH}"
-          sleep 2
+          # 启动新会话，增强日志输出
+          screen -dmS ${SCREEN_NAME} bash -c "\"${REMOTE_EXE_DIR}/${BIN_NAME}\" -id=${REMOTE_ONLINE_IDS} 2>&1 | tee -a ${LOG_PATH}"
+          sleep 3  # 延长等待时间，确保会话启动
+          # 验证会话是否启动
          if screen -ls | grep -q "${SCREEN_NAME}"; then
              echo "✅ 启动成功！Screen会话："
-              screen -ls
+              screen -ls | grep ${SCREEN_NAME}
          else
              echo "❌ 启动失败，无${SCREEN_NAME}会话"
-              screen -ls && exit 1
+              screen -ls
+              exit 1
          fi
-    depends_on: [scp-exe-to-servers]

  # ========== 8. 打印部署汇总（依赖部署完成） ==========
  print-deploy-info:
--- a/logic/service/fight/input.go
+++ b/logic/service/fight/input.go
@@ -324,7 +324,9 @@ func NewFight(p1, p2 common.PlayerI, fn func(info.FightOverInfo)) (*FightC, erro
 	f.Broadcast(func(ff *input.Input) {

 		ff.Player.SendPackCmd(2503, &f.ReadyInfo)
-
+		if p, ok := ff.Player.(*player.Player); ok {
+			p.Service.Info.Save(*p.Info)
+		}
 	})

 	cool.Cron.AfterFunc(loadtime, func() {
--- a/logic/service/player/save.go
+++ b/logic/service/player/save.go
@@ -5,7 +5,6 @@ import (
 	"blazing/cool"
 	"fmt"

-	"blazing/logic/service/fight/info"
 	"blazing/logic/service/space"
 	"context"
 	"time"
@@ -23,30 +22,30 @@ func (p *Player) Save() {
 		return

 	}
-	if p.FightC != nil {
+	// if p.FightC != nil {

-		//ov := make(chan struct{})
-		go func() {
+	// 	//ov := make(chan struct{})
+	// 	go func() {

-			defer func() {
-				if err := recover(); err != nil { // 恢复 panic，err 为 panic 错误值
-					// 1. 打印错误信息
+	// 		defer func() {
+	// 			if err := recover(); err != nil { // 恢复 panic，err 为 panic 错误值
+	// 				// 1. 打印错误信息

-					cool.Logger.Error(context.TODO(), "panic 错误：", err)
+	// 				cool.Logger.Error(context.TODO(), "panic 错误：", err)

-				}
-			}()
-			p.FightC.Over(p, info.BattleOverReason.PlayerOffline) //玩家逃跑，但是不能锁线程
-		}()
-		//<-ov
-		select {
-		case <-p.FightC.GetOverChan(): //等待结束
-		case <-time.After(time.Second * 5): //等待5秒
-			cool.Logger.Error(context.TODO(), "战斗崩溃", p.Info.UserID)
+	// 			}
+	// 		}()
+	// 		p.FightC.Over(p, info.BattleOverReason.PlayerOffline) //玩家逃跑，但是不能锁线程
+	// 	}()
+	// 	//<-ov
+	// 	select {
+	// 	case <-p.FightC.GetOverChan(): //等待结束
+	// 	case <-time.After(time.Second * 5): //等待5秒
+	// 		cool.Logger.Error(context.TODO(), "战斗崩溃", p.Info.UserID)

-		}
+	// 	}

-	}
+	// }

 	newtime := uint32(time.Now().Unix())
 	p.Info.TimeToday = p.Info.TimeToday + newtime - uint32(p.Logintime) //保存电池时间