diff --git a/.gitea/workflows/master_sellrt_build_manual.yaml b/.gitea/workflows/master_sellrt_build_manual.yaml
index 9d50316..635fa02 100644
--- a/.gitea/workflows/master_sellrt_build_manual.yaml
+++ b/.gitea/workflows/master_sellrt_build_manual.yaml
@@ -4,8 +4,7 @@ on:
 
 jobs:
   build_and_deploy:
-    runs-on: java21
-
+    runs-on: ubuntu-latest
     outputs:
       build_status: ${{ job.status }}
       build_url: ${{ gitea.server_url }}/${{ gitea.repository.owner.name }}/${{ gitea.repository.name }}/actions/runs/${{ gitea.run_id }}
@@ -15,7 +14,7 @@ jobs:
       packages: write
 
     env:
-      REMOTE_DEPLOY_PATH: /workspace/workspace_aida/DevelopVersion/master-aida-seller-back
+      REMOTE_DEPLOY_PATH: /workspace/workspace_aida/DevelopVersion/develop-MS-version-aida-back
 
     steps:
       - name: 0.记录开始时间
@@ -25,22 +24,54 @@ jobs:
       - name: 1.检出代码
         uses: actions/checkout@v4
         with:
-          ref: master
+          ref: dev/3.1_release_merge_MS
 
-
-      - name: 3.缓存 Maven 依赖
-        uses: actions/cache@v5
+      - name: 2.Set up JDK 21
+        uses: actions/setup-java@v5
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+          java-version: '21'
+          distribution: 'temurin'
 
-      - name: 4.构建项目
+      - name: 3.设置JAVA Maven 环境
         run: |
-          java -version
-          mvn -v
-          mvn clean package -DskipTests
+          # 适配root/普通用户
+          SUDO=""
+          [ "$(id -u)" != "0" ] && SUDO="sudo"
+
+          # 安装依赖
+          $SUDO apt update && $SUDO apt install -y wget tar --no-install-recommends
+
+          # 下载Maven
+          MAVEN_VERSION="3.9.11"
+          MAVEN_TAR="apache-maven-${MAVEN_VERSION}-bin.tar.gz"
+          MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_TAR}"
+          wget --no-verbose -O /tmp/${MAVEN_TAR} ${MAVEN_URL}
+
+          # 解压+软链接
+          $SUDO tar -xzf /tmp/${MAVEN_TAR} -C /usr/local/
+          $SUDO ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/maven
+
+          # 配置PATH
+          echo "/usr/local/maven/bin" >> $GITHUB_PATH
+          export PATH="/usr/local/maven/bin:$PATH"
+
+          # 验证
+          mvn -v 
+
+      - name: 4.构建jar包
+        run: |
+          echo "===== 开始构建JAR包 ====="
+              # 新增：打印当前构建分支（两种方式双重确认）
+          echo "当前工作目录分支：$(git branch --show-current)"
+          echo "Gitea检出分支:${{ github.ref_name }}"
+          echo "预期构建分支:dev/3.1_release_merge_MS"
+          echo "========================"
+          mvn -B clean install -DskipTests -Pdev 2>&1
+          # 检查构建是否成功
+          if [ $? -ne 0 ]; then
+          echo "JAR包构建失败!"
+          exit 1
+          fi
 
       - name: 5.生成Dockerfile
         run: |
@@ -50,7 +81,7 @@ jobs:
           VOLUME /tmp
           RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
           RUN echo 'Asia/Shanghai' > /etc/timezone
-          ADD ./aida-seller-1.0.0.jar /app.jar
+          ADD ./aida-0.0.1-SNAPSHOT.jar /app.jar
           ENTRYPOINT ["java","-jar","/app.jar"]
           EOF
           echo "Dockerfile内容:"
@@ -62,8 +93,8 @@ jobs:
           cat > docker-compose.yml << 'EOF'
           version: '3'
           services:
-            master-aida-seller:
-              container_name: master-aida-seller
+            aida_back:
+              container_name: develop-aida-ms
               build: .
               volumes:
                 # 数据挂载
@@ -71,41 +102,79 @@ jobs:
                 - ./temp:/temp
                 - ./uploads:/temp/uploads
               ports:
-                - '10093:10093'
+                - '10092:10092'
+              networks:
+                - aida_java_net
               restart: always
+          networks:
+            aida_java_net:
+              external: true
+              name: aida_java_net
           EOF
           # 验证docker-compose.yml生成
           echo "docker-compose.yml内容:"
           cat docker-compose.yml
 
-      - name: 7.上传jar到远程服务器
-        uses: appleboy/scp-action@master
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          port: 22
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          source: "target/*.jar,Dockerfile,docker-compose.yml"
-          target: ${{ env.REMOTE_DEPLOY_PATH }}
-          preserve_host_directory_structure: false
+      - 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. 重启 Docker 服务
-        uses: appleboy/ssh-action@master   # 👈 专门执行命令的 action
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          key_base64: true
-          script: |
-            echo "========= 进入部署目录 ========="
+      - 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 }}
-            ls -l
-            
-            echo "========= 停止旧服务 ========="
-            docker compose down
-            
-            echo "========= 启动新服务 ========="
-            docker compose up -d --build
-            
-            echo "========= 查看运行状态 ========="
-            docker compose ps
\ No newline at end of file
+            echo "停止旧容器..."
+            docker compose down || true
+            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
+        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
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index a8ff19d..35c4763 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <include resource="org/springframework/boot/logging/logback/defaults.xml" />
 
     <!-- 日志存放路径（可通过环境变量覆盖） -->
-    <property name="log.path" value="${LOG_PATH:-./log}" />
+    <property name="log.path" value="./log" />
     <!-- 各服务独立文件名 -->
     <property name="log.file.name" value="aida-seller" />