Merge branch 'main' of https://cnb.cool/blzing/blazing

2026-01-28 22:24:41 +08:00
parent 86e07e94b2 9adbf6f5d4
commit 2f94636d5f
2 changed files with 112 additions and 106 deletions
--- a/.cnb.yml
+++ b/.cnb.yml
@@ -1,11 +1,15 @@
 main:
  push:
-    - stages:
+    - runner:
+        cpus: 1
+      stages:
+        # ========== 同步到GitHub ==========
        - name: sync to github
          image: tencentcom/git-sync
+          cpus: 1
          imports: https://cnb.cool/blzing/key/-/blob/main/githubkey.yml
          settings:
            target_url: https://github.com/72wo/blazing.git
            auth_type: https
            username: ${GIT_USERNAME}
-            password: ${GIT_ACCESS_TOKEN}
+            password: ${GIT_ACCESS_TOKEN}
--- a/.woodpecker/my-first-workflow.yaml
+++ b/.woodpecker/my-first-workflow.yaml
@@ -23,9 +23,10 @@ steps:
    environment:
      WOODPECKER_SSH_KEY:
        from_secret: WOODPECKER_SSH_KEY
+      CNB_ACCK:
+        from_secret: CNB_ACCK
    commands:
      # 调试：验证变量是否传递
-      - echo "🔍 调试：WOODPECKER_SSH_KEY变量长度 = ${#WOODPECKER_SSH_KEY}"
      - echo "🔍 调试：当前环境变量列表（筛选SSH相关）"
      - env | grep -i ssh || echo "⚠️ 无SSH相关环境变量"
      
@@ -51,130 +52,131 @@ steps:
      - SSH_KNOWN_HOSTS_FILE="$HOME/.ssh/known_hosts"
      - ssh-keyscan -H github.com > /root/.ssh/known_hosts
      - chmod 600 /root/.ssh/known_hosts
-      
-      
-
- 
-      
      - echo "🔍 ${#CI_REPO_CLONE_SSH_URL}调试： ${CI_REPO_CLONE_SSH_URL}"
      - git config --global core.compression 0
-
-      - git clone --depth 1 --progress -v  ${CI_REPO_CLONE_SSH_URL}
+      - export GIT_CONFIG_URL="https://cnb:$CNB_ACCK@cnb.cool/blzing/blazing"
+      - echo "🔍 $CNB_ACCK调试： $GIT_CONFIG_URL"
+      - git clone --depth 1 --progress -v  $GIT_CONFIG_URL
      # 拉取代码
  
      - echo "✅ 代码拉取完成"

-  # # ========== 2. 初始化Go环境（依赖prepare：代码拉取完成） ==========
-  # prepare-go:  # 与prepare同级，缩进2个空格
-  #   image: golang:1.25  # 子元素，缩进4个空格
-  #   depends_on: [prepare]  # 子元素，缩进4个空格
-  #   commands:  # 子元素，缩进4个空格
-  #     - go version  # commands内的项，缩进6个空格
-  #     - go mod download -x || { echo "❌ 下载Go依赖失败"; exit 1; }  # 统一缩进6个空格
-  #     - go mod verify || { echo "❌ 验证Go依赖失败"; exit 1; }  # 统一缩进6个空格
-  #     - echo "✅ Go环境初始化完成"  # 统一缩进6个空格
+ 

