From 9e34dd5d54f6ea32b0477bb1e073a6299d80e123 Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Fri, 15 Mar 2024 17:40:11 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E4=BF=AE=E6=94=B9=20jenkins=20?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                                 | 16 ++++++++++++++++
 core-bukkit/build.gradle.kts                     |  6 ------
 core-bukkit/src/main/resources/plugin.yml        |  7 ++-----
 core-bungee/build.gradle.kts                     |  1 -
 core-bungee/src/main/resources/bungee.yml        |  7 ++-----
 .../mc/plugin/core/common/api/CoreAPI.java       |  3 ++-
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 09be84c..7d09bff 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -43,6 +43,22 @@ subprojects {
             from(rootProject.file("LICENSE"))
             duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         }
+        processResources {
+            val map = mutableMapOf<String, String>()
+            map.putAll(System.getenv())
+            map["BUILD_ID"] = System.getenv().getOrDefault("BUILD_ID", "")
+            map["BUILD_NUMBER"] = System.getenv().getOrDefault("BUILD_NUMBER", "")
+            map["BUILD_DISPLAY_NAME"] = System.getenv().getOrDefault("BUILD_DISPLAY_NAME", "")
+            map["JOB_URL"] = System.getenv().getOrDefault("JOB_URL", "")
+            map["BUILD_URL"] = System.getenv().getOrDefault("BUILD_URL", "")
+            map["GIT_COMMIT"] = System.getenv().getOrDefault("GIT_COMMIT", "")
+            rootProject.properties.forEach { (k, v) ->
+                map[k] = v.toString()
+            }
+            filesMatching(listOf("plugin.yml", "bungee.yml")) {
+                expand(map)
+            }
+        }
         jar {
             archiveClassifier = "dev"
         }
diff --git a/core-bukkit/build.gradle.kts b/core-bukkit/build.gradle.kts
index bedcf6b..dc72e5d 100644
--- a/core-bukkit/build.gradle.kts
+++ b/core-bukkit/build.gradle.kts
@@ -30,12 +30,6 @@ dependencies {
 }
 
 tasks {
-    processResources {
-        filesMatching("plugin.yml") {
-            expand(rootProject.properties)
-            expand(System.getenv())
-        }
-    }
     withType<Jar> {
         archiveBaseName = "HamsterCore-Bukkit"
     }
diff --git a/core-bukkit/src/main/resources/plugin.yml b/core-bukkit/src/main/resources/plugin.yml
index 3dc1aa1..2b70cbb 100644
--- a/core-bukkit/src/main/resources/plugin.yml
+++ b/core-bukkit/src/main/resources/plugin.yml
@@ -8,14 +8,11 @@ website: https://git.airgame.net/MiniDay/hamster-core
 description: 仓鼠核心：叁只仓鼠的 Minecraft 插件开发通用工具包
 
 jenkins:
-  CHANGE_ID: ${CHANGE_ID}
-  CHANGE_URL: ${CHANGE_URL}
-  CHANGE_TITLE: ${CHANGE_TITLE}
-  BUILD_NUMBER: ${BUILD_NUMBER}
   BUILD_ID: ${BUILD_ID}
+  BUILD_NUMBER: ${BUILD_NUMBER}
   BUILD_DISPLAY_NAME: ${BUILD_DISPLAY_NAME}
-  BUILD_URL: ${BUILD_URL}
   JOB_URL: ${JOB_URL}
+  BUILD_URL: ${BUILD_URL}
   GIT_COMMIT: ${GIT_COMMIT}
 
 load: STARTUP
diff --git a/core-bungee/build.gradle.kts b/core-bungee/build.gradle.kts
index 3d8685f..1ef8090 100644
--- a/core-bungee/build.gradle.kts
+++ b/core-bungee/build.gradle.kts
@@ -29,7 +29,6 @@ tasks {
     processResources {
         filesMatching("bungee.yml") {
             expand(rootProject.properties)
-            expand(System.getenv())
         }
     }
     withType<Jar> {
diff --git a/core-bungee/src/main/resources/bungee.yml b/core-bungee/src/main/resources/bungee.yml
index 47b2677..f7a091b 100644
--- a/core-bungee/src/main/resources/bungee.yml
+++ b/core-bungee/src/main/resources/bungee.yml
@@ -6,12 +6,9 @@ author: MiniDay
 description: 仓鼠核心：叁只仓鼠的 Minecraft 插件开发通用工具包
 
 jenkins:
-  CHANGE_ID: ${CHANGE_ID}
-  CHANGE_URL: ${CHANGE_URL}
-  CHANGE_TITLE: ${CHANGE_TITLE}
-  BUILD_NUMBER: ${BUILD_NUMBER}
   BUILD_ID: ${BUILD_ID}
+  BUILD_NUMBER: ${BUILD_NUMBER}
   BUILD_DISPLAY_NAME: ${BUILD_DISPLAY_NAME}
-  BUILD_URL: ${BUILD_URL}
   JOB_URL: ${JOB_URL}
+  BUILD_URL: ${BUILD_URL}
   GIT_COMMIT: ${GIT_COMMIT}
diff --git a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java
index bb044de..c92cbf1 100644
--- a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java
+++ b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java
@@ -11,6 +11,7 @@ import org.jetbrains.annotations.NotNull;
 import redis.clients.jedis.JedisPool;
 
 import javax.sql.DataSource;
+import java.net.URI;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.concurrent.ExecutorService;
@@ -50,7 +51,7 @@ public abstract class CoreAPI {
         scheduledService = Executors.newScheduledThreadPool(1, new NamedThreadFactory("HamsterCore - Scheduler"));
 
         getLogger().info("正在创建 Redis 连接池");
-        jedisPool = new JedisPool(config.getString("redis-url"));
+        jedisPool = new JedisPool(URI.create(config.getString("redis-url", "redis://localhost:6379/0?clientName=HamsterCore&timeout=5s")));
         getLogger().info("Redis 连接池创建完成");
 
         ConfigSection datasourceConfig = config.getSection("datasource");