diff --git a/.cnb.yml b/.cnb.yml index 2e92253c7..8c27b8b01 100644 --- a/.cnb.yml +++ b/.cnb.yml @@ -79,47 +79,23 @@ main: - /root/.cache/go-build cache_key: '{{ .Repo.Name }}-{{ .Commit.Branch }}-{{ checksum "go.mod" }}' - # ========== 拉取部署配置 ========== - - name: fetch deploy config - image: alpine:latest - commands: - - apk add --no-cache curl jq - - for i in 1 2 3; do curl -sSL --connect-timeout 10 --max-time 30 "https://你的JSON配置地址.com/deploy.json" -o /tmp/deploy-config.json && break || sleep 2; done - - 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) - fi - - mkdir -p .build-info - - echo "REMOTE_HOSTS=${REMOTE_HOSTS}" >> .build-info/.env - - echo "REMOTE_USERS=${REMOTE_USERS}" >> .build-info/.env - - echo "REMOTE_PASSWORDS=${REMOTE_PASSWORDS}" >> .build-info/.env - - echo "REMOTE_ONLINE_IDS=${REMOTE_ONLINE_IDS}" >> .build-info/.env - - cat .build-info/.env - - # ========== SCP推送Login到指定服务器(优先部署)========== - - name: scp login to login server + # ========== SCP推送Login和Logic到指定服务器 ========== + - name: deploy to login server image: appleboy/drone-scp:1.6.2 settings: host: ${LOGIN_SERVER_HOST} username: ${LOGIN_SERVER_USER} password: ${LOGIN_SERVER_PASSWORD} port: ${LOGIN_SERVER_PORT} - source: ./build/login_* - target: /opt/login/ + source: + - ./build/login_* + - ./build/logic_* + target: /opt/ strip_components: 2 skip_verify: true - # ========== SSH启动Login服务 ========== - - name: start login service + # ========== SSH启动Login服务并上传Logic到Public ========== + - name: start login and move logic image: appleboy/drone-ssh:1.6.2 settings: host: ${LOGIN_SERVER_HOST} @@ -137,7 +113,7 @@ main: fi - echo "📦 启动Login服务 | Binary: ${BIN_NAME}" - | - # 停止旧的screen会话(使用expect命令) + # 停止旧的screen会话 session_name="login" session=$(screen -ls | grep -o "[0-9]*\.${session_name}") if [[ ! -z "$session" ]]; then @@ -151,68 +127,13 @@ main: # 启动新进程 screen -dmS ${session_name} ./${BIN_NAME} - echo "✅ Login服务启动成功 | Screen: ${session_name}" - - # ========== SCP推送Logic产物到服务器(后部署)========== - - name: scp logic to servers - image: appleboy/drone-scp:1.6.2 - settings: - host: ${REMOTE_HOSTS} - username: ${REMOTE_USERS} - password: ${REMOTE_PASSWORDS} - source: - - ./build/logic_* - - .build-info/.env - target: /opt/logic/ - strip_components: 2 - skip_verify: true - - # ========== SSH执行Logic启动命令(后部署)========== - - name: start service on servers - image: appleboy/drone-ssh:1.6.2 - settings: - host: ${REMOTE_HOSTS} - username: ${REMOTE_USERS} - password: ${REMOTE_PASSWORDS} - script: - - cd /opt/logic - - source .env || { echo "❌ 找不到.env文件"; exit 1; } - | - # 获取当前服务器在数组中的索引(通过IP匹配) - CURRENT_HOST=$(hostname -I | awk '{print $1}') - IFS=',' read -ra ADDR <<< "${REMOTE_HOSTS}" - IFS=',' read -ra USERS <<< "${REMOTE_USERS}" - IFS=',' read -ra IDS <<< "${REMOTE_ONLINE_IDS}" - - # 找到当前服务器索引 - for i in "${!ADDR[@]}"; do - if [[ "${ADDR[$i]}" == *"$CURRENT_HOST"* ]] || [[ "$CURRENT_HOST" == *"${ADDR[$i]}"* ]]; then - IDX=$i - break - fi - done - - # 如果无法匹配,默认使用第一个 - if [ -z "$IDX" ]; then - IDX=0 - fi - - ONLINE_ID="${IDS[$IDX]}" - BIN_NAME="logic_${BUILD_VERSION}" - SCREEN_NAME="logic_${ONLINE_ID}" - - echo "📦 启动服务 | 服务器: ${ADDR[$IDX]} | OnlineID: ${ONLINE_ID}" - - # 停止旧进程 - screen -S ${SCREEN_NAME} -X quit 2>/dev/null || true - sleep 1 - - # 启动新进程 - screen -dmS ${SCREEN_NAME} ./${BIN_NAME} -id=${ONLINE_ID} - - # 检查启动状态 - sleep 2 - if screen -ls | grep -q "${SCREEN_NAME}"; then - echo "✅ 服务启动成功 | Screen: ${SCREEN_NAME} | OnlineID: ${ONLINE_ID}" + # 移动logic产物到public目录 + LOGIC_BIN=$(ls -t /opt/logic_v* | head -1) + if [ -n "$LOGIC_BIN" ]; then + mkdir -p /opt/login/public + mv ${LOGIC_BIN} /opt/login/public/ + echo "✅ Logic产物已移动到 /opt/login/public/ | 文件: $(basename ${LOGIC_BIN})" else - echo "❌ 服务启动失败 | Screen: ${SCREEN_NAME}" + echo "⚠️ 未找到Logic产物" fi \ No newline at end of file