-  # # ========== 3. 生成版本号（依赖prepare-go：Go环境就绪） ==========
-  # set-version:  # 与prepare-go同级，缩进2个空格
-  #   image: golang:1.25  # 子元素，缩进4个空格
-  #   depends_on: [prepare-go]  # 子元素，缩进4个空格
-  #   commands:  # 子元素，缩进4个空格
-  #     - |  # commands内的项，缩进6个空格
-  #       if [ -n "${CI_COMMIT_TAG}" ]; then
-  #         VERSION="${CI_COMMIT_TAG}"
-  #       else
-  #         VERSION="v$(git rev-parse --short=8 HEAD 2>/dev/null || echo "unknown")"
-  #       fi
-  #       mkdir -p "$(dirname "$CI_ENV_FILE")"
-  #       echo "BUILD_VERSION=${VERSION}" >> "$CI_ENV_FILE"
-  #       echo "✅ 生成版本号：${VERSION}"
-
-  # ========== 4. 编译Go服务（核心依赖：prepare+prepare-go+set-version） ==========
-  build_logic:  # 与set-version同级，缩进2个空格
-    image: golang:1.25  # 子元素，缩进4个空格
-    depends_on: [prepare]  # 子元素，缩进4个空格
-    environment:  # 子元素，缩进4个空格
-      CGO_ENABLED: 0  # environment内的项，缩进6个空格
-      GO111MODULE: on  # 统一缩进6个空格
-      GOSUMDB: off  # 统一缩进6个空格
-    commands:  # 子元素，缩进4个空格
-      - mkdir -p build  # commands内的项，缩进6个空格
-      - BIN_NAME="logic_${CI_STEP_STARTED}"  # 缩进6个空格
-      - |  # 缩进6个空格
+  # ========== 4. 编译Logic服务（完全参考GitHub Actions编译配置） ==========
+  build_logic:
+    image: golang:1.25
+    depends_on: [prepare]
+    environment:
+      CGO_ENABLED: 0
+      GO111MODULE: on
+      GOSUMDB: off
+    commands:
+      - cd blazing
+      - mkdir -p build
+      - BIN_NAME="login_${CI_PIPELINE_CREATED}"
+      - export GO111MODULE=on
+      - export GOPROXY=https://goproxy.cn
+      - |
        go build -v \
-          -p=4 \
+          -p=24 \
          -trimpath \
          -buildvcs=false \
-          -ldflags "-s -w -buildid= -extldflags '-static' -X main.version=${CI_STEP_STARTED}" \
-          -o ./build/${BIN_NAME} \
+          -ldflags "-s -w -buildid= -extldflags '-static'" \
+          -o ./build/$BIN_NAME \
+          ./login
+      - |
+        if [ ! -f ./build/$BIN_NAME ]; then
+          echo "❌ 编译失败：产物$BIN_NAME不存在"
+          exit 1
+        fi
+      - echo "产物名称：$BIN_NAME"
+      - echo "✅ Login服务编译完成"
+      - BIN_NAME="logic_${CI_PIPELINE_CREATED}"
+      - |
+        go build -v \
+          -p=24 \
+          -trimpath \
+          -buildvcs=false \
+          -ldflags "-s -w -buildid= -extldflags '-static'" \
+          -o ./build/$BIN_NAME \
          ./logic
-      - |  # 缩进6个空格
-        if [ ! -f ./build/${BIN_NAME} ]; then
-          echo "❌ 编译失败：产物${BIN_NAME}不存在"
+      - |
+        if [ ! -f ./build/$BIN_NAME ]; then
+          echo "❌ 编译失败：产物$BIN_NAME不存在"
          exit 1
        fi
-      - ls -lh ./build/  # 缩进6个空格
-      - ./build/${BIN_NAME} -v || true  # 缩进6个空格
-      - echo "✅ Go服务编译完成"  # 缩进6个空格
+      - ls -lh ./build/
+      - echo "产物名称：$BIN_NAME"
+      - echo "✅ Logic服务编译完成"
+    # volumes:
+    # - /ext/go/pkg/mod:~/go/pkg/mod
+    # - /ext/.cache/go-build:~/.cache/go-build

-  # ========== 5. 拉取部署配置（可并行，依赖prepare确保代码拉取完成） ==========
-  fetch-deploy-config:  # 与build_logic同级，缩进2个空格
-    image: alpine:latest  # 子元素，缩进4个空格
-    depends_on: [prepare]  # 子元素，缩进4个空格
-    commands:  # 子元素，缩进4个空格
-      - apk add --no-cache curl jq  # commands内的项，缩进6个空格
-      - echo "🔧 拉取部署配置：${JSON_CONFIG_URL}"  # 缩进6个空格
-      - |  # 缩进6个空格
-        for i in 1 2 3; do
-          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配置失败"
-          exit 1
-        fi
-      - |  # 缩进6个空格
-        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/,$//')
-        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
-      - |  # 缩进6个空格
-        if [ -z "$REMOTE_HOSTS" ] || [ -z "$REMOTE_USERS" ]; then
-          echo "❌ 解析配置失败：服务器/用户名为空"
-          cat /tmp/deploy-config.json
-          exit 1
-        fi
-      - echo "✅ 配置解析完成 | 服务器：${REMOTE_HOSTS} | OnlineID：${REMOTE_ONLINE_IDS}"  # 缩进6个空格
-      - echo "REMOTE_HOSTS=${REMOTE_HOSTS}" >> "$CI_ENV_FILE"  # 缩进6个空格
-      - echo "REMOTE_USERS=${REMOTE_USERS}" >> "$CI_ENV_FILE"  # 缩进6个空格
-      - echo "REMOTE_PASSWORDS=${REMOTE_PASSWORDS}" >> "$CI_ENV_FILE"  # 缩进6个空格
-      - echo "REMOTE_ONLINE_IDS=${REMOTE_ONLINE_IDS}" >> "$CI_ENV_FILE"  # 缩进6个空格

  # ========== 6. SCP推送产物（依赖编译+配置解析） ==========
  scp-exe-to-servers:  # 与fetch-deploy-config同级，缩进2个空格
    image: appleboy/drone-scp:1.6.2  # 子元素，缩进4个空格
    settings:  # 子元素，缩进4个空格
