Merge pull request #6 from 3944Realms/rebuild-develop

Rebuild develop

Author: 3944Realms

.github/workflows/build-and-release.yml

@@ -3,16 +3,13 @@ name: Build and Release
 on:
   push:
     branches:
-      - "rebuild-develop"   # develop分支
-      - "rebuild-release"   # release 分支
-    tags:
-      - 'build-*'  # 打 tag 时跑 build + release
+      - "rebuild-develop"   # develop 分支只构建
+      - "rebuild-release"   # release 分支构建 + 发布
   workflow_dispatch: # 允许手动触发
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -32,8 +29,8 @@ jobs:
       - name: Upload common jar
         uses: actions/upload-artifact@v4
         with:
-            name: Common
-            path: Common/build/libs/*.jar
+          name: Common
+          path: Common/build/libs/*.jar
 
       - name: Upload common api jar
         uses: actions/upload-artifact@v4
@@ -44,40 +41,38 @@ jobs:
   release:
     needs: build
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/build-')  # 只有打 tag 才执行 release
+    if: github.ref_name == 'rebuild-release'  # 仅在 release 分支执行 release job
     steps:
-      # 下载 Common JAR
+      # 下载构建产物
       - name: Download Common artifact
         uses: actions/download-artifact@v4
         with:
           name: Common
           path: ./build-artifacts/Common
 
-      # 下载 CommonApi JAR
       - name: Download CommonApi artifact
         uses: actions/download-artifact@v4
         with:
           name: CommonApi
           path: ./build-artifacts/CommonApi
 
-      # 创建 Release
+      # 创建 GitHub Release
       - name: Create GitHub Release
         id: create_release
         uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ github.ref_name }}
-          name: Release ${{ github.ref_name }}
-          body: |
-            自动发布所有子项目构建产物。
+          tag_name: "release-${{ github.run_number }}"  # 可用 run_number 或自定义版本号
+          name: Release ${{ github.run_number }}
+          body: 自动发布所有子项目构建产物
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # 上传各子项目 JAR 到 Release
-      - name: Upload jars to Release separately
+      # 上传子项目 JAR
+      - name: Upload jars to Release
         run: |
           for file in ./build-artifacts/**/*.jar; do
             echo "Uploading $file"
-            gh release upload "${GITHUB_REF_NAME}" "$file" --repo "${GITHUB_REPOSITORY}" --clobber
+            gh release upload "release-${GITHUB_RUN_NUMBER}" "$file" --repo "${GITHUB_REPOSITORY}" --clobber
           done
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.idea/misc.xml

@@ -25,19 +25,6 @@ repositories {
 dependencies {
     // Common 依赖 CommonApi
     api project(':CommonApi')
-
-    implementation 'org.apache.logging.log4j:log4j-core:2.23.1'
-    implementation 'org.apache.logging.log4j:log4j-api:2.23.1'
-    implementation 'org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1'
-    implementation 'org.realityforge.org.jetbrains.annotations:org.jetbrains.annotations:1.7.0'
-    implementation 'org.apache.commons:commons-lang3:3.17.0'
-    implementation 'com.google.guava:guava:33.3.0-jre'
-    implementation 'io.netty:netty-all:4.1.109.Final'
-    implementation 'com.google.code.gson:gson:2.10.1'
-    implementation 'org.slf4j:slf4j-api:2.0.16'
-
-    testImplementation platform('org.junit:junit-bom:5.10.0')
-    testImplementation 'org.junit.jupiter:junit-jupiter'
 }
 
 // Sources JAR

.idea/uiDesigner.xml

@@ -16,9 +16,10 @@
 
 package com.r3944realms.dg_lab.manager;
 
+import com.r3944realms.dg_lab.api.manager.IDGLabManager;
 import com.r3944realms.dg_lab.api.manager.Status;
-import com.r3944realms.dg_lab.websocket.PowerBoxWSClient;
 import com.r3944realms.dg_lab.api.websocket.message.Message;
+import com.r3944realms.dg_lab.websocket.PowerBoxWSClient;
 import com.r3944realms.dg_lab.websocket.sharedData.ClientPowerBoxSharedData;
 
 /**

Common/build.gradle

@@ -18,8 +18,8 @@
 
 import com.r3944realms.dg_lab.api.manager.IDGLabManager;
 import com.r3944realms.dg_lab.api.manager.Status;
-import com.r3944realms.dg_lab.websocket.PowerBoxWSServer;
 import com.r3944realms.dg_lab.api.websocket.message.Message;
+import com.r3944realms.dg_lab.websocket.PowerBoxWSServer;
 import com.r3944realms.dg_lab.websocket.sharedData.ServerPowerBoxSharedData;
 
 /**

Common/src/main/java/com/r3944realms/dg_lab/manager/DGPBClientManager.java

@@ -17,11 +17,11 @@
 package com.r3944realms.dg_lab.utils.timeTask;
 
 
-import com.r3944realms.dg_lab.utils.annoation.NeedCompletedInFuture;
 import com.r3944realms.dg_lab.api.websocket.message.Message;
 import com.r3944realms.dg_lab.api.websocket.message.PowerBoxMessage;
 import com.r3944realms.dg_lab.api.websocket.message.role.PlaceholderRole;
 import com.r3944realms.dg_lab.api.websocket.message.role.WebSocketClientRole;
+import com.r3944realms.dg_lab.utils.annoation.NeedCompletedInFuture;
 import io.netty.channel.ChannelHandlerContext;
 
 import java.util.TimerTask;