Sync upstream repo and enhance build workflow

Updated upstream repository and refined build process.

Author: Arbousier1

.github/workflows/main.yml

@@ -2,7 +2,6 @@ name: Auto Sync Upstream & Build
 
 on:
   schedule:
-    # 每天凌晨 2 点检查上游更新
     - cron: '0 2 * * *'
   workflow_dispatch:
     inputs:
@@ -12,9 +11,8 @@ on:
         default: 'false'
 
 env:
-  UPSTREAM_REPO: PQguanfang/UltimateShop
+  UPSTREAM_REPO: ManyouTeam/UltimateShop
   JAVA_VERSION: '21'
-  MAVEN_VERSION: '3.9.6'
 
 jobs:
   sync-and-build:
@@ -38,19 +36,15 @@ jobs:
       - name: Check for upstream changes
         id: check_changes
         run: |
-          # 获取上游最新提交
           UPSTREAM_SHA=$(git rev-parse upstream/master)
           LOCAL_SHA=$(git rev-parse origin/master)
-          
           echo "Upstream SHA: $UPSTREAM_SHA"
           echo "Local SHA: $LOCAL_SHA"
-          
           if [ "$UPSTREAM_SHA" = "$LOCAL_SHA" ] && [ "${{ github.event.inputs.force_build }}" != "true" ]; then
             echo "No upstream changes detected"
             echo "has_changes=false" >> $GITHUB_OUTPUT
             exit 0
           fi
-          
           echo "Upstream changes detected!"
           echo "has_changes=true" >> $GITHUB_OUTPUT
           echo "upstream_sha=$UPSTREAM_SHA" >> $GITHUB_OUTPUT
@@ -60,68 +54,29 @@ jobs:
         run: |
           git config user.name "GitHub Actions Bot"
           git config user.email "actions@github.com"
-          
-          # 创建临时分支进行合并
           git checkout -b temp-merge upstream/master
-          
-          # 保存我们的 pom.xml 修改
           cp pom.xml /tmp/our-pom.xml
-          
-          # 尝试合并到 master
           git checkout master
-          
-          # 使用 ort 合并策略，优先保留我们的 pom.xml 修改
           git merge temp-merge -m "Merge upstream changes" || true
-          
-          # 如果 pom.xml 有冲突，使用智能合并
           if git diff --name-only --diff-filter=U | grep -q "^pom.xml$"; then
             echo "Resolving pom.xml conflicts intelligently..."
-            
-            # 提取上游 pom.xml 的关键版本信息
             git show upstream/master:pom.xml > /tmp/upstream-pom.xml
-            
-            # 使用 Python 进行智能合并
             python3 << 'PYTHON_SCRIPT'