-      host: ${REMOTE_HOSTS}  # settings内的项，缩进6个空格
-      username: ${REMOTE_USERS}  # 统一缩进6个空格
-      password: ${REMOTE_PASSWORDS}  # 统一缩进6个空格
-      source: ./build/${BIN_NAME}  # 统一缩进6个空格
-      target: ${REMOTE_EXE_DIR}/  # 统一缩进6个空格
+      host: 103.236.78.60  # settings内的项，缩进6个空格
+      port: 29713
+      username: root  # 统一缩进6个空格
+      password: dgaoXMPC8325  # 统一缩进6个空格
+      source:
+        - blazing/build/**
+      target: /opt/blazing/
      strip_components: 1  # 统一缩进6个空格
      skip_verify: true  # 统一缩进6个空格
      timeout: 30s  # 统一缩进6个空格
    depends_on:  # 子元素，缩进4个空格
      - build_logic  # depends_on内的项，缩进6个空格
-      - fetch-deploy-config  # 统一缩进6个空格
+  start-login-logic:
+    image: appleboy/drone-ssh:1.6.2
+    depends_on: [scp-exe-to-servers]
+    settings:  # 子元素，缩进4个空格
+      host: 103.236.78.60  # settings内的项，缩进6个空格
+      port: 29713
+      username: root  # 统一缩进6个空格
+      password: dgaoXMPC8325  # 统一缩进6个空格
+      script:
+              - |
+                cd /opt/blazing/build
+                ls -t login_* 2>/dev/null | head -1
+                BIN_NAME=$(ls -t login_* 2>/dev/null | head -1)
+                echo "BIN_NAME: $BIN_NAME"
+                if [ -z "$BIN_NAME" ]; then
+                  echo "❌ 未找到可执行的login文件"
+                  exit 1
+                fi
+                echo "📦 启动Login服务 | Binary: $BIN_NAME"
+                # 停止旧的screen会话
+                session_name="login"
+                session=$(screen -ls 2>/dev/null | grep -o "[0-9]*\.$session_name" || true)
+                if [[ ! -z "$session" ]]; then
+                  screen -X -S $session_name stuff "^C"
+                  expect -c "exec screen -x $session_name; wait; exit" 2>/dev/null || true
+                  screen -X -S $session_name quit 2>/dev/null || true
+                  echo "Info: Stopped login app."
+                fi
+                sleep 1
+                # 启动新进程
+                screen -dmS $session_name ./$BIN_NAME
+  
+                echo "✅ Login服务启动成功 | Screen: $session_name"
+                # 等待服务启动并进行健康检查
+                sleep 3
+                if screen -list 2>/dev/null | grep -q "$session_name"; then
+                  echo "✅ 服务健康检查通过 | Screen: $session_name"
+                else
+                  echo "❌ 服务健康检查失败 | Screen: $session_name 不存在"
+                  exit 1
+                fi
+                # 移动logic产物到public目录
+                LOGIC_BIN=$(ls -t logic_* 2>/dev/null | head -1)
+                if [ -n "$LOGIC_BIN" ]; then
+                  mkdir -p /opt/blazing/build/public
+                  mv $LOGIC_BIN /opt/blazing/build/public/
+                  echo "✅ Logic产物已移动到 /opt/blazing/build/public/ | 文件: $(basename $LOGIC_BIN)"
+                else
+                  echo "⚠️ 未找到Logic产物"
+                fi