feat(user): 令saveAll于unloadAll不再异步，避免关服后线程被强制关闭。

2024-09-19 19:25:45 +00:00 · 2023-09-02 21:31:10 +08:00 · 2023-09-02 21:31:10 +08:00 · 19f25db0b7
commit 19f25db0b7
parent 046e901ec1
17 changed files with 37 additions and 32 deletions
--- a/base/color/pom.xml
+++ b/base/color/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>cc.carm.lib</groupId>
        <artifactId>easyplugin-parent</artifactId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <properties>
--- a/base/command-alias/pom.xml
+++ b/base/command-alias/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>cc.carm.lib</groupId>
        <artifactId>easyplugin-parent</artifactId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <properties>
--- a/base/command/pom.xml
+++ b/base/command/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/gui/pom.xml
+++ b/base/gui/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/main/pom.xml
+++ b/base/main/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/messages/pom.xml
+++ b/base/messages/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>cc.carm.lib</groupId>
        <artifactId>easyplugin-parent</artifactId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <properties>
--- a/base/storage/pom.xml
+++ b/base/storage/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/user/pom.xml
+++ b/base/user/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>cc.carm.lib</groupId>
        <artifactId>easyplugin-parent</artifactId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <properties>
--- a/base/user/src/main/java/cc/carm/lib/easyplugin/user/UserDataManager.java
+++ b/base/user/src/main/java/cc/carm/lib/easyplugin/user/UserDataManager.java
@ -63,7 +63,11 @@ public abstract class UserDataManager<K, U extends UserData<K>> {
        return key.toString();
    }

-    public abstract @NotNull U empty(@NotNull K key);
+    public abstract @NotNull U emptyUser(@NotNull K key);
+
+    public @NotNull U errorUser(@NotNull K key) {
+        return emptyUser(key);
+    }

    protected abstract @Nullable U loadData(@NotNull K key) throws Exception;

@ -108,7 +112,7 @@ public abstract class UserDataManager<K, U extends UserData<K>> {
                U data = loadData(key);
                if (data == null) {
                    getPlugin().debug("数据库内不存在用户 " + identifier + " 的数据，视作新档案。");
-                    return empty(key);
+                    return emptyUser(key);
                } else {
                    getPlugin().debug("加载用户 " + identifier + " 的数据完成，耗时 " + (System.currentTimeMillis() - s1) + " ms.");
                    return data;
@ -116,7 +120,7 @@ public abstract class UserDataManager<K, U extends UserData<K>> {
            } catch (Exception ex) {
                getPlugin().error("加载用户 " + serializeKey(key) + " 数据失败，请检查相关配置！");
                ex.printStackTrace();
-                return empty(key);
+                return errorUser(key);
            }

        }, executor).thenApply((data) -> {
@ -223,22 +227,23 @@ public abstract class UserDataManager<K, U extends UserData<K>> {
        return loadGroup(allKeys, (v) -> false);
    }

-    public @NotNull CompletableFuture<Integer> saveAll() {
-        CompletableFuture<Integer> future = CompletableFuture.completedFuture(0);
-        if (getDataCache().isEmpty()) return future;
-
-        for (U value : getDataCache().values()) {
-            future = future.thenCombine(save(value), (before, result) -> before + (result ? 1 : 0));
+    public void saveAll() {
+        if (getDataCache().isEmpty()) return;
+        for (U u : getDataCache().values()) {
+            try {
+                saveData(u);
+            } catch (Exception e) {
+                getPlugin().error("保存用户 " + serializeKey(u.getKey()) + " 数据失败，请检查相关配置！");
+                e.printStackTrace();
+            }
        }
-
-        return future;
    }

-    public @NotNull CompletableFuture<Integer> unloadAll() {
-        return saveAll().thenApply(result -> {
-            getDataCache().clear();
-            return result;
-        });
+    public int unloadAll(boolean save) {
+        if (save) saveAll();
+        int size = getDataCache().size();
+        getDataCache().clear();
+        return size;
    }


--- a/base/utils/pom.xml
+++ b/base/utils/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/collection/all/pom.xml
+++ b/collection/all/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/collection/bom/pom.xml
+++ b/collection/bom/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/collection/common/pom.xml
+++ b/collection/common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/extension/gh-checker/pom.xml
+++ b/extension/gh-checker/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/extension/papi/pom.xml
+++ b/extension/papi/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/extension/vault/pom.xml
+++ b/extension/vault/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/pom.xml
+++ b/pom.xml
@ -15,7 +15,7 @@
    <groupId>cc.carm.lib</groupId>
    <artifactId>easyplugin-parent</artifactId>
    <packaging>pom</packaging>
-    <version>1.5.6</version>
+    <version>1.5.7</version>
    <modules>
        <module>base/color</module>
        <module>base/utils</module>