From 9e5ba17dc409b8ac4481f62d7b1dea6e25cb4963 Mon Sep 17 00:00:00 2001
From: litianxiang <litianxiangxtt@163.com>
Date: Wed, 6 May 2026 17:23:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflows/master_sellrt_build_manual.yaml | 45 ++++---------------
 1 file changed, 8 insertions(+), 37 deletions(-)

diff --git a/.gitea/workflows/master_sellrt_build_manual.yaml b/.gitea/workflows/master_sellrt_build_manual.yaml
index 635fa02..e2962fd 100644
--- a/.gitea/workflows/master_sellrt_build_manual.yaml
+++ b/.gitea/workflows/master_sellrt_build_manual.yaml
@@ -14,7 +14,7 @@ jobs:
       packages: write
 
     env:
-      REMOTE_DEPLOY_PATH: /workspace/workspace_aida/DevelopVersion/develop-MS-version-aida-back
+      REMOTE_DEPLOY_PATH: /workspace/workspace_aida/DevelopVersion/master-aida-seller-back
 
     steps:
       - name: 0.记录开始时间
@@ -24,7 +24,7 @@ jobs:
       - name: 1.检出代码
         uses: actions/checkout@v4
         with:
-          ref: dev/3.1_release_merge_MS
+          ref: master
 
       - name: 2.Set up JDK 21
         uses: actions/setup-java@v5
@@ -64,7 +64,7 @@ jobs:
               # 新增：打印当前构建分支（两种方式双重确认）
           echo "当前工作目录分支：$(git branch --show-current)"
           echo "Gitea检出分支:${{ github.ref_name }}"
-          echo "预期构建分支:dev/3.1_release_merge_MS"
+          echo "预期构建分支: master"
           echo "========================"
           mvn -B clean install -DskipTests -Pdev 2>&1
           # 检查构建是否成功
@@ -81,7 +81,7 @@ jobs:
           VOLUME /tmp
           RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
           RUN echo 'Asia/Shanghai' > /etc/timezone
-          ADD ./aida-0.0.1-SNAPSHOT.jar /app.jar
+          ADD ./aida-seller-1.0.0.jar /app.jar
           ENTRYPOINT ["java","-jar","/app.jar"]
           EOF
           echo "Dockerfile内容:"
@@ -93,8 +93,8 @@ jobs:
           cat > docker-compose.yml << 'EOF'
           version: '3'
           services:
-            aida_back:
-              container_name: develop-aida-ms
+            master-aida-seller:
+              container_name: master-aida-seller
               build: .
               volumes:
                 # 数据挂载
@@ -102,7 +102,7 @@ jobs:
                 - ./temp:/temp
                 - ./uploads:/temp/uploads
               ports:
-                - '10092:10092'
+                - '10093:10093'
               networks:
                 - aida_java_net
               restart: always
@@ -148,33 +148,4 @@ jobs:
             echo "验证容器状态..."
             docker compose ps
             echo "部署完成！"
-          EOF_SSH
-
-      - name: 10.发送构建结果邮件
-        if: always() # 无论上一步是否失败，都执行此步骤
-        uses: dawidd6/action-send-mail@v3
-        with:
-
-          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' # 替换为实际收件人邮箱
-
-          # --- 邮件正文内容 ---
-          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
+          EOF_SSH
\ No newline at end of file