From 80ba12867b89eb79c6f4bbc6182b1caf75b6f8e6 Mon Sep 17 00:00:00 2001 From: noear Date: Wed, 26 Jul 2023 16:59:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20solon-admin-server=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdminClientBootstrapConfiguration.java | 2 +- .../client/{integration => config}/ClientProperties.java | 2 +- .../admin/client/{integration => config}/XPluginImpl.java | 2 +- .../client/registration/AutoRegistrationConfiguration.java | 4 ++-- .../admin/client/services/ApplicationRegistrationService.java | 2 +- .../META-INF/solon/org.noear.solon.admin.client.properties | 2 +- .../AdminServerBootstrapConfiguration.java | 2 +- .../server/{integration => config}/ServerProperties.java | 2 +- .../{integration => config}/WebSocketConfiguration.java | 2 +- .../admin/server/{integration => config}/XPluginImpl.java | 2 +- .../noear/solon/admin/server/services/ApplicationService.java | 2 +- .../org/noear/solon/admin/server/utils/BasicAuthUtils.java | 2 +- .../META-INF/solon/org.noear.solon.admin.server.properties | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) rename solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/{integration => config}/AdminClientBootstrapConfiguration.java (97%) rename solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/{integration => config}/ClientProperties.java (90%) rename solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/{integration => config}/XPluginImpl.java (91%) rename solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/{integration => config}/AdminServerBootstrapConfiguration.java (97%) rename solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/{integration => config}/ServerProperties.java (94%) rename solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/{integration => config}/WebSocketConfiguration.java (92%) rename solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/{integration => config}/XPluginImpl.java (97%) diff --git a/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/integration/AdminClientBootstrapConfiguration.java b/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/config/AdminClientBootstrapConfiguration.java similarity index 97% rename from solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/integration/AdminClientBootstrapConfiguration.java rename to solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/config/AdminClientBootstrapConfiguration.java index 800a059b08..975af14e4f 100644 --- a/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/integration/AdminClientBootstrapConfiguration.java +++ b/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/config/AdminClientBootstrapConfiguration.java @@ -1,4 +1,4 @@ -package org.noear.solon.admin.client.integration; +package org.noear.solon.admin.client.config; import lombok.Value; import lombok.extern.slf4j.Slf4j; diff --git a/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/integration/ClientProperties.java b/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/config/ClientProperties.java similarity index 90% rename from solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/integration/ClientProperties.java rename to solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/config/ClientProperties.java index 7718c51bc3..051d9f81a1 100644 --- a/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/integration/ClientProperties.java +++ b/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/config/ClientProperties.java @@ -1,4 +1,4 @@ -package org.noear.solon.admin.client.integration; +package org.noear.solon.admin.client.config; import lombok.Data; diff --git a/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/integration/XPluginImpl.java b/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/config/XPluginImpl.java similarity index 91% rename from solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/integration/XPluginImpl.java rename to solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/config/XPluginImpl.java index 40a14055ad..d329d901d7 100644 --- a/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/integration/XPluginImpl.java +++ b/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/config/XPluginImpl.java @@ -1,4 +1,4 @@ -package org.noear.solon.admin.client.integration; +package org.noear.solon.admin.client.config; import org.noear.solon.Solon; import org.noear.solon.admin.client.annotation.EnableAdminClient; diff --git a/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/registration/AutoRegistrationConfiguration.java b/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/registration/AutoRegistrationConfiguration.java index 541fb2b3c6..98ac04b688 100644 --- a/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/registration/AutoRegistrationConfiguration.java +++ b/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/registration/AutoRegistrationConfiguration.java @@ -1,7 +1,7 @@ package org.noear.solon.admin.client.registration; -import org.noear.solon.admin.client.integration.AdminClientBootstrapConfiguration; -import org.noear.solon.admin.client.integration.ClientProperties; +import org.noear.solon.admin.client.config.AdminClientBootstrapConfiguration; +import org.noear.solon.admin.client.config.ClientProperties; import org.noear.solon.admin.client.services.ApplicationRegistrationService; import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Configuration; diff --git a/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/services/ApplicationRegistrationService.java b/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/services/ApplicationRegistrationService.java index 4df8060f75..f1bdba723d 100644 --- a/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/services/ApplicationRegistrationService.java +++ b/solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/services/ApplicationRegistrationService.java @@ -4,7 +4,7 @@ import lombok.val; import okhttp3.*; import org.noear.solon.Solon; -import org.noear.solon.admin.client.integration.ClientProperties; +import org.noear.solon.admin.client.config.ClientProperties; import org.noear.solon.admin.client.data.Application; import org.noear.solon.admin.client.data.EnvironmentInformation; import org.noear.solon.admin.client.utils.JsonUtils; diff --git a/solon-projects/solon-tool/solon-admin-client/src/main/resources/META-INF/solon/org.noear.solon.admin.client.properties b/solon-projects/solon-tool/solon-admin-client/src/main/resources/META-INF/solon/org.noear.solon.admin.client.properties index b1bc3867b2..97af5d1498 100644 --- a/solon-projects/solon-tool/solon-admin-client/src/main/resources/META-INF/solon/org.noear.solon.admin.client.properties +++ b/solon-projects/solon-tool/solon-admin-client/src/main/resources/META-INF/solon/org.noear.solon.admin.client.properties @@ -1,2 +1,2 @@ -solon.plugin=org.noear.solon.admin.client.integration.XPluginImpl +solon.plugin=org.noear.solon.admin.client.config.XPluginImpl solon.plugin.priority=1 \ No newline at end of file diff --git a/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/integration/AdminServerBootstrapConfiguration.java b/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/AdminServerBootstrapConfiguration.java similarity index 97% rename from solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/integration/AdminServerBootstrapConfiguration.java rename to solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/AdminServerBootstrapConfiguration.java index 7a85eb58b1..486eda9467 100644 --- a/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/integration/AdminServerBootstrapConfiguration.java +++ b/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/AdminServerBootstrapConfiguration.java @@ -1,4 +1,4 @@ -package org.noear.solon.admin.server.integration; +package org.noear.solon.admin.server.config; import lombok.Value; import lombok.extern.slf4j.Slf4j; diff --git a/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/integration/ServerProperties.java b/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/ServerProperties.java similarity index 94% rename from solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/integration/ServerProperties.java rename to solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/ServerProperties.java index 0543ab71a1..353ad21831 100644 --- a/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/integration/ServerProperties.java +++ b/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/ServerProperties.java @@ -1,4 +1,4 @@ -package org.noear.solon.admin.server.integration; +package org.noear.solon.admin.server.config; import lombok.Data; import org.noear.solon.annotation.Configuration; diff --git a/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/integration/WebSocketConfiguration.java b/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/WebSocketConfiguration.java similarity index 92% rename from solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/integration/WebSocketConfiguration.java rename to solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/WebSocketConfiguration.java index bfe44ebd11..ac75139b79 100644 --- a/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/integration/WebSocketConfiguration.java +++ b/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/WebSocketConfiguration.java @@ -1,4 +1,4 @@ -package org.noear.solon.admin.server.integration; +package org.noear.solon.admin.server.config; import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Configuration; diff --git a/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/integration/XPluginImpl.java b/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/XPluginImpl.java similarity index 97% rename from solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/integration/XPluginImpl.java rename to solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/XPluginImpl.java index 9a602e5a86..91bb87dd13 100644 --- a/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/integration/XPluginImpl.java +++ b/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/XPluginImpl.java @@ -1,4 +1,4 @@ -package org.noear.solon.admin.server.integration; +package org.noear.solon.admin.server.config; import org.noear.solon.Solon; import org.noear.solon.Utils; diff --git a/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/services/ApplicationService.java b/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/services/ApplicationService.java index 08b8e321ac..eec593e47b 100644 --- a/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/services/ApplicationService.java +++ b/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/services/ApplicationService.java @@ -2,7 +2,7 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.noear.solon.admin.server.integration.ServerProperties; +import org.noear.solon.admin.server.config.ServerProperties; import org.noear.solon.admin.server.data.Application; import org.noear.solon.admin.server.data.ApplicationWebsocketTransfer; import org.noear.solon.admin.server.utils.JsonUtils; diff --git a/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/utils/BasicAuthUtils.java b/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/utils/BasicAuthUtils.java index 4a05aafb39..8360472c9e 100644 --- a/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/utils/BasicAuthUtils.java +++ b/solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/utils/BasicAuthUtils.java @@ -1,7 +1,7 @@ package org.noear.solon.admin.server.utils; import org.noear.solon.Utils; -import org.noear.solon.admin.server.integration.ServerProperties; +import org.noear.solon.admin.server.config.ServerProperties; import org.noear.solon.core.handle.Context; import java.io.IOException; diff --git a/solon-projects/solon-tool/solon-admin-server/src/main/resources/META-INF/solon/org.noear.solon.admin.server.properties b/solon-projects/solon-tool/solon-admin-server/src/main/resources/META-INF/solon/org.noear.solon.admin.server.properties index bf0007b174..e340f23527 100644 --- a/solon-projects/solon-tool/solon-admin-server/src/main/resources/META-INF/solon/org.noear.solon.admin.server.properties +++ b/solon-projects/solon-tool/solon-admin-server/src/main/resources/META-INF/solon/org.noear.solon.admin.server.properties @@ -1,2 +1,2 @@ -solon.plugin=org.noear.solon.admin.server.integration.XPluginImpl +solon.plugin=org.noear.solon.admin.server.config.XPluginImpl solon.plugin.priority=2 \ No newline at end of file