调整 solon-admin-server 代码结构

opensolon · Jul 26, 2023 · 80ba128 · 80ba128
1 parent bee1f49
commit 80ba128
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/...on/AdminClientBootstrapConfiguration.java → ...ig/AdminClientBootstrapConfiguration.java b/...on/AdminClientBootstrapConfiguration.java → ...ig/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/.../client/integration/ClientProperties.java → ...admin/client/config/ClientProperties.java b/.../client/integration/ClientProperties.java → ...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/...admin/client/integration/XPluginImpl.java → ...olon/admin/client/config/XPluginImpl.java b/...admin/client/integration/XPluginImpl.java → ...olon/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/...rc/main/java/org/noear/solon/admin/client/registration/AutoRegistrationConfiguration.java b/...rc/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/...t/src/main/java/org/noear/solon/admin/client/services/ApplicationRegistrationService.java b/...t/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/...on-admin-client/src/main/resources/META-INF/solon/org.noear.solon.admin.client.properties b/...on-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
diff --git a/...on/AdminServerBootstrapConfiguration.java → ...ig/AdminServerBootstrapConfiguration.java b/...on/AdminServerBootstrapConfiguration.java → ...ig/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/.../server/integration/ServerProperties.java → ...admin/server/config/ServerProperties.java b/.../server/integration/ServerProperties.java → ...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/...r/integration/WebSocketConfiguration.java → ...server/config/WebSocketConfiguration.java b/...r/integration/WebSocketConfiguration.java → ...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/...admin/server/integration/XPluginImpl.java → ...olon/admin/server/config/XPluginImpl.java b/...admin/server/integration/XPluginImpl.java → ...olon/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/...-admin-server/src/main/java/org/noear/solon/admin/server/services/ApplicationService.java b/...-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/...l/solon-admin-server/src/main/java/org/noear/solon/admin/server/utils/BasicAuthUtils.java b/...l/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/...on-admin-server/src/main/resources/META-INF/solon/org.noear.solon.admin.server.properties b/...on-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