-          import xml.etree.ElementTree as ET
-          import re
-          import sys
-
-          def parse_pom(filepath):
-              """解析 pom.xml 文件"""
-              tree = ET.parse(filepath)
-              return tree.getroot()
-
-          def get_plugin_version(root, group_id, artifact_id):
-              """获取插件版本"""
-              ns = {'maven': 'http://maven.apache.org/POM/4.0.0'}
-              for plugin in root.findall('.//maven:plugin', ns):
-                  gid = plugin.find('maven:groupId', ns)
-                  aid = plugin.find('maven:artifactId', ns)
-                  ver = plugin.find('maven:version', ns)
-                  if gid is not None and aid is not None and ver is not None:
-                      if gid.text == group_id and aid.text == artifact_id:
-                          return ver.text
-              return None
-
-          def smart_merge_pom(our_file, upstream_file, output_file):
-              """智能合并 pom.xml"""
-              
-              with open(our_file, 'r', encoding='utf-8') as f:
-                  our_content = f.read()
-              
-              with open(upstream_file, 'r', encoding='utf-8') as f:
-                  upstream_content = f.read()
-              
-              # 保留我们的关键修复（这些修复是为了解决 GitHub Actions 构建问题）
-              critical_fixes = {
-                  # flatten-maven-plugin 版本升级
-                  (r'<artifactId>flatten-maven-plugin</artifactId>\s*<version>1\.3\.0</version>',
-                   '<artifactId>flatten-maven-plugin</artifactId>\n                <version>1.6.0</version>'): 
-                  "Upgrade flatten plugin for Maven 3.9.6 compatibility",
-                  
-                  # 确保我们的 jar 插件配置存在（GitHub Actions 中只需要 jar 插件，不需要 surefire 跳过测试）
-                  (r'(</flatten-maven-plugin>\s*</plugin>)',
-                   r'''\1
+import re
+import sys
+
+def smart_merge_pom(our_file, upstream_file, output_file):
+    with open(our_file, 'r', encoding='utf-8') as f:
+        our_content = f.read()
+    with open(upstream_file, 'r', encoding='utf-8') as f:
+        upstream_content = f.read()
+
+    critical_fixes = {
+        (r'<artifactId>flatten-maven-plugin</artifactId>\s*<version>1\.3\.0</version>',
+         '<artifactId>flatten-maven-plugin</artifactId>\n                <version>1.6.0</version>'):
+        "Upgrade flatten plugin for Maven 3.9.6 compatibility",
+        (r'(</flatten-maven-plugin>\s*</plugin>)',
+         r'''\1
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -153,68 +108,56 @@ jobs:
                         <version>1.20</version>
                     </dependency>
                 </dependencies>
-            </plugin>'''): 
-                  "Add jar plugin configuration with required dependencies"
-              }
-              
-              merged_content = our_content
-              
-              # 检查上游是否有新的依赖或仓库配置，合并进来
-              # 提取上游的 repositories 和 dependencies
-              upstream_repos = re.search(r'<repositories>(.*?)</repositories>', upstream_content, re.DOTALL)
-              our_repos = re.search(r'<repositories>(.*?)</repositories>', our_content, re.DOTALL)
-              
-              if upstream_repos and our_repos:
-                  # 提取上游独有的仓库
-                  upstream_repo_list = re.findall(r'<repository>.*?</repository>', upstream_repos.group(1), re.DOTALL)
-                  our_repo_list = re.findall(r'<repository>.*?</repository>', our_repos.group(1), re.DOTALL)
-                  
-                  our_repo_ids = set()
-                  for repo in our_repo_list:
-                      match = re.search(r'<id>(.*?)</id>', repo)
-                      if match:
-                          our_repo_ids.add(match.group(1))
-                  
-                  new_repos = []
-                  for repo in upstream_repo_list:
-                      match = re.search(r'<id>(.*?)</id>', repo)
-                      if match and match.group(1) not in our_repo_ids:
-                          new_repos.append(repo)
-                  
-                  if new_repos:
-                      print(f"Adding {len(new_repos)} new repositories from upstream")
-                      new_repos_str = '\n        '.join(new_repos)
-                      merged_content = re.sub(
-                          r'(</repositories>)',
-                          f'        {new_repos_str}\n    </repositories>',
-                          merged_content
-                      )
-              
-              # 应用关键修复
-              for pattern, replacement in critical_fixes.items():
-                  if isinstance(pattern, tuple):
-                      merged_content = re.sub(pattern[0], replacement, merged_content)
-                  else:
-                      merged_content = re.sub(pattern, replacement, merged_content)
-              
-              with open(output_file, 'w', encoding='utf-8') as f:
-                  f.write(merged_content)
-              
-              print("Smart merge completed")
-              return True
-
-          if __name__ == '__main__':
-              success = smart_merge_pom('/tmp/our-pom.xml', '/tmp/upstream-pom.xml', 'pom.xml')
-              sys.exit(0 if success else 1)
-          PYTHON_SCRIPT
-            
+            </plugin>'''):
+        "Add jar plugin configuration with required dependencies"
+    }
+
+    merged_content = our_content
+
+    upstream_repos = re.search(r'<repositories>(.*?)</repositories>', upstream_content, re.DOTALL)
+    our_repos = re.search(r'<repositories>(.*?)</repositories>', our_content, re.DOTALL)
+
+    if upstream_repos and our_repos:
+        upstream_repo_list = re.findall(r'<repository>.*?</repository>', upstream_repos.group(1), re.DOTALL)
+        our_repo_list = re.findall(r'<repository>.*?</repository>', our_repos.group(1), re.DOTALL)
+        our_repo_ids = set()
+        for repo in our_repo_list:
+            match = re.search(r'<id>(.*?)</id>', repo)
+            if match:
+                our_repo_ids.add(match.group(1))
+        new_repos = []
+        for repo in upstream_repo_list:
+            match = re.search(r'<id>(.*?)</id>', repo)
+            if match and match.group(1) not in our_repo_ids:
+                new_repos.append(repo)
+        if new_repos:
+            print(f"Adding {len(new_repos)} new repositories from upstream")
+            new_repos_str = '\n        '.join(new_repos)
+            merged_content = re.sub(
+                r'(</repositories>)',
+                f'        {new_repos_str}\n    </repositories>',
+                merged_content
+            )
+
+    for pattern, replacement in critical_fixes.items():
+        if isinstance(pattern, tuple):
+            merged_content = re.sub(pattern[0], replacement, merged_content)
+        else:
+            merged_content = re.sub(pattern, replacement, merged_content)
+
+    with open(output_file, 'w', encoding='utf-8') as f:
+        f.write(merged_content)
+    print("Smart merge completed")
+    return True
+
+if __name__ == '__main__':
+    success = smart_merge_pom('/tmp/our-pom.xml', '/tmp/upstream-pom.xml', 'pom.xml')
+    sys.exit(0 if success else 1)
+PYTHON_SCRIPT
             git add pom.xml
             git commit -m "Smart merge: resolve pom.xml conflicts with upstream" -m "- Preserved GitHub Actions build fixes" -m "- Merged new repositories from upstream" -m "- Kept flatten-maven-plugin at 1.6.0 for compatibility" -m "- Maintained jar plugin configuration with required dependencies"
           fi
