From 6d983cd0553ac8e3ce58e997f63cbc323a7fd2de Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Sun, 7 Apr 2024 15:30:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=A3=80=E6=9F=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 + pom.xml | 2 +- .../miniplayertitle/MiniPlayerTitle.java | 8 + .../miniplayertitle/utils/ConfigManager.java | 7 +- .../utils/GiteaReleaseCheck.java | 195 ++++++++++++++++++ src/main/resources/config.yml | 2 + 6 files changed, 217 insertions(+), 2 deletions(-) create mode 100644 src/main/java/cn/lunadeer/miniplayertitle/utils/GiteaReleaseCheck.java diff --git a/README.md b/README.md index 0d78a57..f9ffee9 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ ### [开源地址](https://ssl.lunadeer.cn:14446/zhangyuheng/MiniPlayerTitle) | [文档地址](https://ssl.lunadeer.cn:14448/doc/2/) +### [下载页面](https://ssl.lunadeer.cn:14446/zhangyuheng/MiniPlayerTitle/releases) +### [统计页面](https://bstats.org/plugin/bukkit/MiniPlayerTitle/21444) | [Hangar](https://hangar.papermc.io/zhangyuheng/MiniPlayerTitle) @@ -193,6 +195,9 @@ CustomCost: # 玩家称号币初始值 DefaultCoin: 0 +# 更新检查 +CheckUpdate: true + Debug: false ``` diff --git a/pom.xml b/pom.xml index 03cc292..50988f2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.lunadeer MiniPlayerTitle - 2.10.3 + 2.11.0 jar MiniPlayerTitle diff --git a/src/main/java/cn/lunadeer/miniplayertitle/MiniPlayerTitle.java b/src/main/java/cn/lunadeer/miniplayertitle/MiniPlayerTitle.java index b2c86fd..85bdb5e 100644 --- a/src/main/java/cn/lunadeer/miniplayertitle/MiniPlayerTitle.java +++ b/src/main/java/cn/lunadeer/miniplayertitle/MiniPlayerTitle.java @@ -2,6 +2,7 @@ package cn.lunadeer.miniplayertitle; import cn.lunadeer.miniplayertitle.utils.ConfigManager; import cn.lunadeer.miniplayertitle.utils.Database; +import cn.lunadeer.miniplayertitle.utils.GiteaReleaseCheck; import cn.lunadeer.miniplayertitle.utils.XLogger; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; @@ -24,6 +25,12 @@ public final class MiniPlayerTitle extends JavaPlugin { Objects.requireNonNull(Bukkit.getPluginCommand("MiniPlayerTitle")).setTabCompleter(new Commands()); Metrics metrics = new Metrics(this, 21444); + if (config.isCheckUpdate()) { + giteaReleaseCheck = new GiteaReleaseCheck(this, + "https://ssl.lunadeer.cn:14446", + "zhangyuheng", + "MiniPlayerTitle"); + } XLogger.info("称号插件已加载"); XLogger.info("版本: " + getPluginMeta().getVersion()); @@ -46,4 +53,5 @@ public final class MiniPlayerTitle extends JavaPlugin { public static MiniPlayerTitle instance; public static ConfigManager config; public static Connection dbConnection; + private GiteaReleaseCheck giteaReleaseCheck; } diff --git a/src/main/java/cn/lunadeer/miniplayertitle/utils/ConfigManager.java b/src/main/java/cn/lunadeer/miniplayertitle/utils/ConfigManager.java index 882f1e5..4592d0c 100644 --- a/src/main/java/cn/lunadeer/miniplayertitle/utils/ConfigManager.java +++ b/src/main/java/cn/lunadeer/miniplayertitle/utils/ConfigManager.java @@ -31,6 +31,7 @@ public class ConfigManager { _enable_custom = _file.getBoolean("CustomCost.Enabled", true); _custom_cost = _file.getInt("CustomCost.Cost", 1000); _max_length = _file.getInt("CustomCost.MaxLength", 8); + _check_update = _file.getBoolean("CheckUpdate", true); } public Boolean isDebug() { @@ -142,6 +143,10 @@ public class ConfigManager { _plugin.saveConfig(); } + public Boolean isCheckUpdate() { + return _check_update; + } + private final MiniPlayerTitle _plugin; private FileConfiguration _file; @@ -158,6 +163,6 @@ public class ConfigManager { private Integer _default_coin; private Boolean _enable_custom; private Integer _custom_cost; - private Integer _max_length; + private Boolean _check_update; } diff --git a/src/main/java/cn/lunadeer/miniplayertitle/utils/GiteaReleaseCheck.java b/src/main/java/cn/lunadeer/miniplayertitle/utils/GiteaReleaseCheck.java new file mode 100644 index 0000000..6cb928a --- /dev/null +++ b/src/main/java/cn/lunadeer/miniplayertitle/utils/GiteaReleaseCheck.java @@ -0,0 +1,195 @@ +package cn.lunadeer.miniplayertitle.utils; + +import org.bukkit.plugin.java.JavaPlugin; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; +import org.json.simple.parser.JSONParser; + +import javax.net.ssl.HttpsURLConnection; +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.File; +import java.io.InputStreamReader; +import java.net.URL; +import java.nio.file.Files; +import java.util.concurrent.TimeUnit; + +public class GiteaReleaseCheck { + private static class GiteaRelease { + public String tag_name; + public String message; + public String html_url; + public String download_url; + } + + public GiteaReleaseCheck(JavaPlugin plugin, String giteaServer, String owner, String repo) { + this.gitea_server = giteaServer; + this.owner = owner; + this.repo = repo; + this.plugin = plugin; + this.current_version = plugin.getPluginMeta().getVersion(); + // 异步每12小时检查一次更新 + plugin.getServer().getAsyncScheduler().runAtFixedRate(plugin, (instance) -> { + getLatestRelease(); + if (auto_update) { + downloadUpdate(); + } + }, 10, 60 * 60 * 12, TimeUnit.SECONDS); + } + + public void enableAutoUpdate() { + auto_update = true; + } + + private String repoReleases() { + return gitea_server + "/api/v1/repos/" + owner + "/" + repo + "/releases"; + } + + private String tag(String tagName) { + return gitea_server + "/api/v1/repos/" + owner + "/" + repo + "/tags/" + tagName; + } + + private void getLatestRelease() { + XLogger.info("================================"); + XLogger.info("正在检查更新..."); + // send get request to repoReleases() + try { + // 发送 GET 请求 + HttpsURLConnection connection = (HttpsURLConnection) new URL(repoReleases()).openConnection(); + connection.setRequestMethod("GET"); + connection.setConnectTimeout(5000); + connection.setReadTimeout(5000); + connection.connect(); + // 获取响应 + StringBuilder builder = new StringBuilder(); + try (BufferedReader bufferedReader = + new BufferedReader(new InputStreamReader(connection.getInputStream()))) { + String line; + while ((line = bufferedReader.readLine()) != null) { + builder.append(line); + } + } + JSONArray releaseList = (JSONArray) new JSONParser().parse(builder.toString()); + JSONObject latestRelease = (JSONObject) releaseList.get(0); + GiteaRelease release = new GiteaRelease(); + release.tag_name = (String) latestRelease.get("tag_name"); + release.message = getTagMessage(release.tag_name); + release.html_url = (String) latestRelease.get("html_url"); + JSONArray assets = (JSONArray) latestRelease.get("assets"); + if (assets.size() > 0) { + JSONObject asset = (JSONObject) assets.get(0); + release.download_url = (String) asset.get("browser_download_url"); + } + latest_release = release; + XLogger.debug("Latest release: " + latest_release.tag_name); + XLogger.debug("Message: " + latest_release.message); + XLogger.debug("Download URL: " + latest_release.download_url); + XLogger.debug("HTML URL: " + latest_release.html_url); + if (isNewVersion(current_version, latest_release.tag_name)) { + XLogger.info("发现新版本：" + latest_release.tag_name); + XLogger.info("更新内容：" + latest_release.message); + XLogger.info("下载页面：" + latest_release.html_url); + } else { + XLogger.info("当前已是最新版本：" + current_version); + } + XLogger.info("================================"); + } catch (Exception e) { + XLogger.err("Failed to get latest release: " + e.getMessage()); + } + } + + private String getTagMessage(String tagName) { + try { + // 发送 GET 请求 + HttpsURLConnection connection = (HttpsURLConnection) new URL(tag(tagName)).openConnection(); + connection.setRequestMethod("GET"); + connection.setConnectTimeout(5000); + connection.setReadTimeout(5000); + connection.connect(); + // 获取响应 + StringBuilder builder = new StringBuilder(); + try (BufferedReader bufferedReader = + new BufferedReader(new InputStreamReader(connection.getInputStream()))) { + String line; + while ((line = bufferedReader.readLine()) != null) { + builder.append(line); + } + } + JSONObject tag = (JSONObject) new JSONParser().parse(builder.toString()); + return (String) tag.get("message"); + } catch (Exception e) { + XLogger.debug("Failed to get tag message: " + e.getMessage()); + return "null"; + } + } + + private void downloadUpdate() { + if (latest_release == null) { + getLatestRelease(); + if (latest_release == null) + return; + } + if (!isNewVersion(current_version, latest_release.tag_name)) { + XLogger.info("当前已是最新版本"); + return; + } + if (latest_release.download_url == null) { + XLogger.err("下载地址不可用"); + return; + } + try { + XLogger.info("================================"); + XLogger.info("正在下载更新..."); + File pluginsFolder = plugin.getDataFolder().getParentFile(); + File newJarFile = new File(pluginsFolder, latest_release.download_url.substring(latest_release.download_url.lastIndexOf("/") + 1)); + // send get request to download_url + HttpsURLConnection connection = (HttpsURLConnection) new URL(latest_release.download_url).openConnection(); + connection.setRequestMethod("GET"); + connection.setConnectTimeout(5000); + connection.setReadTimeout(5000); + connection.connect(); + // 获取响应写入文件到 newJarFile + try (DataOutputStream outputStream = new DataOutputStream(Files.newOutputStream(newJarFile.toPath()))) { + byte[] buffer = new byte[1024]; + int length; + while ((length = connection.getInputStream().read(buffer)) != -1) { + outputStream.write(buffer, 0, length); + } + } + XLogger.info("更新下载完成"); + XLogger.info("新版本：" + latest_release.tag_name); + XLogger.info("请删除旧版本插件，然后重启服务器。"); + XLogger.info("================================"); + } catch (Exception e) { + XLogger.err("Failed to auto update: " + e.getMessage()); + } + } + + private String gitea_server; + private String owner; + private String repo; + private JavaPlugin plugin; + private String current_version; + private GiteaRelease latest_release = null; + private boolean auto_update = false; + + private boolean isNewVersion(String current, String in_coming) { + // 只保留数字和点号 + current = current.replaceAll("[^0-9.]", ""); + in_coming = in_coming.replaceAll("[^0-9.]", ""); + XLogger.debug("Current version: " + current); + XLogger.debug("In-coming version: " + in_coming); + String[] current_version = current.split("\\."); + String[] in_coming_version = in_coming.split("\\."); + for (int i = 0; i < Math.min(current_version.length, in_coming_version.length); i++) { + int current_v = Integer.parseInt(current_version[i]); + int in_coming_v = Integer.parseInt(in_coming_version[i]); + if (current_v < in_coming_v) { + return true; + } else if (current_v > in_coming_v) { + return false; + } + } + return current_version.length < in_coming_version.length; + } +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 5c79715..9a179fa 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -16,4 +16,6 @@ CustomCost: DefaultCoin: 0 +CheckUpdate: true + Debug: false \ No newline at end of file