diff --git a/.gitea/workflows/develop_3.1_MS_build_manual.yaml b/.gitea/workflows/develop_3.1_MS_build_manual.yaml index d5a594be..9c38479b 100644 --- a/.gitea/workflows/develop_3.1_MS_build_manual.yaml +++ b/.gitea/workflows/develop_3.1_MS_build_manual.yaml @@ -15,7 +15,7 @@ jobs: packages: write env: - REMOTE_DEPLOY_PATH: /workspace/workspace_aida/DevelopVersion/develop-MS-version-aida-back + REMOTE_DEPLOY_PATH: /workspace/workspace_aida/DevelopVersion/develop-MS-version-aida-back-test steps: - name: 0.记录开始时间 @@ -78,68 +78,79 @@ jobs: echo "docker-compose.yml内容:" cat docker-compose.yml - - name: 7.安装SSH工具 - run: | - $SUDO apt install -y sshpass openssh-client --no-install-recommends - # 配置SSH免密 - mkdir -p ~/.ssh - echo "${{ secrets.SSH_KEY }}" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - ssh-keyscan -H ${{ secrets.SERVER_HOST }} >> ~/.ssh/known_hosts - - - name: 8.同步文件到远程服务器 - run: | - echo "===== 同步文件到远程服务器 =====" - # 使用scp同步文件 - scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ - ./target/*.jar ./Dockerfile ./docker-compose.yml \ - ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}:${{ env.REMOTE_DEPLOY_PATH }} 2>&1 - - - name: 9.部署和运行服务 - run: | - echo "===== 开始部署服务 =====" - # SSH执行部署命令 - ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ - ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF_SSH' - cd ${{ env.REMOTE_DEPLOY_PATH }} - echo "停止旧容器..." - docker compose down || true - echo "清理Docker资源..." - docker system prune -f - echo "构建镜像..." - docker compose build --no-cache - echo "启动服务..." - docker compose up -d - echo "验证容器状态..." - docker compose ps - echo "部署完成!" - EOF_SSH - - - name: 10.发送构建结果邮件 - if: always() # 无论上一步是否失败,都执行此步骤 - uses: dawidd6/action-send-mail@v3 + - name: 上传jar到远程服务器 + uses: appleboy/scp-action@v0.17.0 with: + host: ${{ secrets.SERVER_HOST }} + port: 22 + username: ${{ secrets.SERVER_USER }} + key: ${{ secrets.SSH_PRIVATE_KEY }} + source: target/*.jar + target: ${{ env.REMOTE_DEPLOY_PATH }} + strip_components: 1 - from: ${{ secrets.MAIL_USERNAME }} - # --- 邮件配置 --- - server_address: smtp.gmail.com # 替换为你的SMTP服务器地址 - server_port: 465 # 替换为你的SMTP端口 (通常是465或587) - username: ${{ secrets.MAIL_USERNAME }} # 存储在Secrets中的邮箱用户名 - password: ${{ secrets.MAIL_PASSWORD }} # 存储在Secrets中的邮箱密码 - subject: 'Gitea Actions 构建通知: ${{ job.status }} - AiDA back-java Develop' - # 收件人列表,可以根据需要更改 - to: 'cgzhou@aidlab.hk,zchengrong@yeah.net' # 替换为实际收件人邮箱 + # - name: 7.安装SSH工具 + # run: | + # $SUDO apt install -y sshpass openssh-client --no-install-recommends + # # 配置SSH免密 + # mkdir -p ~/.ssh + # echo "${{ secrets.SSH_KEY }}" > ~/.ssh/id_rsa + # chmod 600 ~/.ssh/id_rsa + # ssh-keyscan -H ${{ secrets.SERVER_HOST }} >> ~/.ssh/known_hosts - # --- 邮件正文内容 --- - body: | - 项目: AiDA back-java Develop - 分支: dev/3.1_release_merge_MS + # - name: 8.同步文件到远程服务器 + # run: | + # echo "===== 同步文件到远程服务器 =====" + # # 使用scp同步文件 + # scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ + # ./target/*.jar ./Dockerfile ./docker-compose.yml \ + # ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}:${{ env.REMOTE_DEPLOY_PATH }} 2>&1 - 🎉 构建结果: ${{ job.status }} + # - name: 9.部署和运行服务 + # run: | + # echo "===== 开始部署服务 =====" + # # SSH执行部署命令 + # ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ + # ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF_SSH' + # cd ${{ env.REMOTE_DEPLOY_PATH }} + # echo "停止旧容器..." + # docker compose down || true + # echo "清理Docker资源..." + # docker system prune -f + # echo "构建镜像..." + # docker compose build --no-cache + # echo "启动服务..." + # docker compose up -d + # echo "验证容器状态..." + # docker compose ps + # echo "部署完成!" + # EOF_SSH - 📅 构建时间: ${{ steps.build_start_time.outputs.current_time }} + # - name: 10.发送构建结果邮件 + # if: always() # 无论上一步是否失败,都执行此步骤 + # uses: dawidd6/action-send-mail@v3 + # with: - 🔗 构建链接: ${{ gitea.server_url }}/${{ gitea.repository.owner.name }}/${{ gitea.repository.name }}/actions/runs/${{ gitea.run_id }} + # from: ${{ secrets.MAIL_USERNAME }} + # # --- 邮件配置 --- + # server_address: smtp.gmail.com # 替换为你的SMTP服务器地址 + # server_port: 465 # 替换为你的SMTP端口 (通常是465或587) + # username: ${{ secrets.MAIL_USERNAME }} # 存储在Secrets中的邮箱用户名 + # password: ${{ secrets.MAIL_PASSWORD }} # 存储在Secrets中的邮箱密码 + # subject: 'Gitea Actions 构建通知: ${{ job.status }} - AiDA back-java Develop' + # # 收件人列表,可以根据需要更改 + # to: 'cgzhou@aidlab.hk,zchengrong@yeah.net' # 替换为实际收件人邮箱 - # 确保邮件内容为纯文本,或者你可以设置为 html: true 并调整 body - content_type: text/plain \ No newline at end of file + # # --- 邮件正文内容 --- + # body: | + # 项目: AiDA back-java Develop + # 分支: dev/3.1_release_merge_MS + + # 🎉 构建结果: ${{ job.status }} + + # 📅 构建时间: ${{ steps.build_start_time.outputs.current_time }} + + # 🔗 构建链接: ${{ gitea.server_url }}/${{ gitea.repository.owner.name }}/${{ gitea.repository.name }}/actions/runs/${{ gitea.run_id }} + + # # 确保邮件内容为纯文本,或者你可以设置为 html: true 并调整 body + # content_type: text/plain \ No newline at end of file