-          
-          # 清理临时分支
           git branch -D temp-merge || true
-          
           echo "Merge completed successfully"
 
       - name: Setup Java
@@ -225,25 +168,14 @@ jobs:
           distribution: 'temurin'
           cache: maven
 
-      - name: Setup Maven
-        if: steps.check_changes.outputs.has_changes == 'true' || github.event.inputs.force_build == 'true'
-        run: |
-          wget -q https://dlcdn.apache.org/maven/maven-3/${{ env.MAVEN_VERSION }}/binaries/apache-maven-${{ env.MAVEN_VERSION }}-bin.tar.gz
-          tar -xzf apache-maven-${{ env.MAVEN_VERSION }}-bin.tar.gz
-          sudo mv apache-maven-${{ env.MAVEN_VERSION }} /opt/maven
-          sudo ln -sf /opt/maven/bin/mvn /usr/local/bin/mvn
-          mvn -version
-
       - name: Build with Maven
         if: steps.check_changes.outputs.has_changes == 'true' || github.event.inputs.force_build == 'true'
         run: |
-          # GitHub Actions 环境可以正常下载依赖，不需要跳过测试
           mvn clean package -B
-          
-          # 检查构建结果
-          if [ -f "plugin/target/UltimateShop-*.jar" ]; then
+          JAR_FILE=$(find plugin/target -name "UltimateShop-*.jar" ! -name "*sources.jar" ! -name "*javadoc.jar" | head -1)
+          if [ -n "$JAR_FILE" ]; then
             echo "Build successful!"
-            ls -lh plugin/target/*.jar
+            ls -lh "$JAR_FILE"
           else
             echo "Build failed - no JAR file found"
             exit 1
@@ -268,9 +200,7 @@ jobs:
           name: Auto Build - ${{ steps.check_changes.outputs.upstream_sha }}
           body: |
             Automated build after syncing with upstream ${{ env.UPSTREAM_REPO }}
-            
             Upstream Commit: ${{ steps.check_changes.outputs.upstream_sha }}
-            Build Date: ${{ github.event.repository.updated_at }}
           files: |
             plugin/target/UltimateShop-*.jar
           draft: false
@@ -287,11 +217,9 @@ jobs:
       - name: Notify on success
         if: success() && (steps.check_changes.outputs.has_changes == 'true' || github.event.inputs.force_build == 'true')
         run: |
-          echo "✅ Build completed successfully!"
-          echo "📦 Artifact: UltimateShop-*.jar"
-          echo "🏷️  Release: v${{ github.run_number }}-${{ steps.check_changes.outputs.upstream_sha }}"
+          echo "Build completed successfully!"
 
       - name: Notify on no changes
         if: steps.check_changes.outputs.has_changes == 'false'
         run: |
-          echo "ℹ️ No upstream changes detected. Skipping build."
+          echo "No upstream changes detected. Skipping build."