From 381a0df77f194d949ed08a9d2f095810191216a0 Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Sun, 14 May 2023 00:43:10 +0800 Subject: [PATCH] =?UTF-8?q?refactor(forest):=20=E4=BC=98=E5=8C=96=20url=20?= =?UTF-8?q?=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/forest/service/FlinkService.java | 24 +++++++++---------- .../service/forest/service/InfoService.java | 18 +++++++------- .../service/forest/service/PulsarService.java | 14 +++++------ .../forest/service/ZookeeperService.java | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/FlinkService.java b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/FlinkService.java index 77afd4d..1c2aa76 100644 --- a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/FlinkService.java +++ b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/FlinkService.java @@ -13,38 +13,38 @@ import org.eclipse.collections.api.map.ImmutableMap; * @author lanyuanxiaoyao * @date 2023-05-05 */ -@BaseRequest(baseURL = "http://service-flink-query") +@BaseRequest(baseURL = "http://service-flink-query/flink") public interface FlinkService { - @Get("/flink/overview") + @Get("/overview") FlinkOverview overview(@Query("url") String url); - @Get("/flink/config") + @Get("/config") FlinkConfig config(@Query("url") String url); - @Get("/flink/job_manager_config") + @Get("/job_manager_config") ImmutableList jobManagerConfig(@Query("url") String url); - @Get("/flink/vertex_overview") + @Get("/vertex_overview") FlinkVertexOverview vertexOverview(@Query("url") String url); - @Get("/flink/vertex") + @Get("/vertex") FlinkVertex vertex(@Query("url") String url, @Query("vertex_id") String vertexId); - @Get("/flink/vertex_config") + @Get("/vertex_config") FlinkVertexConfig vertexConfig(@Query("url") String url, @Query("vertex_id") String vertexId); - @Get("/flink/checkpoint_overview") + @Get("/checkpoint_overview") FlinkCheckpointOverview checkpointOverview(@Query("url") String url, @Query("vertex_id") String vertexId); - @Get("/flink/checkpoint") + @Get("/checkpoint") FlinkCheckpoint checkpoint(@Query("url") String url, @Query("vertex_id") String vertexId, @Query("checkpoint_id") Long checkpointId); - @Get("/flink/checkpoint_config") + @Get("/checkpoint_config") FlinkCheckpointConfig checkpointConfig(@Query("url") String url, @Query("vertex_id") String vertexId); - @Get("/flink/task_manager_overview") + @Get("/task_manager_overview") FlinkTaskManagerOverview taskManagerOverview(@Query("url") String url); - @Get("/flink/task_manager") + @Get("/task_manager") FlinkTaskManager taskManager(@Query("url") String url, @Query("task_manager_id") String taskManagerId); } diff --git a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/InfoService.java b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/InfoService.java index 73842fe..350fbad 100644 --- a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/InfoService.java +++ b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/InfoService.java @@ -18,29 +18,29 @@ import org.eclipse.collections.api.list.ImmutableList; * @author lanyuanxiaoyao * @date 2023-04-24 */ -@BaseRequest(baseURL = "http://service-info-query") +@BaseRequest(baseURL = "http://service-info-query/info") public interface InfoService { - @Get("/info/job_id_alias") + @Get("/job_id_alias") PageResponse jobIdAndAlias(@Query Map queryMap); - @Get("/info/job_metas") + @Get("/job_metas") ImmutableList jobAndMetas(); - @Get("/info/flink_job/list") + @Get("/flink_job/list") ImmutableList flinkJobList(); - @Get("/info/flink_job/detail") + @Get("/flink_job/detail") FlinkJob flinkJobDetail(@Query("flink_job_id") Long flinkJobId); - @Get("/info/table_meta/list") + @Get("/table_meta/list") ImmutableList tableMetaList(); - @Get("/info/table_meta/list") + @Get("/table_meta/list") ImmutableList tableMetaList(@Query("flink_job_id") Long flinkJobId); - @Get("/info/table_meta/detail") + @Get("/table_meta/detail") TableMeta tableMetaDetail(@Query("flink_job_id") Long flinkJobId, @Query("alias") String alias); - @Get("/info/sync_state/detail") + @Get("/sync_state/detail") SyncState syncStateDetail(@Query("flink_job_id") Long flinkJobId, @Query("alias") String alias); } diff --git a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/PulsarService.java b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/PulsarService.java index cf98d6f..5ff5932 100644 --- a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/PulsarService.java +++ b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/PulsarService.java @@ -14,23 +14,23 @@ import org.eclipse.collections.api.list.ImmutableList; * @author lanyuanxiaoyao * @date 2023-04-28 */ -@BaseRequest(baseURL = "http://service-pulsar-query") +@BaseRequest(baseURL = "http://service-pulsar-query/pulsar") public interface PulsarService { - @Get("/pulsar/name") + @Get("/name") String name(@Query("pulsar_url") String pulsarUrl); - @Get("/pulsar/names") + @Get("/names") ImmutableList names(); - @Get("/pulsar/tenants") + @Get("/tenants") ImmutableList tenants(@Query("name") String name); - @Get("/pulsar/namespaces") + @Get("/namespaces") ImmutableList namespaces(@Query("name") String name, @Query("tenant") String tenant); - @Get("/pulsar/topic") + @Get("/topic") PulsarTopic topic(@Query("name") String name, @Query("topic") String topic); - @Get("/pulsar/topics") + @Get("/topics") ImmutableList topics(@Query("name") String name, @Query("namespace") String namespace); } diff --git a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/ZookeeperService.java b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/ZookeeperService.java index 2b35e69..05bc2d9 100644 --- a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/ZookeeperService.java +++ b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/ZookeeperService.java @@ -10,7 +10,7 @@ import com.dtflys.forest.annotation.Query; * @author lanyuanxiaoyao * @date 2023-05-13 */ -@BaseRequest(baseURL = "http://service-zookeeper-query") +@BaseRequest(baseURL = "http://service-zookeeper-query/zookeeper") public interface ZookeeperService { @Get("/exists_path") Boolean existsPath(@Query("path") String path);