From 945234e0f89412237821d3c1d1725c2e55e44310 Mon Sep 17 00:00:00 2001 From: VLSMB Date: Mon, 9 Nov 2026 21:57:16 +0800 Subject: [PATCH 1/8] refactor: move AgentTool package --- .../java/io/github/malonetalk/agent/AgentService.java | 4 ++-- .../tools/{MarkAgentTool.java => DataAgentTool.java} | 2 +- .../malonetalk/agent/tools/{ => impls}/AskUserTool.java | 7 +++++-- .../malonetalk/agent/tools/{ => impls}/DateInfoTool.java | 7 +++++-- .../agent/tools/{ => impls}/ExecutePythonTool.java | 7 +++++-- .../agent/tools/{ => impls}/ExecuteSqlTool.java | 8 ++++++-- .../agent/tools/{ => impls}/ExportTableTool.java | 9 +++++++-- .../agent/tools/{ => impls}/GenerateReportTool.java | 8 ++++++-- .../agent/tools/{ => impls}/GetDatasourcesTool.java | 9 +++++++-- .../agent/tools/{ => impls}/GetDomainsTool.java | 8 ++++++-- .../agent/tools/{ => impls}/GetMetricCaliberTool.java | 8 ++++++-- .../agent/tools/{ => impls}/GetTableSchemaTool.java | 9 +++++++-- .../agent/tools/{ => impls}/GetTablesTool.java | 9 +++++++-- .../agent/tools/{ => impls}/DateInfoToolTest.java | 2 +- .../tools/{ => impls}/ToolDatasourceResolverTest.java | 3 ++- .../tools/{ => impls}/ToolResultBoConverterTest.java | 4 +++- docs/architecture.md | 2 +- 17 files changed, 77 insertions(+), 29 deletions(-) rename data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/{MarkAgentTool.java => DataAgentTool.java} (95%) rename data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/{ => impls}/AskUserTool.java (85%) rename data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/{ => impls}/DateInfoTool.java (96%) rename data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/{ => impls}/ExecutePythonTool.java (95%) rename data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/{ => impls}/ExecuteSqlTool.java (93%) rename data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/{ => impls}/ExportTableTool.java (92%) rename data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/{ => impls}/GenerateReportTool.java (93%) rename data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/{ => impls}/GetDatasourcesTool.java (87%) rename data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/{ => impls}/GetDomainsTool.java (92%) rename data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/{ => impls}/GetMetricCaliberTool.java (93%) rename data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/{ => impls}/GetTableSchemaTool.java (90%) rename data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/{ => impls}/GetTablesTool.java (92%) rename data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/{ => impls}/DateInfoToolTest.java (99%) rename data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/{ => impls}/ToolDatasourceResolverTest.java (97%) rename data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/{ => impls}/ToolResultBoConverterTest.java (94%) diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/AgentService.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/AgentService.java index 34f860e2..ab3a7bb0 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/AgentService.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/AgentService.java @@ -35,7 +35,7 @@ import io.github.malonetalk.agent.models.ModelProperties; import io.github.malonetalk.agent.provenance.AnswerProvenanceService; import io.github.malonetalk.agent.skill.SkillLoaderService; -import io.github.malonetalk.agent.tools.MarkAgentTool; +import io.github.malonetalk.agent.tools.DataAgentTool; import io.github.malonetalk.agent.tools.ToolCallConstants; import io.github.malonetalk.convertor.EventConverter; import io.github.malonetalk.dto.ChatRequest; @@ -77,7 +77,7 @@ public class AgentService { private static final ZoneId DEFAULT_ZONE = ZoneId.of("Asia/Shanghai"); private final ModelFactory modelFactory; - private final List allToolBeans; + private final List allToolBeans; private final ModelProperties modelProperties; private final SessionService sessionService; private final SessionDatasourceService sessionDatasourceService; diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/MarkAgentTool.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/DataAgentTool.java similarity index 95% rename from data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/MarkAgentTool.java rename to data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/DataAgentTool.java index ddf185ad..b923b189 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/MarkAgentTool.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/DataAgentTool.java @@ -17,4 +17,4 @@ */ package io.github.malonetalk.agent.tools; -public interface MarkAgentTool {} +public interface DataAgentTool {} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/AskUserTool.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/AskUserTool.java similarity index 85% rename from data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/AskUserTool.java rename to data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/AskUserTool.java index e66736d7..652ee936 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/AskUserTool.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/AskUserTool.java @@ -15,18 +15,21 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import io.agentscope.core.tool.Tool; import io.agentscope.core.tool.ToolParam; import io.agentscope.core.tool.ToolSuspendException; +import io.github.malonetalk.agent.tools.DataAgentTool; +import io.github.malonetalk.agent.tools.ToolCallConstants; +import io.github.malonetalk.agent.tools.ToolResultBoConverter; import io.github.malonetalk.model.bo.ToolResultBo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @Slf4j @Component -public class AskUserTool implements MarkAgentTool { +public class AskUserTool implements DataAgentTool { @Tool( name = ToolCallConstants.ASK_USER, diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/DateInfoTool.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/DateInfoTool.java similarity index 96% rename from data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/DateInfoTool.java rename to data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/DateInfoTool.java index fe46f7c3..27eee6ef 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/DateInfoTool.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/DateInfoTool.java @@ -15,12 +15,15 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.ObjectMapper; import io.agentscope.core.tool.Tool; import io.agentscope.core.tool.ToolParam; +import io.github.malonetalk.agent.tools.DataAgentTool; +import io.github.malonetalk.agent.tools.ToolExceptionMapper; +import io.github.malonetalk.agent.tools.ToolResultBoConverter; import io.github.malonetalk.exception.ExceptionResponseMapper; import io.github.malonetalk.model.bo.ToolResultBo; import java.io.IOException; @@ -47,7 +50,7 @@ @Component @AllArgsConstructor(access = AccessLevel.PRIVATE) -public class DateInfoTool implements MarkAgentTool { +public class DateInfoTool implements DataAgentTool { private static final String DEFAULT_TIMEZONE = "Asia/Shanghai"; private static final String HOLIDAY_API_BASE_URL = "https://timor.tech/api/holiday/info"; diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/ExecutePythonTool.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/ExecutePythonTool.java similarity index 95% rename from data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/ExecutePythonTool.java rename to data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/ExecutePythonTool.java index 89a499df..eeead5bd 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/ExecutePythonTool.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/ExecutePythonTool.java @@ -15,11 +15,14 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import io.agentscope.core.tool.Tool; import io.agentscope.core.tool.ToolParam; import io.github.malonetalk.agent.ToolCallContext; +import io.github.malonetalk.agent.tools.DataAgentTool; +import io.github.malonetalk.agent.tools.ToolExceptionMapper; +import io.github.malonetalk.agent.tools.ToolResultBoConverter; import io.github.malonetalk.enums.PermissionEnum; import io.github.malonetalk.model.bo.ToolResultBo; import io.github.malonetalk.service.PermissionService; @@ -38,7 +41,7 @@ @RequiredArgsConstructor @Slf4j @Component -public class ExecutePythonTool implements MarkAgentTool { +public class ExecutePythonTool implements DataAgentTool { private final PermissionService permissions; private final ToolExceptionMapper toolExceptionMapper; diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/ExecuteSqlTool.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/ExecuteSqlTool.java similarity index 93% rename from data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/ExecuteSqlTool.java rename to data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/ExecuteSqlTool.java index caf182ce..29c7d4fb 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/ExecuteSqlTool.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/ExecuteSqlTool.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,6 +25,10 @@ import io.github.malonetalk.agent.datasource.QueryResult; import io.github.malonetalk.agent.datasource.SqlExecutor; import io.github.malonetalk.agent.datasource.SqlExecutor.SqlExecution; +import io.github.malonetalk.agent.tools.DataAgentTool; +import io.github.malonetalk.agent.tools.ToolDatasourceResolver; +import io.github.malonetalk.agent.tools.ToolExceptionMapper; +import io.github.malonetalk.agent.tools.ToolResultBoConverter; import io.github.malonetalk.model.bo.SqlToolMetadataBo; import io.github.malonetalk.model.bo.ToolResultBo; import io.github.malonetalk.model.po.DatasourcePo; @@ -34,7 +38,7 @@ @Component @AllArgsConstructor -public class ExecuteSqlTool implements MarkAgentTool { +public class ExecuteSqlTool implements DataAgentTool { private final ToolDatasourceResolver datasourceResolver; private final SqlExecutor sqlExecutor; diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/ExportTableTool.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/ExportTableTool.java similarity index 92% rename from data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/ExportTableTool.java rename to data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/ExportTableTool.java index e867924a..10a72dc9 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/ExportTableTool.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/ExportTableTool.java @@ -15,13 +15,18 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import io.agentscope.core.tool.Tool; import io.agentscope.core.tool.ToolParam; import io.github.malonetalk.agent.ToolCallContext; +import io.github.malonetalk.agent.tools.DataAgentTool; +import io.github.malonetalk.agent.tools.ToolCallConstants; +import io.github.malonetalk.agent.tools.ToolDatasourceResolver; +import io.github.malonetalk.agent.tools.ToolExceptionMapper; +import io.github.malonetalk.agent.tools.ToolResultBoConverter; import io.github.malonetalk.dto.TableExportResponse; import io.github.malonetalk.enums.PermissionEnum; import io.github.malonetalk.model.bo.SqlToolMetadataBo; @@ -35,7 +40,7 @@ @Component @AllArgsConstructor -public class ExportTableTool implements MarkAgentTool { +public class ExportTableTool implements DataAgentTool { private final PermissionService permissions; diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GenerateReportTool.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GenerateReportTool.java similarity index 93% rename from data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GenerateReportTool.java rename to data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GenerateReportTool.java index b149566b..9e882114 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GenerateReportTool.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GenerateReportTool.java @@ -15,11 +15,15 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import io.agentscope.core.tool.Tool; import io.agentscope.core.tool.ToolParam; import io.github.malonetalk.agent.ToolCallContext; +import io.github.malonetalk.agent.tools.DataAgentTool; +import io.github.malonetalk.agent.tools.ToolCallConstants; +import io.github.malonetalk.agent.tools.ToolExceptionMapper; +import io.github.malonetalk.agent.tools.ToolResultBoConverter; import io.github.malonetalk.enums.PermissionEnum; import io.github.malonetalk.model.bo.ToolResultBo; import io.github.malonetalk.service.PermissionService; @@ -32,7 +36,7 @@ @Slf4j @Component @AllArgsConstructor -public class GenerateReportTool implements MarkAgentTool { +public class GenerateReportTool implements DataAgentTool { private final PermissionService permissions; diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetDatasourcesTool.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetDatasourcesTool.java similarity index 87% rename from data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetDatasourcesTool.java rename to data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetDatasourcesTool.java index 1fffc006..d9d67e80 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetDatasourcesTool.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetDatasourcesTool.java @@ -15,11 +15,16 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import io.agentscope.core.tool.Tool; import io.agentscope.core.util.JsonUtils; import io.github.malonetalk.agent.ToolCallContext; +import io.github.malonetalk.agent.tools.DataAgentTool; +import io.github.malonetalk.agent.tools.ToolCallConstants; +import io.github.malonetalk.agent.tools.ToolDatasourceResolver; +import io.github.malonetalk.agent.tools.ToolExceptionMapper; +import io.github.malonetalk.agent.tools.ToolResultBoConverter; import io.github.malonetalk.model.bo.DatasourceInfoBo; import io.github.malonetalk.model.bo.ToolResultBo; import io.github.malonetalk.model.po.DatasourcePo; @@ -29,7 +34,7 @@ @Component @AllArgsConstructor -public class GetDatasourcesTool implements MarkAgentTool { +public class GetDatasourcesTool implements DataAgentTool { private final ToolDatasourceResolver datasourceResolver; private final ToolExceptionMapper toolExceptionMapper; diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetDomainsTool.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetDomainsTool.java similarity index 92% rename from data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetDomainsTool.java rename to data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetDomainsTool.java index 5b23d111..72d0ba3c 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetDomainsTool.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetDomainsTool.java @@ -15,12 +15,16 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import io.agentscope.core.tool.Tool; import io.agentscope.core.tool.ToolParam; import io.agentscope.core.util.JsonUtils; import io.github.malonetalk.agent.ToolCallContext; +import io.github.malonetalk.agent.tools.DataAgentTool; +import io.github.malonetalk.agent.tools.ToolDatasourceResolver; +import io.github.malonetalk.agent.tools.ToolExceptionMapper; +import io.github.malonetalk.agent.tools.ToolResultBoConverter; import io.github.malonetalk.enums.PermissionEnum; import io.github.malonetalk.mapper.TableInfoMapper; import io.github.malonetalk.model.bo.ToolResultBo; @@ -36,7 +40,7 @@ @Component @AllArgsConstructor -public class GetDomainsTool implements MarkAgentTool { +public class GetDomainsTool implements DataAgentTool { private final PermissionService permissions; diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetMetricCaliberTool.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetMetricCaliberTool.java similarity index 93% rename from data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetMetricCaliberTool.java rename to data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetMetricCaliberTool.java index 24e8fbc9..2e414b47 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetMetricCaliberTool.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetMetricCaliberTool.java @@ -15,11 +15,15 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import io.agentscope.core.tool.Tool; import io.agentscope.core.tool.ToolParam; import io.github.malonetalk.agent.ToolCallContext; +import io.github.malonetalk.agent.tools.DataAgentTool; +import io.github.malonetalk.agent.tools.ToolDatasourceResolver; +import io.github.malonetalk.agent.tools.ToolExceptionMapper; +import io.github.malonetalk.agent.tools.ToolResultBoConverter; import io.github.malonetalk.enums.PermissionEnum; import io.github.malonetalk.model.bo.ToolResultBo; import io.github.malonetalk.model.vo.AnswerProvenanceVo.MetricUse; @@ -31,7 +35,7 @@ @Component @AllArgsConstructor -public class GetMetricCaliberTool implements MarkAgentTool { +public class GetMetricCaliberTool implements DataAgentTool { private final PermissionService permissions; diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetTableSchemaTool.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetTableSchemaTool.java similarity index 90% rename from data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetTableSchemaTool.java rename to data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetTableSchemaTool.java index 68e68c5b..f5b66277 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetTableSchemaTool.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetTableSchemaTool.java @@ -15,11 +15,16 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import io.agentscope.core.tool.Tool; import io.agentscope.core.tool.ToolParam; import io.github.malonetalk.agent.ToolCallContext; +import io.github.malonetalk.agent.tools.DataAgentTool; +import io.github.malonetalk.agent.tools.ToolCallConstants; +import io.github.malonetalk.agent.tools.ToolDatasourceResolver; +import io.github.malonetalk.agent.tools.ToolExceptionMapper; +import io.github.malonetalk.agent.tools.ToolResultBoConverter; import io.github.malonetalk.dto.prompt.ColumnPromptResponse; import io.github.malonetalk.enums.PermissionEnum; import io.github.malonetalk.model.bo.ToolResultBo; @@ -35,7 +40,7 @@ @Component @AllArgsConstructor -public class GetTableSchemaTool implements MarkAgentTool { +public class GetTableSchemaTool implements DataAgentTool { private final PermissionService permissions; diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetTablesTool.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetTablesTool.java similarity index 92% rename from data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetTablesTool.java rename to data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetTablesTool.java index 3e73a470..0d0af8ed 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/GetTablesTool.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetTablesTool.java @@ -15,12 +15,17 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import io.agentscope.core.tool.Tool; import io.agentscope.core.tool.ToolParam; import io.agentscope.core.util.JsonUtils; import io.github.malonetalk.agent.ToolCallContext; +import io.github.malonetalk.agent.tools.DataAgentTool; +import io.github.malonetalk.agent.tools.ToolCallConstants; +import io.github.malonetalk.agent.tools.ToolDatasourceResolver; +import io.github.malonetalk.agent.tools.ToolExceptionMapper; +import io.github.malonetalk.agent.tools.ToolResultBoConverter; import io.github.malonetalk.dto.prompt.TablePromptResponse; import io.github.malonetalk.enums.PermissionEnum; import io.github.malonetalk.model.bo.DataPermissionScopeBo; @@ -36,7 +41,7 @@ @Component @AllArgsConstructor -public class GetTablesTool implements MarkAgentTool { +public class GetTablesTool implements DataAgentTool { private final PermissionService permissions; diff --git a/data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/DateInfoToolTest.java b/data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/impls/DateInfoToolTest.java similarity index 99% rename from data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/DateInfoToolTest.java rename to data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/impls/DateInfoToolTest.java index 3c8ee593..4972d507 100644 --- a/data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/DateInfoToolTest.java +++ b/data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/impls/DateInfoToolTest.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/ToolDatasourceResolverTest.java b/data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/impls/ToolDatasourceResolverTest.java similarity index 97% rename from data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/ToolDatasourceResolverTest.java rename to data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/impls/ToolDatasourceResolverTest.java index cdbe632d..e6617261 100644 --- a/data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/ToolDatasourceResolverTest.java +++ b/data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/impls/ToolDatasourceResolverTest.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -26,6 +26,7 @@ import static org.mockito.Mockito.when; import io.github.malonetalk.agent.ToolCallContext; +import io.github.malonetalk.agent.tools.ToolDatasourceResolver; import io.github.malonetalk.enums.Status; import io.github.malonetalk.exception.BusinessException; import io.github.malonetalk.exception.ErrorCode; diff --git a/data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/ToolResultBoConverterTest.java b/data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/impls/ToolResultBoConverterTest.java similarity index 94% rename from data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/ToolResultBoConverterTest.java rename to data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/impls/ToolResultBoConverterTest.java index f5152f6c..1e0fbd88 100644 --- a/data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/ToolResultBoConverterTest.java +++ b/data-agent-backend/src/test/java/io/github/malonetalk/agent/tools/impls/ToolResultBoConverterTest.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * limitations under the License. */ -package io.github.malonetalk.agent.tools; +package io.github.malonetalk.agent.tools.impls; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -23,6 +23,8 @@ import io.agentscope.core.message.TextBlock; import io.agentscope.core.message.ToolResultBlock; import io.agentscope.core.tool.ToolSuspendException; +import io.github.malonetalk.agent.tools.ToolExceptionMapper; +import io.github.malonetalk.agent.tools.ToolResultBoConverter; import io.github.malonetalk.exception.BusinessException; import io.github.malonetalk.exception.ErrorCode; import io.github.malonetalk.exception.ExceptionResponseMapper; diff --git a/docs/architecture.md b/docs/architecture.md index 55e62528..903a793e 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -103,7 +103,7 @@ - **HTTP/SSE 型**:保存 `url` / `headers` / `queryParams`。 - `enable` / `disable` 更新配置记录的启停状态。 -当前 `AgentService.init()` 只注册 `MarkAgentTool` Bean 和 Skill;尚未读取 MCP 配置来启动进程、建立远程连接或注册外部工具。保存和启用配置不会立即扩展 Agent 能力,也未提供将 Data Agent 作为 MCP Server 对外暴露的入口。 +当前 `AgentService.init()` 只注册 `DataAgentTool` Bean 和 Skill;尚未读取 MCP 配置来启动进程、建立远程连接或注册外部工具。保存和启用配置不会立即扩展 Agent 能力,也未提供将 Data Agent 作为 MCP Server 对外暴露的入口。 ## 5. API 概览(常用端点) From 0fd893c21515d19f178c2332216e3bdbb8493acc Mon Sep 17 00:00:00 2001 From: VLSMB Date: Mon, 9 Nov 2026 23:40:45 +0800 Subject: [PATCH 2/8] feat: add personal access token management - add user_pat schema and migration - add access:pat:manage permission - add PAT create/list/revoke APIs - add frontend PAT management page --- .../controller/UserPatController.java | 74 +++++ .../malonetalk/enums/PermissionEnum.java | 3 +- .../malonetalk/mapper/UserPatMapper.java | 24 ++ .../github/malonetalk/model/bo/UserPatBo.java | 29 ++ .../model/bo/UserPatCreateResultBo.java | 21 ++ .../model/converter/UserPatConverter.java | 32 ++ .../model/dto/UserPatCreateDto.java | 26 ++ .../github/malonetalk/model/po/UserPatPo.java | 43 +++ .../malonetalk/model/vo/UserPatCreatedVo.java | 21 ++ .../github/malonetalk/model/vo/UserPatVo.java | 30 ++ .../malonetalk/service/UserPatService.java | 32 ++ .../service/UserPatServiceImpl.java | 179 ++++++++++ data-agent-frontend/src/api/pat.ts | 56 ++++ .../src/components/layout/AppHeader.vue | 12 + data-agent-frontend/src/router/index.ts | 6 + .../src/views/settings/PatView.vue | 307 ++++++++++++++++++ sql/data_source.sql | 20 ++ sql/migration.sql | 20 ++ 18 files changed, 934 insertions(+), 1 deletion(-) create mode 100644 data-agent-backend/src/main/java/io/github/malonetalk/controller/UserPatController.java create mode 100644 data-agent-backend/src/main/java/io/github/malonetalk/mapper/UserPatMapper.java create mode 100644 data-agent-backend/src/main/java/io/github/malonetalk/model/bo/UserPatBo.java create mode 100644 data-agent-backend/src/main/java/io/github/malonetalk/model/bo/UserPatCreateResultBo.java create mode 100644 data-agent-backend/src/main/java/io/github/malonetalk/model/converter/UserPatConverter.java create mode 100644 data-agent-backend/src/main/java/io/github/malonetalk/model/dto/UserPatCreateDto.java create mode 100644 data-agent-backend/src/main/java/io/github/malonetalk/model/po/UserPatPo.java create mode 100644 data-agent-backend/src/main/java/io/github/malonetalk/model/vo/UserPatCreatedVo.java create mode 100644 data-agent-backend/src/main/java/io/github/malonetalk/model/vo/UserPatVo.java create mode 100644 data-agent-backend/src/main/java/io/github/malonetalk/service/UserPatService.java create mode 100644 data-agent-backend/src/main/java/io/github/malonetalk/service/UserPatServiceImpl.java create mode 100644 data-agent-frontend/src/api/pat.ts create mode 100644 data-agent-frontend/src/views/settings/PatView.vue diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/controller/UserPatController.java b/data-agent-backend/src/main/java/io/github/malonetalk/controller/UserPatController.java new file mode 100644 index 00000000..4d570f4a --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/controller/UserPatController.java @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.controller; + +import io.github.malonetalk.annotation.RequirePermission; +import io.github.malonetalk.enums.PermissionEnum; +import io.github.malonetalk.model.bo.UserPatCreateResultBo; +import io.github.malonetalk.model.converter.UserPatConverter; +import io.github.malonetalk.model.dto.UserPatCreateDto; +import io.github.malonetalk.model.holder.UserContextHolder; +import io.github.malonetalk.model.vo.BooleanVo; +import io.github.malonetalk.model.vo.ListVo; +import io.github.malonetalk.model.vo.UserPatCreatedVo; +import io.github.malonetalk.model.vo.UserPatVo; +import io.github.malonetalk.service.UserPatService; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@AllArgsConstructor +@RequestMapping("/api/auth/pats") +public class UserPatController { + + private final UserPatService userPatService; + private final UserPatConverter converter; + private final UserContextHolder userContextHolder; + + @PostMapping + @RequirePermission(PermissionEnum.ACCESS_PAT_MANAGE) + public UserPatCreatedVo create(@Valid @RequestBody UserPatCreateDto request) { + UserPatCreateResultBo result = userPatService.create(currentUserId(), request); + return new UserPatCreatedVo(converter.toVo(result.pat()), result.token()); + } + + @GetMapping + @RequirePermission(PermissionEnum.ACCESS_PAT_MANAGE) + public ListVo list() { + return new ListVo<>( + userPatService.list(currentUserId()).stream().map(converter::toVo).toList()); + } + + @DeleteMapping("/{id}") + @RequirePermission(PermissionEnum.ACCESS_PAT_MANAGE) + public BooleanVo revoke(@PathVariable Long id) { + userPatService.revoke(currentUserId(), id); + return BooleanVo.TRUE; + } + + private Integer currentUserId() { + return userContextHolder.checkAndGet().userId(); + } +} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/enums/PermissionEnum.java b/data-agent-backend/src/main/java/io/github/malonetalk/enums/PermissionEnum.java index 7c5df9f8..b36ac762 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/enums/PermissionEnum.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/enums/PermissionEnum.java @@ -75,7 +75,8 @@ public enum PermissionEnum { SYS_ROLE_GRANT("sys:role:grant", "角色:授权", "角色", true), SYS_MCP_READ("sys:mcp:read", "MCP 配置:查看", "MCP 配置"), SYS_MCP_UPDATE("sys:mcp:update", "MCP 配置:修改", "MCP 配置"), - SYS_MCP_SET_STATUS("sys:mcp:set-status", "MCP 配置:启停", "MCP 配置"); + SYS_MCP_SET_STATUS("sys:mcp:set-status", "MCP 配置:启停", "MCP 配置"), + ACCESS_PAT_MANAGE("access:pat:manage", "访问令牌:管理", "访问令牌"); private final String code; private final String name; diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/mapper/UserPatMapper.java b/data-agent-backend/src/main/java/io/github/malonetalk/mapper/UserPatMapper.java new file mode 100644 index 00000000..9df2e2a6 --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/mapper/UserPatMapper.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.mapper; + +import io.github.malonetalk.model.po.UserPatPo; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UserPatMapper extends AuditableMapper {} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/model/bo/UserPatBo.java b/data-agent-backend/src/main/java/io/github/malonetalk/model/bo/UserPatBo.java new file mode 100644 index 00000000..7a8b4966 --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/model/bo/UserPatBo.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.model.bo; + +import java.time.LocalDateTime; + +public record UserPatBo( + Long id, + String name, + String tokenPrefix, + LocalDateTime expiresAt, + LocalDateTime lastUsedAt, + LocalDateTime revokedAt, + LocalDateTime createTime) {} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/model/bo/UserPatCreateResultBo.java b/data-agent-backend/src/main/java/io/github/malonetalk/model/bo/UserPatCreateResultBo.java new file mode 100644 index 00000000..6eb13c5f --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/model/bo/UserPatCreateResultBo.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.model.bo; + +/** 创建结果:token 为明文,只能返回一次。 */ +public record UserPatCreateResultBo(UserPatBo pat, String token) {} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/model/converter/UserPatConverter.java b/data-agent-backend/src/main/java/io/github/malonetalk/model/converter/UserPatConverter.java new file mode 100644 index 00000000..242b6f83 --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/model/converter/UserPatConverter.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.model.converter; + +import io.github.malonetalk.model.bo.UserPatBo; +import io.github.malonetalk.model.po.UserPatPo; +import io.github.malonetalk.model.vo.UserPatVo; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface UserPatConverter { + + UserPatBo toBo(UserPatPo po); + + UserPatVo toVo(UserPatBo bo); +} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/model/dto/UserPatCreateDto.java b/data-agent-backend/src/main/java/io/github/malonetalk/model/dto/UserPatCreateDto.java new file mode 100644 index 00000000..b0c3964e --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/model/dto/UserPatCreateDto.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.model.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import java.time.LocalDateTime; + +public record UserPatCreateDto( + @NotBlank(message = "名称不能为空") @Size(max = 64, message = "名称不能超过 64 个字符") String name, + LocalDateTime expiresAt) {} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/model/po/UserPatPo.java b/data-agent-backend/src/main/java/io/github/malonetalk/model/po/UserPatPo.java new file mode 100644 index 00000000..b128a7ec --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/model/po/UserPatPo.java @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.model.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.time.LocalDateTime; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** 用户个人访问令牌(PAT)。数据库只保存哈希,明文只在创建时返回一次。 */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("user_pat") +public class UserPatPo extends BasePo { + + @TableId(type = IdType.AUTO) + private Long id; + + private Integer userId; + private String name; + private String tokenPrefix; + private String tokenHash; + private LocalDateTime expiresAt; + private LocalDateTime lastUsedAt; + private LocalDateTime revokedAt; +} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/UserPatCreatedVo.java b/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/UserPatCreatedVo.java new file mode 100644 index 00000000..4d93f8c8 --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/UserPatCreatedVo.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.model.vo; + +/** 创建成功响应:token 为明文,只能获取一次。 */ +public record UserPatCreatedVo(UserPatVo pat, String token) implements BaseVo {} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/UserPatVo.java b/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/UserPatVo.java new file mode 100644 index 00000000..bd37ccb0 --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/UserPatVo.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.model.vo; + +import java.time.LocalDateTime; + +public record UserPatVo( + Long id, + String name, + String tokenPrefix, + LocalDateTime expiresAt, + LocalDateTime lastUsedAt, + LocalDateTime revokedAt, + LocalDateTime createTime) + implements BaseVo {} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/service/UserPatService.java b/data-agent-backend/src/main/java/io/github/malonetalk/service/UserPatService.java new file mode 100644 index 00000000..d6630cd9 --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/service/UserPatService.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.service; + +import io.github.malonetalk.model.bo.UserPatBo; +import io.github.malonetalk.model.bo.UserPatCreateResultBo; +import io.github.malonetalk.model.dto.UserPatCreateDto; +import java.util.List; + +public interface UserPatService { + + UserPatCreateResultBo create(Integer userId, UserPatCreateDto request); + + List list(Integer userId); + + void revoke(Integer userId, Long id); +} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/service/UserPatServiceImpl.java b/data-agent-backend/src/main/java/io/github/malonetalk/service/UserPatServiceImpl.java new file mode 100644 index 00000000..1370b109 --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/service/UserPatServiceImpl.java @@ -0,0 +1,179 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.service; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import io.github.malonetalk.exception.BusinessException; +import io.github.malonetalk.exception.ErrorCode; +import io.github.malonetalk.mapper.UserPatMapper; +import io.github.malonetalk.model.bo.UserPatBo; +import io.github.malonetalk.model.bo.UserPatCreateResultBo; +import io.github.malonetalk.model.converter.UserPatConverter; +import io.github.malonetalk.model.dto.UserPatCreateDto; +import io.github.malonetalk.model.po.UserPatPo; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.time.LocalDateTime; +import java.util.Base64; +import java.util.HexFormat; +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class UserPatServiceImpl implements UserPatService { + + static final int MAX_ACTIVE_PATS = 10; + private static final int DEFAULT_EXPIRY_DAYS = 90; + private static final int MAX_EXPIRY_DAYS = 365; + private static final int MIN_EXPIRY_DAYS = 1; + private static final int TOKEN_PREFIX_LENGTH = 12; + private static final int TOKEN_BYTES = 32; + private static final String TOKEN_PREFIX = "pat_"; + private static final SecureRandom RANDOM = new SecureRandom(); + + private final UserPatMapper userPatMapper; + private final UserPatConverter converter; + + @Override + @Transactional + public UserPatCreateResultBo create(Integer userId, UserPatCreateDto request) { + LocalDateTime now = LocalDateTime.now(); + LocalDateTime expiresAt = resolveExpiresAt(request.expiresAt(), now); + if (activeCount(userId, now) >= MAX_ACTIVE_PATS) { + throw BusinessException.of( + ErrorCode.DATA_CONFLICT, + "Active personal access tokens cannot exceed " + MAX_ACTIVE_PATS + "."); + } + + String token = generateToken(); + UserPatPo pat = new UserPatPo(); + pat.setUserId(userId); + pat.setName(requireName(request.name())); + pat.setTokenPrefix(tokenPrefix(token)); + pat.setTokenHash(hash(token)); + pat.setExpiresAt(expiresAt); + if (userPatMapper.insert(pat) == 0) { + throw BusinessException.of(ErrorCode.OPERATION_FAILED, "Failed to create the token."); + } + return new UserPatCreateResultBo(converter.toBo(pat), token); + } + + @Override + @Transactional(readOnly = true) + public List list(Integer userId) { + return userPatMapper + .selectList( + Wrappers.lambdaQuery() + .select( + UserPatPo::getId, + UserPatPo::getName, + UserPatPo::getTokenPrefix, + UserPatPo::getExpiresAt, + UserPatPo::getLastUsedAt, + UserPatPo::getRevokedAt, + UserPatPo::getCreateTime) + .eq(UserPatPo::getUserId, userId) + .orderByDesc(UserPatPo::getCreateTime)) + .stream() + .map(converter::toBo) + .toList(); + } + + @Override + @Transactional + public void revoke(Integer userId, Long id) { + UserPatPo existing = + userPatMapper.selectOne( + Wrappers.lambdaQuery() + .select( + UserPatPo::getId, + UserPatPo::getUserId, + UserPatPo::getRevokedAt) + .eq(UserPatPo::getId, id)); + if (existing == null || !Objects.equals(existing.getUserId(), userId)) { + throw BusinessException.of(ErrorCode.RESOURCE_NOT_FOUND, "Token not found."); + } + if (existing.getRevokedAt() != null) { + return; + } + + UserPatPo update = new UserPatPo(); + update.setId(id); + update.setRevokedAt(LocalDateTime.now()); + if (userPatMapper.updateById(update) == 0) { + throw BusinessException.of(ErrorCode.OPERATION_FAILED, "Failed to revoke the token."); + } + } + + private Long activeCount(Integer userId, LocalDateTime now) { + return userPatMapper.selectCount( + Wrappers.lambdaQuery() + .eq(UserPatPo::getUserId, userId) + .isNull(UserPatPo::getRevokedAt) + .gt(UserPatPo::getExpiresAt, now)); + } + + private static String requireName(String name) { + return Optional.ofNullable(name) + .map(String::trim) + .filter(value -> !value.isEmpty()) + .orElseThrow( + () -> BusinessException.of(ErrorCode.BAD_REQUEST, "Name is required.")); + } + + private static LocalDateTime resolveExpiresAt(LocalDateTime requested, LocalDateTime now) { + LocalDateTime expiresAt = + Optional.ofNullable(requested).orElse(now.plusDays(DEFAULT_EXPIRY_DAYS)); + if (expiresAt.isBefore(now.plusDays(MIN_EXPIRY_DAYS))) { + throw BusinessException.of( + ErrorCode.BAD_REQUEST, "Expiration must be at least 1 day later."); + } + if (expiresAt.isAfter(now.plusDays(MAX_EXPIRY_DAYS))) { + throw BusinessException.of( + ErrorCode.BAD_REQUEST, + "Expiration cannot exceed " + MAX_EXPIRY_DAYS + " days."); + } + return expiresAt; + } + + private static String generateToken() { + byte[] bytes = new byte[TOKEN_BYTES]; + RANDOM.nextBytes(bytes); + return TOKEN_PREFIX + Base64.getUrlEncoder().withoutPadding().encodeToString(bytes); + } + + private static String tokenPrefix(String token) { + return token.substring(0, Math.min(TOKEN_PREFIX_LENGTH, token.length())); + } + + private static String hash(String token) { + try { + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + return HexFormat.of().formatHex(digest.digest(token.getBytes(StandardCharsets.UTF_8))); + } catch (NoSuchAlgorithmException e) { + throw new IllegalStateException("SHA-256 is not available.", e); + } + } +} diff --git a/data-agent-frontend/src/api/pat.ts b/data-agent-frontend/src/api/pat.ts new file mode 100644 index 00000000..2de23cfd --- /dev/null +++ b/data-agent-frontend/src/api/pat.ts @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +import request from './request'; +import type { ApiResponse } from './request'; +import type { BooleanVo } from './types'; + +export interface UserPat { + id: number; + name: string; + tokenPrefix: string; + expiresAt: string; + lastUsedAt: string | null; + revokedAt: string | null; + createTime: string; +} + +export interface UserPatCreated { + pat: UserPat; + token: string; +} + +export interface CreateUserPatRequest { + name: string; + expiresAt: string; +} + +export function createUserPat(payload: CreateUserPatRequest) { + return request + .post>('/auth/pats', payload) + .then(res => res.data.data); +} + +export function getUserPats() { + return request.get>('/auth/pats').then(res => res.data.data); +} + +export function revokeUserPat(id: number) { + return request + .delete>(`/auth/pats/${id}`) + .then(res => res.data.data.value); +} diff --git a/data-agent-frontend/src/components/layout/AppHeader.vue b/data-agent-frontend/src/components/layout/AppHeader.vue index b95206c8..951c0de6 100644 --- a/data-agent-frontend/src/components/layout/AppHeader.vue +++ b/data-agent-frontend/src/components/layout/AppHeader.vue @@ -33,6 +33,10 @@ userStore.logout(); router.push('/login'); } + + function onOpenTokens() { + router.push('/settings/tokens'); + }